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 
Conflicts:
	core/lib/Thelia/Controller/Admin/CustomerController.php
	templates/admin/default/customers.html
This commit is contained in:
mespeche
2013-09-11 10:26:56 +02:00
parent 40a87d50ce 557940c5cf
commit 2f351fd4d9
194 changed files with 1310 additions and 1370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
templates/admin/default/admin-layout.tpl
View File

@@ -23,7 +23,7 @@
<link rel="stylesheet" href="{$asset_url}">
{/stylesheets}
{debugbar_renderHead}
{debugbar_rendercss}
{block name="after-bootstrap-css"}{/block}
@@ -36,8 +36,6 @@
{* Modules css are included here *}
{module_include location='head_css'}
{debugbar_renderHead}
</head>
<body>
@@ -225,11 +223,13 @@
<script src="http://code.jquery.com/jquery-2.0.3.min.js"></script>
{debugbar_renderjs}
{debugbar_renderresult}
{block name="after-javascript-include"}{/block}
{block name="javascript-initialization"}{/block}
{debugbar_render}
{* Modules scripts are included now *}
{module_include location='footer_js'}

57
templates/admin/default/customers.html
View File

@@ -61,14 +61,14 @@
<tbody>
{loop name="customer_list" type="customer" current="false" visible="*" last_order="1" backend_context="1" page={$customer_page} limit={$display_customer}}
<tr>
<td>{#REF}</td>
<td>{$REF}</td>
<td>
{#COMPANY}
{$COMPANY}
</td>
<td class="object-title">
{#FIRSTNAME} {#LASTNAME}
{$FIRSTNAME} {$LASTNAME}
</td>
{module_include location='customer_list_row'}
@@ -87,7 +87,7 @@
<a class="btn btn-default btn-xs" title="{intl l='Edit this customer'}" href="{url path="/admin/customer/update/{$ID}" }"><i class="glyphicon glyphicon-edit"></i></a>
{/loop}
{loop type="auth" name="can_send_mail" roles="ADMIN" permissions="admin.customer.sendMail"}
<a class="btn btn-default btn-xs" title="{intl l="Send a mail to this customer"}" href="mailto:{#EMAIL}"><span class="glyphicon glyphicon-envelope"></span></a>
<a class="btn btn-default btn-xs" title="{intl l="Send a mail to this customer"}" href="mailto:{$EMAIL}"><span class="glyphicon glyphicon-envelope"></span></a>
{/loop}
{loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.customer.delete"}
<a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}" href="#delete_customer_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
@@ -104,33 +104,34 @@
</div>
</div>
{module_include location='customer_bottom'}
<div class="row">
<div class="col-md-12 text-center">
<ul class="pagination pagination-centered">
{if $customer_page != 1}
<li><a href="{url path="/admin/customers" page="1"}">&laquo;</a></li>
{else}
<li class="disabled"><a href="#">&laquo;</a></li>
{/if}
{module_include location='customer_bottom'}
<div class="row">
<div class="col-md-12 text-center">
{pageloop rel="customer_list"}
{if $PAGE != $CURRENT}
<li><a href="{url path="/admin/customers" page="$PAGE"}">{$PAGE}</a></li>
{else}
<li class="active"><a href="#">{$PAGE}</a></li>
{/if}
<ul class="pagination pagination-centered">
{if $customer_page != 1}
<li><a href="{url path="/admin/customers" page="1"}">&laquo;</a></li>
{else}
<li class="disabled"><a href="#">&laquo;</a></li>
{/if}
{pageloop rel="customer_list"}
{if $PAGE != $CURRENT}
<li><a href="{url path="/admin/customers" page="{$PAGE}"}">{$PAGE}</a></li>
{else}
<li class="active"><a href="#">{$PAGE}</a></li>
{/if}
{if $PAGE == $LAST && $LAST != $CURRENT}
<li><a href="{url path="/admin/customers" page="$PAGE"}">&raquo;</a></li>
{else}
<li class="disabled"><a href="#">&raquo;</a></li>
{/if}
{/pageloop}
</ul>
{if $PAGE == $LAST && $LAST != $CURRENT}
<li><a href="{url path="/admin/customers" page="$PAGE"}">&raquo;</a></li>
{else}
<li class="disabled"><a href="#">&raquo;</a></li>
{/if}
{/pageloop}
</ul>
</div>
</div>
</div>
</div>

2
templates/admin/default/includes/generic-js-dialog.html
View File

@@ -15,7 +15,7 @@ Parameters:
{* re-display the form creation dialog if it contains errors *}
{form name="{$form_name}"}
{if #form_error}
{if $form_error}
$('#{$dialog_id}').modal();
{/if}
{/form}

4
templates/admin/default/includes/thelia_news_feed.html
View File

@@ -3,8 +3,8 @@
{loop type="feed" name="thelia_feeds" url="http://thelia.net/Flux-rss.html?id_rubrique=8" limit="3"}
<div class="span4 feed-list-item">
<h3>{$DATE}</h3>
<h2><a href="#URL" target="_blank" title="{intl l='Lire la suite'}">{$TITLE|strip_tags}</a></h2>
<h2><a href="{$URL}" target="_blank" title="{intl l='Lire la suite'}">{$TITLE|strip_tags}</a></h2>
<p>{$DESCRIPTION|strip_tags|truncate:250:"...":true}</p>
<p><a class="btn" href="#URL" target="_blank">{intl l='Lire la suite »'}</a></p>
<p><a class="btn" href="{$URL}" target="_blank">{intl l='Lire la suite »'}</a></p>
</div>
{/loop}

2
templates/admin/default/variable-edit.html
View File

@@ -56,7 +56,7 @@
<input type="hidden" name="{$name}" value="{$edit_language_locale}" />
{/form_field}
{if #form_error}<div class="alert alert-danger">#form_error_message</div>{/if}
{if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
{form_field form=$form field='name'}
<div class="form-group {if $error}has-error{/if}">