[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/errors 400.tmpl,1.1,1.1.2.1 401.tmpl,1.1,1.1.2.1 402.tmpl,1.1,1.1.2.1 403.tmpl,1.1,1.1.2.1 404.tmpl,1.1,1.1.2.1 405.tmpl,1.1,1.1.2.1 500.tmpl,1.1,1.1.2.1

[Owen Leonard]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5373/koha-tmpl/intranet-tmpl/default/en/errors

Modified Files:
      Tag: rel_2_2
        400.tmpl 401.tmpl 402.tmpl 403.tmpl 404.tmpl 405.tmpl 500.tmpl 
Log Message:
Trimming HTML markup, improving translation, and adding KohaAdminEmailAddress

Index: 400.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 400.tmpl    30 Jul 2004 14:46:48 -0000      1.1
--- 400.tmpl    13 Jan 2005 19:14:40 -0000      1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't 
exist</li>    
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't 
exist</li>    
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" 
-->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 401.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 401.tmpl    30 Jul 2004 14:46:48 -0000      1.1
--- 401.tmpl    13 Jan 2005 19:14:40 -0000      1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 401</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that you aren't authorized to view this page</li>        
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 401</h2>
  <ul>
  <li>This error means that you aren't authorized to view this page</li>        
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" 
-->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 402.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 402.tmpl    30 Jul 2004 14:46:48 -0000      1.1
--- 402.tmpl    13 Jan 2005 19:14:40 -0000      1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't 
exist</li>    
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't 
exist</li>    
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" 
-->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 403.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 403.tmpl    30 Jul 2004 14:46:48 -0000      1.1
--- 403.tmpl    13 Jan 2005 19:14:40 -0000      1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't 
exist</li>    
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't 
exist</li>    
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" 
-->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 404.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 404.tmpl    30 Jul 2004 14:46:48 -0000      1.1
--- 404.tmpl    13 Jan 2005 19:14:40 -0000      1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't 
exist</li>    
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't 
exist</li>    
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" 
-->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 405.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 405.tmpl    30 Jul 2004 14:46:48 -0000      1.1
--- 405.tmpl    13 Jan 2005 19:14:40 -0000      1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't 
exist</li>    
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't 
exist</li>    
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" 
-->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 500.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 500.tmpl    30 Jul 2004 14:46:48 -0000      1.1
--- 500.tmpl    13 Jan 2005 19:14:40 -0000      1.1.2.1
***************
*** 1,19 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
! <ul>
! 
! 
  
! <div align="center"><font color="black"><b>Error 500</b> </div></font>
! <br>
! <br>
! <br>
! <br>
! 
! <li>In koha this typically mean that the koha-team is working on a new 
options</li>   
! <li>Wait for a better version or mail the mainteners</li>
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,12 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 500</h2>
  
! <ul>
! <li>In Koha this typically means that the Koha team is working on new 
features</li>   
! <li>Wait while system maintenance is being done or <a href="mailto:<!-- 
TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>