From de8d3f7d0a74a037cf95652a6f69fb6afde24ac9 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Fri, 14 Jun 2013 15:55:02 -0700 Subject: [PATCH] Bug 8884: (follow-up) rearrange placement of the top-bar div in CCSR This patch makes it easier to avoid having the top bar overlap other OPAC page content (particularly custom header content set via the opacheader system preference). This is done by moving the top-nav div outside of the main doc3 div and adjusting the CSS accordingly. Yes, this does end up having top-nav.inc be included from opac-bottom.inc, but it would require touching rather more templates to have it be included immediately after the tag. This patch also removes a duplicate instance of the cmspan span. To test: [1] Change to the CCSR OPAC theme. [2] Before applying the patch, open a set of OPAC pages (e.g., main page, user page, search results, bib details) in your web browser. [3] Apply the patch, and open the same OPAC pages in separate tabs. Comparing the pre- and post- version of each page to verify that the placement [4] Add an OpAC header using the opacheader system preference. [5] Verify that the header is displayed without overlapping the top bar. Signed-off-by: Galen Charlton Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit 33c12cf39588aa022eacaa0bca403c373a6bf8d5) Signed-off-by: Tomas Cohen Arazi --- koha-tmpl/opac-tmpl/ccsr/en/css/colors.css | 1 - koha-tmpl/opac-tmpl/ccsr/en/css/opac.css | 4 + .../opac-tmpl/ccsr/en/includes/masthead.inc | 76 ------------------- .../ccsr/en/includes/opac-bottom.inc | 7 ++ .../opac-tmpl/ccsr/en/includes/top-bar.inc | 73 ++++++++++++++++++ 5 files changed, 84 insertions(+), 77 deletions(-) create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/includes/top-bar.inc diff --git a/koha-tmpl/opac-tmpl/ccsr/en/css/colors.css b/koha-tmpl/opac-tmpl/ccsr/en/css/colors.css index 69f90f755f..c3d4b3951d 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/css/colors.css +++ b/koha-tmpl/opac-tmpl/ccsr/en/css/colors.css @@ -60,7 +60,6 @@ a:hover { background: none; border: none; display: table; - margin: 40px 0 0 !important; padding: 0.7em 0 0 0.5em; width: 100%; } diff --git a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css b/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css index 9f9979ccad..5c01112562 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css @@ -1,6 +1,10 @@ @import url("../../../lib/yui/reset-fonts-grids.css"); @import url("../../../lib/yui/skin.css"); +#doc3 { + padding-top: 35px; +} + a { font-weight : bold; } diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc index 41940664c4..254e4b4752 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc @@ -1,79 +1,5 @@
-
- - -
- [% IF ( opacuserlogin ) %] - - [% END %] -
- -
- -
-
[% IF ( opacheader ) %] [% opacheader %] @@ -211,7 +137,6 @@ -[% IF ( opacbookbag ) %][% END %]
@@ -259,7 +184,6 @@ -[% IF ( opacbookbag ) %][% END %]
diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc index a0eb3f4164..4b4e456f7f 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc @@ -13,6 +13,13 @@
+[%# Sticking the div for the top bar here; since the + top bar is positioned absolutely in this theme, it + it makes the positioning of the rest of the elements + easier to keep it out of the doc3 div. +%] +[% INCLUDE 'top-bar.inc' %] +