[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en acqui.simpl... [rel_2_2]

[Owen Leonard]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Owen Leonard <oleonard> 06/10/16 20:46:44

Modified files:
        koha-tmpl/intranet-tmpl/npl/en/acqui.simple: addbiblio.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/acqui: newbasket2.tmpl 

Log message:
        Synching with default

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.4.2.25&r2=1.4.2.26
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbasket2.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.2&r2=1.1.2.3

Patches:
Index: acqui.simple/addbiblio.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/Attic/addbiblio.tmpl,v
retrieving revision 1.4.2.25
retrieving revision 1.4.2.26
diff -u -b -r1.4.2.25 -r1.4.2.26
--- acqui.simple/addbiblio.tmpl 2 Oct 2006 15:09:22 -0000       1.4.2.25
+++ acqui.simple/addbiblio.tmpl 16 Oct 2006 20:46:44 -0000      1.4.2.26
@@ -16,6 +16,7 @@
 <div class="tabbed">
                <input type="hidden" name="op" value="addbiblio" />
                <input type="hidden" name="addfield_field" />
+               <input type="hidden" name="repeat_field" />
                <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR 
NAME="frameworkcode" -->" />
                <input type="hidden" name="oldbiblionumber" value="<!-- 
TMPL_VAR NAME="oldbiblionumber" -->" />
                <!-- TMPL_IF name="bibid" -->
@@ -67,7 +68,7 @@
             <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
             <!-- TMPL_VAR NAME="tag_lib" -->
             <!-- /TMPL_UNLESS -->
-            <!-- TMPL_IF name="repeatable" --><a href="#<!-- TMPL_VAR 
NAME="tag" -->" 
onclick="javascript:this.nextSibling.type='text';this.nextSibling.focus()">+</a><input
 type="hidden" name="repeat_field" value="" size="2" 
onchange="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->',this.value)" ><!-- 
/TMPL_IF -->
+            <!-- TMPL_IF name="repeatable" --><a href="#<!-- TMPL_VAR 
NAME="tag" -->" 
onclick="javascript:this.nextSibling.type='text';this.nextSibling.focus()">+</a><input
 type="hidden" value="" size="2" onchange="javascript:AddField('<!-- TMPL_VAR 
NAME="tag" -->',this.value)" ><!-- /TMPL_IF -->
         </p>
         <!-- /TMPL_IF -->
         <!-- TMPL_LOOP NAME="subfield_loop" -->
@@ -315,6 +316,7 @@
 function AddField(field,cntrepeatfield) {
        document.forms['f'].op.value = "addfield";
        document.forms['f'].addfield_field.value=field;
+       document.forms['f'].repeat_field.value=cntrepeatfield;
        document.f.submit();
 }
 
@@ -329,12 +331,8 @@
     if(isNaN(NumTabIndex)) NumTabIndex = 0;
     clone.setAttribute('tabindex',NumTabIndex+1);
 
-    var ButtonPlus;
     var CloneButtonPlus;
     try{
-        ButtonPlus = original.getElementsByTagName('a')[0];  // getting the 
'<a href=...>+</a>
-        ButtonPlus.parentNode.removeChild(ButtonPlus);  // removing the '+' 
button
-
         CloneButtonPlus = clone.getElementsByTagName('a')[0];
         CloneButtonPlus.setAttribute('onclick',"cloneSubfield('" + index + 
index + "')");
     }

Index: acqui/newbasket2.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/newbasket2.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- acqui/newbasket2.tmpl       15 Jun 2006 15:23:12 -0000      1.1.2.2
+++ acqui/newbasket2.tmpl       16 Oct 2006 20:46:44 -0000      1.1.2.3
@@ -66,9 +66,13 @@
 <!-- /TMPL_LOOP -->
 
 </table>
-
+       <!-- TMPL_IF name="previous" -->
+       <a class="nav" href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- 
TMPL_VAR NAME="num" -->&amp;offset=<!-- TMPL_VAR NAME="previous" 
-->&amp;type=<!-- TMPL_VAR NAME="type" -->&amp;booksellerid=<!-- TMPL_VAR 
NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" 
-->&amp;search=<!-- TMPL_VAR NAME="title" -->&amp;author=<!-- TMPL_VAR 
NAME="author" -->">
+       &lt; Previous
+       </a>
+       <!-- /TMPL_IF -->
 <!-- TMPL_IF name="offsetover" -->
-<a class="nav" href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR 
name="num" -->&amp;offset=<!-- TMPL_VAR name="offset" -->&amp;type=<!-- 
TMPL_VAR name="type" -->&amp;id=<!-- TMPL_VAR name="id" -->&amp;basket=<!-- 
TMPL_VAR name="basket" -->&amp;search=<!-- TMPL_VAR name="title" 
-->&amp;author=<!-- TMPL_VAR name="author" -->">Next</a>
+<a class="nav" href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR 
name="num" -->&amp;offset=<!-- TMPL_VAR name="offset" -->&amp;type=<!-- 
TMPL_VAR name="type" -->&amp;id=<!-- TMPL_VAR name="id" -->&amp;basket=<!-- 
TMPL_VAR name="basket" -->&amp;search=<!-- TMPL_VAR name="title" 
-->&amp;author=<!-- TMPL_VAR name="author" -->">Next &gt;</a>
 <!-- /TMPL_IF -->
 </div>