Bug 20647: (alternate) When ILL is enabled the hover effect on the ILL requests butto...

[koha.git] / 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 875524a..210cc6e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
@@ -35,13 +35,6 @@
                 [% END %]
             </div> <!-- /.col-sm-2 -->
             <div class="col-sm-9">
-                [% IF adminWarning %]
-                    <div id="adminwarning" class="dialog alert">
-                        <p><strong>Warning:</strong> You are logged in as the database administrative user. This is not recommended because some parts of Koha will not function as expected when using this account.</p>
-                        <p>Please log in instead with a regular staff account. To create a staff account, create a library, a patron category 'Staff' and add a new patron. Then give this patron permissions from 'More' in the toolbar.</p>
-                        <p><a class="btn btn-default btn-sm" href="/cgi-bin/koha/members/members-home.pl"><i class="fa fa-plus"> </i> Create patron</a></p>
-                    </div>
-                [% END %]
                 <div class="row">
                     <div class="col-xs-6">
                         <ul class="biglinks-list">
@@ -73,15 +66,10 @@
                                 </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 %]
                             <li>
                                 <a class="icon_general icon_authorities" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
                             </li>
-                            [% IF Koha.Preference('ILLModule') && (CAN_user_ill || CAN_user_superlibrarian) %]
+                            [% IF Koha.Preference('ILLModule') && CAN_user_ill %]
                             <li>
                                 <a class="icon_general icon_ill" href="/cgi-bin/koha/ill/ill-requests.pl">ILL requests</a>
                             </li>
@@ -90,6 +78,13 @@
                     </div> <!-- /.col-xs-6 -->
                     <div class="col-xs-6">
                         <ul class="biglinks-list">
+
+                            [% 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_serials ) %]
                             <li>
                                 <a class="icon_general icon_serials" href="/cgi-bin/koha/serials/serials-home.pl">Serials</a>
@@ -132,7 +127,7 @@
                 <div class="row">
                     <div class="col-sm-12">
                         [%# Following statement must be in one line for translatability %]
-                        [% IF ( ( CAN_user_tools_moderate_comments  && pendingcomments ) || ( CAN_user_tools_moderate_tags && pendingtags ) || ( CAN_user_borrowers_edit_borrowers && pending_borrower_modifications ) || ( CAN_user_acquisition && pendingsuggestions ) || ( CAN_user_borrowers_edit_borrowers && pending_discharge_requests ) || pending_article_requests) %]
+                        [% IF ( ( CAN_user_tools_moderate_comments  && pendingcomments ) || ( CAN_user_tools_moderate_tags && pendingtags ) || ( CAN_user_borrowers_edit_borrowers && pending_borrower_modifications ) || ( CAN_user_acquisition && pendingsuggestions ) || ( CAN_user_borrowers_edit_borrowers && pending_discharge_requests ) || pending_article_requests) || ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes && pending_checkout_notes.count ) %]
                             <div id="area-pending">
                                 [% IF pending_article_requests %]
                                 <div class="pending-info" id="article_requests_pending">
@@ -142,7 +137,7 @@
                                 </div>
                                 [% END %]
 
-                                [% IF ( CAN_user_acquisition && pendingsuggestions ) %]
+                                [% IF ( CAN_user_acquisition_suggestions_manage && pendingsuggestions ) %]
                                 <div class="pending-info" id="suggestions_pending">
 
                                     <a href="/cgi-bin/koha/suggestion/suggestion.pl#ASKED">Suggestions pending approval</a>:
@@ -179,6 +174,13 @@
                                 </div>
                                 [% END %]
 
+                                [% IF Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes && pending_checkout_notes.count %]
+                                    <div class="pending-info" id="checkout_notes_pending">
+                                        <a href="/cgi-bin/koha/circ/checkout-notes.pl">Checkout notes pending</a>:
+                                        <span class="pending-number-link">[% pending_checkout_notes.count %]</span>
+                                    </div>
+                                [% END %]
+
                             </div>
 
                         [% END %]