Enhancement Bug 4444: Centralize Code Handling Perl Dependencies

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / installer / step1.tmpl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl
index f8e15bc..23ecb65 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl
@@ -6,20 +6,20 @@
 <!--TMPL_UNLESS Name="language"-->
 <p>You are about to install Koha.</p>
 
-<p>Please pick up your language from the following list. If your langauge is not
+<p>Please pick your language from the following list. If your language is not
 listed, please inform your systems administrator.</p>
 <form name="language" method="post">
 <select name="language">
 <!-- TMPL_IF NAME="installer_languages_loop" -->
         <!-- TMPL_LOOP NAME="installer_languages_loop" -->
             <!-- TMPL_IF NAME="plural" -->
-            <optgroup label="<!-- TMPL_VAR NAME="rfc4646_subtag" -->">
+            <optgroup label="<!-- TMPL_VAR NAME="language" -->">
             <!-- TMPL_LOOP NAME="sublanguages_loop" -->
-                <option value="<!-- TMPL_VAR NAME="rfc4646_subtag" -->"><!-- TMPL_VAR NAME="rfc4646_subtag" --></option>
+                <option value="<!-- TMPL_VAR NAME="rfc4646_subtag" -->"><!-- TMPL_IF NAME="native_description" --><!-- TMPL_VAR NAME="native_description" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="rfc4646_subtag" --><!-- /TMPL_IF --></option>
             <!-- /TMPL_LOOP -->
             </optgroup>
             <!-- TMPL_ELSE -->
-               <option value="<!-- TMPL_VAR NAME="rfc4646_subtag" -->"><!-- TMPL_VAR NAME="rfc4646_subtag" --></option>
+               <option value="<!-- TMPL_VAR NAME="rfc4646_subtag" -->"><!-- TMPL_IF NAME="native_description" --><!-- TMPL_VAR NAME="native_description" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="rfc4646_subtag" --><!-- /TMPL_IF --></option>
             <!-- /TMPL_IF -->
         <!-- /TMPL_LOOP -->
 <!-- /TMPL_IF -->
@@ -31,31 +31,19 @@ listed, please inform your systems administrator.</p>
 <!--/TMPL_UNLESS-->
 <!--TMPL_IF Name="language"-->
   <!--TMPL_UNLESS Name="checkmodule"-->
-  <!--TMPL_IF Name="missing"-->
-  <p>Some perl modules are missing.<br />
+  <!--TMPL_IF Name="missing_modules"-->
+  <p>Some perl modules are missing. Modules in red <b>must</b> be installed before you may continue.<br />
   <ul>
-  <!--TMPL_LOOP Name="missing"-->
+  <!--TMPL_LOOP Name="missing_modules"-->
+    <!--TMPL_IF Name="require"-->
+    <li style="color:#FF0000;font-weight:bold;"><!--TMPL_VAR Name="name"-->
+    <!-- TMPL_ELSE -->
     <li><!--TMPL_VAR Name="name"-->
-    <!--TMPL_IF Name="usagemail"-->
-      <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.
-    <!--/TMPL_IF-->
-    <!--TMPL_IF Name="usagespine"-->
-      <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 for authentication.
     <!--/TMPL_IF-->
+      <br /> Version: <!--TMPL_VAR Name="version"-->
+      <br /> Usage: <!--TMPL_VAR Name="usage"-->
     </li>
   <!--/TMPL_LOOP-->
-  Please consider installing these modules before continuing.
-  <pre>
-  <!--TMPL_LOOP Name="missing"-->
-    perl -MCPAN -e "install <!--TMPL_VAR Name="name"-->";
-  <!--/TMPL_LOOP-->
-  </pre>
   <!--/TMPL_IF-->
   <!--TMPL_IF Name="problems"-->
   <p>I encountered some problems.</p>
@@ -67,13 +55,15 @@ listed, please inform your systems administrator.</p>
    </ul>
   <!--/TMPL_IF-->
   <!--/TMPL_UNLESS-->
-  <!--TMPL_IF Name="checkmodule"-->
 <form name="checkmodules" action="install.pl">
-<p> All dependencies installed.
-</p>
+<!--TMPL_IF Name="checkmodule"-->
 <input type="hidden" name="step" value="2" />
+<p> All dependencies installed.</p>
 <p>Please click next to continue <input value="Next &gt;&gt;" type="submit" /></p>
+<!-- TMPL_ELSE -->
+<input type="hidden" name="step" value="1" />
+<p>Click to recheck dependencies <input value="Recheck" type="submit" /></p>
+<!--/TMPL_IF-->
 </form>
-  <!--/TMPL_IF-->
 <!--/TMPL_IF-->
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->