Owen Leonard
6596513d4b
This patch makes style and markup changes to the web installer and new onboarding tool (Bug 17855). - Markup has been corrected, improved, and in many places reindented. - Some page titles have been made more specific. - Some JavaScript and CSS have been moved to separate files. In the onboarding tool I have removed form validation from the markup and JavaScript in many cases where the requirements were not matched elsewhere in Koha. For instance, we shouldn't limit item type descriptions to only letters because the database doesn't require such a limit. To test, apply the patch and run the web installer with an empty database. Confirm that the installation process completes correctly and that each page looks good and works correctly. Works as advertised Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
73 lines
4.6 KiB
Text
73 lines
4.6 KiB
Text
[% INCLUDE 'doc-head-open.inc' %]<title>Koha › Web installer › Database settings</title>
|
|
[% INCLUDE 'installer-doc-head-close.inc' %]
|
|
</head>
|
|
|
|
<body id="installer" class="installer">
|
|
<div class="container-fluid">
|
|
<div class="row">
|
|
<div id="installer-step2" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
|
|
|
|
<h1 id="logo"><a href="#">Koha</a></h1>
|
|
<h2>Web installer › Database settings</h2>
|
|
<h3>Database settings:</h3>
|
|
<ul>
|
|
<li><em>Database type : </em> <code>[% dbms %]</code></li>
|
|
<li><em>Database name : </em> <code>[% dbname %]</code></li>
|
|
<li><em>Database host : </em> <code>[% hostname %]</code></li>
|
|
<li><em>Database port : </em> <code>[% port %]</code> (probably okay if blank)</li>
|
|
<li><em>Database user : </em> <code>[% user %]</code></li>
|
|
</ul>
|
|
|
|
[% IF ( dbconnection ) %]
|
|
<form name="checkdbparameters" method="post" action="install.pl">
|
|
[% IF ( checkdatabaseaccess ) %]
|
|
<div class="alert alert-success" role="alert"><p>Connection established.</p></div>
|
|
[% IF ( checkdatabasecreated ) %]
|
|
<ul>
|
|
<li>Database <code>[% dbname %]</code> exists.</li>
|
|
[% IF ( checkgrantaccess ) %]
|
|
<li>User <code>[% user %]</code> has all required privileges on database <code>[% dbname %]</code>.</li>
|
|
</ul>
|
|
[% ELSE %]
|
|
</ul>
|
|
<p class="error">user <code>[% user %]</code> doesn't have enough privilege on database <code>[% dbname %]</code> </p>
|
|
<p class="tip"> Ask for or make a change in the user's privileges. Need help? See [% IF ( mysql ) %]
|
|
<a href="http://dev.mysql.com/doc/refman/4.1/en/grant.html">
|
|
[% ELSE %]
|
|
<a href="http://www.postgresql.org/docs/8.2/interactive/sql-createrole.html">
|
|
[% END %]
|
|
this page</a>. User <code>[% user %]</code> must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on <code>[% dbname %]</code>
|
|
</p>
|
|
[% END %]
|
|
[% ELSE %]
|
|
<div class="alert alert-danger" role="alert"><p>No database named <code>[% dbname %]</code> detected.</p></div>
|
|
<p>Please create the database before continuing.</p>
|
|
[% END %]
|
|
[% ELSE %]
|
|
<div class="alert alert-warning" role="alert">[% error %] : [% message %]</div>
|
|
<div class="tip">
|
|
<ul>
|
|
<li>Check that your database is running.</li>
|
|
<li>Check your database settings in <code>koha-conf.xml</code>. </li>
|
|
<li>Check the hostname setting in <code>koha-conf.xml</code>.
|
|
Some database servers require <code>127.0.0.1</code> rather than <code>localhost</code>.</li>
|
|
</ul>
|
|
</div>
|
|
<p>Please correct these errors and <a href="/cgi-bin/koha/installer/install.pl">start the installer</a> again.
|
|
[% END %]
|
|
[% UNLESS ( error ) %]
|
|
<input type="hidden" name="step" value="3" />
|
|
<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="Continue to the next step" class="btn btn-primary" type="submit" /> </p>
|
|
</form>
|
|
[% END # / IF dbconnection %]
|
|
</div> <!-- / #installer-step2 -->
|
|
</div> <!-- / .row -->
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|