Bug 13618: Specific for other prefs

[koha_ffzg] / 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 8fc64fc..37f2768 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha staff client</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/mainpage.css" />
@@ -26,7 +27,7 @@
 
             <div id="area-list-left">
                 <ul class="biglinks-list">
-                    [% IF ( CAN_user_circulate ) %]
+                    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
                     <li>
                         <a class="icon_general icon_circulation" href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
                     </li>
@@ -48,12 +49,17 @@
                         <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 %]
-
                     <li>
                         <a class="icon_general icon_authorities" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
                     </li>
@@ -83,11 +89,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>
@@ -95,6 +96,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>
@@ -106,7 +112,9 @@
             [% IF ( ( CAN_user_tools_moderate_comments  && pendingcomments ) 
                     || ( CAN_user_tools_moderate_tags && pendingtags )
                     || ( CAN_user_borrowers && pending_borrower_modifications )
-                    || ( CAN_user_acquisition && pendingsuggestions ) ) %]
+                    || ( CAN_user_acquisition && pendingsuggestions )
+                    || ( CAN_user_borrowers && pending_discharge_requests )
+            ) %]
                 <div id="area-pending">
                     [% IF ( CAN_user_acquisition && pendingsuggestions ) %]
                     <div class="pending-info" id="suggestions_pending">
@@ -138,6 +146,13 @@
                     </div>
                     [% END %]
 
+                    [% IF CAN_user_borrowers && pending_discharge_requests %]
+                    <div class="pending-info" id="patron_discharges_pending">
+                        <a href="/cgi-bin/koha/members/discharges.pl">Discharge requests pending</a>:
+                        <span class="pending-number-link">[% pending_discharge_requests %]</span>
+                    </div>
+                    [% END %]
+
                 </div>
 
             [% END %]
@@ -146,7 +161,7 @@
             [% IF ( IntranetmainUserblock ) %]
                 <div class="yui-g" id="area-userblock">
                     <div class="user-info">
-                        [% IntranetmainUserblock %]
+                        [% IntranetmainUserblock.raw %]
                     </div>
                 </div>
             [% END %]
@@ -156,10 +171,11 @@
     [% IF ( koha_news_count ) %]
         <div id="area-news">
             <h3><span="news_title">News</span></h3>
+            [% SET newsdisp = Koha.Preference('NewsAuthorDisplay') %]
             [% FOREACH koha_new IN koha_news %]
                 <div class="newsitem" id="news[% koha_new.idnew %]"><h4>[% koha_new.title %]</h4>
                     <p>[% koha_new.new %]</p>
-                    <p class="newsfooter"> Posted on [% koha_new.newdate %]
+                    <p class="newsfooter"> Posted on [% koha_new.newdate %][% IF( ( newsdisp == 'staff' || newsdisp == 'both' ) && koha_new.borrowernumber ) %] by <span class="newsauthor_title">[% koha_new.author_title %] </span>[% koha_new.author_firstname %] [% koha_new.author_surname %]<br />[% END %]
                         [% IF ( CAN_user_tools ) %]
                             <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% koha_new.idnew %]">Edit</a>
                              | <a href="/cgi-bin/koha/tools/koha-news.pl?op=del&amp;ids=[% koha_new.idnew %]">Delete</a>