[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes intranet-nav.inc,1.7,1.8 intranet.css,1.11,1.12 search-topmenu.inc,1.2,1.3

Owen Leonard oleonard at users.sourceforge.net
Tue Jul 5 22:17:32 CEST 2005


Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv797/koha-tmpl/intranet-tmpl/npl/en/includes

Modified Files:
	intranet-nav.inc intranet.css search-topmenu.inc 
Log Message:
Synching with rel_2_2.

Index: intranet-nav.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav.inc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** intranet-nav.inc	8 Feb 2005 20:17:58 -0000	1.7
--- intranet-nav.inc	5 Jul 2005 20:17:29 -0000	1.8
***************
*** 17,21 ****
  
  	</form></li></ul></li>
! 				<li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">Catalog</a><ul><li><form name="f" method="post" action="/cgi-bin/koha/search.marc/search.pl"><input type="hidden" name="op" value="do_search" /><input type="hidden" name="type" value="intranet" /><input type="hidden" name="nbstatements" value="3" /><label for="navkeyword"><span class="accesskey">Q</span>uick Search:</label><input type="hidden" name="marclist" value="" /><input type="hidden" name="and_or" value="and" /><input type="hidden" name="excluding" value="" /><input type="hidden" name="operator" value="contains" /><input type="text" id="navkeyword" name="value" size="10" accesskey="q" /><input type="submit" value="Start search" class="submit"></form></li><!-- Display for NPL <li><a href="/item_report.php">Format Search</a></li><li><a href="http://live.moreforohio.org:8080/vdx/">MORE Search</a></li> /Display for NPL -->
  </ul></li>
  <li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul><!-- Display for NPL <li><a href="/cgi-bin/koha/acqui.simple/addbiblio-simple.pl">Add Temp</a> </li> /Display for NPL --><li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a></li><!-- Hide from NPL --><li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li>
--- 17,21 ----
  
  	</form></li></ul></li>
! 				<li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">Catalog</a><ul><li><form method="post" action="/cgi-bin/koha/search.marc/search.pl"><input type="hidden" name="op" value="do_search" /><input type="hidden" name="type" value="intranet" /><input type="hidden" name="nbstatements" value="3" /><label for="navkeyword"><span class="accesskey">Q</span>uick Search:</label><input type="hidden" name="and_or" value="and" /><input type="hidden" name="excluding" value="" /><input type="hidden" name="operator" value="contains" /><input type="text" id="navkeyword" name="value" size="10" accesskey="q" /><input type="submit" value="Start search" class="submit" /></form></li><!-- Display for NPL <li><a href="/item_report.php">Format Search</a></li><li><a href="http://live.moreforohio.org:8080/vdx/">MORE Search</a></li> /Display for NPL -->
  </ul></li>
  <li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul><!-- Display for NPL <li><a href="/cgi-bin/koha/acqui.simple/addbiblio-simple.pl">Add Temp</a> </li> /Display for NPL --><li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a></li><!-- Hide from NPL --><li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li>

Index: intranet.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/intranet.css,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** intranet.css	16 Feb 2005 22:37:24 -0000	1.11
--- intranet.css	5 Jul 2005 20:17:29 -0000	1.12
***************
*** 318,324 ****
  
  div.error .submit {
  	background-color : #993300;
  	font-size: 14px;
! 	color: #E7E7CA;
  	padding : 2px 15px 2px 15px;
  }
--- 318,331 ----
  
  div.error .submit {
+ 	background-color : #669999;
+ 	font-size: 14px;
+ 	margin-left : 5%;
+ 	padding : 2px 15px 2px 15px;
+ }
+ 
+ div.error .cancel {
  	background-color : #993300;
  	font-size: 14px;
! 	margin-left : 5%;
  	padding : 2px 15px 2px 15px;
  }
***************
*** 351,361 ****
  }
  
! div.form {
! 	background-color : #FFFFCC;
! 	border : 0px dotted #333333;
! 	margin : 0px auto;
! 	padding : 5px;
! 	position : relative;
! }
  
  	div.help {
--- 358,362 ----
  }
  
! 
  
  	div.help {
***************
*** 367,371 ****
  	
  	div.help h3 {
- 		cursor : pointer;
  		font-size : 100%;
  		background-color : #FFFFCC;
--- 368,371 ----
***************
*** 414,433 ****
  }
  
  div.tabitem ul li {
! 	margin-left: 0;
! 	margin-bottom: 0;
! 	padding: 2px 15px 5px;
! 	border: 1px solid #000;
! 	list-style: none;
! 	display: inline;
! 	}
! 	
! 		
! div.tabitem ul li.here {
! 	border-bottom: 1px solid #ffc;
  	list-style: none;
  	display: inline;
  	}
  
  fieldset {
  	border : 0;
--- 414,446 ----
  }
  
+ div.tabitem ul {
+ 	margin : 0;
+ 	padding : 0;
+ }
+ 
  div.tabitem ul li {
! 	font-size : 80%;
! 	margin : 0 2px 0 0;
! 	border-right: 1px solid #999900;
! 	padding : 3px 0;
  	list-style: none;
  	display: inline;
  	}
  
+ div.tabitem li a {
+ 	background-color : #E7E7CA;
+ 	font-weight : bold;
+ 	padding : 3px 3px;
+ 	text-decoration : none;
+ }
+ 
+ div.tabitem li a.here {
+ 	background-color : #D8DEB8;
+ }
+ 
+ div.tabitem li a:hover {
+ 	background-color : #FFFFCC;
+ }
+ 
  fieldset {
  	border : 0;
***************
*** 565,568 ****
--- 578,588 ----
  }
  
+ tr th[scope=row], tr.highlight th[scope=row]{
+ 	font-family : Arial, Geneva, Helvetica, sans-serif;
+ 	font-size : 70%;
+ 	font-weight : normal;
+ 	padding : 0;
+ }
+ 
  th:last-child {
  	background-color : #D8DEB8;
***************
*** 624,628 ****
  	margin : 3px 0px 5px 0px;
  	padding : 0px;
! 	width : 95%;
  }
  
--- 644,648 ----
  	margin : 3px 0px 5px 0px;
  	padding : 0px;
! 	width : auto;
  }
  
