koha-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] koha installer/InstallAuth.pm koha-tmpl/intrane... [rel_3_0]


From: Joshua Ferraro
Subject: [Koha-cvs] koha installer/InstallAuth.pm koha-tmpl/intrane... [rel_3_0]
Date: Sun, 04 Mar 2007 20:57:27 +0000

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Joshua Ferraro <kados>  07/03/04 20:57:27

Modified files:
        installer      : InstallAuth.pm 
        koha-tmpl/intranet-tmpl/prog/en/installer: step1.tmpl step2.tmpl 
                                                   step3.tmpl 
Added files:
        koha-tmpl/intranet-tmpl/prog/en/images: koha.org-logo.gif 
        koha-tmpl/intranet-tmpl/prog/en/includes: 
                                                  installer-doc-head-close.inc 
        koha-tmpl/intranet-tmpl/prog/en/installer: auth.tmpl 

Log message:
        Improvements to English language strings in Web Installer
        Improvements to semantics of HTML in Web Installer
        Added Web Installer-specific styles, including koha.org logo

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/installer/InstallAuth.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/images/koha.org-logo.gif?cvsroot=koha&only_with_tag=rel_3_0&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc?cvsroot=koha&only_with_tag=rel_3_0&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/installer/step2.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/installer/auth.tmpl?cvsroot=koha&only_with_tag=rel_3_0&rev=1.1.2.1

Patches:
Index: installer/InstallAuth.pm
===================================================================
RCS file: /sources/koha/koha/installer/Attic/InstallAuth.pm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- installer/InstallAuth.pm    9 Feb 2007 21:04:17 -0000       1.1.2.1
+++ installer/InstallAuth.pm    4 Mar 2007 20:57:27 -0000       1.1.2.2
@@ -32,7 +32,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.1.2.1 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.1.2.2 $' =~ /\d+/g;
     shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
 };
 
@@ -231,7 +231,7 @@
 
 
     my $template_name;
-    $template_name = "auth.tmpl";
+    $template_name = "installer/auth.tmpl";
 
     # state variables
     my $loggedin = 0;

Index: koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/installer/Attic/step1.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
--- koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl        9 Feb 2007 
21:10:49 -0000       1.1.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl        4 Mar 2007 
20:57:27 -0000       1.1.2.2
@@ -1,20 +1,12 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type">
-  <title>Koha Installer</title>
-
-
-</head>
-<body>
-
-<h1>Welcome to Koha Installer</h1>
-
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha &rsaquo; Web Installer 
&rsaquo; Step 1
+<!-- TMPL_INCLUDE NAME="installer-doc-head-close.inc" -->
+<h1>Koha &rsaquo; Web Installer &rsaquo; Step 1</h1>
 <!--TMPL_UNLESS Name="language"-->
 <p>You are about to install Koha.</p>
-<form name="language" method="POST">
-<p>Pick up your language :<br />
+<form name="language" method="post">
+
+<p>Please pick up your language from the following list. If your langauge is 
not
+listed, please inform your systems administrator.</p>
 
 <select name="language">
   <!--TMPL_LOOP Name="languages"-->
@@ -24,7 +16,7 @@
 </select>
 </p>
 
-<p> And click Next to continue <input value="Next &gt;&gt;" type="submit"></p>
+<p> Click Next to continue <input value="Next &gt;&gt;" type="submit"></p>
 </form>
 <!--/TMPL_UNLESS-->
 <!--TMPL_IF Name="language"-->
@@ -35,7 +27,7 @@
   <!--TMPL_LOOP Name="missing"-->
     <li><!--TMPL_VAR Name="name"-->
     <!--TMPL_IF Name="usagemail"-->
-      <br/> This module is used whenever Koha has to send a mail.
+      <br/> This module is used whenever Koha has to send email.
     <!--/TMPL_IF-->
     <!--TMPL_IF Name="usagebarcode"-->
       <br/> This module is needed if you intend to print barcodes.
