Merge branch 'install_wizard'
This commit is contained in:
Manuel Raynaud
@@ -34,7 +34,7 @@
|
||||
</div>
|
||||
|
||||
<div class="clearfix">
|
||||
<a href="install/step/2" class="pull-right btn btn-default btn-primary"><span class="glyphicon glyphicon-chevron-right"></span> {intl l="Continue"}</a>
|
||||
<a href="{url path='/install/step/2'}" class="pull-right btn btn-default btn-primary"><span class="glyphicon glyphicon-chevron-right"></span> {intl l="Continue"}</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -26,8 +26,12 @@
|
||||
</div>
|
||||
|
||||
{* -- Main page content section ----------------------------------------- *}
|
||||
{if $isAlreadyInstalled}
|
||||
<div>{intl l='Thelia is already installed'}</div>
|
||||
{else}
|
||||
{block name="main-content"}Put here the content of the template{/block}
|
||||
{/if}
|
||||
|
||||
{block name="main-content"}Put here the content of the template{/block}
|
||||
|
||||
{* -- Footer section ---------------------------------------------------- *}
|
||||
|
||||
@@ -38,7 +42,6 @@
|
||||
- <a href="http://www.openstudio.fr/" target="_blank">{intl l='Édité par OpenStudio'}</a>
|
||||
- <a href="http://forum.thelia.net/" target="_blank">{intl l='Forum Thelia'}</a>
|
||||
- <a href="http://contrib.thelia.net/" target="_blank">{intl l='Contributions Thelia'}</a>
|
||||
<span class="pull-right">{intl l='interface par <a target="_blank" href="http://www.steaw-webdesign.com/">Steaw-Webdesign</a>'}</span>
|
||||
</p>
|
||||
|
||||
{module_include location='in_footer'}
|
||||
|
||||
@@ -24,22 +24,21 @@
|
||||
</div>
|
||||
|
||||
<div class="well">
|
||||
<p>We will check some rights to files and directories...</p>
|
||||
<p>{intl l="Checking directory permissions ..."}</p>
|
||||
<ul class="list-unstyled list-group">
|
||||
<li class="list-group-item text-success">Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</li>
|
||||
<li class="list-group-item text-success">Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</li>
|
||||
<li class="list-group-item text-danger">Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</li>
|
||||
<li class="list-group-item text-danger">Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</li>
|
||||
<li class="list-group-item text-success">Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</li>
|
||||
<li class="list-group-item text-danger">Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</li>
|
||||
<li class="list-group-item text-success">Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</li>
|
||||
{foreach from=$validationMessages item=validationMessage}
|
||||
<li class="list-group-item {if $validationMessage.status}text-success{else}text-danger{/if}">
|
||||
{$validationMessage.text nofilter}
|
||||
{if !$validationMessage.status} - {$validationMessage.hint nofilter}{/if}
|
||||
</li>
|
||||
{/foreach}
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="clearfix">
|
||||
<a href="install" class="pull-left btn btn-default"><span class="glyphicon glyphicon-chevron-left"></span> {intl l="Return"}</a>
|
||||
<a href="install/step/3" class="pull-right btn btn-default btn-primary"><span class="glyphicon glyphicon-chevron-right"></span> {intl l="Continue"}</a>
|
||||
<a href="{url path='/install'}" class="pull-left btn btn-default"><span class="glyphicon glyphicon-chevron-left"></span> {intl l="Return"}</a>
|
||||
<a href="{url path='/install/step/3'}" class="pull-right btn btn-default btn-primary"><span class="glyphicon glyphicon-chevron-right"></span> {intl l="Continue"}</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -23,29 +23,59 @@
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="well">
|
||||
|
||||
<form action="">
|
||||
<div class="form-group">
|
||||
<label for="">{intl l="Host"} :</label>
|
||||
<input id="" type="text" class="form-control">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="">{intl l="Login"} :</label>
|
||||
<input id="" type="text" class="form-control">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="">{intl l="Password"} :</label>
|
||||
<input id="" type="password" class="form-control">
|
||||
</div>
|
||||
</form>
|
||||
{form name="thelia.install.step3"}
|
||||
<form action="{url path=$formAction}" {form_enctype form=$form} method="POST" >
|
||||
{if ! empty($general_error) }
|
||||
<div class="alert alert-danger">{$general_error}</div>
|
||||
{/if}
|
||||
|
||||
</div>
|
||||
|
||||
<div class="clearfix">
|
||||
<a href="install/step/2" class="pull-left btn btn-default"><span class="glyphicon glyphicon-chevron-left"></span> {intl l="Return"}</a>
|
||||
<a href="install/step/4" class="pull-right btn btn-default btn-primary"><span class="glyphicon glyphicon-chevron-right"></span> {intl l="Continue"}</a>
|
||||
</div>
|
||||
{form_hidden_fields form=$form}
|
||||
|
||||
{form_field form=$form field='locale'}
|
||||
<input type="hidden" name="{$name}" value="{if $value}{$value}{else}{$edit_language_locale}{/if}" />
|
||||
{/form_field}
|
||||
|
||||
<div class="well">
|
||||
{form_field form=$form field='host'}
|
||||
<div class="form-group{if $error} has-error{/if}">
|
||||
<label for="host">{intl l="Host"} :</label>
|
||||
<input id="host" class="form-control" type="text" name="{$name}" value="{$value}" placeholder="localhost">
|
||||
{if $error}{$message}{/if}
|
||||
</div>
|
||||
{/form_field}
|
||||
|
||||
{form_field form=$form field='user'}
|
||||
<div class="form-group{if $error} has-error{/if}">
|
||||
<label for="user">{intl l="User"} :</label>
|
||||
<input id="user" type="text" class="form-control" name="{$name}" value="{$value}" >
|
||||
{if $error}{$message}{/if}
|
||||
</div>
|
||||
{/form_field}
|
||||
|
||||
{form_field form=$form field='password'}
|
||||
<div class="form-group{if $error} has-error{/if}">
|
||||
<label for="password">{intl l="Password"} :</label>
|
||||
<input id="password" type="password" class="form-control" name="{$name}" value="{$value}" >
|
||||
{if $error}{$message}{/if}
|
||||
</div>
|
||||
{/form_field}
|
||||
|
||||
{form_field form=$form field='port'}
|
||||
<div class="form-group{if $error} has-error{/if}">
|
||||
<label for="port">{intl l="Port"} :</label>
|
||||
<input id="port" type="text" class="form-control" name="{$name}" value="{if value}{$value}{else}3306{/if}">
|
||||
{if $error}{$message}{/if}
|
||||
</div>
|
||||
{/form_field}
|
||||
</div>
|
||||
<button type="submit" value="{intl l="Continue"}" />
|
||||
<div class="clearfix">
|
||||
|
||||
<a href="install/step/2" class="pull-left btn btn-default"><span class="glyphicon glyphicon-chevron-left"></span> {intl l="Return"}</a>
|
||||
<a href="install/step/4" class="pull-right btn btn-default btn-primary"><span class="glyphicon glyphicon-chevron-right"></span> {intl l="Continue"}</a>
|
||||
</div>
|
||||
</form>
|
||||
{/form}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user