Trimming HTML markup, improving translation, and adding KohaAdminEmailAddress

diff --git a/koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl b/koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl
index 54b4e2f..0d5898a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl
@@ -1,19 +1,12 @@
 <!-- TMPL_INCLUDE NAME="error-top.inc" -->
-<!--------------------------MAIN BODY OF PAGE-------------------------->
+<!-- ------------------------MAIN BODY OF PAGE------------------------ -->
 <div id="mainbloc">
-<h1>One error happens !!</h1>
+<h1>An Error has Occurred!</h1>
+<h2>Error 404</h2>
 <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>
+<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>
 <!-- TMPL_INCLUDE NAME="error-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl b/koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl
index 2c589d5..ce840d3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl
@@ -1,19 +1,12 @@
 <!-- TMPL_INCLUDE NAME="error-top.inc" -->
-<!--------------------------MAIN BODY OF PAGE-------------------------->
+<!-- ------------------------MAIN BODY OF PAGE------------------------ -->
 <div id="mainbloc">
-<h1>One error happens !!</h1>
+<h1>An Error has Occurred!</h1>
+<h2>Error 401</h2>
 <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>
+<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>
 <!-- TMPL_INCLUDE NAME="error-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl b/koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl
index 54b4e2f..0d5898a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl
@@ -1,19 +1,12 @@
 <!-- TMPL_INCLUDE NAME="error-top.inc" -->
-<!--------------------------MAIN BODY OF PAGE-------------------------->
+<!-- ------------------------MAIN BODY OF PAGE------------------------ -->
 <div id="mainbloc">
-<h1>One error happens !!</h1>
+<h1>An Error has Occurred!</h1>
+<h2>Error 404</h2>
 <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>
+<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>
 <!-- TMPL_INCLUDE NAME="error-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl b/koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl
index 54b4e2f..0d5898a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl
@@ -1,19 +1,12 @@
 <!-- TMPL_INCLUDE NAME="error-top.inc" -->
-<!--------------------------MAIN BODY OF PAGE-------------------------->
+<!-- ------------------------MAIN BODY OF PAGE------------------------ -->
 <div id="mainbloc">
-<h1>One error happens !!</h1>
+<h1>An Error has Occurred!</h1>
+<h2>Error 404</h2>
 <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>
+<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>
 <!-- TMPL_INCLUDE NAME="error-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl b/koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl
index 54b4e2f..0d5898a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl
@@ -1,19 +1,12 @@
 <!-- TMPL_INCLUDE NAME="error-top.inc" -->
-<!--------------------------MAIN BODY OF PAGE-------------------------->
+<!-- ------------------------MAIN BODY OF PAGE------------------------ -->
 <div id="mainbloc">
-<h1>One error happens !!</h1>
+<h1>An Error has Occurred!</h1>
+<h2>Error 404</h2>
 <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>
+<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>
 <!-- TMPL_INCLUDE NAME="error-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl b/koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl
index 54b4e2f..0d5898a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl
@@ -1,19 +1,12 @@
 <!-- TMPL_INCLUDE NAME="error-top.inc" -->
-<!--------------------------MAIN BODY OF PAGE-------------------------->
+<!-- ------------------------MAIN BODY OF PAGE------------------------ -->
 <div id="mainbloc">
-<h1>One error happens !!</h1>
+<h1>An Error has Occurred!</h1>
+<h2>Error 404</h2>
 <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>
+<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>
 <!-- TMPL_INCLUDE NAME="error-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl b/koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl
index b436df0..f70f02e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl
@@ -1,20 +1,13 @@
 <!-- TMPL_INCLUDE NAME="error-top.inc" -->
-<!--------------------------MAIN BODY OF PAGE-------------------------->
+<!-- ------------------------MAIN BODY OF PAGE------------------------ -->
 <div id="mainbloc">
-<h1>One error happens !!</h1>
-<ul>
-
-
+<h1>An Error has Occurred!</h1>
+<h2>Error 500</h2>
 
-<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>
+<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>
 <!-- TMPL_INCLUDE NAME="error-bottom.inc" -->