[Koha-patches] [PATCH 28/54] MT3138 : Adding permissions on viewlog+change in display

paul.poulain at biblibre.com paul.poulain at biblibre.com
Thu Dec 16 11:54:22 CET 2010


From: Paul Poulain <paul.poulain at biblibre.com>

* dealing with CAN_user_circulate_view_borrowers_logs new permission
* changing the display of the borrower informations
---
 .../intranet-tmpl/prog/en/includes/circ-menu.inc   |  117 ++++++++++++--------
 1 files changed, 72 insertions(+), 45 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index 56dd2f2..8bd6d58 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -4,6 +4,19 @@
 <style type="tex/css">img { width: expression(this.width > 140 ? 140: true);
 }</style>
 <![endif]-->
+<script type="text/javascript">
+$(document).ready(function()
+{
+  //hide the all of the element with class msg_body
+  $("#collapsedaddress").hide();
+  //toggle the componenet with class msg_body
+  $("#toggleaddress").click(function()
+  {
+    $("#collapsedaddress").slideToggle("normal");
+    $("#toggleaddress").toggleClass("toggleaddress2");
+  });
+});
+</script>
 <ul>
 <!-- TMPL_IF NAME="patronimages" -->
 <!-- TMPL_IF NAME="picture" -->
@@ -12,46 +25,64 @@
 <li><img src="/intranet-tmpl/prog/img/patron-blank.png" alt="<!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
 <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
