[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/koha-tmpl/opac-tmpl/prog/en includes/opac.... [rel_3_0]
|
From: |
paul poulain |
|
Subject: |
[Koha-cvs] koha/koha-tmpl/opac-tmpl/prog/en includes/opac.... [rel_3_0] |
|
Date: |
Wed, 10 Jan 2007 17:15:51 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: paul poulain <tipaul> 07/01/10 17:15:51
Modified files:
koha-tmpl/opac-tmpl/prog/en/includes: opac.css
koha-tmpl/opac-tmpl/prog/en: opac-main.tmpl
Log message:
news management : news on the right
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/opac.css?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.10&r2=1.1.2.11
Patches:
Index: includes/opac.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/opac.css,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- includes/opac.css 10 Jan 2007 14:34:38 -0000 1.1.2.5
+++ includes/opac.css 10 Jan 2007 17:15:51 -0000 1.1.2.6
@@ -8,11 +8,11 @@
/* attribute for standard html tags */
body {
-font-family : Verdana, Geneva, Arial, sans-serif;
-font-size : 1em;
-background-color : #eeeeee;
-text-align: left;
-margin-bottom:0px;
+ font-family : Verdana, Geneva, Arial, sans-serif;
+ font-size : 1em;
+ background-color : #eeeeee;
+ text-align: left;
+ margin-bottom:0px;
}
h1 {
@@ -23,99 +23,100 @@
}
p {
-margin:0px;
-padding:0px;
+ margin:0px;
+ padding:0px;
}
a:link, a:visited, a:active {
-text-decoration : none;
-color :#384b73;
+ text-decoration : none;
+ color :#384b73;
}
a:hover {
-text-decoration : none;
-background-color : #EEC95A;
+ text-decoration : none;
+ background-color : #EEC95A;
}
fieldset {
-display:inline;
-border: 1px solid #384b73;
+ display:inline;
+ border: 1px solid #384b73;
}
table {
-border-collapse : collapse;
-border : 1px solid #CCCCCC;
-margin : 1em 0;
+ border-collapse : collapse;
+ border : 1px solid #CCCCCC;
+ margin : 1em 0;
}
caption {
-font-size : 140%;
-text-align : left;
-font-weight : bold;
+ font-size : 140%;
+ text-align : left;
+ font-weight : bold;
}
td,th {
-border : 1px solid #CCCCCC;
-border-bottom : 1px solid #CCCCCC;
-padding : 5px;
+ border : 1px solid #CCCCCC;
+ border-bottom : 1px solid #CCCCCC;
+ padding : 5px;
}
th {
-background-color: #384b73;
-color:white;
-border : 1px solid #CCCCCC;
-border-right: 1px solid #CCCCCC;
+ background-color: #384b73;
+ color:white;
+ border : 1px solid #CCCCCC;
+ border-right: 1px solid #CCCCCC;
}
th[scope=row] {
-text-align : right;
+ text-align : right;
}
input[type=submit], input[type=button], input[type=reset] {
-background-color : #EEC95A;
-color : #FFFFFF;
-font-size : 1em;
-font-weight : bold;
+ background-color : #EEC95A;
+ color : #FFFFFF;
+ font-size : 1em;
+ font-weight : bold;
}
li {
-list-style-type:square;
+ list-style-type:square;
}
/* attributes for search result list */
.searchresults td, .searchresults th, .searchresults table {
-border: 0;
+ border: 0;
}
.searchresults tr {
-border-bottom : 1px solid #CCCCCC;
+ border-bottom : 1px solid #CCCCCC;
}
.searchresults table {
-border-top : 0px solid #CCCCCC;
-border: 1px solid #CCCCCC;
+ border-top : 0px solid #CCCCCC;
+ border: 1px solid #CCCCCC;
}
p.searchresults {
-background-color : #EFF1DC;
+ background-color : #EFF1DC;
}
.searchresults a.reserve {
-background-color : transparent;
-color : #006699;
+ background-color : transparent;
+ color : #006699;
}
.searchresults table tr:hover {
-background-color: #CCFFFF;
+ background-color: #CCFFFF;
}
tr.highlight td, tr.highlight th {
-background-color : #EEEEEE;
-border: 1px solid #DDDDDD;
-border-right: 1px solid #DDDDDD;}
+ background-color : #EEEEEE;
+ border: 1px solid #DDDDDD;
+ border-right: 1px solid #DDDDDD;
+}
/* the top part of the opac : (the LibraryName) */
#masthead {
-color:#384b73;
-margin-left:15%;
-text-align:left;
-font-size:150%;
-font-weight:bold;
-margin-bottom:25px;
+ color:#384b73;
+ margin-left:15%;
+ text-align:left;
+ font-size:150%;
+ font-weight:bold;
+ margin-bottom:25px;
}
/* The image on the top-left (the logo) */
@@ -128,79 +129,82 @@
/* the itemtype list in advanced search */
#advsearch-itemtype table {
-border-collapse: separate;
-border-spacing: 3px;
+ border-collapse: separate;
+ border-spacing: 3px;
}
#advsearch-itemtype table tr td {
-background-color:#CCCCCC;
-width:100%;
+ background-color:#CCCCCC;
+ width:100%;
}
#advsearch-itemtype table tr td p {
-font-size:0.8em;
+ font-size:0.8em;
}
/* the content part of every page */
#main {
-margin-left:15%;
-margin-bottom:0px;
+ margin-left:15%;
+ margin-bottom:0px;
}
/* the main menu (home, adv search, login...) */
#menu {
-position:fixed;
-margin-top:100px;
-border-right:1px solid black;
-padding:0px;
-font-size:0.8em;
-color:#384b73;
+ position:fixed;
+ margin-top:100px;
+ border-right:1px solid black;
+ padding:0px;
+ font-size:0.8em;
+ color:#384b73;
}
#menu ul a {
-display:block;
-margin:5px 5px 0px 5px;
-padding :5px 5px 0px 5px;
-text-decoration:none;
-color:#384b73;
+ display:block;
+ margin:5px 5px 0px 5px;
+ padding :5px 5px 0px 5px;
+ text-decoration:none;
+ color:#384b73;
}
#menu ul a:hover {
-display:block;
-margin:5px 5px 0px 5px;
-padding :5px 5px 0px 5px;
-text-decoration:none;
-background-color:#384b73;
-color:white;
+ display:block;
+ margin:5px 5px 0px 5px;
+ padding :5px 5px 0px 5px;
+ text-decoration:none;
+ background-color:#384b73;
+ color:white;
}
#menu ul {
-padding-left:0px;
-margin-bottom:0px;
-margin-top:0px;
+ padding-left:0px;
+ margin-bottom:0px;
+ margin-top:0px;
}
#menu li {
-list-style-type:none;
+ list-style-type:none;
}
/* the user menu, for user option (and biblio detail view) */
#usermenu a {
-background-color : #EEC95A;
-color : #FFFFFF;
-font-size : 1em;
-border: 2px outset;
-font-weight : bold;
-margin:0px 5px 0px 0px;
-padding:2px 5px 2px 5px;
-text-decoration:none;
-display: inline;
+ background-color : #EEC95A;
+ color : #FFFFFF;
+ font-size : 1em;
+ border: 2px outset;
+ font-weight : bold;
+ margin:0px 5px 0px 0px;
+ padding:2px 5px 2px 5px;
+ text-decoration:none;
+ display: inline;
}
#usermenu a:hover {
-border: 2px inset;
-background-color:#384b73;
+ border: 2px inset;
+ background-color:#384b73;
}
/* the opac-news */
#news {
-display:float;
-float:right;
-border:1px solid black;
-font-size:8px;
+ width:20%;
+ float:right;
+ font-size:11px;
+}
+#news th {
+background-color:white;
+color:#384b73;
}
/* "problem" enhancement */
@@ -210,50 +214,49 @@
}
#action a {
-background-color : #EEC95A;
-color : #FFFFFF;
-font-size : 1em;
-border: 2px outset;
-font-weight : bold;
-margin:0px 5px 0px 0px;
-padding-right:5px;
-padding-left:5px;
-text-decoration:none;
-display: inline;
+ background-color : #EEC95A;
+ color : #FFFFFF;
+ font-size : 1em;
+ border: 2px outset;
+ font-weight : bold;
+ margin:0px 5px 0px 0px;
+ padding-right:5px;
+ padding-left:5px;
+ text-decoration:none;
+ display: inline;
}
#action a:hover {
-border: 2px inset;
-background-color:#CCCCCC;
+ border: 2px inset;
+ background-color:#CCCCCC;
}
#auth {
-float:left;
+ float:left;
}
/* facets bloc */
#facets {
-float:right;
-border: 1px solid #CCCCCC;
-margin-top: 5px;
-margin-left: 15px;
-font-size:0.8em;
+ float:right;
+ border: 1px solid #CCCCCC;
+ margin-top: 5px;
+ margin-left: 15px;
+ font-size:0.8em;
}
#facets h2 {
-background-color:#EFF1DC;
-border-bottom: 1px solid #CCCCCC;
-margin:0px;
-font-size:1em;
+ background-color:#EFF1DC;
+ border-bottom: 1px solid #CCCCCC;
+ margin:0px;
+ font-size:1em;
}
#facets ul {
-list-style-type: none;
-padding-left:10px;
-margin-bottom:0px;
-margin-top:0px;
+ list-style-type: none;
+ padding-left:10px;
+ margin-bottom:0px;
+ margin-top:0px;
}
/* the USER information block */
#librarian_information {
-/* position:absolute; */
float:right;
font-size:10pt;
}
@@ -261,6 +264,7 @@
/* the footer */
#footer h2 {
margin-left:15%;
+ margin-right:20%;
border-top:1px solid #384b73;
color: #384b73;
font-size:1em;
Index: opac-main.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -b -r1.1.2.10 -r1.1.2.11
--- opac-main.tmpl 10 Jan 2007 14:34:38 -0000 1.1.2.10
+++ opac-main.tmpl 10 Jan 2007 17:15:51 -0000 1.1.2.11
@@ -5,13 +5,30 @@
<!--TMPL_INCLUDE NAME="masthead.inc" -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_IF name="koha_news_count" -->
+<div id="news">
+ <table>
+ <!-- TMPL_LOOP name="koha_news" -->
+ <tr>
+ <th>
+ <!-- TMPL_VAR name="title" -->
+ </th>
+ <tr><td>
+ <p><!-- TMPL_VAR name="new" --></p>
+ <p><i>(published on <!-- TMPL_VAR name="newdate" -->)</i></p>
+ </td></tr>
+ <!-- /TMPL_LOOP -->
+ </table>
+</div>
+<!-- /TMPL_IF -->
+
<div id="opac-main-search">
<h1>Search our catalogue</h1>
<form name="searchform" method="POST"
action="/cgi-bin/koha/opac-search.pl" id="searchform">
<ul><li>
<label for="masthead_search">Query the catalogue</label>
<input type="text" name="q" style="width: 30%;"/>
- <input type="submit" value="Search" class="submit" /> <i>(click <a
href="/cgi-bin/koha/opac-search.pl">here</a> for more search options)</i>
+ <input type="submit" value="Search" class="submit" /> <i>(<a
href="/cgi-bin/koha/opac-search.pl">more search options</a>)</i>
</li>
</form>
<!-- TMPL_IF name="OpacAuthorities" -->
@@ -41,21 +58,4 @@
</div>
<!-- /TMPL_IF -->
-<!-- TMPL_IF name="koha_news_count" -->
-<div id="news">
-<p><!-- TMPL_VAR name="koha_news_count" --> recent news</p>
- <table>
- <!-- TMPL_LOOP name="koha_news" -->
- <tr>
- <th>
- on <!-- TMPL_VAR name="newdate" -->, <!-- TMPL_VAR name="title" -->
- </th>
- <tr><td>
- <p><!-- TMPL_VAR name="new" --></p>
- </td></tr>
- <!-- /TMPL_LOOP -->
- </table>
-</div>
-<!-- /TMPL_IF -->
-
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha/koha-tmpl/opac-tmpl/prog/en includes/opac.... [rel_3_0],
paul poulain <=