From db0fa0eacda5a448d9406a03fc92cdaff393ea52 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 10 May 2013 12:12:11 -0400 Subject: [PATCH] Bug 9680 - cart aligned right in CCSR The CCSR theme sets a min-width of 1000px for windows which are more than 700px wide. This caused the cart popup window to be given a min-width of 1000px, resulting in a broken layout with unnecessary horizontal scrolling. This patch adds a class to the cart template and to other pop-up window templates to ensure that a large min-width is not enforced and to give consistent padding to those pages. To test, set your theme to 'CCSR' and view the following pop-up pages: - The Cart. From the cart, trigger: - The "send" window - The "download" window - From a view of a List's contents trigger: - The "send" window" - The "download" window Each of these pages should look correct with no horizontal scrolling. Signed-off-by: Nicole C. Engard All tests pass Signed-off-by: Katrin Fischer Template and CSS changes only, but no string changes. Save for inclusion in 3.12. Signed-off-by: Katrin Fischer Signed-off-by: Jared Camins-Esakov --- koha-tmpl/opac-tmpl/ccsr/en/css/colors.css | 5 +++++ koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tt | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tt | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tt | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tt | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/opac-tmpl/ccsr/en/css/colors.css b/koha-tmpl/opac-tmpl/ccsr/en/css/colors.css index 7e8a9469d3..c751c3dd71 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/css/colors.css +++ b/koha-tmpl/opac-tmpl/ccsr/en/css/colors.css @@ -13,6 +13,11 @@ body { background-color : #eaeae6; } +body.popup { + min-width: 100px; + padding : 1em; +} + #container { background: #fff; border:1px solid #d2d2cf; diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt index 90a259e5b0..09993af8c6 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt @@ -135,7 +135,7 @@ function enableCheckboxActions(){ [% END %] - +
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tt index f594ffcafb..9af57c8b25 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tt @@ -1,6 +1,6 @@ [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Download cart[% INCLUDE 'doc-head-close.inc' %] - +
[% IF ( format ) %]

Your download should begin automatically.

[% ELSE %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tt index 5712c6aa63..0af60cdf25 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tt @@ -6,7 +6,7 @@ //]]> - +
[% UNLESS ( invalidlist ) %] [% IF ( format ) %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tt index 927fc7a62c..d5da34dc61 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tt @@ -1,7 +1,7 @@ [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Sending your cart [% INCLUDE 'doc-head-close.inc' %] - +
[% IF ( email_add ) %] [% IF ( SENT ) %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tt index f64eb08da0..fbe7add70c 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tt @@ -7,7 +7,7 @@ //]]> - +
[% IF ( email ) %] [% IF ( SENT ) %] -- 2.20.1