@@ -44,11 +36,11 @@
       <br/> This module is needed if you intend to print spine labels.
     <!--/TMPL_IF-->
     <!--TMPL_IF Name="usageLDAP"-->
-      <br/> This module is needed if you intend to use LDAP connexions.
+      <br/> This module is needed if you intend to use LDAP for authentication.
     <!--/TMPL_IF-->
     </li>
   <!--/TMPL_LOOP-->
-  Please consider installing them using these commands before getting further.
+  Please consider installing these modules before continuing.
   <pre>
   <!--TMPL_LOOP Name="missing"-->
     perl -MCPAN -e "install <!--TMPL_VAR Name="name"-->";
@@ -56,38 +48,38 @@
   </pre>
   <!--/TMPL_IF-->
   <!--TMPL_IF Name="problems"-->
-  <p>Some problems occured.<br />
+  <p>I encountered some problems.</p>
+   <ul>
     <!--TMPL_IF Name="perlversion"-->
-      <p>Your perl version seems to be obsolete.<br />
-      Consider upgrading</p>
+    <li>Your perl version seems to be obsolete.
+      Please upgrade to a newer version of Perl (at least Version 
5.006001).</li>
     <!--/TMPL_IF-->
     <!--TMPL_IF Name="perllocation"-->
-      <p>Your perl installation is not in /usr/bin/.<br />
-      You may have problems.</p>
+    <li>Your perl installation is not in /usr/bin/.
+      This version of the Web Installer expects perl to be in /usr/bin/.</li>
     <!--/TMPL_IF-->
     <!--TMPL_IF Name="zebra"-->
-      <p>Zebra server doesnot seem to be installed.<br />
-      Please consider installing it before getting further.</p>
+    <li>Zebra server doesn't seem to be installed or I can't find it.
+      Please install it before continuing.</li>
     <!--/TMPL_IF-->
     <!--TMPL_IF Name="mysql"-->
-      <p>Mysql server doesnot seem to be installed.<br />
-      Please consider installing it before getting further.</p>
+    <li>MySQL server doesn't seem to be installed or I can't find it.
+      Please install it before continuing.</li>
     <!--/TMPL_IF-->
     <!--TMPL_IF Name="yaz"-->
-      <p>YAZ doesnot seem to be installed.<br />
-      It is required for research.<br />
-      Please consider installing it before getting further.</p>
+    <li>Yaz doesn't seem to be installed or I can't find it.
+      Please install it before continuing.</li>
     <!--/TMPL_IF-->
+   </ul>
   <!--/TMPL_IF-->
   <!--/TMPL_UNLESS-->
   <!--TMPL_IF Name="checkmodule"-->
 <form name="checkmodules" action="install.pl">
-<p> All Modules and third-party softwares installed OK
+<p> All dependencies installed.
 </p>
 <input type="hidden" name="step" value="2" />
-<p> Click next to continue<input value="Next &gt;&gt;" type="submit"></p>
+<p>Please click next to continue <input value="Next &gt;&gt;" 
type="submit"></p>
 </form>
   <!--/TMPL_IF-->
 <!--/TMPL_IF-->
-</body>
-</html>
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

