From 4467131aeb0fcff8f8c304cc24e991491606af94 Mon Sep 17 00:00:00 2001 From: Adrien Saurat Date: Thu, 22 Mar 2012 12:07:16 +0100 Subject: [PATCH] Bug 7781 : enhancements on main page - moves the different search boxes on top of page - displays the Koha logo - displays the breadcrumb bar - displays a general title "Welcome to Koha" - reorganises the links to modules - centers the main menu even if no news are displayed - fixes the Submit button when CircAutocompl is on Signed-off-by: mveron --- .../intranet-tmpl/prog/en/css/staff-global.css | 2 +- .../intranet-tmpl/prog/en/includes/home-search.inc | 40 ++++ .../intranet-tmpl/prog/en/modules/intranet-main.tt | 201 ++++++++++---------- 3 files changed, 144 insertions(+), 99 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index fa66dbf..ef01648 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -1848,7 +1848,7 @@ span.permissiondesc { } /* borrower autocomplete */ -#borrowerautocomplete { width: 450px; text-align:left;} /* z-index needed on top instances for ie & sf absolute inside relative issue */ +#borrowerautocomplete { width: 500px; text-align:left;} /* z-index needed on top instances for ie & sf absolute inside relative issue */ .autocomplete .yui-ac-highlight , .autocomplete .yui-ac-highlight .sample-result, .autocomplete .yui-ac-highlight .sample-query { color:#FFF; } 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..514ec90 --- /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 1afa5b0..8f4b304 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt @@ -5,125 +5,130 @@ [% INCLUDE 'header.inc' %] -[% IF ( koha_news_count ) %]
[% ELSE %]
[% END %] +[% INCLUDE 'home-search.inc' %] + + + +
-[% 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 ) %] -
-
-
-
-

News

- [% FOREACH koha_new IN koha_news %] + +
+
+ [% 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 ) %] - Edit | Delete | New[% END %]

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

[% koha_new.new %]

+

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

+
+ [% END %] +
+
+ [% END %] +
-- 1.7.4.1