Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 18629: (followup) Plain text "Continue..." instead of BLOCK

Browse source 
Remove
[% BLOCK txt_continue %]Continue to the next step[% END %]
...and restore original text

See comment #19 and comment #20

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Marc Véron 2017-06-14 09:02:59 +02:00 committed by Jonathan Druart
parent bd81047f42
commit 59e95182cf
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
View file

@ -1,4 +1,3 @@
[% BLOCK txt_continue %]Continue to the next step[% END %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Web installer &rsaquo;
[% UNLESS ( language ) %] Choose your language [% END %]
@ -47,7 +46,7 @@
[% END %]
</select>
</div>
<p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /></p>
<p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
</form>
[% END %]
@ -88,7 +87,7 @@
<form name="checkmodules" role="form" action="install.pl">
<input type="hidden" name="step" value="2" />
<p> <input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /> </p>
<p> <input value="Continue to the next step" class="btn btn-primary" type="submit" /> </p>
</form>
[% END # IF checkmodule%]
[% END # IF language %]

5
koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
View file

@ -1,5 +1,4 @@
[% USE HtmlTags %]
[% BLOCK txt_continue %]Continue to the next step[% END %]
[% INCLUDE 'doc-head-open.inc' %]<title>Koha &rsaquo; Web installer &rsaquo; Database settings</title>
[% INCLUDE 'installer-doc-head-close.inc' %]
</head>
@ -58,14 +57,14 @@
[% END %]
[% UNLESS ( error ) %]
<input type="hidden" name="step" value="3" />
<p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /></p>
<p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
[% END %]
</form>
[% ELSE %]
<form name="checkinformation" method="post" action="install.pl">
<input type="hidden" name="step" value="2" />
<input type="hidden" name="checkdb" value="1" />
<p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /> </p>
<p><input value="Continue to the next step" class="btn btn-primary" type="submit" /> </p>
</form>
[% END # / IF dbconnection %]
</div> <!-- / #installer-step2 -->

9
koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
View file

@ -1,4 +1,3 @@
[% BLOCK txt_continue %]Continue to the next step[% END %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Web installer &rsaquo;
@ -71,7 +70,7 @@
</p>
[% END %]
[% END %]
<p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /></p>
<p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
</form>
[% END # / IF choosemarc %]
@ -208,7 +207,7 @@
<div class="alert alert-success"><p>Database tables created</p></div>
<form action="install.pl" method="post">
<input type="hidden" name="step" value="3" />
<p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /></p>
<p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
</form>
[% END %]
[% END # / IF importdatastructure %]
@ -219,7 +218,7 @@
<form action="install.pl" method="post">
<input type="hidden" name="step" value="3" />
<input type="hidden" name="op" value="importdatastructure" />
<p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /></p>
<p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
</form>
[% END # / proposeimport %]
@ -231,7 +230,7 @@
[% ELSE %]
<h2>Web installer &rsaquo; Install basic configuration settings</h2>
<p>We are ready to do some basic configuration.</p>
<p><a href="install.pl?step=3&amp;op=choosemarc" class="btn btn-primary">[% INCLUDE txt_continue %]</a></p>
<p><a href="install.pl?step=3&amp;op=choosemarc" class="btn btn-primary">Continue to the next step</a></p>
[% END %]
[% END # / IF default %]