Index: koha-tmpl/intranet-tmpl/prog/en/installer/step2.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/installer/Attic/step2.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
--- koha-tmpl/intranet-tmpl/prog/en/installer/step2.tmpl        9 Feb 2007 
21:10:49 -0000       1.1.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/installer/step2.tmpl        4 Mar 2007 
20:57:27 -0000       1.1.2.2
@@ -1,71 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type">
-  <title>Koha Installer</title>
-
-
-</head>
-<body>
-<style type="text/css">
-#bloc25, .bloc25 {
-       float:left;
-       border:1px solid #000000;
-       margin:0px;
-       padding:0px;
-}
-</style>
-<h1>Welcome to Koha Installer</h1>
-
-<div id="bloc25"><h2 align="center">Mysql connection information</h2>
-<p>
-<em>database name : </em><!--TMPL_VAR Name="dbname"-->
-</p>
-<p>
-<em>database host : </em><!--TMPL_VAR Name="hostname"-->
-</p>
-<p>
-<em>database port : </em><!--TMPL_VAR Name="port"-->
-</p>
-<p>
-<em>database user : </em><!--TMPL_VAR Name="user"-->
-</p>
-</div>
-<div id="bloc25">
-<!--TMPL_IF Name="mysqlconnection"-->
-<form name="checkmysqlparameters" type="POST" action="install.pl">
-  <!--TMPL_IF Name="checkdatabaseaccess"-->
-  <p>Can Connect OK</p>
-     <!--TMPL_IF Name="checkdatabasecreated"-->
-  <p>database <!--TMPL_VAR Name="dbname"--> created OK</p>
-        <!--TMPL_IF Name="checkgrantaccess"-->
-  <p>user <!--TMPL_VAR Name="user"--> has all required privileges on database 
<!--TMPL_VAR Name="dbname"--> OK</p>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha &rsaquo; Web Installer 
&rsaquo; Step 2
+<!-- TMPL_INCLUDE NAME="installer-doc-head-close.inc" -->
+<h1>Koha &rsaquo; Web Installer &rsaquo; Step 2</h1>
+<h2 align="center">Database settings:</h2>
+<ul>
+<li><em>database name : </em><!--TMPL_VAR NAME="dbname"--></li>
+<li><em>database host : </em><!--TMPL_VAR NAME="hostname"--></li>
+<li><em>database port : </em><!--TMPL_VAR NAME="port"--> (probably OK if 
blank)</li>
+<li><em>database user : </em><!--TMPL_VAR NAME="user"--></li>
+</ul>
+<div>
+<!--TMPL_IF NAME="mysqlconnection"-->
+<form name="checkmysqlparameters" type="post" action="install.pl">
+  <!--TMPL_IF NAME="checkdatabaseaccess"-->
+  <p>Connection established.</p>
+     <!--TMPL_IF NAME="checkdatabasecreated"-->
+  <p>Database <code><!--TMPL_VAR NAME="dbname"--></code> exists.</p>
+        <!--TMPL_IF NAME="checkgrantaccess"-->
+  <p>User <code><!--TMPL_VAR NAME="user"--></code> has all required privileges 
on database <code><!--TMPL_VAR Name="dbname"--></code>.</p>
         <!--TMPL_ELSE-->
-  <p class="error">user <!--TMPL_VAR Name="user"--> doesnot have enough 
privilege on database <!--TMPL_VAR Name="dbname"--> </p>
-  <p class="tip"> Ask for or make a change in user privileges <br />see <a 
href=http://dev.mysql.com/doc/refman/4.1/en/grant.html>this page</a> and ask 
for usage insert update delete drop and create access for user <!--TMPL_VAR 
Name="user"-->  on <!--TMPL_VAR Name="dbname"--></p>
+  <p class="error">user <code><!--TMPL_VAR NAME="user"--></code> doesn't have 
enough privilege on database <code><!--TMPL_VAR Name="dbname"--></code> </p>
+  <p class="tip"> Ask for or make a change in the user's privileges. Need 
help? See <a href=http://dev.mysql.com/doc/refman/4.1/en/grant.html>this 
page</a>. User <code><!--TMPL_VAR NAME="user"--></code> must have USAGE, 
INSERT, UPDATE, DELETE, DROP and CREATE privileges on <code><!--TMPL_VAR 
Name="dbname"--></code></p>
         <!--/TMPL_IF-->
       <!--TMPL_ELSE-->
-  <p class="error">No database <!--TMPL_VAR Name="dbname"--> detected on 
system</p>
-  <p class="tip">Ask for or create Database in mysql database management 
system</p>
+  <p class="error">No database named <code><!--TMPL_VAR 
NAME="dbname"--></code> detected.</p>
+  <p class="tip">Please create the database before continuing.</p>
       <!--/TMPL_IF-->
    <!--TMPL_ELSE-->
