Merge branch 'backoffice' into frontend

This commit is contained in:
touffies
2013-11-25 10:24:29 +01:00
17 changed files with 455 additions and 34 deletions

View File

@@ -0,0 +1,170 @@
{extends file="admin-layout.tpl"}
{block name="page-title"}{intl l='Store'}{/block}
{block name="check-resource"}admin.configuration.store{/block}
{block name="check-access"}update{/block}
{block name="main-content"}
<div class="variables edit-variable">
<div id="wrapper" class="container">
<ul class="breadcrumb">
<li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
<li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
<li>{intl l="Store"}</li>
</ul>
<div class="row">
<div class="col-md-12 general-block-decorator">
<div class="row">
<div class="col-md-12 title title-without-tabs">
{intl l="Store configuration"}
</div>
</div>
<div class="form-container">
<div class="row">
<div class="col-md-12">
{form name='thelia.configuration.store'}
<form method="POST" action="{url path='/admin/configuration/store/save'}">
{form_hidden_fields form=$form}
{include
file = "includes/inner-form-toolbar.html"
hide_flags = true
page_url = "{url path='/admin/configuration/store'}"
close_url = "{url path='/admin/configuration'}"
}
<div class="row">
<div class="col-md-6">
<p class="title title-without-tabs">{intl l='General'}</p>
{if $form_error}
<div class="alert alert-danger">{$form_error_message}</div>
{/if}
<fieldset>
{form_field form=$form field='store_name'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">{$label}: </label>
<div class="form-group">
<input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Used in your store front'}">
</div>
</div>
{/form_field}
{form_field form=$form field='store_business_id'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">{$label}: </label>
<div class="form-group">
<input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Store Business Identification Number (SIRET, etc).'}">
</div>
</div>
{/form_field}
{form_field form=$form field='store_email'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">{$label}: </label>
<div class="form-group">
<input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Email used when you send an email to your customers (Order confirmations, etc).'}">
</div>
</div>
{/form_field}
{form_field form=$form field='store_phone'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">{$label}: </label>
<div class="form-group">
<input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l=''}">
</div>
</div>
{/form_field}
{form_field form=$form field='store_fax'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">{$label}: </label>
<div class="form-group">
<input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l=''}">
</div>
</div>
{/form_field}
</div>
<div class="col-md-6">
<p class="title title-without-tabs">{intl l="Store address"}</p>
{form_field form=$form field='store_address1'}
<div style="margin-bottom: 5px" class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">{$label}{if $required} <span class="required">*</span>{/if} : </label>
<input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Address'}">
</div>
{/form_field}
{form_field form=$form field='store_address2'}
<div style="margin-bottom: 5px" class="form-group">
<input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Additional address'}">
</div>
{/form_field}
{form_field form=$form field='store_address3'}
<div class="form-group">
<input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Additional address'}">
</div>
{/form_field}
{form_field form=$form field='store_zipcode'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">{$label}{if $required} <span class="required">*</span>{/if} : </label>
<input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Zip code'}">
</div>
{/form_field}
{form_field form=$form field='store_city'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">{$label}{if $required} <span class="required">*</span>{/if} : </label>
<input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='City'}">
</div>
{/form_field}
{form_field form=$form field='store_country'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">{$label}{if $required} <span class="required">*</span>{/if} : </label>
<select name="{$name}" id="{$label_attr.for}" class="form-control">
{loop type="country" name="country1"}
<option value="{$ID}" {if {$value} == $ID}selected{/if}>{$TITLE}</option>
{/loop}
</select>
</div>
{/form_field}
</fieldset>
</div>
</div>
{include
file = "includes/inner-form-toolbar.html"
hide_flags = true
page_url = "{url path='/admin/configuration/store'}"
close_url = "{url path='/admin/configuration'}"
}
</form>
{/form}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{/block}

View File

@@ -116,6 +116,13 @@
{module_include location='system_configuration_top'}
{loop type="auth" name="pcc-store" role="ADMIN" resource="admin.configuration.store" access="VIEW"}
<tr>
<td><a href="{url path='/admin/configuration/store'}">{intl l='Store'}</a></td>
<td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/store'}"><i class="glyphicon glyphicon-edit"></i></a></td>
</tr>
{/loop}
{loop type="auth" name="pcc2" role="ADMIN" resource="admin.configuration.variable" access="VIEW"}
<tr>
<td><a href="{url path='/admin/configuration/variables'}">{intl l='System variables'}</a></td>

View File

@@ -43,11 +43,11 @@ Parameters:
<div class="col-md-6 inner-actions">
{if $hide_submit_buttons != true}
<button type="submit" name="save_mode" value="stay" class="form-submit-button btn btn-default btn-success" title="{intl l='Save'}">{intl l='Save'} <span class="glyphicon glyphicon-ok"></span></button>
<button type="submit" name="save_mode" value="close" class="form-submit-button btn btn-default btn-info" title="{intl l='Save and close'}">{intl l='Save and close'} <span class="glyphicon glyphicon-remove"></span></button>
<button type="submit" name="save_mode" value="stay" class="form-submit-button btn btn-sm btn-default btn-success" title="{intl l='Save'}">{intl l='Save'} <span class="glyphicon glyphicon-ok"></span></button>
<button type="submit" name="save_mode" value="close" class="form-submit-button btn btn-sm btn-default btn-info" title="{intl l='Save and close'}">{intl l='Save and close'} <span class="glyphicon glyphicon-remove"></span></button>
{/if}
{if ! empty($close_url)}
<a href="{$close_url}" class="page-close-button btn btn-default">{intl l='Close'} <span class="glyphicon glyphicon-remove"></span></a>
<a href="{$close_url}" class="page-close-button btn btn-sm btn-default">{intl l='Close'} <span class="glyphicon glyphicon-remove"></span></a>
{/if}
</div>
</div>

View File

@@ -1,9 +1,9 @@
{* Declare assets directory, relative to template base directory *}
{declare_assets directory='assets'}
{block name="no-return-functions"}{/block}
{assign var="company_name" value="{config key="company_name"}"}
{if not $company_name}
{assign var="company_name" value="{intl l='Thelia V2'}"}
{assign var="store_name" value="{config key="store_name"}"}
{if not $store_name}
{assign var="store_name" value="{intl l='Thelia V2'}"}
{/if}
<!doctype html>
<!--
@@ -37,14 +37,14 @@ GNU General Public License : http://www.gnu.org/licenses/
<meta charset="utf-8">
{* Page Title *}
<title>{block name="page-title"}{strip}{if $breadcrumbs}{foreach from=$breadcrumbs|array_reverse item=breadcrumb}{$breadcrumb.title} - {/foreach}{/if}{$company_name}{/strip}{/block}</title>
<title>{block name="page-title"}{strip}{if $breadcrumbs}{foreach from=$breadcrumbs|array_reverse item=breadcrumb}{$breadcrumb.title} - {/foreach}{/if}{$store_name}{/strip}{/block}</title>
{* Meta Tags *}
<meta name="generator" content="{intl l='Thelia V2'}">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
{block name="meta"}
<meta name="description" content="{$company_name}">
<meta name="description" content="{$store_name}">
<meta name="robots" content="noindex,nofollow">
{/block}
@@ -86,7 +86,7 @@ GNU General Public License : http://www.gnu.org/licenses/
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{navigate to="index"}">{$company_name}</a>
<a class="navbar-brand" href="{navigate to="index"}">{$store_name}</a>
</div>
<!-- Place everything within .nav-collapse to hide it until above 768px -->
@@ -146,8 +146,8 @@ GNU General Public License : http://www.gnu.org/licenses/
<header class="container" role="banner">
<div class="header">
<h1 class="logo">
<a href="{navigate to="index"}" title="{$company_name}">
{images file='assets/img/logo.gif'}<img src="{$asset_url}" alt="{$company_name}">{/images}
<a href="{navigate to="index"}" title="{$store_name}">
{images file='assets/img/logo.gif'}<img src="{$asset_url}" alt="{$store_name}">{/images}
</a>
</h1>
@@ -356,21 +356,25 @@ GNU General Public License : http://www.gnu.org/licenses/
<section class="block block-contact" itemscope itemtype="http://schema.org/Organization">
<div class="block-heading"><h3 class="block-title">{intl l="Contact Us"}</h3></div>
<div class="block-content">
<meta itemprop="name" content="{$company_name}">
<meta itemprop="name" content="{$store_name}">
<ul>
<li class="contact-address">
<address class="adr" itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
<span class="street-address" itemprop="streetAddress">Street name of my business</span><br>
<span class="postal-code" itemprop="postalCode">75000</span>
<span class="locality" itemprop="addressLocality">City, <span class="country-name">France</span></span>
<span class="street-address" itemprop="streetAddress">{config key="store_address1"} {config key="store_address2"} {config key="store_address3"}</span><br>
<span class="postal-code" itemprop="postalCode">{config key="store_zipcode"}</span>
<span class="locality" itemprop="addressLocality">{config key="store_city"}{loop type="country" name="address.country.title" id={config key="store_country"}}, <span class="country-name">{$TITLE}</span>{/loop}</span>
</address>
</li>
{if {config key="store_phone"} }
<li class="contact-phone">
<span class="tel" itemprop="telephone">+33 (0)0 00 00 00 00</span>
<span class="tel" itemprop="telephone">{config key="store_phone"}</span>
</li>
{/if}
{if {config key="store_email"} }
<li class="contact-email">
{mailto address="contact@yourdomain.com" encode="hex" extra='class="email" itemprop="email"'}
{mailto address="{config key="store_email"}" encode="hex" extra='class="email" itemprop="email"'}
</li>
{/if}
</ul>
</div>
</section>

View File

@@ -68,7 +68,7 @@
<div style="text-align: center; padding-bottom: 5mm;">
<h1 style="font-size: 5mm;">
{config key="company_name"}
{config key="store_name"}
<!-- Vous pouvez remplacer #VARIABLE(nomsite) par le nom de votre entreprise -->
</h1>

View File

@@ -59,7 +59,7 @@
<td style="width:50%; padding: 0; border: none;" valign="bottom">
<div style="text-align: center; padding-bottom: 10mm;">
<h1>{config key="company_name"}</h1>
<h1>{config key="store_name"}</h1>
<p><!-- Insérer ici l'adresse de votre entreprise --></p>
<h2>{intl l="invoice"} {$INVOICE_REF}</h2>
</div>