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

Merge pull request #82 from thelia/frontend

Browse Source 
Frontend - 	Add GNU General Public License
This commit is contained in:
Manuel Raynaud
2013-10-25 05:52:01 -07:00
parent 4b157b30eb 51cd9f4ee8
commit 30ea1f3c49
3 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Form/AddressCreateForm.php
View File

@@ -168,7 +168,7 @@ class AddressCreateForm extends BaseForm
))
// Default address
->add("is_default", "checkbox", array(
"label" => Translator::getInstance()->trans("Make this address has my primary address"),
"label" => Translator::getInstance()->trans("Make this address as my primary address"),
"label_attr" => array(
"for" => "default_address"
),

43
templates/default/layout.tpl
View File

@@ -1,5 +1,23 @@
{block name="no-return-functions"}{/block}
<!doctype html>
<!--
______ __ __ ______ __ __ ______
/\__ _\ /\ \_\ \ /\ ___\ /\ \ /\ \ /\ __ \
\/_/\ \/ \ \ __ \ \ \ __\ \ \ \____ \ \ \ \ \ __ \
\ \_\ \ \_\ \_\ \ \_____\ \ \_____\ \ \_\ \ \_\ \_\
\/_/ \/_/\/_/ \/_____/ \/_____/ \/_/ \/_/\/_/
Copyright (c) OpenStudio
email : info@thelia.net
web : http://www.thelia.net
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the
GNU General Public License : http://www.gnu.org/licenses/
-->
{* paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither *}
<!--[if lt IE 7 ]><html class="no-js oldie ie6" lang="{lang attr="code"}"> <![endif]-->
<!--[if IE 7 ]><html class="no-js oldie ie7" lang="{lang attr="code"}"> <![endif]-->
@@ -18,21 +36,25 @@
{* Meta Tags *}
<meta name="description" content="">
<meta name="generator" content="{intl l='Thelia V2'}">
<meta name="robots" content="index,follow">
<meta name="robots" content="noindex,nofollow">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
{block name="meta"}{/block}
{* HTML5 shim, for IE6-8 support of HTML5 elements *}
<!--[if lt IE 9]>
<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
{* Stylesheets *}
{stylesheets file='assets/less/styles.less' filters='less,cssembed'}
<link rel="stylesheet" href="{$asset_url}">
{/stylesheets}
{block name="stylesheet"}{/block}
{* HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries *}
<!--[if lt IE 9]>
<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
{javascripts file='assets/js/libs/respond.min.js'}
<script src="{$asset_url}"></script>
{/javascripts}
<![endif]-->
</head>
<body class="{block name="body-class"}{/block}" itemscope itemtype="http://schema.org/WebPage">
@@ -397,14 +419,5 @@
{javascripts file='assets/js/script.js'}
<script src="{$asset_url}"></script>
{/javascripts}
{* HTML5 shim, for IE6-8 support of HTML5 elements *}
<!--[if lt IE 9]>
{javascripts file='assets/js/libs/respond.min.js'}
<script src="{$asset_url}"></script>
{/javascripts}
<![endif]-->
</body>
</html>

16
templates/default/order-invoice.html
View File

@@ -139,13 +139,15 @@
<th class="coupon"><label for="coupon">{intl l="You may have a coupon ?"}</label></th>
<td class="coupon">
{form_field form=$form field='coupon-code'}
<div class="input-group {if $error}has-error{/if}">
<label class="control-label sr-only" for="code">{intl l='Code :'}</label>
<input id="coupon" class="form-control" type="text" name="{$name}" value="{$value}" placeholder="{intl l='Coupon code'}">
<span class="input-group-btn">
<button type="submit" class="btn btn-coupon">{intl l="Ok"}</button>
</span>
{if $error}{$message}{/if}
<div class="{if $error}has-error{/if}">
<div class="input-group">
<label class="control-label sr-only" for="code">{intl l='Code :'}</label>
<input id="coupon" class="form-control" type="text" name="{$name}" value="{$value}" placeholder="{intl l='Coupon code'}">
<span class="input-group-btn">
<button type="submit" class="btn btn-coupon">{intl l="Ok"}</button>
</span>
</div>
{if $error}<span class="help-block"><i class="icon-remove"></i> {$message}</span>{/if}
</div>
{/form_field}
<!-- /input-group -->