[Koha-cvs] koha/koha-tmpl/opac-tmpl/npl/en includes/opac-c... [rel_2_2]

Owen Leonard oleonard at athenscounty.lib.oh.us
Tue Aug 8 18:18:03 CEST 2006


CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Owen Leonard <oleonard>	06/08/08 16:18:03

Modified files:
	koha-tmpl/opac-tmpl/npl/en/includes: opac-colors.css 
	                                     opac-layout.css 
	koha-tmpl/opac-tmpl/npl/en: opac-full-serial-issues.tmpl 
	                            opac-serial-issues.tmpl 

Log message:
	Synching opac serials templates with default, prettying up the full-serial-issues tabs

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.css?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-full-serial-issues.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-serial-issues.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.3&r2=1.1.2.4

Patches:
Index: includes/opac-colors.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/opac-colors.css,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- includes/opac-colors.css	28 Apr 2006 18:46:30 -0000	1.1.2.3
+++ includes/opac-colors.css	8 Aug 2006 16:18:03 -0000	1.1.2.4
@@ -430,6 +430,22 @@
 	border-bottom: 1px solid White;
 }
 
+div.tabitem ul li {
+	border-right : 1px solid #4C4C4C;
+}
+
+div.tabitem li a.here {
+	background-color : #CBCBCB;
+}
+
+div.tabitem li a {
+	background-color : #D9D9D9;
+}
+
+div.tabitem li a:hover {
+	background-color : #F0F0F0;
+}
+
 .MARCtag { /* style for tag definition (700 - Statement of responsability) */
 	color:#000066;
 	background-color:#EEEEEE;

Index: includes/opac-layout.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/opac-layout.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-layout.css	7 Aug 2006 14:48:17 -0000	1.1.2.5
+++ includes/opac-layout.css	8 Aug 2006 16:18:03 -0000	1.1.2.6
@@ -793,6 +793,29 @@
 	padding : 3px 0;
 }
 
