Bug 8282: Bug in modules list in about.pl

[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 6c19248..492dca4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
@@ -33,7 +33,7 @@
 
                     [% IF ( CAN_user_catalogue ) %]
                     <li>
-                        <a class="icon_general icon_search" href="/cgi-bin/koha/catalogue/search.pl">Advanced Search</a>
+                        <a class="icon_general icon_search" href="/cgi-bin/koha/catalogue/search.pl">Advanced search</a>
                     </li>
                     [% END %]
 
@@ -41,7 +41,7 @@
                         <a class="icon_general icon_lists" href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a>
                     </li>
 
-                    [% IF ( CAN_user_catalogue || CAN_user_editcatalogue ) %]
+                    [% 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>
@@ -80,7 +80,7 @@
 
                     [% IF ( CAN_user_parameters ) %]
                     <li>
-                        <a class="icon_general icon_administration" href="/cgi-bin/koha/admin/admin-home.pl">Koha Administration</a>
+                        <a class="icon_general icon_administration" href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a>
                     </li>
                     [% END %]
 
@@ -98,26 +98,28 @@
         </div><!-- /yui-u -->
 </div><!-- /yui-g -->
 <div class="yui-g">
-                [% IF ( CAN_user_tools_moderate_comments ) && ( pendingsuggestions || pendingcomments || pendingtags ) %]
+            [% IF ( ( CAN_user_tools_moderate_comments  && pendingcomments ) 
+                    || ( CAN_user_tools_moderate_tags && pendingtags )
+                    || ( CAN_user_acquisition && pendingsuggestions ) ) %]
                 <div id="area-pending">
-                    [% IF ( pendingsuggestions ) %]
+                    [% IF ( CAN_user_acquisition && pendingsuggestions ) %]
                     <div class="pending-info">
-                        <a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions pending approval:
-                        <span class="pending-number-link">[% pendingsuggestions %]</span></a>
+                        <a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions pending approval</a>:
+                        <span class="pending-number-link">[% pendingsuggestions %]</span>
                     </div>
                     [% END %]
 
-                    [% IF ( pendingcomments ) %]
+                    [% IF ( CAN_user_tools_moderate_comments  && pendingcomments ) %]
                     <div class="pending-info">
-                        <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments pending approval:
-                        <span class="pending-number-link">[% pendingcomments %]</span></a>
+                        <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments pending approval</a>:
+                        <span class="pending-number-link">[% pendingcomments %]</span>
                     </div>
                     [% END %]
 
-                    [% IF ( pendingtags ) %]
+                    [% IF ( CAN_user_tools_moderate_tags && pendingtags ) %]
                     <div class="pending-info">
-                        <a href="/cgi-bin/koha/tags/review.pl">Tags pending approval:
-                        <span class="pending-number-link">[% pendingtags %]</span></a>
+                        <a href="/cgi-bin/koha/tags/review.pl">Tags pending approval</a>:
+                        <span class="pending-number-link">[% pendingtags %]</span>
                     </div>
                     [% END %]
                 </div>