TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/thelia/thelia

Browse Source
This commit is contained in:
Franck Allimant
2014-01-20 23:38:33 +01:00
parent 66d6d03770 7d6e889865
commit 70651c2f32
32 changed files with 246 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,6 +1,7 @@
#2.0.0-beta4
- Tinymce is now a dedicated module. You need to activate it.
- Fix PDF creation. Bug #180
- Fix many translation issues.
#2.0.0-beta3
- Coupon effect inputs are now more customisable (input text, select, ajax, etc.. are usable) and unlimited amount of input for coupon effect are now possible too

2
Readme.md
View File

@@ -3,7 +3,7 @@ Readme
Thelia
------
[![Build Status](https://travis-ci.org/thelia/thelia.png?branch=master)](https://travis-ci.org/thelia/thelia)
[![Build Status](https://travis-ci.org/thelia/thelia.png?branch=master)](https://travis-ci.org/thelia/thelia) [![License](https://poser.pugx.org/thelia/thelia/license.png)](https://packagist.org/packages/thelia/thelia)
[Thelia](http://thelia.net/v2) is an open source tool for creating e-business websites and managing online content. This software is published under GPL.

5
composer.json
View File

@@ -57,5 +57,10 @@
"": "local/modules/",
"Thelia" : "core/lib/"
}
},
"extra": {
"branch-alias": {
"dev-master": "2.0.0-dev"
}
}
}

2
composer.lock generated
View File

@@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
],
"hash": "6dee359d61c06345d0e4cc045b19dc4e",
"hash": "f779af80bcfc2ed1deefba9350bdcf66",
"packages": [
{
"name": "ensepar/html2pdf",

21
core/lib/Thelia/Controller/Admin/AdministratorController.php
View File

@@ -114,26 +114,6 @@ class AdministratorController extends AbstractCrudController
return new AdministratorModificationForm($this->getRequest(), "form", $data);
}
protected function hydrateResourceUpdateForm($object)
{
$data = array(
'id' => $object->getId(),
);
// Setup the object form
return new AdministratorUpdateResourceAccessForm($this->getRequest(), "form", $data);
}
protected function hydrateModuleUpdateForm($object)
{
$data = array(
'id' => $object->getId(),
);
// Setup the object form
return new AdministratorUpdateModuleAccessForm($this->getRequest(), "form", $data);
}
protected function getObjectFromEvent($event)
{
return $event->hasAdministrator() ? $event->getAdministrator() : null;
@@ -142,7 +122,6 @@ class AdministratorController extends AbstractCrudController
protected function getExistingObject()
{
return AdminQuery::create()
->joinWithI18n($this->getCurrentEditionLocale())
->findOneById($this->getRequest()->get('administrator_id'));
}

11
core/lib/Thelia/Controller/Admin/AttributeAvController.php
View File

@@ -137,9 +137,14 @@ class AttributeAvController extends AbstractCrudController
protected function getExistingObject()
{
return AttributeAvQuery::create()
->joinWithI18n($this->getCurrentEditionLocale())
->findOneById($this->getRequest()->get('attributeav_id'));
$attributeAv = AttributeAvQuery::create()
->findOneById($this->getRequest()->get('attributeav_id', 0));
if (null !== $attributeAv) {
$attribute->setLocale($this->getCurrentEditionLocale());
}
return $attributeAv;
}
protected function getObjectLabel($object)

11
core/lib/Thelia/Controller/Admin/AttributeController.php
View File

@@ -167,9 +167,14 @@ class AttributeController extends AbstractCrudController
protected function getExistingObject()
{
return AttributeQuery::create()
->joinWithI18n($this->getCurrentEditionLocale())
->findOneById($this->getRequest()->get('attribute_id'));
$attribute = AttributeQuery::create()
->findOneById($this->getRequest()->get('attribute_id', 0));
if (null !== $attribute) {
$attribute->setLocale($this->getCurrentEditionLocale());
}
return $attribute;
}
protected function getObjectLabel($object)

9
core/lib/Thelia/Controller/Admin/ConfigController.php
View File

@@ -140,9 +140,14 @@ class ConfigController extends AbstractCrudController
protected function getExistingObject()
{
return ConfigQuery::create()
->joinWithI18n($this->getCurrentEditionLocale())
$config = ConfigQuery::create()
->findOneById($this->getRequest()->get('variable_id'));
if (null !== $config) {
$config->setLocale($this->getCurrentEditionLocale());
}
return $config;
}
protected function getObjectLabel($object)

7
core/lib/Thelia/Controller/Admin/ConfigStoreController.php
View File

@@ -85,7 +85,12 @@ class ConfigStoreController extends BaseAdminController
$this->adminLogAppend(AdminResources::STORE, AccessManager::UPDATE, "Store configuration changed");
$this->redirectToRoute('admin.configuration.store.default');
if ($this->getRequest()->get('save_mode') == 'stay') {
$this->redirectToRoute('admin.configuration.store.default');
}
// Redirect to the success URL
$this->redirect($configStoreForm->getSuccessUrl());
} catch (\Exception $ex) {
$error_msg = $ex->getMessage();

11
core/lib/Thelia/Controller/Admin/CountryController.php
View File

@@ -120,8 +120,6 @@ class CountryController extends AbstractCrudController
$event
->setLocale($formData['locale'])
->setTitle($formData['title'])
->setChapo($formData['chapo'])
->setDescription($formData['description'])
->setIsocode($formData['isocode'])
->setIsoAlpha2($formData['isoalpha2'])
->setIsoAlpha3($formData['isoalpha3'])
@@ -164,9 +162,14 @@ class CountryController extends AbstractCrudController
*/
protected function getExistingObject()
{
return CountryQuery::create()
->joinWithI18n($this->getCurrentEditionLocale())
$country = CountryQuery::create()
->findPk($this->getRequest()->get('country_id', 0));
if (null !== $country) {
$country->setLocale($this->getCurrentEditionLocale());
}
return $country;
}
/**

9
core/lib/Thelia/Controller/Admin/CurrencyController.php
View File

@@ -141,9 +141,14 @@ class CurrencyController extends AbstractCrudController
protected function getExistingObject()
{
return CurrencyQuery::create()
->joinWithI18n($this->getCurrentEditionLocale())
$currency = CurrencyQuery::create()
->findOneById($this->getRequest()->get('currency_id'));
if (null !== $currency) {
$currency->setLocale($this->getCurrentEditionLocale());
}
return $currency;
}
protected function getObjectLabel($object)

11
core/lib/Thelia/Controller/Admin/FeatureAvController.php
View File

@@ -137,9 +137,14 @@ class FeatureAvController extends AbstractCrudController
protected function getExistingObject()
{
return FeatureAvQuery::create()
->joinWithI18n($this->getCurrentEditionLocale())
->findOneById($this->getRequest()->get('featureav_id'));
$featureAv = FeatureAvQuery::create()
->findOneById($this->getRequest()->get('featureav_id', 0));
if (null !== $featureAv) {
$featureAv->setLocale($this->getCurrentEditionLocale());
}
return $featureAv;
}
protected function getObjectLabel($object)

11
core/lib/Thelia/Controller/Admin/FeatureController.php
View File

@@ -167,9 +167,14 @@ class FeatureController extends AbstractCrudController
protected function getExistingObject()
{
return FeatureQuery::create()
->joinWithI18n($this->getCurrentEditionLocale())
->findOneById($this->getRequest()->get('feature_id'));
$feature = FeatureQuery::create()
->findOneById($this->getRequest()->get('feature_id', 0));
if (null !== $feature) {
$feature->setLocale($this->getCurrentEditionLocale());
}
return $feature;
}
protected function getObjectLabel($object)

11
core/lib/Thelia/Controller/Admin/MessageController.php
View File

@@ -143,9 +143,14 @@ class MessageController extends AbstractCrudController
protected function getExistingObject()
{
return MessageQuery::create()
->joinWithI18n($this->getCurrentEditionLocale())
->findOneById($this->getRequest()->get('message_id'));
$message = MessageQuery::create()
->findOneById($this->getRequest()->get('message_id', 0));
if (null !== $message) {
$message->setLocale($this->getCurrentEditionLocale());
}
return $message;
}
protected function getObjectLabel($object)

11
core/lib/Thelia/Controller/Admin/ModuleController.php
View File

@@ -144,9 +144,14 @@ class ModuleController extends AbstractCrudController
protected function getExistingObject()
{
return ModuleQuery::create()
->joinWithI18n($this->getCurrentEditionLocale())
->findOneById($this->getRequest()->get('module_id'));
$module = ModuleQuery::create()
->findOneById($this->getRequest()->get('module_id', 0));
if (null !== $module) {
$module->setLocale($this->getCurrentEditionLocale());
}
return $module;
}
protected function getObjectLabel($object)

11
core/lib/Thelia/Controller/Admin/ProfileController.php
View File

@@ -145,9 +145,14 @@ class ProfileController extends AbstractCrudController
protected function getExistingObject()
{
return ProfileQuery::create()
->joinWithI18n($this->getCurrentEditionLocale())
->findOneById($this->getRequest()->get('profile_id'));
$profile = ProfileQuery::create()
->findOneById($this->getRequest()->get('profile_id', 0));
if (null !== $profile) {
$profile->setLocale($this->getCurrentEditionLocale());
}
return $profile;
}
protected function getObjectLabel($object)

11
core/lib/Thelia/Controller/Admin/TaxController.php
View File

@@ -121,9 +121,14 @@ class TaxController extends AbstractCrudController
protected function getExistingObject()
{
return TaxQuery::create()
->joinWithI18n($this->getCurrentEditionLocale())
->findOneById($this->getRequest()->get('tax_id'));
$tax = TaxQuery::create()
->findOneById($this->getRequest()->get('tax_id', 0));
if (null !== $tax) {
$tax->setLocale($this->getCurrentEditionLocale());
}
return $tax;
}
protected function getObjectLabel($object)

9
core/lib/Thelia/Controller/Admin/TaxRuleController.php
View File

@@ -140,9 +140,14 @@ class TaxRuleController extends AbstractCrudController
protected function getExistingObject()
{
return TaxRuleQuery::create()
->joinWithI18n($this->getCurrentEditionLocale())
$taxRule = TaxRuleQuery::create()
->findOneById($this->getRequest()->get('tax_rule_id'));
if (null !== $taxRule) {
$taxRule->setLocale($this->getCurrentEditionLocale());
}
return $taxRule;
}
protected function getObjectLabel($object)

11
core/lib/Thelia/Controller/Admin/TemplateController.php
View File

@@ -129,9 +129,14 @@ class TemplateController extends AbstractCrudController
protected function getExistingObject()
{
return TemplateQuery::create()
->joinWithI18n($this->getCurrentEditionLocale())
->findOneById($this->getRequest()->get('template_id'));
$template = TemplateQuery::create()
->findOneById($this->getRequest()->get('template_id', 0));
if (null !== $template) {
$template->setLocale($this->getCurrentEditionLocale());
}
return $template;
}
protected function getObjectLabel($object)

3
core/lib/Thelia/Form/CustomerUpdateForm.php
View File

@@ -62,7 +62,8 @@ class CustomerUpdateForm extends BaseForm
"label" => Translator::getInstance()->trans("Company"),
"label_attr" => array(
"for" => "company"
)
),
"required" => false
))
->add("firstname", "text", array(
"constraints" => array(

3
templates/backOffice/default/config-store.html
View File

@@ -32,6 +32,9 @@
<form method="POST" action="{url path='/admin/configuration/store/save'}">
{form_hidden_fields form=$form}
{form_field form=$form field='success_url'}
<input type="hidden" name="{$name}" value="{url path='/admin/configuration'}">
{/form_field}
{include
file = "includes/inner-form-toolbar.html"
hide_flags = true

8
templates/backOffice/default/configuration.html
View File

@@ -178,14 +178,6 @@
<td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/system-logs'}"><i class="glyphicon glyphicon-edit"></i></a></td>
</tr>
{/loop}
{loop type="auth" name="pcc9" role="ADMIN" resource="admin.configuration.update" access="VIEW"}
<tr>
<td><a href="{url path='/admin/configuration/update'}">{intl l='Update your Thelia'}</a></td>
<td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/update'}"><i class="glyphicon glyphicon-edit"></i></a></td>
</tr>
{/loop}
{module_include location='system_configuration_bottom'}
</table>
</div>

2
templates/frontOffice/default/layout.tpl
View File

@@ -36,7 +36,7 @@ GNU General Public License : http://www.gnu.org/licenses/
<meta charset="utf-8">
{* Page Title *}
<title>{block name="page-title"}{strip}{if $page_title}{$page_title}{elseif $breadcrumbs}{foreach from=$breadcrumbs|array_reverse item=breadcrumb}{$breadcrumb.title} - {/foreach}{$store_name}{/if}{/strip}{/block}</title>
<title>{block name="page-title"}{strip}{if $page_title}{$page_title}{elseif $breadcrumbs}{foreach from=$breadcrumbs|array_reverse item=breadcrumb}{$breadcrumb.title|unescape} - {/foreach}{$store_name}{/if}{/strip}{/block}</title>
{* Meta Tags *}
<meta name="generator" content="{intl l='Thelia V2'}">

34
web/install/I18n/en_US.php Normal file
View File

@@ -0,0 +1,34 @@
<?php
return array(
'Administrator login :' => 'Administrator login :',
'Administrator password :' => 'Administrator password :',
'Administrator password verification :' => 'Administrator password verification :',
'Checking permissions' => 'Checking permissions',
'Choose your database' => 'Choose your database',
'Company name :' => 'Company name :',
'Contact email :' => 'Contact email :',
'Continue' => 'Continue',
'Create an other database' => 'Create an other database',
'Database connection' => 'Database connection',
'Database selection' => 'Database selection',
'Don\'t forget to delete the web/install directory.' => 'Don\'t forget to delete the web/install directory.',
'General information' => 'General information',
'Go to back office' => 'Go to back office',
'Host :' => 'Host :',
'or' => 'or',
'Password :' => 'Password :',
'Port :' => 'Port :',
'Select below the one you want to use.' => 'Select below the one you want to use.',
'Thanks' => 'Thanks',
'Thanks, you have installed Thelia' => 'Thanks, you have installed Thelia',
'Thelia installation wizard' => 'Thelia installation wizard',
'The SQL server contains multiple databases.' => 'The SQL server contains multiple databases.',
'Username :' => 'Username :',
'Version undefined' => 'Version undefined',
'website url :' => 'website url :',
'Welcome' => 'Welcome',
'Welcome in the Thelia installation wizard.' => 'Welcome in the Thelia installation wizard.',
'We will guide you throughout this process to install any application on your system.' => 'We will guide you throughout this process to install any application on your system.',
'Wrong connection information' => 'Wrong connection information'
);

34
web/install/I18n/fr_FR.php Executable file
View File

@@ -0,0 +1,34 @@
<?php
return array(
'Administrator login :' => 'Identifiant administrateur :',
'Administrator password :' => 'Mot de passe administrateur :',
'Administrator password verification :' => 'Vérification mot de passe administrateur :',
'Checking permissions' => 'Permissions',
'Choose your database' => 'Choissisez la base de donnée',
'Company name :' => 'Nom de la société :',
'Contact email :' => 'Email de contact :',
'Continue' => 'Continuez',
'Create an other database' => 'Créez une nouvelle base de donnée',
'Database connection' => 'Base de donnée',
'Database selection' => 'Sélectionnez la base de donnée',
'Don\'t forget to delete the web/install directory.' => 'N\'oubliez d\'enlever le répertoire web/install.',
'General information' => 'Information générale',
'Go to back office' => 'Allez dans l\'interface d\'administration',
'Host :' => 'Hôte :',
'or' => 'ou',
'Password :' => 'Mot de passe :',
'Port :' => 'Port :',
'Select below the one you want to use.' => 'Sélectionnez ci-dessous celle que vous souhaitez utiliser.',
'Thanks' => 'Merci',
'Thanks, you have installed Thelia' => 'Merci, d\'avoir installé Thélia',
'Thelia installation wizard' => 'Gestionnaire d\'installation de Thélia',
'The SQL server contains multiple databases.' => 'Le serveur SQL contient plusieurs databases.',
'Username :' => 'Utilisateur :',
'Version undefined' => 'Version non définie',
'website url :' => 'Url du site :',
'Welcome' => 'Bienvenue',
'Welcome in the Thelia installation wizard.' => 'Bienvenue dans le gestionnaire d\'installation de Thélia.',
'We will guide you throughout this process to install any application on your system.' => 'Nous allons vous guidez pour installer Thélia sur votre système.',
'Wrong connection information' => 'Mauvaise information de connexion'
);

12
web/install/bdd.php
View File

@@ -53,10 +53,10 @@ $databases = $connection->query('show databases');
<div class="well">
<form action="config.php" method="post">
<fieldset>
<legend>Choose your database</legend>
<legend><?php echo $trans->trans('Choose your database'); ?></legend>
<p>
The SQL server contains multiple databases.<br/>
Select below the one you want to use.
<?php echo $trans->trans('The SQL server contains multiple databases.'); ?><br/>
<?php echo $trans->trans('Select below the one you want to use.'); ?>
</p>
<?php foreach($databases as $database): ?>
<?php if ($database['Database'] == 'information_schema') continue; ?>
@@ -93,12 +93,12 @@ $databases = $connection->query('show databases');
if($permissions->fetchColumn(0) > 0) {
?>
<p>
or
<?php echo $trans->trans('or'); ?>
</p>
<div class="radio">
<label>
Create an other database
<?php echo $trans->trans('Create an other database'); ?>
</label>
</div>
@@ -109,7 +109,7 @@ $databases = $connection->query('show databases');
</fieldset>
<div class="clearfix">
<div class="control-btn">
<button type="submit" class="pull-right btn btn-default btn-primary">Continue</button>
<button type="submit" class="pull-right btn btn-default btn-primary"><?php echo $trans->trans('Continue'); ?></button>
</div>
</div>

14
web/install/config.php
View File

@@ -81,32 +81,32 @@ $website_url = preg_replace("#/install/[a-z](.*)#" ,'', $url);
<form action="end.php" method="POST" >
<div class="well">
<div class="form-group">
<label for="admin_login">Administrator login :</label>
<label for="admin_login"><?php echo $trans->trans('Administrator login :'); ?></label>
<input id="admin_login" class="form-control" type="text" name="admin_login" placeholder="admin" value="" required>
</div>
<div class="form-group">
<label for="admin_password">Administrator password :</label>
<label for="admin_password"><?php echo $trans->trans('Administrator password :'); ?></label>
<input id="admin_password" class="form-control" type="password" name="admin_password" value="" required>
</div>
<div class="form-group">
<label for="admin_password_verif">Administrator password verification :</label>
<label for="admin_password_verif"><?php echo $trans->trans('Administrator password verification :'); ?></label>
<input id="admin_password_verif" class="form-control" type="password" name="admin_password_verif" value="" required>
</div>
<div class="form-group">
<label for="email_contact">Contact email :</label>
<label for="email_contact"><?php echo $trans->trans('Contact email :'); ?></label>
<input id="email_contact" class="form-control" type="text" name="store_email" placeholder="foo@bar.com" value="" required>
</div>
<div class="form-group">
<label for="site_name">Company name :</label>
<label for="site_name"><?php echo $trans->trans('Company name :'); ?></label>
<input id="site_name" class="form-control" type="text" name="store_name" placeholder="" value="" required>
</div>
<div class="form-group">
<label for="site_name">website url :</label>
<label for="site_name"><?php echo $trans->trans('website url :'); ?></label>
<input id="site_name" class="form-control" type="text" name="url_site" placeholder="" value="http://<?php echo $_SERVER['SERVER_NAME'].$website_url; ?>" required>
</div>
<div class="clearfix">
<div class="control-btn">
<button type="submit" class="pull-right btn btn-default btn-primary">Continue</button>
<button type="submit" class="pull-right btn btn-default btn-primary"><?php echo $trans->trans('Continue'); ?></button>
</div>
</div>

12
web/install/connection.php
View File

@@ -32,25 +32,25 @@ $_SESSION['install']['step'] = 3;
<form action="bdd.php" method="POST" >
<?php if(isset($_GET['err']) && $_GET['err'] == 1){ ?>
<div class="alert alert-danger">Wrong connection information</div>
<div class="alert alert-danger"><?php echo $trans->trans('Wrong connection information'); ?></div>
<?php } ?>
<div class="well">
<div class="form-group">
<label for="host">Host :</label>
<label for="host"><?php echo $trans->trans('Host :'); ?></label>
<input id="host" class="form-control" type="text" name="host" placeholder="localhost" value="<?php if(isset($_SESSION['install']['host'])){ echo $_SESSION['install']['host']; } ?>">
</div>
<div class="form-group">
<label for="user">Username :</label>
<label for="user"><?php echo $trans->trans('Username :'); ?></label>
<input id="user" type="text" class="form-control" name="username" placeholder="john" value="<?php if(isset($_SESSION['install']['username'])){ echo $_SESSION['install']['username']; } ?>">
</div>
<div class="form-group">
<label for="password">Password :</label>
<label for="password"><?php echo $trans->trans('Password :'); ?></label>
<input id="password" type="password" class="form-control" name="password" placeholder="l33t 5p34k" >
</div>
<div class="form-group">
<label for="port">Port :</label>
<label for="port"><?php echo $trans->trans('Port :'); ?></label>
<input id="port" type="text" class="form-control" name="port" value="<?php if(isset($_SESSION['install']['port'])){ echo $_SESSION['install']['port']; } else { echo '3306'; } ?>">
</div>
@@ -58,7 +58,7 @@ $_SESSION['install']['step'] = 3;
<div class="clearfix">
<div class="control-btn">
<button type="submit" class="pull-right btn btn-default btn-primary">Continue</button>
<button type="submit" class="pull-right btn btn-default btn-primary"><?php echo $trans->trans('Continue'); ?></button>
</div>
</div>

6
web/install/end.php
View File

@@ -67,14 +67,14 @@ $website_url = preg_replace("#/install/[a-z](.*)#" ,'', $url);
<div class="well">
<p class="lead text-center">
Thanks, you have installed Thelia
<?php echo $trans->trans('Thanks, you have installed Thelia'); ?>
</p>
<p class="lead text-center">
Don't forget to delete the web/install directory.
<?php echo $trans->trans('Don\'t forget to delete the web/install directory.'); ?>
</p>
<p class="lead text-center">
<a href="<?php echo $request->getSchemeAndHttpHost().$website_url; ?>/admin">Go to back office</a>
<a href="<?php echo $request->getSchemeAndHttpHost().$website_url; ?>/admin"><?php echo $trans->trans('Go to back office'); ?></a>
</p>
</div>

35
web/install/header.php
View File

@@ -22,6 +22,21 @@
/*************************************************************************************/
session_start();
include 'bootstrap.php';
use Symfony\Component\Translation\Translator;
$_SESSION['install']['lang'] = "en_US";
if($_REQUEST['lang']){
$_SESSION['install']['lang'] = $_REQUEST['lang'];
}
$trans = new Translator();
$trans->setLocale($_SESSION['install']['lang']);
$trans->addLoader("php", new Symfony\Component\Translation\Loader\PhpFileLoader());
$trans->addResource('php', __DIR__.'/I18n/'.$_SESSION['install']['lang'].'.php', $_SESSION['install']['lang']);
?>
<!DOCTYPE html>
<html lang="">
@@ -29,14 +44,16 @@ include 'bootstrap.php';
<title>Installation</title>
<link rel="shortcut icon" href="fd33fd0-6fda040.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta charset="UTF-8">
<link rel="stylesheet" href="styles.css">
</head>
<body>
<div class="topbar">
<div class="container">
<div class="row">
<div class="col-md-6">
<div class="version-info">Version undefined</div>
<div class="version-info"><?php echo $trans->trans('Version undefined'); ?></div>
</div>
</div>
</div>
@@ -46,14 +63,14 @@ include 'bootstrap.php';
<div class="row">
<div class="col-md-12">
<div class="general-block-decorator">
<h3 class="title title-without-tabs">Thelia installation wizard</h3>
<h3 class="title title-without-tabs"><?php echo $trans->trans('Thelia installation wizard'); ?></h3>
<div class="wizard">
<ul>
<li class="<?php if($step == 1){ echo 'active'; } elseif ($step > 1) { echo 'complete'; }?>"><span class="badge">1</span>Welcome<span class="chevron"></span></li>
<li class="<?php if($step == 2){ echo 'active'; } elseif ($step > 2) { echo 'complete'; }?>"><span class="badge">2</span>Checking permissions<span class="chevron"></span></li>
<li class="<?php if($step == 3){ echo 'active'; } elseif ($step > 3) { echo 'complete'; }?>"><span class="badge">3</span>Database connection<span class="chevron"></span></li>
<li class="<?php if($step == 4){ echo 'active'; } elseif ($step > 4) { echo 'complete'; }?>"><span class="badge">4</span>Database selection<span class="chevron"></span></li>
<li class="<?php if($step == 5){ echo 'active'; } elseif ($step > 5) { echo 'complete'; }?>"><span class="badge">5</span>General information<span class="chevron"></span></li>
<li class="<?php if($step == 6){ echo 'active'; } elseif ($step > 6) { echo 'complete'; }?>"><span class="badge">6</span>Thanks<span class="chevron"></span></li>
<li class="<?php if($step == 1){ echo 'active'; } elseif ($step > 1) { echo 'complete'; }?>"><span class="badge">1</span><?php echo $trans->trans('Welcome'); ?><span class="chevron"></span></li>
<li class="<?php if($step == 2){ echo 'active'; } elseif ($step > 2) { echo 'complete'; }?>"><span class="badge">2</span><?php echo $trans->trans('Checking permissions'); ?><span class="chevron"></span></li>
<li class="<?php if($step == 3){ echo 'active'; } elseif ($step > 3) { echo 'complete'; }?>"><span class="badge">3</span><?php echo $trans->trans('Database connection'); ?><span class="chevron"></span></li>
<li class="<?php if($step == 4){ echo 'active'; } elseif ($step > 4) { echo 'complete'; }?>"><span class="badge">4</span><?php echo $trans->trans('Database selection'); ?><span class="chevron"></span></li>
<li class="<?php if($step == 5){ echo 'active'; } elseif ($step > 5) { echo 'complete'; }?>"><span class="badge">5</span><?php echo $trans->trans('General information'); ?><span class="chevron"></span></li>
<li class="<?php if($step == 6){ echo 'active'; } elseif ($step > 6) { echo 'complete'; }?>"><span class="badge">6</span><?php echo $trans->trans('Thanks'); ?><span class="chevron"></span></li>
</ul>
</div>
</div>

11
web/install/index.php
View File

@@ -26,14 +26,19 @@
include("header.php");
?>
<div class="well">
<div class="clearfix">
<a href="?lang=fr_FR"><span class="glyphicon glyphicon-chevron-right"></span> <?php echo $trans->trans('French'); ?></a>
<a href="?lang=en_US"><span class="glyphicon glyphicon-chevron-right"></span> <?php echo $trans->trans('English'); ?></a>
</div>
<p class="lead text-center">
Welcome in the Thelia installation wizard.
<?php echo $trans->trans('Welcome in the Thelia installation wizard.'); ?>
</p>
<p class="text-center">
We will guide you throughout this process to install any application on your system.
<?php echo $trans->trans('We will guide you throughout this process to install any application on your system.'); ?>
</p>
</div>
<div class="clearfix">
<a href="permission.php" class="pull-right btn btn-default btn-primary"><span class="glyphicon glyphicon-chevron-right"></span> Continue</a>
<a href="permission.php" class="pull-right btn btn-default btn-primary"><span class="glyphicon glyphicon-chevron-right"></span> <?php echo $trans->trans('Continue'); ?></a>
</div>
<?php include("footer.php"); ?>

4
web/install/permission.php
View File

@@ -35,7 +35,7 @@ $_SESSION['install']['current_step'] = 'permission.php';
$_SESSION['install']['step'] = 2;
?>
<div class="well">
<p>Checking permissions</p>
<p><?php echo $trans->trans('Checking permissions'); ?></p>
<ul class="list-unstyled list-group">
<?php foreach($validationMessage as $item => $data): ?>
<li class="list-group-item <?php if ($data['status']) {echo 'text-success';} else { echo 'text-danger';} ?>">
@@ -48,7 +48,7 @@ $_SESSION['install']['step'] = 2;
</div>
<div class="clearfix">
<?php if($isValid){ ?>
<a href="connection.php" class="pull-right btn btn-default btn-primary"><span class="glyphicon glyphicon-chevron-right"></span> Continue</a>
<a href="connection.php" class="pull-right btn btn-default btn-primary"><span class="glyphicon glyphicon-chevron-right"></span> <?php echo $trans->trans('Continue'); ?></a>
<?php } else { ?>
<a href="permission.php" class="pull-right btn btn-default btn-danger"><span class="glyphicon glyphicon-refresh"></span> refresh</a>
<?php } ?>