From 7bb60e300563c3afad826a5d1eb287d58ac9f694 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 6 Mar 2018 13:16:21 +0000 Subject: [PATCH] Bug 20322: (follow-up) Circulation page layout and design update This follow-up makes some suggestions about how to push this further: - Put content in four columns which reduces to two on smaller screens - Adjust font size of large links - Move Offline Circulation links into its own column - Add image icons to the Firefox extension and Windows application download links - Improve indentation in template Signed-off-by: Katrin Fischer Signed-off-by: Mark Tompsett Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart --- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 15 +- .../prog/en/modules/circ/circulation-home.tt | 233 +++++++++++++-------- koha-tmpl/intranet-tmpl/prog/img/firefox-icon.png | Bin 0 -> 852 bytes koha-tmpl/intranet-tmpl/prog/img/windows-icon.png | Bin 0 -> 336 bytes 4 files changed, 152 insertions(+), 96 deletions(-) rewrite koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (88%) create mode 100644 koha-tmpl/intranet-tmpl/prog/img/firefox-icon.png create mode 100644 koha-tmpl/intranet-tmpl/prog/img/windows-icon.png diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css index 3a038e5ce4..118bbf0d1b 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -1254,6 +1254,8 @@ div.alert strong { a.document { background-position : left middle; background-repeat : no-repeat; + display: inline-block; + min-height: 20px; padding-left : 20px; } @@ -3190,16 +3192,15 @@ ul.buttons-list li a.circ-button { display: block; box-sizing: content-box; max-width : 260px; - margin: 10px; + margin: .5em 0; padding:8px; border: solid 2px #b9d8d9; border-radius: 6px; text-decoration: none; - font-family: verdana, arial; font-weight: bold; - font-size: large; + font-size: 110%; color: #000000; background-color:#f4f8f9; @@ -3213,6 +3214,14 @@ ul.buttons-list li a:hover.circ-button { border-color: #538200; } +.firefox-link { + background-image: url("../img/firefox-icon.png"); +} + +.windows-link { + background-image: url("../img/windows-icon.png"); +} + /* ==== MODULE LINKS - End ==== */ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt dissimilarity index 88% index 9df3807527..5746dfbd64 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt @@ -1,93 +1,140 @@ -[% USE Koha %] -[% USE Branches %] -[% INCLUDE 'doc-head-open.inc' %] -Koha › Circulation -[% INCLUDE 'doc-head-close.inc' %] - - -[% INCLUDE 'header.inc' %] -[% INCLUDE 'circ-search.inc' %] - - - -
-
-
- -
- -
-

Circulation

- - -

Holds management

- - -
-
-

Patron request management

- -

Transfers management

- -

Overdues management

- - -
-
- -
-
- [% Koha.Preference('IntranetCirculationHomeHTML') %] -
Offline circulation
- - -
-
-
-
- -[% INCLUDE 'intranet-bottom.inc' %] +[% USE Koha %] +[% USE Branches %] +[% INCLUDE 'doc-head-open.inc' %] +Koha › Circulation +[% INCLUDE 'doc-head-close.inc' %] + + +[% INCLUDE 'header.inc' %] +[% INCLUDE 'circ-search.inc' %] + + + +
+ +
+ +
+

Circulation

+ + +
+ +
+

Holds management

+ + +
+ + +
+ +
+ [% IF Koha.Preference('ArticleRequests') %] +

Patron request management

+ + [% END %] + +

Transfers management

+ + + +

Overdues management

+ + +
+ +
+

Offline circulation

+ + + +

Get desktop application

+ +

Get Firefox add-on

+ +
+
+ +
+
+ [% Koha.Preference('IntranetCirculationHomeHTML') %] +
+
+
+ +[% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/img/firefox-icon.png b/koha-tmpl/intranet-tmpl/prog/img/firefox-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3f47897154c1c4b84772178502504e89c4a04f08 GIT binary patch literal 852 zcwPZi1FQUrP)rhHA<3hc41&+;;Nn4XxRd>vDop=qOMcIRu{oHRs`{ ztnXg*KD|^qJG=x60uIL0sWzF}%N9O*6;Q8Qqg%m2sS3cYVHe@NlfypI3PS0}A78v= zao9h6S_CxZ>zgNx*(pESO|(+sM^4mh6wW<>n>H*00`oi!{xMYTsYA!euE}Q?D))V} zP1u8gj|Ji16BC3uLdgJ1j!v%`Rm^3~idy(UFV!dnaQ{FZ_8QvJ@K$Il$m_O{U6C^L zhf-~~oFa0_{{o!j8mPB#L5)8Zw+AyI@;n5u7os2_Y106n7hH$Ww}xMBvc-}|7UjcY zGhGt=EGNOsD-5`zsYb0`2T`T~L=gdx3xT;AY+uiz`D`_aHVr#6yN;1JhnbeFI7J3z zL=qD?XH38Jy58dElCoe3-?x(ovKocSry;GLLlKC+*qVj^s!xX+h+jSHR;^ z!s5Sx9|3l;$KnFOX00JNcB}86PGHJ|9ti|Q%EEyaX!dMH zeApObx6I%~PYzmb3|O5T)(R_(I~Ykkh1}zPr6heVeW)>A-?)6B+#H2DQ26X*adTo1 z?1+(U;8B=p!=1cdAdJVr5XZ;o4w(o=pz5};{V^IU3d>TyH@X@3W>er687PSldB%R6 zP3cAi>w#Y>qNGmO{__2o)L@zW4XXUwo#9VHN1GEVjQF)MFdnR2DFwp>h-v{tqKYr7 zAI|C-^tAl@Ku*Pl-8^H`SC9}$Fev##r1px8fZs}Cy0UYkylueS5V}kxi`AA@nZm2X zX-Xdo;YET@w`}yB?MLPm=j;9NHZB}SMk2Bzbj67}Cdo)s>!$g@S5_4&EF90000