-    <div class="error"><!--TMPL_VAR name="error"--> : <!--TMPL_VAR 
Name="message"-->
+    <div class="error"><!--TMPL_VAR name="error"--> : <!--TMPL_VAR 
NAME="message"-->
     </div>
-    <div class="tip">Problem can come out from various reasons :
-      <ul><li> Check mysql server is up and running.</li>
-      <li>Check data entered in koha.xml </li>
-      <li>Check hostname in koha.xml.<br /> Some Linux mysql servers donot use 
localhost but ip adress :127.0.0.1</li>
+    <div class="tip">
+      <ul>
+      <li>Check that your database is running.</li>
+      <li>Check your database settings in <code>koha.xml</code>. </li>
+      <li>Check the hostname setting in <code>koha.xml</code>. 
+      Some database servers require <code>127.0.0.1</code> rather than 
<code>localhost</code>.</li>
       </div>
+    <p>Please correct these errors and <a 
href="/cgi-bin/koha/installer/install.pl">start the installer</a> again.
   <!--/TMPL_IF-->
+  <!-- TMPL_IF NAME="error" --><!-- TMPL_ELSE -->
 <input type="hidden" name="step" value="3" />
 <p> Click Next to continue <input value="Next &gt;&gt;" type="submit"></p>
+<!-- /TMPL_IF -->
 </form>
 <!--TMPL_ELSE-->
-<form name="checkinformation" type="POST" action="install.pl">
+<form name="checkinformation" type="post" action="install.pl">
 <input type="hidden" name="step" value="2" />
 <input type="hidden" name="checkmysql" value="1" />
-<p> Click Next to continue if information are valid <input value="Next 
&gt;&gt;" type="submit"></p>
+<p> Please click Next to continue if this information is correct <input 
value="Next &gt;&gt;" type="submit"></p>
 </form>
 <!--/TMPL_IF-->
 </div>

Index: koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/installer/Attic/step3.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
--- koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl        9 Feb 2007 
21:10:49 -0000       1.1.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl        4 Mar 2007 
20:57:27 -0000       1.1.2.2
@@ -1,12 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type">
-  <title>Koha Installer</title>
-
-
-<!--TMPL_IF Name="selectframeworks"-->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha &rsaquo; Web Installer 
&rsaquo; Step 3
+<!-- TMPL_INCLUDE NAME="installer-doc-head-close.inc" -->
+<h1>Koha &rsaquo; Web Installer &rsaquo; Step 3</h1>
+<!--TMPL_IF NAME="selectframeworks"-->
 <script language="JavaScript">
 <!--
 
@@ -78,22 +73,13 @@
 }
 </script>
 <!--/TMPL_IF-->
-<style type="text/css">
-#bloc25, .bloc25 {
-       float:left;
-       border:1px solid #000000;
-       margin:0px;
-       padding:0px;
-}
-</style>
-<h1>Welcome to Koha Installer</h1>
 
 <!--TMPL_IF Name="selectframeworks"-->
-  <h2 align="center">Select Dataset</h2>
-  <form name="frameworkselection" method="POST" action="install.pl">
+  <h2 align="center">Selecting Frameworks</h2>
+  <form name="frameworkselection" method="post" action="install.pl">
   <input type="hidden" name="step" value="3" />
   <input type="hidden" name="op" value="addframeworks" />
-  <p>Select Language first :</p>
+  <p>Please select a framework language you want to import:</p>
   <p><select name="fwklanguage" onchange="javascript:refresh(this.value)">
   <!--TMPL_LOOP Name="languagelist" -->
   <!--TMPL_IF Name="checked"--><option value="<!--TMPL_VAR Name="dirname"-->" 
selected ><!--TMPL_VAR Name="languagedescription"--></option>
@@ -103,13 +89,13 @@
   </select>
   </p>
   <p><!--TMPL_LOOP Name="levelloop"-->
