Bug 10862: (follow-up) fix a couple of issues

[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / modules / intranet-main.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
index 38658dd..c34ca85 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
@@ -16,7 +16,14 @@
    <div id="bd" role="main">
     <div id="yui-main">
     <div class="yui-b"><div class="yui-g">
+    [% IF adminWarning %]
+        <div id="adminwarning" class="dialog alert">
+            <p><strong>Warning:</strong> You're logged in with the database administrator account. This is a bad idea, and you are likely to encounter problems.</p>
+            <p>You should <a href="/cgi-bin/koha/members/members-home.pl">create a patron</a> to use when administering Koha and give it superlibrarian permissions.</p>
+        </div>
+    [% END %]
     <div class="yui-u first">
+
             <div id="area-list-left">
                 <ul class="biglinks-list">
                     [% IF ( CAN_user_circulate ) %]
@@ -41,17 +48,20 @@
                         <a class="icon_general icon_lists" href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a>
                     </li>
 
+                    [% IF ( UseCourseReserves ) %]
+                        <li>
+                            <a class="icon_general icon_course_reserves" href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a>
+                        </li>
+                    [% END %]
+
                     [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ) %]
                     <li>
                         <a class="icon_general icon_cataloging" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>
                     </li>
                     [% END %]
-
-                    [% IF ( CAN_user_editauthorities ) %]
                     <li>
                         <a class="icon_general icon_authorities" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
                     </li>
-                    [% END %]
                 </ul>
             </div><!-- /area-list-left -->
         </div><!-- /yui-u first -->
@@ -78,11 +88,6 @@
                     </li>
                     [% END %]
 
-                    [% IF ( CAN_user_parameters ) %]
-                    <li>
-                        <a class="icon_general icon_administration" href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a>
-                    </li>
-                    [% END %]
 
                     [% IF ( CAN_user_tools ) %]
                     <li>
@@ -90,6 +95,11 @@
                     </li>
                     [% END %]
 
+                    [% IF ( CAN_user_parameters ) %]
+                    <li>
+                        <a class="icon_general icon_administration" href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a>
+                    </li>
+                    [% END %]
                     <li>
                         <a class="icon_general icon_koha" href="/cgi-bin/koha/about.pl">About Koha</a>
                     </li>
@@ -100,12 +110,13 @@
 <div class="yui-g">
             [% IF ( ( CAN_user_tools_moderate_comments  && pendingcomments ) 
                     || ( CAN_user_tools_moderate_tags && pendingtags )
+                    || ( CAN_user_borrowers && pending_borrower_modifications )
                     || ( CAN_user_acquisition && pendingsuggestions ) ) %]
                 <div id="area-pending">
                     [% IF ( CAN_user_acquisition && pendingsuggestions ) %]
                     <div class="pending-info" id="suggestions_pending">
 
-                        <a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions pending approval</a>:
+                        <a href="/cgi-bin/koha/suggestion/suggestion.pl#ASKED">Suggestions pending approval</a>:
                         <span class="pending-number-link">[% pendingsuggestions %]</span>
                     </div>
                     [% END %]
@@ -123,9 +134,18 @@
                         <span class="pending-number-link">[% pendingtags %]</span>
                     </div>
                     [% END %]
+
+
+                    [% IF ( CAN_user_borrowers && pending_borrower_modifications ) %]
+                    <div class="pending-info" id="patron_updates_pending">
+                        <a href="/cgi-bin/koha/members/members-update.pl">Patrons requesting modifications</a>:
+                        <span class="pending-number-link">[% pending_borrower_modifications %]</span>
+                    </div>
+                    [% END %]
+
                 </div>
-            [% END %]
 
+            [% END %]
 
 </div>
             [% IF ( IntranetmainUserblock ) %]