[Koha-patches] [PATCH] Template restructuring to allow option of styling OPAC with fixed-width layout. This commit doesn't change the default OPAC appearance.
Owen Leonard
oleonard at myacpl.org
Mon May 19 16:34:59 CEST 2008
---
koha-tmpl/opac-tmpl/prog/en/css/opac.css | 43 ++++++++++++++------
koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 17 ++-----
.../opac-tmpl/prog/en/modules/maintenance.tmpl | 6 +-
.../opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl | 8 ++--
.../opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl | 7 ++-
.../opac-tmpl/prog/en/modules/opac-account.tmpl | 4 +-
.../opac-tmpl/prog/en/modules/opac-advsearch.tmpl | 6 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl | 12 +++--
.../prog/en/modules/opac-authorities-home.tmpl | 12 +++---
.../modules/opac-authoritiessearchresultlist.tmpl | 21 +++++-----
.../opac-tmpl/prog/en/modules/opac-browser.tmpl | 8 ++--
.../opac-tmpl/prog/en/modules/opac-detail.tmpl | 8 ++--
.../opac-tmpl/prog/en/modules/opac-dictionary.tmpl | 4 +-
.../prog/en/modules/opac-full-serial-issues.tmpl | 8 ++--
koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl | 19 +++++---
.../opac-tmpl/prog/en/modules/opac-passwd.tmpl | 4 +-
.../prog/en/modules/opac-readingrecord.tmpl | 4 +-
.../opac-tmpl/prog/en/modules/opac-reserve.tmpl | 20 +++++-----
.../opac-tmpl/prog/en/modules/opac-results.tmpl | 20 +++++----
.../prog/en/modules/opac-serial-issues.tmpl | 16 ++++----
.../opac-tmpl/prog/en/modules/opac-shelves.tmpl | 7 ++-
koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl | 4 +-
.../prog/en/modules/opac-tags_subject.tmpl | 9 ++--
.../opac-tmpl/prog/en/modules/opac-topissues.tmpl | 8 ++--
koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl | 4 +-
.../prog/en/modules/opac-userdetails.tmpl | 4 +-
.../opac-tmpl/prog/en/modules/opac-userupdate.tmpl | 4 +-
27 files changed, 154 insertions(+), 133 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 4b25c75..edc7c07 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -334,18 +334,20 @@ p.availability {
color : #006600;
}
-.inwait {
- background-color : #33CC99;
+.waiting,.intransit,.notforloan,.checkedout,.lost,.notonhold {
+ display : block;
}
-
-/* css styles for reserves color alerts */
-.onloan {
- background-color : #eeeeee;
+.notforloan {
+ color : #900;
}
-
-.other {
- background-color : #ffcccc;
+.lost {
+ color : #666;
}
+.waiting {
+
+}
+
+
/* "problem" enhancement */
.problem {
@@ -353,10 +355,6 @@ p.availability {
background-color : red;
}
-.reserved {
- background-color : #8EBAFF;
-}
-
/* style for search terms in catalogsearch */
.term {
color : blue;
@@ -499,9 +497,17 @@ a .term {
background-color: #FFF;
}
+#holds,#opac-auth {
+ min-width : 750px;
+ width : 57.69em;
+ margin : auto;
+}
+
#members {
background-color: #fff;
font-size : 85%;
+ margin-left : -10px;
+ margin-right : -10px;
padding : 4px 0 4px 0;
color : #000066;
}
@@ -540,6 +546,8 @@ a .term {
background-color : #739ACF;
border-top : 1px solid #335599;
border-bottom : 1px solid #335599;
+ margin-left : -10px;
+ margin-right : -10px;
padding : .7em 0 .4em .5em;
font-size : 108%;
line-height : 116%;
@@ -1122,6 +1130,11 @@ div.message {
text-decoration : none;
}
+#news th {
+ text-align : left;
+ padding : 3px 5px;
+}
+
#opac-main-search #listsmenu a, #opac-main-search #listsmenu h4 {
color : #000;
font-weight : normal;
@@ -1619,6 +1632,7 @@ ul.ui-tabs-nav li.ui-tabs-selected a, ul.ui-tabs-nav li.ui-tabs-selected span.a
}
#bibliodescriptions {
+ clear : left;
margin-top : .5em;
}
@@ -1732,4 +1746,7 @@ input.tagbutton {
}
table#items th {
padding : 2px;
+}
+#action {
+ margin-top: 0;
}
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 0994957..329c09d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -114,22 +114,15 @@
<!-- /TMPL_IF -->
</div>
</div>
- <div id="breadcrumbs" class="yui-g">
-
-<!-- TMPL_IF NAME="searchdesc" --><p><!-- TMPL_IF name="total" --><strong>“<!-- TMPL_VAR NAME="query_desc" --><!-- TMPL_VAR NAME="limit_desc" -->” </strong>returned <!-- TMPL_VAR NAME="total" --> results. <!-- TMPL_IF NAME="related" --> (related searches: <!-- TMPL_LOOP NAME="related" --><!-- TMPL_VAR NAME="related_search" --><!-- /TMPL_LOOP -->). <!-- /TMPL_IF -->
-<a href="http://<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi" ESCAPE="HTML" -->&format=rss2"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" /></a>
-<!-- TMPL_ELSE -->
-<!-- TMPL_IF NAME="searchdesc" -->
+<div id="breadcrumbs" class="yui-g"><!-- TMPL_IF NAME="searchdesc" --><p><!-- TMPL_IF name="total" --><strong>“<!-- TMPL_VAR NAME="query_desc" --><!-- TMPL_VAR NAME="limit_desc" -->” </strong>returned <!-- TMPL_VAR NAME="total" --> results. <!-- TMPL_IF NAME="related" --> (related searches: <!-- TMPL_LOOP NAME="related" --><!-- TMPL_VAR NAME="related_search" --><!-- /TMPL_LOOP -->). <!-- /TMPL_IF -->
+<a href="http://<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi" ESCAPE="HTML" -->&format=rss2"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" /></a><!-- TMPL_ELSE --><!-- TMPL_IF NAME="searchdesc" -->
<strong>No Result found !</strong>
<p>
No results match your search for <span style="font-weight: bold;">“<!-- TMPL_VAR NAME="query_desc" --><!-- TMPL_VAR NAME="limit_desc" -->”</span> in <!-- TMPL_VAR NAME="LibraryName" --> Catalog. <a href="http://<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi" ESCAPE="HTML" -->&format=rss2"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" /></a>
</p>
-<!-- TMPL_ELSE -->
-<strong> No result found !</strong>
+<!-- TMPL_ELSE --><strong> No result found !</strong>
<p>
You did not specify any search criteria.
</p>
-</div>
-<!-- /TMPL_IF -->
-<!-- /TMPL_IF --></p><!-- /TMPL_IF -->
-</div>
+</div><!-- /TMPL_IF -->
+<!-- /TMPL_IF --></p><!-- /TMPL_IF --></div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tmpl
index 287d30c..f3854e4 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tmpl
@@ -2,11 +2,11 @@
<!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> -- Library Catalog
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
-<body>
+<body><div id="doc" class="yui-t7">
+ <div id="bd">
<!-- TMPL_INCLUDE name="masthead.inc" -->
-<div id="doc" class="yui-t7">
- <div id="bd">
+
System Maintenance ... we'll be back soon! If you have any questions, please contact the <a href="mailto:<!--TMPL_VAR Name="KohaAdminEmailAddress"-->">Site Administrator</a>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
index 44867eb..cb81422 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
@@ -9,10 +9,10 @@
</script>
</head>
<body>
+<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
+ <div id="bd" class="columnfix">
<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
- <div id="bd">
<div id="yui-main">
<div class="yui-b">
<div class="yui-ge">
@@ -183,11 +183,11 @@
</div>
</div>
-</div>
+</div><!-- TMPL_IF NAME="OpacNav" -->
<div class="yui-b">
<div class="container">
<!--TMPL_INCLUDE NAME="navigation.inc" -->
</div>
-</div>
+</div><!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
index 2a921be..615e3a1 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
@@ -2,10 +2,10 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body>
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-
<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
<div id="bd">
+<!-- TMPL_INCLUDE name="masthead.inc" -->
+
<div id="yui-main">
<div class="yui-b">
<div class="container"><div class="yui-g">
@@ -144,10 +144,11 @@
</div>
</div>
</div>
+<!-- TMPL_IF NAME="OpacNav" -->
<div class="yui-b">
<div class="container">
<!--TMPL_INCLUDE NAME="navigation.inc" -->
</div>
-</div>
+</div><!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl
index 1c1bad3..3108055 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl
@@ -2,10 +2,10 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body>
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-
<div id="doc3" class="yui-t1">
<div id="bd">
+<!-- TMPL_INCLUDE name="masthead.inc" -->
+
<div id="yui-main">
<div class="yui-b"><div class="yui-g">
<div class="container">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
index ba2eb59..d1836ae 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
@@ -3,10 +3,10 @@
Catalog › Advanced Search
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
-<body id="advsearch">
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-<div id="doc3" class="yui-t7">
+<body id="advsearch"><div id="doc3" class="yui-t7">
<div id="bd">
+<!-- TMPL_INCLUDE name="masthead.inc" -->
+
<form action="/cgi-bin/koha/opac-search.pl" method="get">
<div class="yui-gc">
<div class="yui-u first">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl
index a1a9db8..21d5afe 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl
@@ -7,12 +7,13 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body>
+<div id="doc3" class="yui-t7">
+ <div id="bd">
<!-- TMPL_INCLUDE name="masthead.inc" -->
-<div id="doc" class="yui-t7">
- <div id="bd">
<div id="yui-g">
-<div id="auth" class="container">
+<div class="container">
+<div id="opac-auth">
<!--CONTENT-->
<!-- TMPL_IF NAME="opacuserlogin" -->
<!-- TMPL_IF NAME="loginprompt" -->
@@ -50,8 +51,8 @@
</ol></fieldset>
<input type="submit" value="Log In" class="submit" />
- <h5>Don't have a password yet?</h5><p> If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.</p>
-<h5>Don't have a library card?</h5><p> If you don't have a library card, stop by your local library to sign up. </p>
+<div> <h5>Don't have a password yet?</h5><p> If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.</p>
+<h5>Don't have a library card?</h5><p> If you don't have a library card, stop by your local library to sign up. </p></div>
</form>
@@ -66,5 +67,6 @@
<!-- /TMPL_IF --></div>
</div>
</div>
+</div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl
index 6631621..8107665 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl
@@ -2,13 +2,13 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body>
+<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
+ <div id="bd">
<!-- TMPL_INCLUDE name="masthead.inc" -->
-<div id="doc3" class="yui-t1">
- <div id="bd">
<div id="yui-main">
<div class="yui-b"><div class="yui-g">
-
+<div class="container">
<form name="f" action="/cgi-bin/koha/opac-authorities-home.pl" method="post">
<input type="hidden" name="op" value="do_search" />
<input type="hidden" name="type" value="opac" />
@@ -70,15 +70,15 @@
<input type="submit" value="Submit" class="submit" />
</fieldset>
</form>
-
</div>
</div>
</div>
+
+</div><!-- TMPL_IF NAME="OpacNav" -->
<div class="yui-b">
<div class="container">
<!--TMPL_INCLUDE NAME="navigation.inc" -->
-<!-- TMPL_INCLUDE name="usermenu.inc" -->
-</div>
</div>
+</div><!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl
index 0cedc31..cf002fa 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl
@@ -2,17 +2,17 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body>
+<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
+ <div id="bd">
<!-- TMPL_INCLUDE name="masthead.inc" -->
-<div id="doc3" class="yui-t1">
- <div id="bd">
<div id="yui-main">
<div class="yui-b"><div class="yui-g">
-
+<div class="container">
<h1>Authority search results</h1>
<div id="pages">
<!-- TMPL_IF name="displayprev" -->
- <a href="opac-authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=opac&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
+ <a href="opac-authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=opac&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
<<
</a>
<!-- /TMPL_IF -->
@@ -20,11 +20,11 @@
<!-- TMPL_IF name="highlight" -->
<span class="current"><!-- TMPL_VAR NAME="number" --></span>
<!-- TMPL_ELSE -->
- <a href="opac-authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=opac&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->"><!-- TMPL_VAR NAME="number" --></a>
+ <a href="opac-authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=opac&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->"><!-- TMPL_VAR NAME="number" --></a>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF name="displaynext" -->
- <a href="opac-authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=opac&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">>></a>
+ <a href="opac-authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=opac&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">>></a>
<!-- /TMPL_IF -->
</div>
<div id="results">
@@ -68,11 +68,11 @@
<div id="resultnumber">
<p>
<!-- TMPL_IF name="displayprev" -->
- <a href="opac-authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=opac&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->"><<</a>
+ <a href="opac-authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=opac&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->"><<</a>
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="numbers" -->
<!-- TMPL_IF name="highlight" --><span class="current"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE -->
- <a href="opac-authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=opac&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->"><!-- TMPL_VAR NAME="number" --></a>
+ <a href="opac-authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=opac&op=do_search&authtypecode=<!-- TMPL_VAR name="authtypecode" -->"><!-- TMPL_VAR NAME="number" --></a>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF name="displaynext" -->
@@ -84,11 +84,12 @@
</div>
</div>
</div>
+</div>
+<!-- TMPL_IF NAME="OpacNav" -->
<div class="yui-b">
<div class="container">
<!--TMPL_INCLUDE NAME="navigation.inc" -->
-<!-- TMPL_INCLUDE name="usermenu.inc" -->
-</div>
</div>
+</div><!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
index 92624f3..726d218 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
@@ -2,10 +2,10 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body>
+ <!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
+ <div id="bd">
<!-- TMPL_INCLUDE name="masthead.inc" -->
-<div id="doc3" class="yui-t1">
- <div id="bd">
<div id="yui-main">
<div class="yui-b"><div class="yui-g">
<div class="container">
@@ -45,11 +45,11 @@
</div></div>
</div>
</div>
+<!-- TMPL_IF NAME="OpacNav" -->
<div class="yui-b">
<div class="container">
<!--TMPL_INCLUDE NAME="navigation.inc" -->
-<!-- TMPL_INCLUDE name="usermenu.inc" -->
-</div>
</div>
+</div><!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index 425ca03..c25669a 100755
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -35,13 +35,13 @@
</head>
<body>
-
-<!--TMPL_INCLUDE NAME="masthead.inc" -->
-
<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
<div id="bd">
+<!--TMPL_INCLUDE NAME="masthead.inc" -->
+
+
<div id="yui-main">
- <div class="yui-b"><div class="yui-ge">
+ <div class="yui-b"><div id="opac-detail" class="yui-ge">
<div class="yui-u first">
<div class="container">
<div id="catalogue_detail_biblio">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl
index 12fe6d3..dbf01ae 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl
@@ -1,7 +1,7 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog › Dictionary Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body><div id="window">
- <h1>Dictionary Search</h1>
+ <div class="container"><h1>Dictionary Search</h1>
<form name="f" method="post" action="opac-dictionary.pl">
<input type="hidden" name="op" value="do_search" />
@@ -11,7 +11,7 @@
<input type="submit" value="Start search" class="submit" />
<input type="hidden" name="type" value="<!-- TMPL_VAR Name="type" -->" />
<input type="hidden" name="index" value="<!-- TMPL_VAR Name="anindex" ESCAPE="URL" -->" />
- </form>
+ </form></div>
<!-- TMPL_IF Name=search -->
<!-- TMPL_IF NAME="authresult" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
index 0ae76ec..3e53485 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
@@ -2,10 +2,10 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body>
+<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
+ <div id="bd">
<!-- TMPL_INCLUDE name="masthead.inc" -->
-<div id="doc3" class="yui-t1">
- <div id="bd">
<div id="yui-main">
<div class="yui-b"><div class="yui-g">
<div class="container">
@@ -76,11 +76,11 @@ function showlayer(numlayer)
</div></div>
</div>
</div>
+<!-- TMPL_IF NAME="OpacNav" -->
<div class="yui-b">
<div class="container">
<!--TMPL_INCLUDE NAME="navigation.inc" -->
-<!-- TMPL_INCLUDE name="usermenu.inc" -->
-</div>
</div>
+</div><!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
index 95ed417..e317d27 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
@@ -3,13 +3,18 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body>
-<!--TMPL_INCLUDE NAME="masthead.inc" -->
-
<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
<div id="bd">
+<!--TMPL_INCLUDE NAME="masthead.inc" -->
+
<div id="yui-main">
+
<div class="yui-b"><div class="yui-ge">
+ <!-- TMPL_IF NAME="opacuserlogin" -->
+ <!-- TMPL_UNLESS NAME="loggedinusername" -->
<div class="yui-u first">
+ <!-- /TMPL_UNLESS -->
+<!-- /TMPL_IF -->
<!-- TMPL_IF name="koha_news_count" -->
<div id="news" class="container">
<table>
@@ -77,10 +82,10 @@
<!-- /TMPL_IF -->
</div>
- <div class="yui-u">
-
<!-- TMPL_IF NAME="opacuserlogin" -->
<!-- TMPL_UNLESS NAME="loggedinusername" -->
+ <div class="yui-u">
+
<div id="login" class="container">
<form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
<fieldset class="brief">
@@ -94,17 +99,17 @@
</form>
</div>
+ </div>
<!-- /TMPL_UNLESS -->
<!-- /TMPL_IF -->
- </div>
</div>
</div>
</div>
-<div class="yui-b">
+<!-- TMPL_IF NAME="OpacNav" --><div class="yui-b">
<div class="container">
<!--TMPL_INCLUDE NAME="navigation.inc" -->
</div>
-</div>
+</div><!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl
index 2b31cb8..3ce76d9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl
@@ -2,10 +2,10 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body>
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-
<div id="doc3" class="yui-t1">
<div id="bd">
+<!-- TMPL_INCLUDE name="masthead.inc" -->
+
<div id="yui-main">
<div class="yui-b"><div class="yui-g">
<div class="container">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
index e1055a1..6dd9eba 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
@@ -2,10 +2,10 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body>
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-
<div id="doc3" class="yui-t1">
<div id="bd">
+<!-- TMPL_INCLUDE name="masthead.inc" -->
+
<div id="yui-main">
<div class="yui-b"><div class="yui-g">
<div class="container">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
index f4eabd5..04898c0 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
@@ -2,9 +2,9 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body>
+<div id="doc3" class="yui-t7">
<!--TMPL_INCLUDE NAME="masthead.inc" -->
-<div id="doc" class="yui-t7">
<div id="bd">
<div id="yui-g">
<div id="holds" class="container">
@@ -134,7 +134,7 @@
<input DISABLED type="checkbox" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
<!-- /TMPL_IF -->
</td>
-
+ <td> </td>
<!-- TMPL_IF NAME="item-level_itypes" -->
<td>
<img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->">
@@ -160,27 +160,27 @@
<span class="checkedout">Due <!-- TMPL_VAR NAME="date_due" --></span>
<!-- TMPL_ELSE -->
<!-- TMPL_IF Name="transfertwhen" -->
- In transit from <!-- TMPL_VAR NAME="transfertfrom" -->,
- to <!-- TMPL_VAR NAME="transfertto" -->, since <!-- TMPL_VAR NAME="transfertwhen" -->
+ <span class="intransit">In transit from <!-- TMPL_VAR NAME="transfertfrom" -->,
+ to <!-- TMPL_VAR NAME="transfertto" -->, since <!-- TMPL_VAR NAME="transfertwhen" --></span>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- TMPL_IF Name="message" -->
- Unavailable (lost or missing)
+ <span class="lost">Unavailable (lost or missing)</span>
<!-- /TMPL_IF -->
<!-- TMPL_IF Name="notforloan" -->
- Not for loan (<!-- TMPL_VAR NAME="notforloanvalue" -->)
+ <span class="notforloan">Not for loan (<!-- TMPL_VAR NAME="notforloanvalue" -->)</span>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="reservedate"-->
- <!-- TMPL_IF NAME="waitingdate" -->Waiting<!-- TMPL_ELSE -->On hold<!-- /TMPL_IF --> for patron
+ <span class="waiting"><!-- TMPL_IF NAME="waitingdate" -->Waiting<!-- TMPL_ELSE -->On hold<!-- /TMPL_IF --> for patron
<!-- TMPL_IF NAME="waitingdate" -->at<!-- TMPL_ELSE -->expected at<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="ExpectedAtLibrary" -->
since
- <!-- TMPL_IF NAME="waitingdate" --><!-- TMPL_VAR NAME="waitingdate" --><!-- TMPL_ELSE --><!-- TMPL_IF name="reservedate" --><!-- TMPL_VAR NAME="reservedate" --><!-- /TMPL_IF --><!-- /TMPL_IF -->.
+ <!-- TMPL_IF NAME="waitingdate" --><!-- TMPL_VAR NAME="waitingdate" --><!-- TMPL_ELSE --><!-- TMPL_IF name="reservedate" --><!-- TMPL_VAR NAME="reservedate" --><!-- /TMPL_IF --><!-- /TMPL_IF -->.</span>
<!-- TMPL_ELSE -->
- Not on hold
- <!-- /TMPL_IF -->
+ <span class="notonhold">Not on hold</span>
+ <!-- /TMPL_IF -->
</td>
</tr>
<!-- /TMPL_LOOP --> <!-- itemloop -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index 06a09ad..7200482 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -59,14 +59,16 @@ $(document).ready(function(){
</script>
</head>
<body id="results">
+ <!-- TMPL_IF NAME="opacfacets" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
+ <div id="bd">
+
<!--TMPL_INCLUDE NAME="masthead.inc" -->
-<div id="doc3" class="yui-t1">
- <div id="bd">
- <div id="yui-main">
+ <div id="yui-main">
<div class="yui-b">
+ <div class="container">
<!-- TMPL_IF NAME="koha_spsuggest" -->
Did you mean:
<ul style="list-style: none;">
@@ -144,7 +146,7 @@ $(document).ready(function(){
</form>
<!-- TMPL_ELSE -->
- <div class="searchresults container">
+ <div class="searchresults">
<form action="/cgi-bin/koha/opac-search.pl" method="get" name="bookbag_form" id="bookbag_form">
<!-- TMPL_IF NAME="searchdesc" -->
<!-- TMPL_LOOP NAME="QUERY_INPUTS"-->
@@ -294,16 +296,16 @@ $(document).ready(function(){
<!-- TMPL_IF name="suggestion" -->
<!-- TMPL_IF NAME="AnonSuggestions" --><div class="suggestion">Not finding what you're looking for?<br /> Make a <a href="/cgi-bin/koha/opac-suggestions.pl?op=add">purchase suggestion</a></div><!-- TMPL_ELSE --><!-- TMPL_IF NAME="loggedinusername" --><div class="suggestion">Not finding what you're looking for?<br /> Make a <a href="/cgi-bin/koha/opac-suggestions.pl?op=add">purchase suggestion</a></div><!-- /TMPL_IF --><!-- /TMPL_IF -->
<!-- /TMPL_IF -->
-
+</div>
</div>
</div>
-<div class="yui-b">
- <!-- FACETS START -->
<!-- TMPL_IF NAME="opacfacets" -->
+<div class="yui-b"><div class="container">
+ <!-- FACETS START -->
<!-- TMPL_INCLUDE NAME="opac-facets.inc" -->
- <!-- /TMPL_IF -->
<!-- FACETS END -->
-</div>
+</div></div>
+ <!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
index b8e1e55..56b5cdb 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
@@ -2,10 +2,10 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body>
+<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
+ <div id="bd">
<!-- TMPL_INCLUDE name="masthead.inc" -->
-<div id="doc3" class="yui-t1">
- <div id="bd">
<div id="yui-main">
<div class="yui-b"><div class="yui-g">
@@ -119,11 +119,11 @@
</div>
</div>
</div>
-<div class="yui-b">
-<div class="container">
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
-<!-- TMPL_INCLUDE name="usermenu.inc" -->
-</div>
-</div>
+ <!-- TMPL_IF NAME="OpacNav" -->
+ <div class="yui-b">
+ <div class="container">
+ <!--TMPL_INCLUDE NAME="navigation.inc" -->
+ </div>
+ </div><!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
index a603215..f9c781d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -37,10 +37,10 @@ $.tablesorter.addParser({
</script>
</head>
<body>
+ <!-- TMPL_IF EXPR="OpacNav||loggedinusername" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
+ <div id="bd">
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<div id="doc3" class="yui-t1">
- <div id="bd">
<div id="yui-main">
<div class="yui-b">
<div class="container">
@@ -276,12 +276,13 @@ $.tablesorter.addParser({
</div></div>
</div>
</div>
+<!-- TMPL_IF EXPR="OpacNav||loggedinusername" -->
<div class="yui-b">
<div class="container">
<!-- TMPL_INCLUDE NAME="navigation.inc" -->
<!-- TMPL_INCLUDE NAME="usermenu.inc" -->
</div>
- </div>
+ </div><!-- /TMPL_IF -->
</div>
<!-- </div> -->
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl
index f83b61b..ae962c5 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl
@@ -2,10 +2,10 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body>
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-
<div id="doc3" class="yui-t1">
<div id="bd">
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+
<div id="yui-main">
<div class="yui-b"><div class="yui-g">
<div class="container">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
index f9d1faa..f7b5141 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
@@ -2,10 +2,10 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body>
+ <!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
+ <div id="bd">
<!-- TMPL_INCLUDE name="masthead.inc" -->
-<div id="doc3" class="yui-t1">
- <div id="bd">
<div id="yui-main">
<div class="yui-b"><div class="yui-g">
@@ -25,12 +25,11 @@ subject below to see the items in our collection.</p>
</div>
</div>
-</div>
+</div><!-- TMPL_IF NAME="OpacNav" -->
<div class="yui-b">
<div class="container">
<!--TMPL_INCLUDE NAME="navigation.inc" -->
-<!-- TMPL_INCLUDE name="usermenu.inc" -->
-</div>
</div>
+</div><!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
index bad59a4..eec1ad1 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
@@ -27,10 +27,10 @@ function Dopop(link) {
</style>
</head>
<body>
+ <!-- TMPL_IF EXPR="OpacNav||results_loop" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
+ <div id="bd">
<!-- TMPL_INCLUDE name="masthead.inc" -->
-<div id="doc3" class="yui-t1">
- <div id="bd">
<div id="yui-main">
<div class="yui-b"><div class="yui-g">
<div id="topissues" class="container">
@@ -122,11 +122,11 @@ function Dopop(link) {
</div>
</div>
</div>
-</div>
+</div><!-- TMPL_IF EXPR="OpacNav||results_loop" -->
<div class="yui-b"><div class="container">
<!-- TMPL_IF NAME="results_loop" --><!-- TMPL_INCLUDE NAME="opac-topissues.inc" --><!-- /TMPL_IF -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->
-<!-- TMPL_INCLUDE name="usermenu.inc" -->
</div></div>
+<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
index 0d0bd0c..92f1fae 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
@@ -47,10 +47,10 @@ $.tablesorter.addParser({
</script>
</head>
<body>
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-
<div id="doc3" class="yui-t1">
<div id="bd">
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+
<div id="yui-main">
<div class="yui-b"><div class="yui-g">
<div id="userdetails" class="container">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl
index 852c5b0..89b7a7b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl
@@ -2,10 +2,10 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body>
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-
<div id="doc3" class="yui-t1">
<div id="bd">
+<!-- TMPL_INCLUDE name="masthead.inc" -->
+
<div id="yui-main">
<div class="yui-b"><div class="yui-g">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
index 86cb8b4..3036ddc 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
@@ -2,10 +2,10 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body>
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-
<div id="doc3" class="yui-t1">
<div id="bd">
+<!-- TMPL_INCLUDE name="masthead.inc" -->
+
<div id="yui-main">
<div class="yui-b"><div class="yui-g" id="userupdate">
--
1.5.2.1
More information about the Koha-patches
mailing list