projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6587b92)
Bug 9680 - cart aligned right in CCSR
authorOwen Leonard <oleonard@myacpl.org>
Fri, 10 May 2013 16:12:11 +0000 (12:12 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 12 May 2013 14:14:02 +0000 (10:14 -0400)
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 <nengard@bywatersolutions.com>
All tests pass

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template and CSS changes only, but no string changes.
Save for inclusion in 3.12.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
koha-tmpl/opac-tmpl/ccsr/en/css/colors.css patch | blob | history
koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt patch | blob | history
koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tt patch | blob | history
koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tt patch | blob | history
koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tt patch | blob | history
koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tt patch | blob | history

diff --git a/koha-tmpl/opac-tmpl/ccsr/en/css/colors.css b/koha-tmpl/opac-tmpl/ccsr/en/css/colors.css
index 7e8a946..c751c3d 100644 (file)
--- 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 90a259e..09993af 100644 (file)
--- 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(){
     </script>
     [% END %]
 </head>
-<body id="basket">
+<body id="basket" class="popup">
 
 <div id="doc" class="yui-t7">
 <div id="userbasket" class="container">
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 f594ffc..9af57c8 100644 (file)
--- 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 &rsaquo; Download cart[% INCLUDE 'doc-head-close.inc' %]
 </head>
-<body id="opac-downloadcart" style="padding:1em;">
+<body id="opac-downloadcart" class="popup">
 <div id="userdownloadcart" class="container">[% IF ( format ) %]
     <p>Your download should begin automatically.</p>
 [% 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 5712c6a..0af60cd 100644 (file)
--- 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 @@
 //]]>
 </script>
 </head>
-<body id="opac-downloadlist" style="padding:1em;">
+<body id="opac-downloadlist" class="popup">
 <div id="userdownloadshelf" class="container">
 [% 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 927fc7a..d5da34d 100644 (file)
--- 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 &rsaquo;  Sending your cart
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
-<body style="padding: 1em;" id="sendbasket">
+<body id="sendbasket" class="popup">
 <div id="usersendbasket" class="container">[% 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 f64eb08..fbe7add 100644 (file)
--- 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 @@
 //]]>
 </script>
 </head>
-<body style="padding: 1em;" id="sendshelf">
+<body id="sendshelf" class="popup">
 <div id="usersendshelfform" class="container">[% IF ( email ) %]
 
     [% IF ( SENT ) %]
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git