From 9d842b4185a8a7247a4a3b3994076d6f9aa0d95a Mon Sep 17 00:00:00 2001 From: Adrien Saurat Date: Wed, 21 Mar 2012 16:45:39 +0100 Subject: [PATCH] Bug 7781: enhancements on main page Creation of a new include and editing of the mainpage.tt to : - move the different search boxes (checkout, checkin, search patron, search catalog) on top of page, the way it's done on other pages; - display the Koha logo (deep pages display it but not the front page!) - display the breadcrumb bar (even if it will contain only "Home") - display a general title like "Welcome to Koha" (module pages have titles already) - reorganise the links to modules (Cataloguing can move to the left side if the search boxes disappear) Use of rights limitations was corrected too. --- .../intranet-tmpl/prog/en/includes/home-search.inc | 40 +++++ .../intranet-tmpl/prog/en/modules/intranet-main.tt | 181 ++++++++++---------- 2 files changed, 131 insertions(+), 90 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc new file mode 100644 index 0000000..ceb062a --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc @@ -0,0 +1,40 @@ + +

[% LibraryName %]

+ + + + 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 a4377df..ee99952 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt @@ -5,124 +5,125 @@ [% INCLUDE 'header.inc' %] +[% INCLUDE 'home-search.inc' %] + + + [% IF ( koha_news_count ) %]
[% ELSE %]
[% END %]
[% IF ( koha_news_count ) %]
[% ELSE %]
[% END %] -
- [% IF ( CAN_user_circulate ) %] -

Circulation

-
  • -
    - - - - - -
    -
  • -
  • -
    - - - -
  • +

    Welcome to Koha

    -
  • Transfers
- [% END %] - [% IF ( CAN_user_borrowers ) %] -

Patrons

-
    -
  • - - - -
    -
  • -
- [% END %] - [% IF ( CAN_user_catalogue ) %] -

Search

-
    -
  • -
    - - - -
    -
  • -
- [% END %] -

Lists

-
- -
- [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] -

Cataloging

-
    -
  • Add MARC Record
  • - [% ELSE %] - [% IF ( CAN_user_editauthorities ) %] -

    Cataloging

    +
    + + [% IF ( CAN_user_circulate ) %] +

    Circulation

    [% END %] + + + + [% IF ( CAN_user_borrowers ) %] +

    Patrons

    [% END %] - - [% IF ( CAN_user_editauthorities ) %] -
  • Authorities
  • + + + + [% IF ( CAN_user_catalogue ) %] +

    Advanced search

    [% END %] -
- + + +

Lists

+ + + + [% IF ( CAN_user_catalogue || CAN_user_editcatalogue || CAN_user_editauthorities ) %] +

Cataloging

+
    + [% IF ( CAN_user_catalogue || CAN_user_editcatalogue ) %] +
  • Add MARC Record
  • + [% END %] + [% IF ( CAN_user_editauthorities ) %] +
  • Authorities
  • + [% END %] +
+ [% END %] + +
+ +
+ [% IF ( CAN_user_serials ) %] -

Serials

+

Serials

+ [% END %] + [% IF ( CAN_user_acquisition ) %] +

Acquisitions

+ [% IF ( pendingsuggestions ) %] + + [% END %] [% END %] - [% IF ( CAN_user_acquisition ) %] -

Acquisitions

- [% IF ( pendingsuggestions ) %][% END %] - [% END %] + + + [% IF ( CAN_user_reports ) %] -

Reports

+

Reports

[% END %] + + + [% IF ( CAN_user_parameters ) %] -

Koha administration

- - [% END %] +

Koha administration

+ + [% END %] [% IF ( CAN_user_tools ) %] -

Tools

+

Tools

[% IF ( CAN_user_tools_moderate_comments && pendingcomments ) || ( CAN_user_tools_moderate_tags && pendingtags ) %] [% END %] [% END %] + + +

About Koha

-
-
- [% IF ( IntranetmainUserblock ) %]
- [% IntranetmainUserblock %] -
[% ELSE %]  - [% END %] -[% IF ( koha_news_count ) %] -
-
-
-
+ +
+
+ [% IF ( IntranetmainUserblock ) %] +
+ [% IntranetmainUserblock %] +
[% ELSE %]  + [% END %] + [% IF ( koha_news_count ) %] +
+
+
+

News

[% FOREACH koha_new IN koha_news %]

[% koha_new.title %]

-

[% koha_new.new %]

-

Posted on [% koha_new.newdate %] [% IF ( CAN_user_tools ) %] +

[% koha_new.new %]

+

Posted on [% koha_new.newdate %] [% IF ( CAN_user_tools ) %] Edit | Delete | New[% END %]

[% END %] -
-
+
+
[% END %] -- 1.7.5.4