From 04d109546ec0ba595360676be4db62a0cc3d0175 Mon Sep 17 00:00:00 2001 From: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com> Date: Thu, 29 Jan 2009 15:21:17 +0100 Subject: [PATCH][3.0.x] (bug #2933) change popup names containing space chars Content-Type: text/plain; charset="utf-8" This patch change all call to open.window that have a window identifier which contains space chars. --- .../intranet-tmpl/prog/en/includes/error-top.inc | 2 +- .../en/modules/authorities/authorities-home.tmpl | 2 +- .../prog/en/modules/authorities/authorities.tmpl | 2 +- .../prog/en/modules/authorities/detail.tmpl | 2 +- .../en/modules/authorities/searchresultlist.tmpl | 2 +- .../prog/en/modules/cataloguing/addbiblio.tmpl | 4 ++-- .../prog/en/modules/cataloguing/additem.tmpl | 2 +- .../cataloguing/value_builder/labs_theses.tmpl | 2 +- .../prog/en/modules/tools/holidays.tmpl | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc index a1d3826..5375ade 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc @@ -16,7 +16,7 @@ window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable") <script language="JavaScript" type="text/javascript"> function Help() { - newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes'); + newin=window.open("/cgi-bin/koha/help.pl","KohaHelp",'width=600,height=600,toolbar=false,scrollbars=yes'); } </script> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl index 76203e9..425e373 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl @@ -4,7 +4,7 @@ <script language="JavaScript" type="text/javascript"> //<![CDATA[ function Help() { - newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes'); + newin=window.open("/cgi-bin/koha/help.pl","KohaHelp",'width=600,height=600,toolbar=false,scrollbars=yes'); } function addauthority() { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl index db7c409..c27a01f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl @@ -85,7 +85,7 @@ function AddField(field,cntrepeatfield) { function Dopop(link,i) { defaultvalue = document.getElementById(i).value; - window.open(link+"&result="+defaultvalue,"value builder",'width=700,height=550,toolbar=false,scrollbars=yes'); + window.open(link+"&result="+defaultvalue,"valuebuilder",'width=700,height=550,toolbar=false,scrollbars=yes'); } function ExpandField(index) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl index 774e4d8..5980d9e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl @@ -43,7 +43,7 @@ function showChildren(mynumber) { } } function Help() { - newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes'); + newin=window.open("/cgi-bin/koha/help.pl","KohaHelp",'width=600,height=600,toolbar=false,scrollbars=yes'); } function addauthority() { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl index 67a394f..e49a997 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl @@ -11,7 +11,7 @@ function confirm_deletion(id) { } } function Help() { - newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes'); + newin=window.open("/cgi-bin/koha/help.pl","KohaHelp",'width=600,height=600,toolbar=false,scrollbars=yes'); } function addauthority() { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl index 1db25f9..0c33f78 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl @@ -54,7 +54,7 @@ function Check(){ function Dopop(link,i) { defaultvalue = document.getElementById(i).value; - window.open(link+"&result="+defaultvalue,"value builder",'width=700,height=550,toolbar=false,scrollbars=yes'); + window.open(link+"&result="+defaultvalue,"valuebuilder",'width=700,height=550,toolbar=false,scrollbars=yes'); } /** @@ -171,7 +171,7 @@ function openAuth(tagsubfieldid,authtype) { } } } - newin=window.open("../authorities/auth_finder.pl?authtypecode="+ authtype+ "&index="+tagsubfieldid+"&mainmainstring="+encodeURI(mainmainstring)+"&mainstring="+encodeURI(mainstring), "value builder",'width=700,height=550,toolbar=false,scrollbars=yes'); + newin=window.open("../authorities/auth_finder.pl?authtypecode="+ authtype+ "&index="+tagsubfieldid+"&mainmainstring="+encodeURI(mainmainstring)+"&mainstring="+encodeURI(mainstring), "_blank",'width=700,height=550,toolbar=false,scrollbars=yes'); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl index b55b166..7358fee 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl @@ -47,7 +47,7 @@ function Check(f) { } function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; - newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes'); + newin=window.open(link+"&result="+defaultvalue,"valuebuilder",'width=500,height=400,toolbar=false,scrollbars=yes'); } function confirm_deletion(biblionumber,itemnumber) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl index ef17e48..5312bff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl @@ -14,7 +14,7 @@ function openWindow(targeturl, windowname) { window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable") } function Help() { - newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes'); + newin=window.open("/cgi-bin/koha/help.pl","KohaHelp",'width=600,height=600,toolbar=false,scrollbars=yes'); } // end hiding --> </script> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl index b1d0b9c..73aedce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl @@ -99,7 +99,7 @@ } function Help() { - newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes'); + newin=window.open("/cgi-bin/koha/help.pl","KohaHelp",'width=600,height=600,toolbar=false,scrollbars=yes'); } $(document).ready(function() { $("#branch").change(function(){ -- 1.5.6.3