Bug 8152: Clicking cancel link on edit suggestion redirect to the suggestions list

[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 bcd0f6c..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
@@ -10,28 +10,13 @@
 [% INCLUDE 'home-search.inc' %]
 
 <div id="breadcrumbs" >Home</div>
-<div style="clear: both"></div>
-<div id="area-content">
-    [% IF ( koha_news_count ) %]
-        <div id="area-news">
-            <h3><span="news_title">News</span></h3>
-            [% 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 %]
-                        [% 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>
-                             | <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New</a>
-                        [% END %]
-                    </p>
-                </div>
-            [% END %]
-        </div><!-- /koha-news -->
-    [% ELSE %]
-        <div id="area-nonews">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
-    [% END %]
-        <div id="area-lists">
+
+
+<div id="doc3" class="yui-t3">
+   <div id="bd" role="main">
+    <div id="yui-main">
+    <div class="yui-b"><div class="yui-g">
+    <div class="yui-u first">
             <div id="area-list-left">
                 <ul class="biglinks-list">
                     [% IF ( CAN_user_circulate ) %]
@@ -48,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 %]
 
@@ -56,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>
@@ -69,7 +54,8 @@
                     [% END %]
                 </ul>
             </div><!-- /area-list-left -->
-
+        </div><!-- /yui-u first -->
+    <div class="yui-u">
             <div id="area-list-right">
                 <ul class="biglinks-list">
                     [% IF ( CAN_user_serials ) %]
@@ -94,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 %]
 
@@ -109,45 +95,68 @@
                     </li>
                 </ul>
             </div><!-- /area-list-right -->
-
-            [% IF ( CAN_user_tools_moderate_comments ) && ( pendingsuggestions || pendingcomments || pendingtags ) %]
+        </div><!-- /yui-u -->
+</div><!-- /yui-g -->
+<div class="yui-g">
+            [% 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>
             [% END %]
 
+
+</div>
             [% IF ( IntranetmainUserblock ) %]
-            <div id="area-userblock">
-                <div class="user-info">
-                    [% IntranetmainUserblock %]
+                <div class="yui-g" id="area-userblock">
+                    <div class="user-info">
+                        [% IntranetmainUserblock %]
+                    </div>
                 </div>
-            </div>
             [% END %]
-
-            <div style="height: 30px">
-                <!-- Without this white space the end of the page can be hidden by the language selector -->
-                &nbsp;
-            </div>
-        </div><!-- /area-lists -->
+</div>
+    </div>
+    <div class="yui-b"><!-- YOUR NAVIGATION GOES HERE -->
+    [% IF ( koha_news_count ) %]
+        <div id="area-news">
+            <h3><span="news_title">News</span></h3>
+            [% 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 %]
+                        [% 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>
+                             | <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New</a>
+                        [% END %]
+                    </p>
+                </div>
+            [% END %]
+        </div><!-- /koha-news -->
+    [% END %]
+    </div>
+    </div>
+</div>
 
 <!-- the main div is closed in intranet-bottom.inc -->
 [% INCLUDE 'intranet-bottom.inc' %]