[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en about.tmpl...

paul poulain paul at koha-fr.org
Fri Mar 9 15:41:45 CET 2007


CVSROOT:	/sources/koha
Module name:	koha
Changes by:	paul poulain <tipaul>	07/03/09 14:41:45

Modified files:
	koha-tmpl/intranet-tmpl/prog/en: about.tmpl auth.tmpl 
	                                 intranet-main.tmpl 

Log message:
	rel_3_0 moved to HEAD

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/about.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/intranet-main.tmpl?cvsroot=koha&r1=1.9&r2=1.10

Patches:
Index: about.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/about.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- about.tmpl	16 Mar 2006 11:33:28 -0000	1.3
+++ about.tmpl	9 Mar 2007 14:41:45 -0000	1.4
@@ -1,54 +1,47 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->About Koha
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
 
+<div id="main">
 <div id="mainbloc">
 	<h1>Data about the current version of Koha for bug reports (or general interest).</h1>
 	
 <table>
 	<caption>Server information</caption>
-	<tr><th scope="row">Koha version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></td></tr>
-	<tr><th scope="row">OS version ('uname -a'): </th><td><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></td></tr>
-	<tr><th scope="row">Perl version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></td></tr>
-	<tr><th scope="row">MySQL version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></td></tr>
-	<tr><th scope="row">Apache version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></td></tr>
-	<tr><th scope="row">Zebra version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="zebraVersion" --></td></tr>
+	<tr><th>Koha version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></td></tr>
+	<tr><th>OS version ('uname -a'): </th><td><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></td></tr>
+	<tr><th>Perl version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></td></tr>
+	<tr><th>MySQL version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></td></tr>
+	<tr><th>Apache version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></td></tr>
+	<tr><th>Zebra version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="zebraVersion" --></td></tr>
 </table>
 
 <table>
         <caption>Perl modules</caption>
 	<!-- TMPL_LOOP name="components" -->
 	<tr>
-	  <th scope="row"><!-- TMPL_VAR NAME="name" --></th>
+	  <th><!-- TMPL_VAR NAME="name" --></th>
           <td><!-- TMPL_VAR NAME="version" --></td>
         </tr>
 	<!-- /TMPL_LOOP -->
 </table>
 
 	
-		<h2>Special thanks to the following libraries</h2>
+<h2>Special thanks to the following libraries</h2>
 <ul>
 	<li><strong>Horowhenua Library Trust</strong>, New Zealand, and Rosalie Blake, Head of Libraries, (Koha 1.0)</li>
 	<li>The <strong>Nelsonville Public Library</strong>, USA, Ohio (MARC support funding)</li>
 	<li><strong>EMN (Ecole des Mines de Nantes)</strong>, France (Suggestion, stats modules and improved ldap support funding)</li>
-	<li><strong>ENSMP (Ecole Nationale Supérieure des Mines de Paris)</strong>, France (biblio frameworks, MARC authorities, OPAC basket, Serials support funding)</li>
+	<li><strong>ENSMP (Ecole Nationale Supérieure des Mines de Paris)</strong>, France (biblio frameworks, MARC authorities, OPAC basket, Serials support funding)</li>
+	<li><strong>SAN-Ouest Provence </strong> Koha 3.0 members &amp; reserve modules.
 </ul>	
 	
-		<h2>Core team for 2.2</h2>
+<h2>Core team</h2>
 <ul>
-	<li><strong>Rachel Hamilton-Williams</strong>, Kaitiaki</li>
-	<li><strong>Paul Poulain</strong>, 2.2 release manager (MARC developer)</li>
-	<li>Stephen Hedges, Owen Leonard, Joshua Ferraro (<strong>Nelsonville Public Library</strong>)</li>
-	<li><strong>Katipo Communications</strong> (Koha 1.0 developers)</li>
-	<li><ul></li>
-	<li>Rachel Hamilton-Williams, General Manager (Webmistress)</li>
-	<li>Chris Cormack, 1.2 release manager</li>
-	<li>and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson,</li>
-	<li>Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</li></ul></li>
-	<li>Emiliano Marmonti, Matías Veleda and Sebastian Catañeda <strong>La Plata University, Argentina</strong> (barcode printing)</li>
-	<li>MJ Ray and <strong>Turo Technology LLP</strong>, (quality control, installer and updater, 2.0 release maintainer)</li>
-	<li>Nicholas Rosasco, (Documentation Compiler)</li>
-	<li>Mike Hansen</li>
-	<li><strong>Pate Eyler</strong> (Kaitiaki from 2002 to 2004)</li>
+	<li><strong>LibLime (Joshua Ferraro)</strong>, USA (Koha 3.0 Release Manager)</li>
+	<li><strong>Paul Poulain, Henri Damien Laurent, Antoine Farnault</strong>, France (Koha 2.0 &amp; 2.2 Release Manager)</li>
+	<li><strong>Katipo Communications (Chris Cormack)</strong>, New Zealand (Koha 1.0 &amp; 1.2 Release Manager)</li>
+	<li><strong>SAN-Ouest Provence (Bruno Toumi &amp; Arnaud Laurin)</strong>, France</li>
 </ul>
 	
 	
@@ -66,7 +59,7 @@
 	<li>Dorian Meid (German translation)</li>
 	<li>doXulting (Matthieu Branlat) OPAC basket</li>
 	<li>Ed Summers (Some code and Perl packages like MARC::Record)</li>
-	<li>Esiee School (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)</li>
+	<li>Esiee School (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)</li>
 	<li>Florian Bischof</li>
 	<li>Francisco M. Marzoa Alonso</li>
 	<li>Glen Stewart</li>
@@ -76,15 +69,20 @@
 	<li>Marco Gaiarin</li>
 	<li>Md. Aftabuddin</li>
 	<li>Michaes Herman</li>
+	<li>Mike Hansen</li>
 	<li>Mike Johnson</li>
 	<li>Mike Mylonas</li>
+	<li>MJ Ray and Turo Technology LLP, (quality control, installer and updater, 2.0 release maintainer)</li>
+	<li>Nicholas Rosasco, (Documentation Compiler)</li>
 	<li>Nicolas Morin (French Translation in 2.0)</li>
 	<li>Pawel Skuza (Polish for 1.2)</li>
+	<li>Pate Eyler (Kaitiaki from 2002 to 2004)</li>
 	<li>Regula Sebastiao</li>
 	<li>Roger Buck</li>
 	<li>Ron Wickersham</li>
 	<li>Sebastiaan Durand</li>
 	<li>Steve Tonnesen (early MARC work, Virtual Bookshelves concept, KohaCD)</li>
+	<li>Stephen Hedges</li>
 	<li>Universidad ORT Uruguay (Ernesto Silva, Andres Tarallo)</li>
 </ul>
 	
@@ -96,7 +94,7 @@
 	<li><strong>Spanish: </strong>Andres Tarallo</li>
 	<li><strong>Italian: </strong>Giuseppe Angilella</li>
 </ul>
-	
+</div>
 
 
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file

Index: auth.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- auth.tmpl	6 Aug 2005 20:19:56 -0000	1.1
+++ auth.tmpl	9 Mar 2007 14:41:45 -0000	1.2
@@ -1,5 +1,12 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="nopermission" -->Access Denied<!-- /TMPL_IF --><!-- TMPL_IF NAME="timed_out" -->Session Timed Out --<!-- /TMPL_IF --><!-- TMPL_IF NAME="different_ip" -->IP Change -- <!-- /TMPL_IF --><!-- TMPL_IF NAME="invalid_username_or_password" -->Invalid Username or Password -- <!-- /TMPL_IF --><!-- TMPL_IF NAME="loginprompt" -->Log in to Koha<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+    <!-- TMPL_IF NAME="nopermission" -->Access Denied<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="timed_out" -->Session Timed Out --<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="different_ip" -->IP Change -- <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="invalid_username_or_password" -->Invalid Username or Password -- <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="loginprompt" -->Log in to Koha<!-- /TMPL_IF -->
+    <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<div id="login">
+<h1><a href="" title=""><span class="hide">Log in to Koha</span></a></h1>
 <!-- TMPL_IF NAME="nopermission" -->
 <!-- This is what is displayed if user doesn"t have permission --><h3>Login Error</h3>
 <p>Sorry, Koha doesn"t think you have permission for this page.</p>
@@ -23,21 +30,20 @@
 
 <!-- TMPL_IF NAME="loginprompt" -->
 <!-- login prompt time-->
-
 <form action="<!-- TMPL_VAR NAME="url" -->" method="post" name="mainform" id="mainform">
 <!-- TMPL_LOOP NAME="INPUTS" -->
   <input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->" />
 <!-- /TMPL_LOOP -->
-
-<table>
-	<caption>Log In to Koha</caption>
-    <tr><th scope="row"><label for="userid">Cardnumber:</label></th><td><input name="userid" id="userid" /></td></tr>
-    <tr><th scope="row"><label for="password">Password:</label></th><td><input type="password" name="password" id="password" /></td></tr>
-    </table>
-<p><input type="submit" value="Submit" /></p>
+<p>
+<label>Username:<br />
+<input type="text" name="userid" id="userid" class="input" value="" size="20" tabindex="10" /></label>
+</p>
+<p>
+<label>Password:<br />
+<input type="password" name="password" id="password" class="input" value="" size="20" tabindex="20" /></label>
+</p>    
+<p class="submit"><input type="submit" value="Login &raquo;" /></p>
 </form>
 
-
 <!-- /TMPL_IF -->
-
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file

Index: intranet-main.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/intranet-main.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- intranet-main.tmpl	4 Jul 2006 15:02:42 -0000	1.9
+++ intranet-main.tmpl	9 Mar 2007 14:41:45 -0000	1.10
@@ -1,99 +1,25 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha Intranet Home<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<h1>Koha Intranet Home</h1>
-<ul>
-	<li>Circulation
-		<ul>
-			<li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a></li>
-			<li><a href="/cgi-bin/koha/circ/circulation.pl">Issues</a></li>
-			<li><a href="/cgi-bin/koha/circ/returns.pl">Returns</a></li>
-			<li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li>
-			<li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set branch</a></li>
-			<li><a href="/cgi-bin/koha/circ/branchreserves.pl">Waiting reserves</a></li>
-			<li><a href="/cgi-bin/koha/circ/waitingreservestransfers.pl">Transfers to do</a></li>
-			<li><a href="/cgi-bin/koha/circ/currenttransfers.pl">Transfers to recieve</a></li>
-		</ul>
-	</li>
-	<li>Members
-		<ul>
-			<li><a href="/cgi-bin/koha/members/members-home.pl">Search</a></li>
- 			<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A"/>Add adult</a></li>
- 			<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C"/>Add child</a></li>
- 			<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=P"/>Add prof</a></li>
- 			<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=I"/>Add org</a></li>
-		</ul>
-	</li>
-	<li>Catalogue
-		<ul>
-			<li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">Advanced Search</a></li>
-			<li><a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual Shelves</a></li>
-		</ul>
-	</li>
-	<li>Cataloging
-<ul>
-			<li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></li>
-			<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add Full MARC Record</a></li>
-</ul></li>
-<li>Acquisitions<ul>
-<li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li><li><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book funds</a></li>
-<li><a href="/cgi-bin/koha/acqui/histsearch.pl">Search Order History</a></li>
-<li><a href="/cgi-bin/koha/import/breeding.pl">Import to reservoir</a></li><li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li></ul>
-	</li>
-	<li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
-	<li>Accounts and Reports
-		<ul>
-			<li>Catalogue Statistics
-				<ul>
-					<li><a href="/cgi-bin/koha/reports/inventory.pl">Inventory/Stocktaking</a></li>
-					<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></li>
-				</ul>
-			</li>
-			<li>Circulation Statistics
-				<ul>
-					<li><a href="/cgi-bin/koha/reports/stats.pl?time=yesterday">Till Reconcipation: Daily Report (yesterday)</a></li>
-					<li><a href="/cgi-bin/koha/reports/stats.pl?time=today">Till Reconcipation: Daily Report (today)</a></li>
-					<li><a href="/cgi-bin/koha/reports/overdue.pl">Overdue items</a></li>
-				</ul>
-			</li>
-			<li>Statistics Wizards
-				<ul>
-					<li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></li>
-					<li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">Borrowers</a></li>
-					<li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalogue</a></li>
-					<li><a href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></li>
-				</ul>
-			</li>
-			<li>Top Lists
-				<ul>
-					<li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Most issuing Borrowers</a></li>
-					<li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most issued items</a></li>
-				</ul>
-			</li>
-		</ul>
-	</li>
-	<li>Koha Administration
-		<ul>
-		<li><a href="/cgi-bin/koha/admin/admin-home.pl">Tools</a></li>
-		<li><a href="/cgi-bin/koha/admin/admin-home.pl">System Administration Home</a></li>
-		<li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li>
-		<li><a href="/cgi-bin/koha/barcodes/barcodes.pl">Barcodes generator</a></li>
-		</ul>
-	</li>
-</ul>
-<div id="news">
-	<h1>News</h1>
-	<!-- TMPL_LOOP name="koha_news" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+    Koha Intranet Home
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+
+<div id="main">
+    <h1>Welcome to Koha</h1>
+    
+        <!-- TMPL_IF name="koha_news_count" -->
+            <p><!-- TMPL_VAR name="koha_news_count" --> recent news</p>
 			<table>
+            <!-- TMPL_LOOP name="koha_news" -->
 				<tr>
 				<th>
-					<!-- TMPL_VAR NAME="title" --></th>
-					<td>
-					<!-- TMPL_VAR NAME="new" -->
-					</td>
-				<td>
-						<!-- TMPL_VAR NAME="newdate" --> 
-					</td>
-				</tr>
-			</table>
+                    on <!-- TMPL_VAR name="newdate" -->, <!-- TMPL_VAR name="title" -->
+                </th>
+                <tr><td>
+                    <p><!-- TMPL_VAR name="new" --></p>
+                </td></tr>
 	<!-- /TMPL_LOOP -->
+            </table>
+        <!-- /TMPL_IF -->
 </div>
+
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->





More information about the Koha-cvs mailing list