From 870988baaf44098ca39daa2d0e9cee8dc18258f2 Mon Sep 17 00:00:00 2001 From: Terran McCanna Date: Tue, 11 Apr 2017 17:42:54 -0400 Subject: [PATCH] LP#1681943 Improve Responsive Design in My Lists - Moved action dropdown out of header row so that it is no longer hidden on mobile view. - Hid less essential columns on mobile view, leaving only title / author. - Sized and lined up buttons more neatly on both mobile and normal view. - Added a title to the section for editing a list title and description. Signed-off-by: Terran McCanna Signed-off-by: Galen Charlton Conflicts: Open-ILS/src/templates/opac/css/style.css.tt2 Open-ILS/src/templates/opac/parts/anon_list.tt2 Signed-off-by: Ben Shum Signed-off-by: Galen Charlton --- Open-ILS/src/templates/opac/css/style.css.tt2 | 113 +++++++++++++---------- Open-ILS/src/templates/opac/myopac/lists.tt2 | 114 +++++++++++------------- Open-ILS/src/templates/opac/parts/anon_list.tt2 | 4 +- 3 files changed, 118 insertions(+), 113 deletions(-) diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2 index 576f5af7bc..244853cde1 100644 --- a/Open-ILS/src/templates/opac/css/style.css.tt2 +++ b/Open-ILS/src/templates/opac/css/style.css.tt2 @@ -2094,19 +2094,11 @@ a.opac-button-header:hover, #dash_wrapper a.opac-button:hover { [% END -%] } .bookbag-controls-title-block { - [% IF rtl == 't' -%] - float:right; - [% ELSE -%] float:left; - [% END -%] width:40%; } .bookbag-controls-button-block { - [% IF rtl == 't' -%] - float:right; - [% ELSE -%] float:left; - [% END -%] width:50%; } h2.bookbag-name { margin-bottom: 0em; padding-bottom: 0em; } @@ -2152,57 +2144,25 @@ h2.bookbag-name { margin-bottom: 0em; padding-bottom: 0em; } max-width: 40em; } .bbag-edit-desc-label { - [% IF rtl == 't' -%] - float:right; - [% ELSE -%] float:left; - [% END -%] width:8em; } .bbag-edit-desc-save { clear:both; margin-bottom:10px; } -#bbag-edit-description { - width: 20em; - [% IF rtl == 't' -%] - float:right; - [% ELSE -%] - float:left; - [% END -%] -} -#bbag-edit-name { - width: 20em; - [% IF rtl == 't' -%] - float: right; - [% ELSE -%] - float: left; - [% END -%] -} +#bbag-edit-description { width: 20em; float:left;} +#bbag-edit-name { width: 20em; float: left; } .bbag-action { - [% IF rtl == 't' -%] - margin-right: 15px; - [% ELSE -%] margin-left: 15px; - [% END -%] } .bbag-navigate-list { - [% IF rtl == 't' -%] - padding-right: 32px; - float:right; - [% ELSE -%] padding-left: 32px; float:left; - [% END -%] } .bbag-navigate-list-pages { - [% IF rtl == 't' -%] - padding-right: 10px; - float:right; - [% ELSE -%] padding-left: 10px; float:left; - [% END -%] } textarea { font-family: sans-serif; } table.bookbag-specific { @@ -2229,12 +2189,6 @@ table.bookbag-specific { padding: 0px 0px 0px 10px; [% END -%] } - -.bookbag-specific td { - padding-top:10px; - padding-bottom:10px; -} - .bookbag-specific td.list_checkbox { [% IF rtl == 't' -%] padding-right: 10px !important; @@ -2803,6 +2757,69 @@ div.result_table_utils { padding: 2px 4px 3px 4px; font-size: [% css_fonts.size_base %]; } + .bookbag-controls-title-block { + clear:left; + width:90%; + } + .bookbag-controls-button-block { + clear:left; + width;90%; + } + .bookbag-specific { + margin-left: 0px; + } + .bookbag-specific div.sort { + float: left; + width: 95%; + margin: 5px 0px 5px 0px; + text-align: left; + border: 1px #ccc solid; + padding:5px; + } + .bookbag-specific div.meta { + float: left; + width: 95%; + margin-left:0px; + margin-bottom:5px; + padding:5px; + text-align: left; + } + #bbag-edit-name { + float: left; + width: 220px; + } + #bbag-edit-description { + width: 220px; + margin-top:5px; + } + .bbag-content { + padding:5px; + border:1px #ccc solid; + } + .bbag-action { + margin-left:0px; + margin-bottom:5px; + } + .bbag-action-field { + width:230px; + } + .bookbag-specific div.sort select { + width:180px; + } + .bookbag-specific td.list_checkbox { + padding-left: 0px !important; + } + .bookbag-specific td.list_entry { + min-width: 5em; + padding-left: 5px !important; + } + .bbag-navigate-list { + display: none; + } + .bbag-navigate-list-pages { + text-align:right; + float:right; + } #dash_wrapper div { background-color: transparent; padding: 0px; diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2 index b8b5820193..308971de0a 100644 --- a/Open-ILS/src/templates/opac/myopac/lists.tt2 +++ b/Open-ILS/src/templates/opac/myopac/lists.tt2 @@ -64,27 +64,19 @@ - - - - - - - -   - + -       +     + @@ -144,7 +136,7 @@
[% FOR bbag IN ctx.bookbags %]
-
+
[% baseurl = ctx.opac_root _ '/myopac/lists'; IF bbag.id != CGI.param("bbid"); url = mkurl(baseurl,{bbid => bbag.id, item_page => 1},['edit_notes','sort']); @@ -240,8 +232,6 @@ alt="[% l('RSS Feed') %]" border="0" src="[% ctx.media_prefix %]/images/small-rss.png[% ctx.cache_key %]"/> [% END %] -
-
[% IF bbag.pub == 't'; %] [% l('HTML View') %] [% END %]
+
[% IF CGI.param("bbid") == bbag.id %]
-
-
- - [%- INCLUDE "opac/parts/preserve_params.tt2" params=['loc', 'query', 'qtype']; %] - [% INCLUDE "opac/parts/filtersort.tt2" - value=CGI.param('sort') mode='bookbag' %] - - -
-
+ [% IF bbag.items.size %] +
+
+ + [%- INCLUDE "opac/parts/preserve_params.tt2" params=['loc', 'query', 'qtype']; %] + [% INCLUDE "opac/parts/filtersort.tt2" + value=CGI.param('sort') mode='bookbag' %] + + +
+
+ [% END %]
@@ -274,31 +267,23 @@ [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - - - - - - - - - - - - -
+

[% l('Edit List Description') %]

+
-
- + -
- -
- -
+
+ [% l("Save changes to name or description?") %] + +
@@ -306,6 +291,18 @@
+
+ [% IF bbag.items.size %] +
+ + [%- INCLUDE "opac/parts/preserve_params.tt2"; %] + +
+ [% END %] @@ -338,15 +335,6 @@ | [% l('Edit') %] [% END %] - @@ -372,7 +360,7 @@ mkurl(ctx.opac_root _ '/results', {qtype => 'author', query => authorquery}, ['page', 'bbid', 'edit_notes']) -%]">[% attrs.author | html %] - - - [% IF CGI.param("edit_notes") == bbag.id %] - [% ELSE %] - [% END %] [% IF CGI.param("edit_notes") == bbag.id %] - - + + [% END %] diff --git a/Open-ILS/src/templates/opac/parts/anon_list.tt2 b/Open-ILS/src/templates/opac/parts/anon_list.tt2 index 9ec6d588a5..28eefe636f 100644 --- a/Open-ILS/src/templates/opac/parts/anon_list.tt2 +++ b/Open-ILS/src/templates/opac/parts/anon_list.tt2 @@ -30,7 +30,7 @@
-
- - [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - -
+ [% copy = attrs.holdings.0; IF copy; @@ -389,21 +377,21 @@ END; %] + [% attrs.pubdate | html %] + [% attrs.format_label | html %] + [% FOR note IN item.notes %] [% END %] + [% FOR note IN item.notes %]
[% note.note | html %]
[% END %] @@ -412,12 +400,12 @@
[%- INCLUDE "opac/parts/preserve_params.tt2"; %] - +
+
-
@@ -61,7 +61,7 @@ ['page', 'id', 'edit_notes'] ) -%]">[% attrs.author | html %] + [% copy = attrs.holdings.0; IF copy; -- 2.11.0