Attachment 73302 Details for Bug 20322 – Bug 20322: design refresh for circulation page

[patch] Bug 20322: design refresh for circulation page

Bug-20322-design-refresh-for-circulation-page.patch (text/plain), 8.11 KB, created by Mark Tompsett on 2018-03-27 01:38:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Tompsett

Created: 2018-03-27 01:38:30 UTC

Size: 8.11 KB

patch

obsolete

>From 7d39a5417917d0d63aaf632be6c38efbaadbb92e Mon Sep 17 00:00:00 2001
>From: Liz Rea <liz@catalyst.net.nz>
>Date: Fri, 2 Mar 2018 15:21:24 +1300
>Subject: [PATCH] Bug 20322: design refresh for circulation page
>
>do note, I don't actually mind if these aren't the changes eventually accepted. I just know it needs doing and starting it will hopefully get some gears turning.
>
>To test:
>Click all the links and check they work.
>Do you like the styling? it's different. :)
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>
>Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
>---
> koha-tmpl/intranet-tmpl/prog/css/staff-global.css  | 46 +++++++++++
> .../prog/en/modules/circ/circulation-home.tt       | 89 ++++++++++++----------
> 2 files changed, 94 insertions(+), 41 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
>index 3ab9d7e..0210b31 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
>+++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
>@@ -3156,6 +3156,52 @@ table#ill-requests {
>     font-weight: bold;
> }
> 
>+
>+/* ==== MODULE LINKS - Start ==== */
>+
>+ul.buttons-list {
>+    /* List containing the module links */
>+    padding: 0px;
>+    margin-bottom:30px;
>+}
>+
>+ul.buttons-list li {
>+    /* Standard attributes for the list elements */
>+    list-style-type:none;
>+}
>+
>+ul.buttons-list li a.circ-button {
>+    /* Class used for each module link */
>+    display: block;
>+    box-sizing: content-box;
>+    max-width : 260px;
>+    margin: 10px;
>+    padding:8px;
>+
>+    border: solid 2px #b9d8d9;
>+    border-radius: 6px;
>+
>+    text-decoration: none;
>+    font-family: verdana, arial;
>+    font-weight: bold;
>+    font-size: large;
>+    color: #000000;
>+
>+    background-color:#f4f8f9;
>+    background-position: 5px 3px;
>+    background-repeat:no-repeat;
>+}
>+
>+ul.buttons-list li a:hover.circ-button {
>+    /* Class used for each module link hover state */
>+    color: #538200;
>+    border-color: #538200;
>+}
>+
>+/* ==== MODULE LINKS - End ==== */
>+
>+
>+
> @media (min-width: 200px) {
>     .navbar-nav > li {
>         float: left;
>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
>index c74a443..9df3807 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
>@@ -14,54 +14,66 @@
>         <div class="row">
>             <div class="col-md-8 col-md-offset-2">
> 
>+<div class="row">
>+
>+<div class="col-xs-6">
> <h1>Circulation</h1>
> 
>-<div class="row">
>-<div class="col-sm-4">
>-	<ul>
>-        <li><a href="/cgi-bin/koha/circ/circulation.pl">Check out</a></li>
>-        <li><a href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
>-        <li><a href="/cgi-bin/koha/circ/renew.pl">Renew</a></li>
>-    [% IF Branches.InIndependentBranchesMode %]
>-		<li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
>-    [% END %]
>-    [% UNLESS IndependentBranches %]<li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li>[% END %]
>-	[% IF ( fast_cataloging ) %]
>-	    [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
>-		<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA">Fast cataloging</a></li>
>-	    [% END %]
>-	[% END %]
>-	</ul>
>-</div>
>+    <ul class="buttons-list">
>+        <li><a class="circ-button" href="/cgi-bin/koha/circ/circulation.pl"><i class="fa fa-upload"></i> Check out</a></li>
>+        <li><a class="circ-button" href="/cgi-bin/koha/circ/returns.pl"><i class="fa fa-download"></i> Check in</a></li>
>+        <li><a class="circ-button" href="/cgi-bin/koha/circ/renew.pl"><i class="fa fa-retweet"></i> Renew</a></li>
>+    [% UNLESS IndependentBranches %]<li><a class="circ-button" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li>[% END %]
>+        [% IF ( fast_cataloging ) %]
>+            [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
>+                <li><a class="circ-button" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA"><i class="fa fa-plus"></i> Fast cataloging</a></li>
>+            [% END %]
>+        [% END %]
> 
>-<div class="col-sm-4">
>+    </ul>
>+<h1>Holds management</h1>
>+<ul class="buttons-list">
>+    <li>    <a class="circ-button" href="/cgi-bin/koha/circ/view_holdsqueue.pl"><i class="fa fa-tasks"></i> Holds queue</a></li>
>+    <li>    <a class="circ-button" href="/cgi-bin/koha/circ/pendingreserves.pl"><i class="fa fa-hand-grab-o"></i> Holds to pull</a></li>
>+    <li>    <a class="circ-button" href="/cgi-bin/koha/circ/waitingreserves.pl"><i class="fa fa-calendar"></i> Holds awaiting pickup</a></li>
>+    <li>    <a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart"></i> Hold ratios</a></li>
>+</ul>
> 
>-<h5>Circulation reports</h5>
>-<ul>
>-    <li>    <a href="/cgi-bin/koha/circ/view_holdsqueue.pl">Holds queue</a></li>
>-	<li>    <a href="/cgi-bin/koha/circ/pendingreserves.pl">Holds to pull</a></li>
>-    <li>    <a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a></li>
>-	<li>    <a href="/cgi-bin/koha/circ/reserveratios.pl">Hold ratios</a></li>
>-	<li>    <a href="/cgi-bin/koha/circ/transferstoreceive.pl">Transfers to receive</a></li>
>+</div>
>+<div class="col-xs-6">
>+<h1>Patron request management</h1>
>+<ul class="buttons-list">
>     [% IF Koha.Preference('ArticleRequests') %]
>-        <li>
>-            <a href="/cgi-bin/koha/circ/article-requests.pl" title="Article requests">Article requests</a>
>-        </li>
>+    <li>
>+        <a class="circ-button" href="/cgi-bin/koha/circ/article-requests.pl" title="Article requests"><i class="fa fa-newspaper-o"></i> Article requests</a>
>+    </li>
>+    [% END %]
>+</ul>
>+<h1>Transfers management</h1>
>+<ul class="buttons-list">
>+    [% IF Branches.InIndependentBranchesMode %]
>+        <li><a class="circ-button" href="/cgi-bin/koha/circ/branchtransfers.pl"><i class="fa fa-exchange"></i> Transfer</a></li>
>     [% END %]
>-     [% IF ( CAN_user_circulate_overdues_report ) %]<li>    <a href="/cgi-bin/koha/circ/overdue.pl">Overdues</a>
>-	- <b>Warning:</b> This report is very resource intensive on
>-	systems with large numbers of overdue items.</li>[% END %]
>-	<li>    <a href="/cgi-bin/koha/circ/branchoverdues.pl">Overdues with fines</a> - Limited to your library.  See report help for other details.</li>
>+    <li>    <a class="circ-button" href="/cgi-bin/koha/circ/transferstoreceive.pl"><i class="fa fa-sign-in"></i> Transfers to receive</a></li>
>+</ul>
>+<h1>Overdues management</h1>
>+<ul class="buttons-list">
>+     [% IF ( CAN_user_circulate_overdues_report ) %]<li>    <a class="circ-button" href="/cgi-bin/koha/circ/overdue.pl"><i class="fa fa-clock-o"></i> Overdues</a></li>[% END %]
>+	<li>    <a class="circ-button" href="/cgi-bin/koha/circ/branchoverdues.pl"><i class="fa fa-clock-o"></i> Overdues with fines</a> </li>
>+        Limited to your library.  See report help for other details.
>     [% IF Koha.Preference('OnSiteCheckouts') %]
>-        <li><a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a></li>
>+        <li><a class="circ-button" href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a></li>
>     [% END %]
> </ul>
> 
>+	</div>
> </div>
> 
>-<div class="col-sm-4">
>+    <div class="row" id="intranet-circulation-home-html">
>+        <div class="col-md-12">
>+            [% Koha.Preference('IntranetCirculationHomeHTML') %]
>         <h5>Offline circulation</h5>
>-		<ul>
>+                <ul>
>             [% IF (AllowOfflineCirculation) %]
>             <li><a href="/cgi-bin/koha/circ/offline.pl">Built-in offline circulation interface</a></li>
>             [% END %]
>@@ -71,13 +83,8 @@
>                 <li><a href="https://github.com/bywatersolutions/koha-offline-circulation/releases">Get desktop application</a></li>
>                 <li><a href="https://addons.mozilla.org/[% lang %]/firefox/addon/koct/">Get Firefox add-on</a></li>
>             </ul>
>-		</ul>
>-	</div>
>-</div>
>+                </ul>
> 
>-    <div class="row" id="intranet-circulation-home-html">
>-        <div class="col-md-12">
>-            [% Koha.Preference('IntranetCirculationHomeHTML') %]
>         </div>
>     </div>
> </div>
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 20322: 72342 | 72466 | 72484 | 72490 | 73113 | 73114 | 73271 | 73272 | 73273 | 73300 | 73301 | 73302 | 73303 | 73304 | 73305 | 73306 | 73313 | 73314 | 74097 | 74098 | 74099 | 74100 | 74101 | 74577 | 74578 | 74579 | 74580 | 74581 | 74582