-    <li><!-- TMPL_IF NAME="address"-->
-            <!-- TMPL_VAR NAME="address" -->
-    <!-- TMPL_ELSE -->
-            <span class="empty">No address stored.</span>
-    <!-- /TMPL_IF --></li>
-    <!-- TMPL_IF NAME="address2" -->
-        <li><!-- TMPL_VAR NAME="address2" --></li>
-    <!-- /TMPL_IF --><li> 
-    <!-- TMPL_IF NAME="city" -->
-            <!-- TMPL_VAR NAME="city" -->
-	    <!-- TMPL_VAR NAME="zipcode" -->
-	    <!-- TMPL_IF NAME="country" -->, <!-- TMPL_VAR NAME="country" --><!-- /TMPL_IF -->
-    <!-- TMPL_ELSE -->
-        <span class="empty">No city stored.</span>
-    <!-- /TMPL_IF --></li>
-    <li><!--TMPL_IF NAME="phone" -->
-        <!-- TMPL_VAR NAME="phone" -->
-    <!-- TMPL_ELSE -->
-        <!--TMPL_IF NAME="mobile" -->
-            <!-- TMPL_VAR NAME="mobile" -->
-        <!-- TMPL_ELSE -->
-            <!--TMPL_IF NAME="phonepro" -->
-                <!-- TMPL_VAR NAME="phonepro" -->
-            <!-- TMPL_ELSE -->
-                <span class="empty">No phone stored.</span>    
-            <!-- /TMPL_IF -->
-        <!-- /TMPL_IF -->
-    <!-- /TMPL_IF --></li>
-    <!-- TMPL_IF NAME="email" -->
-        <li class="email"> <a href="mailto:<!-- TMPL_VAR NAME="email" -->" title="<!-- TMPL_VAR NAME="email" -->"><!-- TMPL_VAR NAME="email" --></a></li>
-    <!-- TMPL_ELSE -->
-        <!-- TMPL_IF NAME="emailpro" -->
-            <li class="email"> <a href="mailto:<!-- TMPL_VAR NAME="emailpro" -->" title="<!-- TMPL_VAR NAME="emailpro" -->"><!-- TMPL_VAR NAME="emailpro" --></a></li>
-        <!-- TMPL_ELSE -->
-            <li> <span class="empty">No email stored.</span>    </li>
-        <!-- /TMPL_IF -->
-    <!-- /TMPL_IF -->
-    <li>Category: <!-- TMPL_VAR NAME="categoryname" --> (<!-- TMPL_VAR NAME="categorycode" -->)</li>
-    <li>Home Library: <!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="branch" --><!-- /TMPL_IF --></li>
-</ul></div>
+    <li><!-- TMPL_VAR NAME="categoryname" --> (<!-- TMPL_VAR NAME="categorycode" -->)</li>
+    <li><!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="branch" --><!-- /TMPL_IF --></li>
+    <!-- TMPL_LOOP NAME="extendedattributes" -->
+    	<!-- TMPL_IF NAME="display_checkout" -->
+    		<!-- TMPL_IF NAME="value" -->
+    			<!-- TMPL_VAR NAME="description" --> : <!-- TMPL_IF NAME="value_description" --><!-- TMPL_VAR NAME="value_description" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
+    		<!-- /TMPL_IF -->
+    	<!-- /TMPL_IF -->
+    <!-- /TMPL_LOOP -->
+    <li>
+		<div id="collapsedaddress">
+			<p>
+		    <!-- TMPL_IF NAME="address"-->
+		            <!-- TMPL_VAR NAME="address" -->
+		    <!-- TMPL_ELSE -->
+		            <span class="empty">No address stored.</span>
+		    <!-- /TMPL_IF -->
+		    <!-- TMPL_IF NAME="address2" -->
+		        <!-- TMPL_VAR NAME="address2" -->
+		    <!-- /TMPL_IF -->
+		    <!-- TMPL_IF NAME="city" -->
+		            <!-- TMPL_VAR NAME="city" -->
+			    <!-- TMPL_VAR NAME="zipcode" -->
+			    <!-- TMPL_IF NAME="country" -->, <!-- TMPL_VAR NAME="country" --><!-- /TMPL_IF -->
+		    <!-- TMPL_ELSE -->
+		        <span class="empty">No city stored.</span>
+		    <!-- /TMPL_IF -->
+		    </p>
+		    <p>
+		    <!--TMPL_IF NAME="phone" -->
+		        <!-- TMPL_VAR NAME="phone" -->
+		    <!-- TMPL_ELSE -->
+		        <!--TMPL_IF NAME="mobile" -->
+		            <!-- TMPL_VAR NAME="mobile" -->
+		        <!-- TMPL_ELSE -->
+		            <!--TMPL_IF NAME="phonepro" -->
+		                <!-- TMPL_VAR NAME="phonepro" -->
+		            <!-- TMPL_ELSE -->
+		                <span class="empty">No phone stored.</span>    
+		            <!-- /TMPL_IF -->
+		        <!-- /TMPL_IF -->
+		    <!-- /TMPL_IF -->
+		    </p><p>
+		    <!-- TMPL_IF NAME="email" -->
+		        <a href="mailto:<!-- TMPL_VAR NAME="email" -->" title="<!-- TMPL_VAR NAME="email" -->"><!-- TMPL_VAR NAME="email" --></a>
+		    <!-- TMPL_ELSE -->
+		        <!-- TMPL_IF NAME="emailpro" -->
+		            <a href="mailto:<!-- TMPL_VAR NAME="emailpro" -->" title="<!-- TMPL_VAR NAME="emailpro" -->"><!-- TMPL_VAR NAME="emailpro" --></a>
+		        <!-- TMPL_ELSE -->
+		            <span class="empty">No email stored.</span>
+		        <!-- /TMPL_IF -->
+		    <!-- /TMPL_IF -->
+		    </p>
+		</div>
+		<a id="toggleaddress" class="toggleaddress">View/Hide address</a>
+    </li>
+</ul>
+</div>
 <div id="menu">
 <ul>
 	<!-- TMPL_IF NAME="circview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Check Out</a></li>
@@ -62,11 +93,7 @@
 	<!-- TMPL_IF NAME="finesview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Fines</a></li>
 	<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="intranetreadinghistory" --><!-- TMPL_IF NAME="readingrecordview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Circulation History</a></li><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="CAN_user_parameters"--><!-- TMPL_IF NAME="logview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;action=MODIFY&amp;object=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;src=circ">Modification Log</a></li><!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="EnhancedMessagingPreferences" -->
+	<!-- TMPL_IF NAME="CAN_user_circulate_view_borrowers_logs"--><!-- TMPL_IF NAME="logview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;modules=circulation&amp;object=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;src=circ">Modification Log</a></li><!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="messagingview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/members/messaging.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Messaging</a></li>
-    <!-- /TMPL_IF -->	
-	<!-- TMPL_IF NAME="sentnotices" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/members/notices.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Notices</a></li>
 </ul></div>
-<!-- /TMPL_IF -->
 
-- 
1.7.1



More information about the Koha-patches mailing list