[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en circ/branc... [rel_3_0]

[Antoine Farnault]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	06/10/18 08:04:19

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/circ: branchtransfers.tmpl 
	                                      circulation.tmpl 
	koha-tmpl/intranet-tmpl/prog/en/includes: menus.inc 

Log message:
	Some minor display change & fix wrong link.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4.2.2&r2=1.4.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.3&r2=1.6.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.11&r2=1.6.2.12

Patches:
Index: circ/branchtransfers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -b -r1.4.2.2 -r1.4.2.3
--- circ/branchtransfers.tmpl	17 Oct 2006 09:53:19 -0000	1.4.2.2
+++ circ/branchtransfers.tmpl	18 Oct 2006 08:04:19 -0000	1.4.2.3
@@ -78,7 +78,10 @@
 		<!-- TMPL_IF Name="setwaiting" -->
 			Item should now be waiting at branch: <!-- TMPL_VAR Name="reqbrchname" --><br>
 		<!-- /TMPL_IF -->
+	<!-- TMPL_ELSE -->
+	    No message.
 	<!-- /TMPL_IF -->
+	
 	<!-- TMPL_LOOP Name="errmsgloop" -->
 		<!-- TMPL_IF Name="errbadcode" -->
 			No Item with barcode: <!-- TMPL_VAR Name="msg" -->

Index: circ/circulation.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -b -r1.6.2.3 -r1.6.2.4
--- circ/circulation.tmpl	11 Oct 2006 10:00:08 -0000	1.6.2.3
+++ circ/circulation.tmpl	18 Oct 2006 08:04:19 -0000	1.6.2.4
@@ -23,42 +23,41 @@
 <!-- TMPL_IF NAME="IMPOSSIBLE" -->
 <fieldset id="circ_circulation_impossible">
   <legend>Error Issuing Item</legend>
-
   <ul>
   <!-- TMPL_IF NAME="INVALID_DATE" -->
-    <li>The due date is invalid</li>
+    <li><span class="problem">The due date is invalid</span></li>
   <!-- /TMPL_IF -->
   
   <!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
-    <li>The barcode was not found</li>
+    <li><span class="problem">The barcode was not found</span></li>
   <!-- /TMPL_IF -->
   
   <!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
-    <li>Item not for loan</li>
+    <li><span class="problem">Item not for loan</span></li>
   <!-- /TMPL_IF -->
   
   <!-- TMPL_IF NAME="WTHDRAWN" -->
-    <li>Item is cancelled</li>
+    <li><span class="problem">Item is cancelled</span></li>
   <!-- /TMPL_IF -->
   
   <!-- TMPL_IF NAME="GNA" -->
-    <li>Patron's address is in doubt</li>
+    <li><span class="problem">Patron's address is in doubt</span></li>
   <!-- /TMPL_IF -->
   
   <!-- TMPL_IF NAME="CARD_LOST" -->
-    <li>Patron's card is lost</li>
+    <li><span class="problem">Patron's card is lost</span></li>
   <!-- /TMPL_IF -->
   
   <!-- TMPL_IF NAME="DEBARRED" -->
-    <li>Patron is debarred</li>
+    <li><span class="problem">Patron is debarred</span></li>
   <!-- /TMPL_IF -->
   
   <!-- TMPL_IF NAME="NO_MORE_RENEWALS" -->
-    <li>No more renewals possible</li>
+    <li><span class="problem">No more renewals possible</span></li>
   <!-- /TMPL_IF -->
   
   <!-- TMPL_IF NAME="EXPIRED" -->
-    <li>Patron's card is expired</li>
+    <li><span class="problem">Patron's card is expired</span></li>
   <!-- /TMPL_IF -->
   </ul>
 </fieldset>
@@ -185,7 +184,18 @@
   </h4>
 
   <ul>
-    <li><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="city" --></li>
+    <li>
+        <!-- TMPL_IF NAME="streetaddress"-->
+            <!-- TMPL_VAR NAME="streetaddress" -->,
+        <!-- TMPL_ELSE -->
+            <span class="problem">No Adress stored</span>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="city" -->
+             <!-- TMPL_VAR NAME="city" -->
+        <!-- TMPL_ELSE -->
+            No city stored.     
+        <!-- /TMPL_IF -->
+    </li>
     <li><!-- TMPL_VAR NAME="phone" --></li>
   
     <!-- TMPL_IF NAME="emailaddress" -->

Index: includes/menus.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc,v
retrieving revision 1.6.2.11
retrieving revision 1.6.2.12
diff -u -b -r1.6.2.11 -r1.6.2.12
--- includes/menus.inc	17 Oct 2006 09:46:31 -0000	1.6.2.11
+++ includes/menus.inc	18 Oct 2006 08:04:19 -0000	1.6.2.12
@@ -38,7 +38,7 @@
 				<a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>
 				    <ul>
 				    <li>
-				        <form name="searchform" method="get" action="catalogue/search.pl" id="searchform">
+				        <form name="searchform" method="get" action="/cgi-bin/koha/catalogue/search.pl" id="searchform">
 				        <input type="hidden" name="idx" value="" />
 				        <label for="navkeyword">
     				        <span class="accesskey">S</span>earch:&nbsp;