+div.tabitem {
+	margin-top : .8em;
+	margin-bottom : -2px;
+}
+
+div.tabitem li a {
+	font-weight: bold;
+	padding: 3px 3px;
+	text-decoration: none;
+}
+
+div.tabitem ul {
+	margin: 0;
+	padding: 0;
+}
+
+div.tabitem ul li {
+	margin: 0 2px 0 0;
+	padding: 3px 0;
+	list-style: none;
+	display: inline;
+}
+
 .MARCtag { /* style for tag definition (700 - Statement of responsability) */
 	font-weight:bold;
 	clear : both;

Index: opac-full-serial-issues.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-full-serial-issues.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- opac-full-serial-issues.tmpl	9 Jun 2005 21:16:20 -0000	1.1.2.1
+++ opac-full-serial-issues.tmpl	8 Aug 2006 16:18:03 -0000	1.1.2.2
@@ -7,74 +7,69 @@
 
 <!-- TMPL_UNLESS name="popup" -->
 <div id="main">
-	<h2>Subscription information for <em><!-- TMPL_VAR name="bibliotitle" --></em></h2>
-	<form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Normal View" /></form>
+ <h1>Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h1>
+    <form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="Return to Record" /></form>
 <!-- /TMPL_UNLESS -->
-
-	<div class="tabs">
+<form action="opac-serial-issues.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="hidden" name="selectview" value="small" /><input type="submit" value="Summary view" class="submit"></form>
+    <div class="tabitem">
+	<ul>
 	<!-- TMPL_LOOP NAME="years" -->
 		<!-- TMPL_IF NAME="year" -->
-			<a href="#" onclick="active(<!-- TMPL_VAR NAME="year" -->); return false;" id="link<!-- TMPL_VAR NAME="year" -->"><!-- TMPL_VAR NAME="year" --></a>
+           <li> <a class="tabsubs" href="javascript:showlayer(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a></li>
 		<!-- /TMPL_IF -->
 	<!-- /TMPL_LOOP -->
+	</ul>
 	</div>
 
 	<!-- TMPL_LOOP NAME="years" -->
-	<div name="<!-- TMPL_VAR NAME="year" -->" id="<!-- TMPL_VAR NAME="year" -->" class="tab" <!--TMPL_IF Name="first" -->style="visibility:visible"<!--/TMPL_IF -->>
+    <div name="yeardata" id="<!-- TMPL_VAR NAME="year" -->" class="tabsub"<!--TMPL_IF Name="first" --> style="display:inline"<!--/TMPL_IF -->>
 		<table>
-			<caption><!-- TMPL_VAR NAME="year" --> Issues</caption>
 			<tr>
-				<th> Date
-				</th>
-				<th> Number
-				</th>
-				<th> Status
-				</th>
+                <th>Date</th>
+                <th>Date received</th>
+                <th>Number</th>
+                <th>Status</th>
 			</tr>
 			<!-- TMPL_LOOP Name="serials" -->
 			<tr>
 				<td>
+                    <!-- TMPL_VAR Name="publisheddate" -->
+                </td>
+                <td>
 					<!-- TMPL_VAR Name="planneddate" -->
 				</td>
 				<td>
 					<!-- TMPL_VAR Name="serialseq" -->
 				</td>
 				<td>
-					<!-- TMPL_IF Name="status1" -->Arrived<!-- /TMPL_IF -->
-					<!-- TMPL_IF Name="status2" -->Waited<!-- /TMPL_IF -->
+                    <!-- TMPL_IF Name="status1" -->Waited<!-- /TMPL_IF -->
+                    <!-- TMPL_IF Name="status2" -->Arrived<!-- /TMPL_IF -->
 					<!-- TMPL_IF Name="status3" -->Late<!-- /TMPL_IF -->
 					<!-- TMPL_IF Name="status4" -->Missing<!-- /TMPL_IF -->
+                    <!-- TMPL_IF Name="status5" -->Not Published<!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
 				</td>
 			</tr>
 			<!-- /TMPL_LOOP -->
 		</table>
 	</div>
 	<!--/TMPL_LOOP -->
-</div>
+	</div>
 <script language="JavaScript" type="text/javascript">
-function active(numlayer)
+showlayer(<!-- TMPL_VAR name="yearmin" -->);
+function showlayer(numlayer)
 {
-	for (i=<!--TMPL_VAR Name="yearmin"-->; i<=<!--TMPL_VAR Name="yearmax"-->; i++ ) {
-		ong = i;
-		link = "link"+i;
-		if (numlayer==i) {
-			document.getElementById(ong).style.visibility="visible";
-			document.getElementById(link).style.color="#000066";
-			document.getElementById(link).style.backgroundColor="#FFFFCC";
+	var yeardata=document.getElementsByName("yeardata");
+    for (i=0; i<yeardata.length; i++ ) {
+		ong=yeardata[i].getAttribute('id');
+        if (numlayer==ong) {
+			yeardata[i].style.display="inline";
 		} else {
-			document.getElementById(ong).style.visibility="hidden";
-			if (document.getElementById(link)) {
-			document.getElementById(link).style.color="#669999";
-			document.getElementById(link).style.backgroundColor="#D8DEB8";
-			}
+			yeardata[i].style.display="none";
 		}
 	}
 }
-<!-- TMPL_LOOP name="years" -->
-<!-- TMPL_IF NAME="first" -->
-	active(<!-- TMPL_VAR NAME="year" -->);
-<!-- /TMPL_IF -->
-	<!--/TMPL_LOOP -->
+
 </script>
 </body>
 </html>

Index: opac-serial-issues.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-serial-issues.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- opac-serial-issues.tmpl	5 Jul 2005 21:29:08 -0000	1.1.2.3
+++ opac-serial-issues.tmpl	8 Aug 2006 16:18:03 -0000	1.1.2.4
@@ -4,14 +4,14 @@
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
 <div id="main">
-<h1>Issues for a subscription</h1>
-	<form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Normal View" /></form>
+	<h1>Issues for a subscription</h1>
+	<form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="Return to Record" /></form>
+	<form action="opac-serial-issues.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="hidden" name="selectview" value="full" /><input type="submit" value="Complete view" class="submit"></form>
 
-<form method="post" name="f">
-<!-- TMPL_LOOP name="subscription_LOOP" -->
-<div class="content-block">
+	<!-- TMPL_LOOP name="subscription_LOOP" -->
+	<div class="details">
 	<h2>Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h2>
-		<p>It began on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every
+		<p>It began on <b><!-- TMPL_VAR name="histstartdate" --></b> and is issued every
 		<b>
 		<!--TMPL_IF name="periodicity1" -->
 				day
@@ -47,37 +47,36 @@
 				2 years
 		<!-- /TMPL_IF -->
 		</b>
-		on
-		<b>
 		<!--TMPL_IF name="arrival1" -->
-			Monday
+			on <b>monday</b>
 		<!-- /TMPL_IF -->
 		<!--TMPL_IF name="arrival2" -->
-				Tuesday
+			on <b>tuesday</b>
 		<!-- /TMPL_IF -->
 		<!--TMPL_IF name="arrival3" -->
-				Wednesday
+			on <b>wednesday</b>
 		<!-- /TMPL_IF -->
 		<!--TMPL_IF name="arrival4" -->
-				Thursday
+			on <b>thursday</b>
 		<!-- /TMPL_IF -->
 		<!--TMPL_IF name="arrival5" -->
-				Friday
+			on <b>friday</b>
 		<!-- /TMPL_IF -->
 		<!--TMPL_IF name="arrival6" -->
-				Saturday
+			on <b>saturday</b>
 		<!-- /TMPL_IF -->
 		<!--TMPL_IF name="arrival7" -->
-				Sunday
+			on <b>sunday</b>
 		<!-- /TMPL_IF -->
-		</b>
 		for <b>
 			<!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> issues<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> weeks<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> months<!-- /TMPL_IF -->
 			</b>
-		since <b><!-- TMPl_VAR name="startdate" --></b>
 		</p>
+		<p>Last renewal of subscription was <b><!-- TMPl_VAR name="startdate" --></b></p>
+		<!-- TMPL_IF name="enddate" --><p><b>This subscription is now ended. The last issue was recieved on <!-- TMPL_VAR name="enddate" --></b></p><!-- /TMPL_IF name="enddate" -->
+	<!--TMPL_UNLESS Name=fullinfo -->
 		<p><!-- TMPL_VAR name="notes" --></p>
 	<!-- TMPL_IF name="opacnote" -->
 		<h2>Issues summary</h2>
@@ -85,7 +84,20 @@
 			<!-- TMPL_VAR name="opacnote" -->
 		</p>
 	<!-- /TMPL_IF -->
-</div>
+		<!-- TMPL_IF name="recievedlist" -->
+			<h2>Recieved issues</h2>
+			<p>
+				<!-- TMPL_VAR name="recievedlist" -->
+			</p>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="missinglist" -->
+			<h2>Missing issues</h2>
+			<p>
+				<!-- TMPL_VAR name="missinglist" -->
+			</p>
+		<!-- /TMPL_IF -->
+	</div>
+	<!-- /TMPL_UNLESS -->
 <!-- /TMPL_LOOP -->
 </div>
 </body>





More information about the Koha-cvs mailing list