[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/09/14 14:11:41

Modified files:
	koha-tmpl/intranet-tmpl/npl/en/acqui.simple: addbiblio.tmpl 
	koha-tmpl/intranet-tmpl/npl/en/authorities: auth_finder.tmpl 
	koha-tmpl/intranet-tmpl/npl/en/members: jmemberentry.tmpl 

Log message:
	Synching with updates to default templates

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.23&r2=1.4.2.24
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/auth_finder.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/members/jmemberentry.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.1&r2=1.2.2.2

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.23
retrieving revision 1.4.2.24
diff -u -b -r1.4.2.23 -r1.4.2.24
--- acqui.simple/addbiblio.tmpl	31 Jul 2006 16:12:52 -0000	1.4.2.23
+++ acqui.simple/addbiblio.tmpl	14 Sep 2006 14:11:41 -0000	1.4.2.24
@@ -67,7 +67,7 @@
             <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
             <!-- TMPL_VAR NAME="tag_lib" -->
             <!-- /TMPL_UNLESS -->
-            <!-- TMPL_IF name="repeatable" --><a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a><!-- /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" name="repeat_field" value="" size="2" onchange="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->',this.value)" ><!-- /TMPL_IF -->
         </p>
         <!-- /TMPL_IF -->
         <!-- TMPL_LOOP NAME="subfield_loop" -->
@@ -312,7 +312,7 @@
 }
 
 
-function AddField(field) {
+function AddField(field,cntrepeatfield) {
 	document.forms['f'].op.value = "addfield";
 	document.forms['f'].addfield_field.value=field;
 	document.f.submit();
@@ -343,9 +343,30 @@
 }
 
 function upSubfield(index) {
-var original = document.getElementById(index);
-var previous = original.previousSibling;
-original.parentNode.insertBefore( original, previous );
+	try{
+		var line = document.getElementById(index); // get the line where the user has clicked.
+	} catch(e) {
+		return;
+	}
+	var tag = line.parentNode; // get the dad of this line. (should be "<div tag=XXX>")
+	
+	// getting all subfields for this tag
+	var subfields = tag.getElementsByTagName('div');
+	var subfieldsLength = subfields.length;
+	if(subfieldsLength<=1) return; // nothing to do if there is just one subfield.
+	// among all subfields 
+	for(var i=0;i<subfieldsLength;i++){ 
+		if(subfields[i].getAttribute('id') == index){ //looking for the subfield which is clicked :
+			if(i==0){ // if the clicked subfield is on the top
+				tag.appendChild(subfields[0]);
+				return;
+			}else{
+				var lineAbove = subfields[i-1];
+				tag.insertBefore(line,lineAbove);
+				return;
+			}
+		}
+	}
 }
 
 function unHideSubfield(index,labelindex) {

Index: authorities/auth_finder.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/Attic/auth_finder.tmpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- authorities/auth_finder.tmpl	31 Jul 2006 16:41:32 -0000	1.1.2.5
+++ authorities/auth_finder.tmpl	14 Sep 2006 14:11:41 -0000	1.1.2.6
@@ -21,7 +21,7 @@
 				<option value="contains">contains</option>
 				<option value="start">start by</option>
 			</select>
-			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
+			<input type="text" name="value" value="<!-- TMPL_VAR NAME="resultstring" -->" />
 			<input type="hidden" name="marclist" value="$a" />
 			<input type="hidden" name="and_or" value="and" />
 			<input type="hidden" name="excluding" value="" />
@@ -32,7 +32,7 @@
 				<option value="contains">contains</option>
 				<option value="start">start by</option>
 			</select>
-			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
+			<input type="text" name="value" />
 			<input type="hidden" name="marclist" value="mainentry" />
 			<input type="hidden" name="and_or" value="and" />
 			<input type="hidden" name="excluding" value="" />

Index: members/jmemberentry.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/Attic/jmemberentry.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- members/jmemberentry.tmpl	3 Aug 2006 16:42:43 -0000	1.2.2.1
+++ members/jmemberentry.tmpl	14 Sep 2006 14:11:41 -0000	1.2.2.2
@@ -5,6 +5,9 @@
 
 
 <div id="main"><form action="/cgi-bin/koha/members/newjmember.pl" method="post">
+	<input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->" />
+	<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->" />
+	<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="zipcode" -->" />
 	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->" />
 	<input type="hidden" name="updtype" value="I" />
 	<input type="hidden" name="area" value="<!-- TMPL_VAR NAME="area" -->" />