-  <a id="link<!--TMPL_VAR Name="code"-->" style="color: grey; font-size: 80%; 
cursor: se-resize;"  onclick="Hide('<!--TMPL_VAR Name="code"-->')">
-  <!--TMPL_VAR Name="label"--></a>
+  <a id="link<!--TMPL_VAR Name="code"-->" style="color: grey; cursor: 
se-resize;"  onclick="Hide('<!--TMPL_VAR Name="code"-->')">+</a>
+  <!--TMPL_VAR Name="label"-->
   <!--/TMPL_LOOP-->
   </p>
   <p>
   <!--TMPL_LOOP Name="levelloop"-->
-  <div id="bloc<!--TMPL_VAR Name="code"-->" style="display:none" 
class="bloc25">
+  <div id="bloc<!--TMPL_VAR Name="code"-->" style="display:none">
   <h3><!--TMPL_VAR Name="label"--></h3>
   <!--TMPL_LOOP Name="frameworks"-->
     <p><em><!--TMPL_VAR Name="fwkname"--></em>
@@ -122,6 +108,9 @@
   </div>
   </p>
   <!--/TMPL_LOOP-->
+  <p>Hint: You can select specific frameworks from each framework set by 
clicking on the <code>+</code> to expand.</p>
+  <p>When you've made your selections, please click 'Import' below to begin 
the process. It may take a while to complete,
+  please be patient</p>
   <p><input type="submit" value="import" />
   </p>
   </form>
@@ -141,7 +130,8 @@
   </p>
   <!--/TMPL_LOOP-->
   <p>Installation complete.<br/>
-    <p>Click on Finish to close the process, change access lists so that these 
operations are unreachable, and get to Koha Interface.
+    <p>Click on Finish to complete and load the Koha Staff Interface.
+    The installer will be disabled for security reasons.
     <form name="finish">
     <input type="hidden" name="step" value="3" />
     <input type="hidden" name="op" value="finish" />
@@ -150,18 +140,24 @@
   </p>
 <!--/TMPL_IF-->
 <!--TMPL_IF Name="proposeimport"-->
-  <div id="bloc25"><h2 align="center">Import the database structure ?</h2>
-<a href="install.pl?step=3&amp;op=importdatastructure" 
class="button">Import</a>
-  </div>
+  <p>Now we're ready to create the database tables and fill them with some 
default data.</p>
+<a href="install.pl?step=3&amp;op=importdatastructure" class="button">Click 
here</a> to continue.
+
 <!--/TMPL_IF-->
 <!--TMPL_IF Name="default"-->
-  <div id="bloc25"><h2 align="center">Update</h2>
-  <p>Database structure OK</p>
-<a href="install.pl?step=3&amp;op=updatestructure" class="button">update</a><a 
href="install.pl?step=3&amp;op=selectframeworks" class="button">Skip to 
datasets Import</a>
-  </div>
+  <h2 align="center">Success</h2>
+  <ul>
+  <li>Database tables created</li>
+  </ul>
+
+You can now <a href="install.pl?step=3&amp;op=updatestructure" 
class="button">update your database</a>
+structure to the latest version if you are upgrading from a previous version 
of Koha.
+</p>
+<p>Otherwise, <a href="install.pl?step=3&amp;op=selectframeworks" 
class="button">select frameworks to import</a> to continue the installation.</p>
+
 <!--/TMPL_IF-->
 <!--TMPL_IF Name="updatestructure"-->
-  <div id="bloc25"><h2 align="center">Updating Mysql database</h2>
+  <div><h2 align="center">Updating Mysql database</h2>
   <!--TMPL_IF Name="updatereport"-->
     <p>Update report :</p>
     <p>

Index: koha-tmpl/intranet-tmpl/prog/en/images/koha.org-logo.gif
===================================================================
RCS file: koha-tmpl/intranet-tmpl/prog/en/images/koha.org-logo.gif
diff -N koha-tmpl/intranet-tmpl/prog/en/images/koha.org-logo.gif
Binary files /dev/null and /tmp/cvsmtA39o differ