***************
*** 660,663 ****
--- 680,692 ----
  }
  
+ td.credit, td.debit, td.sum {
+ 	font-family : "Courier New", Courier, monospace;
+ 	text-align : right;
+ }
+ 
+ td.debit {
+ 	color : #990000;
+ }
+ 
  .current {
  	background-color : #FFFFFF;
***************
*** 703,708 ****
  }
  
! .help {
! 		cursor: help;
  }
  
--- 732,738 ----
  }
  
! .form-help {
! 	font-size : 95%;
! 	padding-left : 15px;
  }
  
***************
*** 743,746 ****
--- 773,811 ----
  }
  
+ td form {
+ 	margin : 0;
+ }
+ 
+ td input.submit {
+ 	border : 1px outset #CCCC99;
+ 	color : #FFFFCC;
+ 	margin : 0 5px 0 0;
+ 	padding : 0 5px 0 5px;
+ }
+ 
+ td input.submit:active {
+ 	border : 1px inset #cccc99;
+ }
+ 
+ td input.delete {
+ 	border : 1px outset #CCCC99;
+ 	color : #FFFFCC;
+ 	background-color : #993300;
+ 	font-size : 12px;
+ 	font-weight : bold;
+ 	padding : 0 5px 0 5px;
+ 	margin : 0 5px 0 0;
+ }
+ 
+ td input.delete:active {
+ 	border : 1px inset #cccc99;
+ }
+ 
+ .thumbnail {
+ 	float : left;
+ 	margin : 0 5px 10px 0;
+ 	border : 0px solid #E7E7CA;
+ }
+ 
  .yes {
  	float: left;
***************
*** 1042,1050 ****
--- 1107,1123 ----
  }
  
+ .searchresults td {
+ 	padding : 2px 2px 2px 5px;
+ }
+ 
  .searchresults p {
+ 	font-size : 1.2em;
+ 	font-weight : bold;
  	margin : .2em;
  }
  
  .searchresults p+p {
+ 	font-size : 1em;
+ 	font-weight : normal;
  	text-indent : 1em;
  }
***************
*** 1161,1164 ****
--- 1234,1241 ----
  }
  
+ div.data table tr.highlight td {
+ 	background-color: #FFFFE1;
+ }
+ 
  div.data table th[scope=col], div.data-main table th[scope=col] {
  	text-align: center;
***************
*** 1172,1174 ****
--- 1249,1264 ----
  .accesskey {
  	text-decoration : underline;
+ }
+ 
+ div#controls {
+ 	float: right;
+ 	margin-left : .7em;
+ 	width : 15%;
+ }
+ 
+ div#controls form {
+ 	background-color : #FFFFCC;
+ 	font-size : 80%;
+ 	margin : .3em 0;
+ 	padding : .3em;
  }
\ No newline at end of file

Index: search-topmenu.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/search-topmenu.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** search-topmenu.inc	3 Feb 2005 18:09:50 -0000	1.2
--- search-topmenu.inc	5 Jul 2005 20:17:29 -0000	1.3
***************
*** 1 ****
! <div id="topmenu"><a href="/cgi-bin/koha/search.marc/search.pl?type=intranet">Advanced Search</a> | <form name="f" method="post" action="/cgi-bin/koha/search.marc/search.pl"><input type="hidden" name="op" value="do_search" /><input type="hidden" name="type" value="intranet" /><input type="hidden" name="nbstatements" value="3" /><label for="keyword">Quick Search:</label><input type="hidden" name="marclist" value="" /><input type="hidden" name="and_or" value="and" /><input type="hidden" name="excluding" value="" /><input type="hidden" name="operator" value="contains" /><input type="text" id="keyword" name="value" size="10" /> <input type="submit" value="Start search" class="submit"></form> | <a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual Shelves</a></div>
\ No newline at end of file
--- 1 ----
! <div id="topmenu"><a href="/cgi-bin/koha/search.marc/search.pl?type=intranet">Advanced Search</a> | <form method="post" action="/cgi-bin/koha/search.marc/search.pl"><input type="hidden" name="op" value="do_search" /><input type="hidden" name="type" value="intranet" /><input type="hidden" name="nbstatements" value="3" /><label for="keyword">Quick Search:</label><input type="hidden" name="and_or" value="and" /><input type="hidden" name="excluding" value="" /><input type="hidden" name="operator" value="contains" /><input type="text" id="keyword" name="value" size="10" /> <input type="submit" value="Start search" class="submit" /></form> | <a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual Shelves</a></div>
\ No newline at end of file





More information about the Koha-cvs mailing list