Index: koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc
===================================================================
RCS file: koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc
diff -N koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc       
4 Mar 2007 20:57:27 -0000       1.1.2.1
@@ -0,0 +1,65 @@
+</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
+<style type="text/css" media="screen">
+
+html { background: #eee; }
+
+body {
+        background: #fff;
+        color: #000;
+        font-family: Georgia, "Times New Roman", Times, serif;
+        margin-left: 20%;
+        margin-right: 20%;
+        padding: .2em 2em;
+}
+
+h1 {
+        color: #006;
+        font-size: 18px;
+        font-weight: lighter;
+}
+
+h2 { font-size: 16px; }
+
+h3 {
+        color: #006;
+        font-size: 18px;
+        font-weight: lighter;
+}
+
+p, li, dt {
+        line-height: 140%;
+        padding-bottom: 2px;
+}
+
+ul, ol { padding: 5px 5px 5px 20px; }
+
+#logo { margin-bottom: 2em; }
+
+.step a, .step input { font-size: 2em; }
+
+td input { font-size: 1.5em; }
+
+.step, th { text-align: right; }
+
+#bloc25, .bloc25 {
+        float:left;
+        border:1px solid #000000;
+        margin:0px;
+        padding:0px;
+
+}
+
+#footer {
+        text-align: center;
+        border-top: 1px solid #ccc;
+        padding-top: 1em;
+        font-style: italic;
+}
+
+</style>
+</head>
+
+<body>
+<h1 id="logo"><img alt="Koha" 
src="/intranet-tmpl/prog/en/images/koha.org-logo.gif" /></h1>

Index: koha-tmpl/intranet-tmpl/prog/en/installer/auth.tmpl
===================================================================
RCS file: koha-tmpl/intranet-tmpl/prog/en/installer/auth.tmpl
diff -N koha-tmpl/intranet-tmpl/prog/en/installer/auth.tmpl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ koha-tmpl/intranet-tmpl/prog/en/installer/auth.tmpl 4 Mar 2007 20:57:27 
-0000       1.1.2.1
@@ -0,0 +1,48 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+    <!-- TMPL_IF NAME="nopermission" -->Koha &rsaquo; Error: Access Denied<!-- 
/TMPL_IF -->
+    <!-- TMPL_IF NAME="timed_out" -->Koha &rsaquo; Error: Session Timed Out 
--<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="different_ip" -->Koha &rsaquo; Error: IP Address Change 
-- <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="invalid_username_or_password" -->Koha &rsaquo; Error 
Invalid Username or Password -- <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="loginprompt" -->Koha &rsaquo; Welcome to the Koha Web 
Installer<!-- /TMPL_IF -->
+    <!-- TMPL_INCLUDE NAME="installer-doc-head-close.inc" -->
+<!-- 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>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="timed_out" -->
+<!-- This is what is displayed if login has timed out -->
+<h3>Login Error</h3><p>Sorry, your session has timed out. Please login 
again.</p>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="different_ip" -->
+<!-- This is what is displayed if user's IP has changed -->
+<h3>Login Error</h3><p>You are accessing Koha from a different IP address! 
Please login again.</p>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="invalid_username_or_password" -->
+<!-- This is what is displayed if the username or password doesn't work -->
+<h3>Login Error</h3><p>You entered an incorrect username or password. Please 
try again.</p>
+<!-- /TMPL_IF -->
+
+<!-- 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 -->
+<h3>Welcome to the Koha Web Installer</h3>
+<p>Before we begin, please verify you have the correct credentials to 
continue. Please log in
+with the username and password given to you by your systems administrator and 
located in your
+<code>koha.xml</code>.</p>
+<table>
+       <caption>Please enter your username and password</caption>
+    <tr><th scope="row"><label for="userid">Username:</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>
+</form>
+
+<!-- /TMPL_IF -->
+
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->




reply via email to

[Prev in Thread] Current Thread [Next in Thread]