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

Merge branch 'master' into modules

Browse Source 
Conflicts:
	templates/backOffice/default/product-edit.html
This commit is contained in:
Manuel Raynaud
2013-12-17 10:48:59 +01:00
parent 65f43b5eff e5576864cd
commit 0c24a8afc0
121 changed files with 4530 additions and 2203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/backOffice/default/admin-layout.tpl
View File

@@ -267,6 +267,6 @@
{* Modules scripts are included now *}
{module_include location='footer_js'}
{block name="javascript-last-call"}{/block}
</body>
</html>

4
templates/backOffice/default/admin-logs.html
View File

@@ -231,4 +231,8 @@
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='admin-logs-js'}
{/block}

4
templates/backOffice/default/administrators.html
View File

@@ -355,4 +355,8 @@ jQuery(function($) {
})
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='administrators-js'}
{/block}

4
templates/backOffice/default/attribute-edit.html
View File

@@ -317,4 +317,8 @@
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='attribute-edit-js'}
{/block}

4
templates/backOffice/default/attributes.html
View File

@@ -327,4 +327,8 @@
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='attributes-js'}
{/block}

4
templates/backOffice/default/categories.html
View File

@@ -709,4 +709,8 @@
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='categories-js'}
{/block}

484
templates/backOffice/default/category-edit.html
View File

@@ -6,296 +6,293 @@
{block name="page-title"}{intl l='Edit category'}{/block}
{block name="main-content"}
<div class="catalog edit-category">
<div id="wrapper" class="container">
{include file="includes/catalog-breadcrumb.html" editing_category="true"}
<div class="catalog edit-category">
<div id="wrapper" class="container">
<div class="row">
{loop name="category_edit" type="category" visible="*" id="{$category_id}" backend_context="1" lang="$edit_language_id"}
<div class="col-md-12 general-block-decorator">
<div class="row">
<div class="col-md-7 title">
{intl l='Edit category %title' title=$TITLE}
</div>
{include file="includes/catalog-breadcrumb.html" editing_category="true"}
<div class="col-md-5 actions">
<div class="row">
{loop name="category_edit" type="category" visible="*" id="{$category_id}" backend_context="1" lang="$edit_language_id"}
{if $HAS_PREVIOUS != 0}
<a href="{url path='/admin/categories/update' category_id=$PREVIOUS}" class="btn btn-default" title="{intl l='Edit previous category'}"><span class="glyphicon glyphicon-arrow-left"></span></a>
{else}
<a href="#" disabled="disabled" class="btn btn-default"><span class="glyphicon glyphicon-arrow-left"></span></a>
{/if}
{* Define close url *}
{if $PARENT gt 0}
{assign var='close_url' value="{url path='/admin/categories' category_id=$PARENT}"}
{else}
{assign var='close_url' value="{url path='/admin/catalog'}"}
{/if}
<a href="{$URL}" target="_blank" class="btn btn-default" title="{intl l='Preview category page'}"><span class="glyphicon glyphicon-eye-open"></span></a>
{if $HAS_NEXT != 0}
<a href="{url path='/admin/categories/update' category_id=$NEXT}" class="btn btn-default" title="{intl l='Edit next category'}"><span class="glyphicon glyphicon-arrow-right"></span></a>
{else}
<a href="#" disabled="disabled" class="btn btn-default"><span class="glyphicon glyphicon-arrow-right"></span></a>
{/if}
</div>
</div>
<div class="col-md-12 general-block-decorator">
<div class="row">
<div class="col-md-7 title">
{intl l='Edit category %title</small>' title=$TITLE}
</div>
<div class="row">
<div class="col-md-12">
<div class="col-md-5 actions">
<a {if $HAS_PREVIOUS != 0}href="{url path='/admin/categories/update' category_id=$PREVIOUS}"{else}disabled="disabled"{/if} class="btn btn-default" title="{intl l='Edit previous category'}"><span class="glyphicon glyphicon-arrow-left"></span></a>
<a href="{$URL}" target="_blank" class="btn btn-default" title="{intl l='Preview category page'}"><span class="glyphicon glyphicon-eye-open"></span></a>
<a {if $HAS_NEXT != 0}href="{url path='/admin/categories/update' category_id=$NEXT}"{else}disabled="disabled"{/if} class="btn btn-default" title="{intl l='Edit next category'}"><span class="glyphicon glyphicon-arrow-right"></span></a>
</div>
</div>
<ul class="nav nav-tabs" id="tabbed-menu">
<li {if $current_tab == 'general'}class="active"{/if}><a href="#general" data-toggle="tab">{intl l="General description"}</a></li>
<li {if $current_tab == 'associations'}class="active"{/if}><a href="#associations" data-toggle="tab">{intl l="Associations"}</a></li>
<li {if $current_tab == 'images'}class="active"{/if}><a href="#images" data-toggle="tab">{intl l="Images"}</a></li>
<li {if $current_tab == 'documents'}class="active"{/if}><a href="#documents" data-toggle="tab">{intl l="Documents"}</a></li>
<li {if $current_tab == 'modules'}class="active"{/if}><a href="#modules" data-toggle="tab">{intl l="Modules"}</a></li>
</ul>
<div class="row">
<div class="col-md-12">
<div class="tab-content">
<ul class="nav nav-tabs" id="tabbed-menu">
<li><a href="#general" data-toggle="tab">{intl l="General description"}</a></li>
<li><a href="#seo" data-toggle="tab">{intl l="SEO"}</a></li>
<li><a href="#associations" data-toggle="tab">{intl l="Associations"}</a></li>
<li><a href="#images" data-toggle="tab">{intl l="Images"}</a></li>
<li><a href="#documents" data-toggle="tab">{intl l="Documents"}</a></li>
<li><a href="#modules" data-toggle="tab">{intl l="Modules"}</a></li>
</ul>
<div class="tab-pane fade {if $current_tab == 'general'}active in{/if}" id="general">
<div class="tab-content">
<div class="form-container">
<div class="tab-pane fade" id="general">
{form name="thelia.admin.category.modification"}
<form method="POST" action="{url path='/admin/categories/save'}" {form_enctype form=$form} class="clearfix">
<div class="form-container">
{include file="includes/inner-form-toolbar.html" close_url="{url path='/admin/categories' category_id=$PARENT}"}
{form name="thelia.admin.category.modification"}
<form method="POST" action="{url path='/admin/categories/save'}" {form_enctype form=$form} class="clearfix">
{* Be sure to get the category ID, even if the form could not be validated *}
<input type="hidden" name="category_id" value="{$category_id}" />
{include
file="includes/inner-form-toolbar.html"
close_url=$close_url
}
<input type="hidden" name="current_tab" value="general" />
{* Be sure to get the category ID, even if the form could not be validated *}
<input type="hidden" name="category_id" value="{$ID}" />
<input type="hidden" name="current_tab" value="general" />
{form_hidden_fields form=$form}
{form_hidden_fields form=$form}
{form_field form=$form field='success_url'}
<input type="hidden" name="{$name}" value="{url path='/admin/category' category_id={$category_id}}" />
{/form_field}
{form_field form=$form field='success_url'}
<input type="hidden" name="{$name}" value="{$close_url}">
{/form_field}
{form_field form=$form field='locale'}
<input type="hidden" name="{$name}" value="{$edit_language_locale}" />
{/form_field}
{* Display error message if exist *}
{include file='includes/notifications.html' message=$form_error_message}
{if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
<div class="row">
<div class="col-md-8">
{include file="includes/standard-description-form-fields.html"}
</div>
{include file="includes/standard-description-form-fields.html"}
<div class="col-md-4">
{form_field form=$form field='parent'}
<div class="form-group {if $error}has-error{/if}">
{form_field form=$form field='url'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">
{$label} :
</label>
<label for="{$label_attr.for}" class="control-label">
{$label} :
</label>
<input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value}" title="{intl l='Rewritten URL'}" placeholder="{intl l='Rewritten URL'}" class="form-control">
</div>
{/form_field}
<select id="{$label_attr.for}" required="required" name="{$name}" class="form-control">
<option value="0">{intl l="Top level"}</option>
<div class="row">
<div class="col-md-6">
{form_field form=$form field='parent'}
<div class="form-group {if $error}has-error{/if}">
{$myparent=$PARENT}
{loop name="cat-parent" type="category-tree" visible="*" category="0"}
<option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px" {if $myparent == $ID}selected="selected"{/if} {if $category_id == $ID}disabled="disabled"{/if}>{$TITLE}</option>
{/loop}
<label for="{$label_attr.for}" class="control-label">
{$label} :
</label>
</select>
</div>
{/form_field}
<select id="{$label_attr.for}" required="required" name="{$name}" class="form-control">
<option value="0">{intl l="Top level"}</option>
{$myparent=$PARENT}
{loop name="cat-parent" type="category-tree" visible="*" category="0"}
<option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px" {if $myparent == $ID}selected="selected"{/if} {if $category_id == $ID}disabled="disabled"{/if}>{$TITLE}</option>
{/loop}
</select>
</div>
{/form_field}
</div>
<div class="col-md-6">
{form_field form=$form field='visible'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">{intl l='Visibility'}</label>
<div class="checkbox">
<label>
<input type="checkbox" id="{$label_attr.for}" name="{$name}" value="1" {if $value != 0}checked="checked"{/if}>
{$label}
</label>
</div>
</div>
{/form_field}
{form_field form=$form field='visible'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">{intl l='Visibility'}</label>
<div class="checkbox">
<label>
<input type="checkbox" id="{$label_attr.for}" name="{$name}" value="1" {if $value != 0}checked="checked"{/if}>
{$label}
</label>
</div>
</div>
{/form_field}
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="control-group">
<lablel>&nbsp;</lablel>
<div class="controls">
<p>{intl l='Category created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</p>
{include
file="includes/inner-form-toolbar.html"
hide_submit_buttons = false
hide_flags = true
close_url=$close_url
}
<small>{intl l='Category created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</small>
</form>
{/form}
</div>
</div>
<div class="tab-pane fade" id="seo">
{form name="thelia.admin.seo"}
{include file="includes/seo-tab.html"
form = $form
formAction = "{url path='/admin/categories/seo/save'}"
current_id=$ID
closeUrl = $close_url
}
{/form}
</div>
<div class="tab-pane fade" id="associations">
<div class="form-container">
<div class="form-group">
<form action="{url path='/admin/categories/related-content/add'}" id="related_content_form">
{include
file="includes/inner-form-toolbar.html"
hide_submit_buttons=true
close_url=$close_url
}
<p class="title title-without-tabs">{intl l='Related content'}</p>
<p>{intl l='You can attach here some content to this category'}</p>
<input type="hidden" name="category_id" value="{$ID}" />
<input type="hidden" name="current_tab" value="associations" />
{ifloop rel="folders"}
<div class="row">
<div class="col-md-6">
<div class="form-group">
<select name="folder_id" id="folder_id" class="form-control">
<option value="">{intl l='Select a folder...'}</option>
{loop name="folders" type="folder-tree" folder="0" backend_context="1" lang="$edit_language_id"}
<option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px">{$TITLE}</option>
{/loop}
</select>
</div>
<span class="help-block">{intl l='Select a folder to get its content'}</span>
</div>
</div>
</div>
<div class="col-md-6">
<div id="content_selector" class="hide">
<div class="input-group">
<select required="required" name="content_id" id="content_id" class="form-control">
<option value="">{intl l='Select a folder content...'}</option>
</select>
<span class="input-group-btn" id="content_add_button">
<button class="btn btn-default btn-primary action-btn" type="submit"><span class="glyphicon glyphicon-plus-sign"></span></button>
</span>
</div>
<span class="help-block">{intl l='Select a content and click (+) to add it to this category'}</span>
</div>
<div id="content_selector_empty" class="hide">
<div class="alert alert-info">
{intl l="No available content in this folder"}
</div>
</div>
</div>
</div>
{/ifloop}
{elseloop rel="folders"}
<div class="alert alert-info">{intl l="No folders found"}</div>
{/elseloop}
</form>
</div>
</form>
{/form}
</div>
</div>
<div class="table-responsive">
<table class="table table-striped table-condensed table-left-aligned">
<thead>
<tr>
<th>{intl l='ID'}</th>
<div class="tab-pane fade {if $current_tab == 'associations'}active in{/if}" id="associations">
<div class="form-container">
<div class="form-group">
<form action="{url path='/admin/categories/related-content/add'}" id="related_content_form">
<th>{intl l='Content title'}</th>
{include
file="includes/inner-form-toolbar.html"
hide_submit_buttons=true
close_url="{url path='/admin/categories' category_id=$PARENT}"
}
{module_include location='category_contents_table_header'}
<p class="title title-without-tabs">{intl l='Related content'}</p>
<p>{intl l='You can attach here some content to this category'}</p>
<th class="actions">{intl l="Actions"}</th>
</tr>
</thead>
<input type="hidden" name="category_id" value="{$category_id}" />
<input type="hidden" name="current_tab" value="associations" />
<tbody>
{loop name="assigned_contents" type="associated_content" category="$ID" backend_context="1" lang="$edit_language_id"}
<tr>
<td>{$ID}</td>
{ifloop rel="folders"}
<div class="row">
<td>{$TITLE}</td>
<div class="col-md-6">
<div class="form-group">
<select name="folder_id" id="folder_id" class="form-control">
<option value="">{intl l='Select a folder...'}</option>
{loop name="folders" type="folder-tree" folder="0" backend_context="1" lang="$edit_language_id"}
<option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px">{$TITLE}</option>
{/loop}
</select>
</div>
<span class="help-block">{intl l='Select a folder to get its content'}</span>
</div>
{module_include location='category_contents_table_row'}
<div class="col-md-6">
<div id="content_selector" class="hide">
<div class="input-group">
<select required="required" name="content_id" id="content_id" class="form-control">
<option value="">{intl l='Select a folder content...'}</option>
</select>
<span class="input-group-btn" id="content_add_button">
<button class="btn btn-default btn-primary action-btn" type="submit"><span class="glyphicon glyphicon-plus-sign"></span></button>
</span>
</div>
<td class="actions">
<div class="btn-group">
{loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.category" access="UPDATE"}
<a class="btn btn-default btn-xs delete-content" title="{intl l='Delete this content'}" href="#delete_content_dialog" data-id="{$ID}" data-toggle="modal">
<span class="glyphicon glyphicon-trash"></span>
</a>
{/loop}
</div>
</td>
</tr>
{/loop}
<span class="help-block">{intl l='Select a content and click (+) to add it to this category'}</span>
</div>
{elseloop rel="assigned_contents"}
<tr>
<td colspan="3">
<div class="alert alert-info">
{intl l="This category contains no contents"}
</div>
</td>
</tr>
{/elseloop}
</tbody>
</table>
</div>
</div>
</div>
<div id="content_selector_empty" class="hide">
<div class="alert alert-info">
{intl l="No available content in this folder"}
</div>
</div>
</div>
<div class="tab-pane fade" id="images">
{include file='includes/image-upload-form.html' imageType='category' parentId=$ID}
</div>
</div>
{/ifloop}
<div class="tab-pane fade" id="documents">
{include file='includes/document-upload-form.html' documentType='category' parentId=$ID}
</div>
{elseloop rel="folders"}
<div class="alert alert-info">{intl l="No folders found"}</div>
{/elseloop}
</form>
</div>
<div class="table-responsive">
<table class="table table-striped table-condensed table-left-aligned">
<thead>
<tr>
<th>{intl l='ID'}</th>
<th>{intl l='Content title'}</th>
{module_include location='category_contents_table_header'}
<th class="actions">{intl l="Actions"}</th>
</tr>
</thead>
<tbody>
{loop name="assigned_contents" type="associated_content" category="$category_id" backend_context="1" lang="$edit_language_id"}
<tr>
<td>{$ID}</td>
<td>
{$TITLE}
</td>
{module_include location='category_contents_table_row'}
<td class="actions">
<div class="btn-group">
{loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.category" access="UPDATE"}
<a class="btn btn-default btn-xs delete-content" title="{intl l='Delete this content'}" href="#delete_content_dialog" data-id="{$ID}" data-toggle="modal">
<span class="glyphicon glyphicon-trash"></span>
</a>
{/loop}
</div>
</td>
</tr>
{/loop}
{elseloop rel="assigned_contents"}
<tr>
<td colspan="3">
<div class="alert alert-info">
{intl l="This category contains no contents"}
</div>
</td>
</tr>
{/elseloop}
</tbody>
</table>
</div>
</div>
</div>
<div class="tab-pane fade {if $current_tab == 'images'}active in{/if}" id="images">
{include file='includes/image-upload-form.html' imageType='category' parentId=$category_id}
</div>
<div class="tab-pane fade {if $current_tab == 'documents'}active in{/if}" id="documents">
{include file='includes/document-upload-form.html' documentType='category' parentId=$category_id}
</div>
<div class="tab-pane fade {if $current_tab == 'modules'}active in{/if}" id="modules">
</div>
</div>
<div class="tab-pane fade" id="modules">
{module_include location='category-edit'}
</div>
</div>
</div>
</div>
</div>
</div>
{/loop}
</div>
</div>
</div>
{/loop}
</div>
</div>
</div>
{* Delete related content confirmation dialog *}
{* Delete related content confirmation dialog *}
{capture "delete_content_dialog"}
<input type="hidden" name="category_id" value="{$category_id}" />
<input type="hidden" name="content_id" id="content_delete_id" value="" />
<input type="hidden" name="folder_id" id="folder_delete_id" value="" />
{capture "delete_content_dialog"}
<input type="hidden" name="category_id" value="{$category_id}" />
<input type="hidden" name="content_id" id="content_delete_id" value="" />
<input type="hidden" name="folder_id" id="folder_delete_id" value="" />
<input type="hidden" name="current_tab" value="associations" />
{/capture}
<input type="hidden" name="current_tab" value="associations" />
{/capture}
{include
file = "includes/generic-confirm-dialog.html"
{include
file = "includes/generic-confirm-dialog.html"
dialog_id = "delete_content_dialog"
dialog_title = {intl l="Remove related content"}
dialog_message = {intl l="Do you really want to remove this related content ?"}
dialog_id = "delete_content_dialog"
dialog_title = {intl l="Remove related content"}
dialog_message = {intl l="Do you really want to remove this related content ?"}
form_action = {url path='/admin/categories/related-content/delete'}
form_content = {$smarty.capture.delete_content_dialog nofilter}
}
form_action = {url path='/admin/categories/related-content/delete'}
form_content = {$smarty.capture.delete_content_dialog nofilter}
}
{/block}
{block name="javascript-initialization"}
@@ -347,6 +344,9 @@ $(function() {
$('#folder_delete_id').val($('#folder_id').val());
});
// Load active tab
$('.nav-tabs a[href="#{$current_tab}"]').trigger("click");
// Load content on folder selection
$('#folder_id').change(function(event) {
@@ -393,4 +393,8 @@ $(function() {
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='category-edit-js'}
{/block}

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

@@ -168,3 +168,7 @@
</div>
</div>
{/block}
{block name="javascript-last-call"}
{module_include location='config-store-js'}
{/block}

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

@@ -189,4 +189,8 @@
</div>
</div>
</div>
{/block}
{block name="javascript-last-call"}
{module_include location='configuration-js'}
{/block}

55
templates/backOffice/default/content-edit.html
View File

@@ -42,7 +42,7 @@
<ul class="nav nav-tabs" id="tabbed-menu">
<li class="active"><a href="#general" data-toggle="tab">{intl l="General description"}</a></li>
<li><a href="#seo" data-toggle="tab">{intl l="SEO"}</a></li>
<li><a href="#association" data-toggle="tab">{intl l="Associations"}</a></li>
<li><a href="#images" data-toggle="tab">{intl l="Images"}</a></li>
<li><a href="#documents" data-toggle="tab">{intl l="Documents"}</a></li>
@@ -77,20 +77,13 @@
{if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
{include file="includes/standard-description-form-fields.html"}
{form_field form=$form field='url'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">
{$label} :
</label>
<input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value}" title="{intl l='Rewritten URL'}" placeholder="{intl l='Rewritten URL'}" class="form-control">
<div class="row">
<div class="col-md-8">
{include file="includes/standard-description-form-fields.html"}
</div>
{/form_field}
<div class="row">
<div class="col-md-6">
<div class="col-md-4">
{form_field form=$form field='default_folder'}
<div class="form-group {if $error}has-error{/if}">
@@ -109,9 +102,7 @@
</select>
</div>
{/form_field}
</div>
<div class="col-md-6">
{form_field form=$form field='visible'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">{intl l='Visibility'}</label>
@@ -126,22 +117,32 @@
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="control-group">
<lablel>&nbsp;</lablel>
<div class="controls">
<p>{intl l='Folder created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</p>
</div>
</div>
</div>
</div>
{include
file="includes/inner-form-toolbar.html"
hide_submit_buttons = false
hide_flags = true
close_url="{url path='/admin/folders' parent=$DEFAULT_FOLDER}"
}
<small>{intl l='Folder created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</small>
</form>
{/form}
</div>
</div>
<div class="tab-pane fade" id="seo">
{form name="thelia.admin.seo"}
{include file="includes/seo-tab.html"
form = $form
formAction = "{url path='/admin/content/seo/save'}"
closeUrl = "{url path='/admin/folders' parent=$DEFAULT_FOLDER}"
current_id = $content_id
}
{/form}
</div>
<div class="tab-pane fade" id="association">
{include file="includes/content-folder-management.html"}
</div>
@@ -263,4 +264,8 @@ form_content = {$smarty.capture.delete_folder_dialog nofilter}
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='content-edit-js'}
{/block}

4
templates/backOffice/default/countries.html
View File

@@ -261,4 +261,8 @@
</script>
{/javascripts}
{/block}
{block name="javascript-last-call"}
{module_include location='countries-js'}
{/block}

4
templates/backOffice/default/country-edit.html
View File

@@ -124,4 +124,8 @@
</div>
</div>
{/block}
{block name="javascript-last-call"}
{module_include location='country-edit-js'}
{/block}

4
templates/backOffice/default/coupon-create.html
View File

@@ -62,3 +62,7 @@
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='coupon-create-js'}
{/block}

4
templates/backOffice/default/coupon-list.html
View File

@@ -162,3 +162,7 @@
<script src="{$asset_url}"></script>
{/javascripts}
{/block}
{block name="javascript-last-call"}
{module_include location='coupon-list-js'}
{/block}

4
templates/backOffice/default/coupon-read.html
View File

@@ -165,3 +165,7 @@
{/javascripts}
{/block}
{block name="javascript-last-call"}
{module_include location='coupon-read-js'}
{/block}

4
templates/backOffice/default/coupon-update.html
View File

@@ -147,3 +147,7 @@
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='coupon-update-js'}
{/block}

4
templates/backOffice/default/currencies.html
View File

@@ -358,4 +358,8 @@
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='currencies-js'}
{/block}

4
templates/backOffice/default/currency-edit.html
View File

@@ -123,4 +123,8 @@
</div>
</div>
{/block}
{block name="javascript-last-call"}
{module_include location='currency-edit-js'}
{/block}

4
templates/backOffice/default/customer-edit.html
View File

@@ -423,4 +423,8 @@
{/if}
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='customer-edit-js'}
{/block}

4
templates/backOffice/default/customers.html
View File

@@ -371,4 +371,8 @@
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='customers-js'}
{/block}

4
templates/backOffice/default/document-edit.html
View File

@@ -160,4 +160,8 @@
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='document-edit-js'}
{/block}

4
templates/backOffice/default/feature-edit.html
View File

@@ -317,4 +317,8 @@
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='feature-edit-js'}
{/block}

4
templates/backOffice/default/features.html
View File

@@ -327,4 +327,8 @@
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='features-js'}
{/block}

100
templates/backOffice/default/folder-edit.html
View File

@@ -13,28 +13,21 @@
<div class="row">
{loop name="folder_edit" type="folder" visible="*" id="{$folder_id}" backend_context="1" lang="$edit_language_id"}
{* Define close url *}
{assign var='close_url' value="{url path='/admin/folders' folder_id=$ID}"}
<div class="col-md-12 general-block-decorator">
<div class="row">
<div class="col-md-7 title">
{intl l='Edit folder %title' title=$TITLE}
</div>
<div class="col-md-5 actions">
{if $HAS_PREVIOUS != 0}
<a href="{url path="/admin/folders/update/$PREVIOUS"}" class="btn btn-default" title="{intl l='Edit previous folder'}"><span class="glyphicon glyphicon-arrow-left"></span></a>
{else}
<a href="#" disabled="disabled" class="btn btn-default"><span class="glyphicon glyphicon-arrow-left"></span></a>
{/if}
<a href="{$URL}" target="_blank" class="btn btn-default" title="{intl l='Preview folder page'}"><span class="glyphicon glyphicon-eye-open"></span></a>
{if $HAS_NEXT != 0}
<a href="{url path="/admin/folders/update/$NEXT"}" class="btn btn-default" title="{intl l='Edit next folder'}"><span class="glyphicon glyphicon-arrow-right"></span></a>
{else}
<a href="#" disabled="disabled" class="btn btn-default"><span class="glyphicon glyphicon-arrow-right"></span></a>
{/if}
</div>
<div class="col-md-5 actions">
<a {if $HAS_PREVIOUS != 0}href="{url path="/admin/folders/update/$PREVIOUS"}"{else}disabled="disabled"{/if} class="btn btn-default" title="{intl l='Edit previous folder'}"><span class="glyphicon glyphicon-arrow-left"></span></a>
<a href="{$URL}" target="_blank" class="btn btn-default" title="{intl l='Preview folder page'}"><span class="glyphicon glyphicon-eye-open"></span></a>
<a {if $HAS_NEXT != 0}href="{url path="/admin/folders/update/$NEXT"}"{else}disabled="disabled"{/if} class="btn btn-default" title="{intl l='Edit next folder'}"><span class="glyphicon glyphicon-arrow-right"></span></a>
</div>
</div>
<div class="row">
@@ -42,7 +35,7 @@
<ul class="nav nav-tabs" id="tabbed-menu">
<li class="active"><a href="#general" data-toggle="tab">{intl l="General description"}</a></li>
<li><a href="#seo" data-toggle="tab">{intl l="SEO"}</a></li>
<li><a href="#details" data-toggle="tab">{intl l="Details"}</a></li>
<li><a href="#images" data-toggle="tab">{intl l="Images"}</a></li>
<li><a href="#documents" data-toggle="tab">{intl l="Documents"}</a></li>
@@ -58,40 +51,29 @@
{form name="thelia.admin.folder.modification"}
<form method="POST" action="{url path='/admin/folders/save'}" {form_enctype form=$form} class="clearfix">
{include file="includes/inner-form-toolbar.html" close_url="{url path='/admin/folders' folder_id=$folder_id}"}
{include file="includes/inner-form-toolbar.html" close_url=$close_url}
{* Be sure to get the folder ID, even if the form could not be validated *}
<input type="hidden" name="folder_id" value="{$folder_id}" />
<input type="hidden" name="current_tab" value="general" />
{form_hidden_fields form=$form}
{form_field form=$form field='success_url'}
<input type="hidden" name="{$name}" value="{url path="/admin/folders/update{$ID}"}" />
<input type="hidden" name="{$name}" value="{url path="/admin/folders/update/{$ID}"}" />
{/form_field}
{form_field form=$form field='locale'}
<input type="hidden" name="{$name}" value="{$edit_language_locale}" />
{/form_field}
{* Display error message if exist *}
{include file='includes/notifications.html' message=$form_error_message}
{if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
<div class="row">
<div class="col-md-8">
{include file="includes/standard-description-form-fields.html"}
</div>
{include file="includes/standard-description-form-fields.html"}
<div class="col-md-4">
{form_field form=$form field='url'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">
{$label} :
</label>
<input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value}" title="{intl l='Rewritten URL'}" placeholder="{intl l='Rewritten URL'}" class="form-control">
</div>
{/form_field}
<div class="row">
<div class="col-md-6">
{form_field form=$form field='parent'}
{form_field form=$form field='parent'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">
@@ -109,9 +91,7 @@
</select>
</div>
{/form_field}
</div>
<div class="col-md-6">
{form_field form=$form field='visible'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">{intl l='Visibility'}</label>
@@ -126,22 +106,30 @@
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="control-group">
<lablel>&nbsp;</lablel>
<div class="controls">
<p>{intl l='Folder created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</p>
</div>
</div>
</div>
</div>
{include
file="includes/inner-form-toolbar.html"
hide_flags = true
close_url=$close_url
}
</form>
<small>{intl l='Colder created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</small>
</form>
{/form}
</div>
</div>
<div class="tab-pane fade" id="seo">
{form name="thelia.admin.seo"}
{include file="includes/seo-tab.html"
form = $form
formAction = "{url path='/admin/folders/seo/save'}"
closeUrl = $close_url
current_id = $folder_id
}
{/form}
</div>
<div class="tab-pane fade" id="details">
<div class="form-container">
<div class="form-group">
@@ -150,7 +138,7 @@
{include
file="includes/inner-form-toolbar.html"
hide_submit_buttons=true
close_url="{url path='/admin/folders' folder_id=$folder_id}"
close_url=$close_url
}
<input type="hidden" name="folder_id" value="{$folder_id}" />
@@ -247,11 +235,11 @@
</div>
<div class="tab-pane fade" id="images">
{include file='includes/image-upload-form.html' imageType='folder' parentId=$folder_id}
{include file='includes/image-upload-form.html' imageType='folder' parentId=$ID}
</div>
<div class="tab-pane fade" id="documents">
{include file='includes/document-upload-form.html' documentType='folder' parentId=$folder_id}
{include file='includes/document-upload-form.html' documentType='folder' parentId=$ID}
</div>
<div class="tab-pane fade" id="modules">
@@ -359,4 +347,8 @@
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='folder-edit-js'}
{/block}

4
templates/backOffice/default/folders.html
View File

@@ -627,4 +627,8 @@
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='folders-js'}
{/block}

4
templates/backOffice/default/home.html
View File

@@ -408,4 +408,8 @@ jQuery(function($){
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='home-js'}
{/block}

4
templates/backOffice/default/image-edit.html
View File

@@ -165,4 +165,8 @@
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='image-edit-js'}
{/block}

8
templates/backOffice/default/includes/notifications.html
View File

@@ -1,11 +1,13 @@
{*
Params
- type : notification type (default alert)
- type (default: danger) : notification type
- dismissable (default: true) : Add a close button
- message : modal message
*}
{if $message}
<div class="{if $type}$type{else}alert alert-info{/if}">
<span class="icon-question-sign"></span>
<div class="alert alert-{$type|default:danger}{if not $dismissable} alert-dismissable{/if}">
{if not $dismissable}<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>{/if}
{$message}
</div>
{/if}

80
templates/backOffice/default/includes/product-general-tab.html
View File

@@ -11,54 +11,45 @@
close_url = "{url path='/admin/categories' category_id=$DEFAULT_CATEGORY}"
}
{* Be sure to get the product ID, even if the form could not be validated *}
<input type="hidden" name="product_id" value="{$product_id}" />
<input type="hidden" name="current_tab" value="general" />
{* Be sure to get the product ID, even if the form could not be validated*}
<input type="hidden" name="product_id" value="{$product_id}">
<input type="hidden" name="current_tab" value="general">
{form_hidden_fields form=$form}
{form_field form=$form field='id'}
<input type="hidden" name="{$name}" value="{$value}" />
<input type="hidden" name="{$name}" value="{$value}">
{/form_field}
{form_field form=$form field='success_url'}
<input type="hidden" name="{$name}" value="{url path='/admin/categories' category_id=$DEFAULT_CATEGORY}" />
<input type="hidden" name="{$name}" value="{url path='/admin/categories' category_id=$DEFAULT_CATEGORY}">
{/form_field}
{form_field form=$form field='locale'}
<input type="hidden" name="{$name}" value="{$edit_language_locale}" />
<input type="hidden" name="{$name}" value="{$edit_language_locale}">
{/form_field}
{if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
<div class="form-group">
<label class="control-label">
{intl l='Product reference'} :
</label>
<div class="well well-sm">{$REF}</div>
{form_field form=$form field='ref'}
<input type="hidden" name="{$name}" value="{$value}" />
{/form_field}
</div>
{include file="includes/standard-description-form-fields.html"}
{form_field form=$form field='url'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">
{$label} :
</label>
<input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value}" title="{intl l='Rewritten URL'}" placeholder="{intl l='Rewritten URL'}" class="form-control">
</div>
{/form_field}
<div class="row">
<div class="col-md-6">
<div class="col-md-8">
{form_field form=$form field='ref'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">
{$label} :
</label>
<div class="control-input">
{* If ref's 'value is not empty the field is disable and the value is sent with an hidden field *}
<input type="text" id="{$label_attr.for}" {if $value}name="{$name}_disabled" disabled{else}name="{$name}"{/if} class="form-control" value="{$value}"{if $required} aria-required="true" required{/if}>
{if $value}<input type="hidden" name="{$name}" value="{$value}">{/if}
</div>
</div>
{/form_field}
{include file="includes/standard-description-form-fields.html"}
</div>
<div class="col-md-4">
{form_field form=$form field='default_category'}
<div class="form-group {if $error}has-error{/if}">
@@ -79,9 +70,6 @@
</div>
{/form_field}
</div>
<div class="col-md-6">
{form_field form=$form field='visible'}
<div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">{intl l='Visibility'}</label>
@@ -96,16 +84,16 @@
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="control-group">
<label>&nbsp;</label>
<div class="controls">
<p>{intl l='Product created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</p>
</div>
</div>
</div>
</div>
{include
file = "includes/inner-form-toolbar.html"
hide_submit_buttons = false
hide_flags = true
page_url = "{url path='/admin/products/update' product_id=$ID}"
close_url = "{url path='/admin/categories' category_id=$DEFAULT_CATEGORY}"
}
<small>{intl l='Product created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</small>
</form>
{/form}

81
templates/backOffice/default/includes/seo-tab.html Normal file
View File

@@ -0,0 +1,81 @@
<div class="form-container">
<form method="POST" action="{$formAction}" {form_enctype form=$form} class="clearfix">
{include
file = "includes/inner-form-toolbar.html"
hide_submit_buttons = false
page_url = {$pageUrl}
close_url = {$closeUrl}
}
{* Hidden field *}
<input type="hidden" name="current_id" value="{$current_id}">
<input type="hidden" name="current_tab" value="seo">
{form_hidden_fields form=$form}
{form_field form=$form field='success_url'}
<input type="hidden" name="{$name}" value="{$closeUrl}">
{/form_field}
{* Display error message if exist *}
{include file='includes/notifications.html' message=$form_error_message}
{form_field form=$form field='url'}
<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>
<div class="input-group">
<span class="input-group-addon">{$url_language|default:{config key="url_site"}}</span>
<input type="text" id="{$label_attr.for}" name="{$name}" value="{$value}" title="{intl l='Rewritten URL'}" {if $required} aria-required="true" required{/if} class="form-control" placeholder="{intl l='Use the keyword phrase in your URL.'}">
</div>
</div>
{/form_field}
{form_field form=$form field='meta_title'}
<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}
<span class="label-help-block">{intl l='The HTML TITLE element is the most important element on your web page.'}</span>
</label>
<div class="control-input">
<input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}"{if $required} aria-required="true" required{/if} title="{$label}" placeholder="{intl l='Make sure that your title is clear, and contains many of the keywords within the page itself.'}">
</div>
</div>
{/form_field}
{form_field form=$form field='meta_description'}
<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}
<span class="label-help-block">{intl l='Keep the most important part of your description in the first 150-160 characters.'}</span>
</label>
<textarea name="{$name}" id="{$label_attr.for}" rows="6"{if $required} aria-required="true" required{/if} placeholder="{intl l='Make sure it uses keywords found within the page itself.'}" class="form-control">{$value}</textarea>
</div>
{/form_field}
{form_field form=$form field='meta_keywords'}
<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}
<span class="label-help-block">{intl l='You don\'t need to use commas or other punctuations.'}</span>
</label>
<textarea name="{$name}" id="{$label_attr.for}" rows="3"{if $required} aria-required="true" required{/if} placeholder="{intl l='Don\'t repeat keywords over and over in a row. Rather, put in keyword phrases.'}" class="form-control">{$value}</textarea>
</div>
{/form_field}
{include
file = "includes/inner-form-toolbar.html"
hide_submit_buttons = false
hide_flags = true
page_url = {$pageUrl}
close_url = {$closeUrl}
}
</form>
</div>

4
templates/backOffice/default/languages.html
View File

@@ -306,4 +306,8 @@
});
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='languages-js'}
{/block}

4
templates/backOffice/default/mailing-system.html
View File

@@ -140,4 +140,8 @@ jQuery(function($) {
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='mainling-system-js'}
{/block}

4
templates/backOffice/default/message-edit.html
View File

@@ -234,3 +234,7 @@
})(jQuery);
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='message-edit-js'}
{/block}

4
templates/backOffice/default/messages.html
View File

@@ -213,4 +213,8 @@
}
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='messages-js'}
{/block}

4
templates/backOffice/default/module-configure.html
View File

@@ -22,4 +22,8 @@
</div>
</div>
{/block}
{block name="javascript-last-call"}
{module_include location='module-config-js'}
{/block}

6
templates/backOffice/default/module-edit.html
View File

@@ -75,8 +75,6 @@
{/block}
{block name="javascript-initialization"}
{block name="javascript-last-call"}
{module_include location='module-edit-js'}
{/block}

4
templates/backOffice/default/modules.html
View File

@@ -140,4 +140,8 @@
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='modules-js'}
{/block}

4
templates/backOffice/default/order-edit.html
View File

@@ -509,4 +509,8 @@
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='order-edit-js'}
{/block}

4
templates/backOffice/default/orders.html
View File

@@ -164,4 +164,8 @@
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='orders-js'}
{/block}

188
templates/backOffice/default/product-edit.html
View File

@@ -6,118 +6,120 @@
{block name="page-title"}{intl l='Edit product'}{/block}
{block name="main-content"}
<div class="catalog edit-product">
<div id="wrapper" class="container">
<div class="catalog edit-product">
{include file="includes/catalog-breadcrumb.html" editing_category="false" editing_product="true"}
<div id="wrapper" class="container">
<div class="row">
{loop name="product_edit" type="product" visible="*" id=$product_id backend_context="1" lang=$edit_language_id}
<div class="col-md-12 general-block-decorator">
<div class="row">
<div class="col-md-7 title">
{intl l='Edit product %title' title=$TITLE}
</div>
{include file="includes/catalog-breadcrumb.html" editing_category="false" editing_product="true"}
<div class="col-md-5 actions">
<div class="row">
{loop name="product_edit" type="product" visible="*" id=$product_id backend_context="1" lang=$edit_language_id}
{if $HAS_PREVIOUS != 0}
<a href="{url path='/admin/products/update' product_id=$PREVIOUS}" class="btn btn-default" title="{intl l='Edit previous product'}"><span class="glyphicon glyphicon-arrow-left"></span></a>
{else}
<a href="#" disabled="disabled" class="btn btn-default"><span class="glyphicon glyphicon-arrow-left"></span></a>
{/if}
{* Define close url *}
{assign var='close_url' value="{url path='/admin/catalog' category_id=$DEFAULT_CATEGORY}"}
<a href="{$URL}" target="_blank" class="btn btn-default" title="{intl l='Preview product page'}"><span class="glyphicon glyphicon-eye-open"></span></a>
<div class="col-md-12 general-block-decorator">
<div class="row">
<div class="col-md-7 title">
{intl l='Edit product %title' title=$TITLE}
</div>
{if $HAS_NEXT != 0}
<a href="{url path='/admin/products/update' product_id=$NEXT}" class="btn btn-default" title="{intl l='Edit next product'}"><span class="glyphicon glyphicon-arrow-right"></span></a>
{else}
<a href="#" disabled="disabled" class="btn btn-default"><span class="glyphicon glyphicon-arrow-right"></span></a>
{/if}
</div>
</div>
<div class="col-md-5 actions">
<a {if $HAS_PREVIOUS != 0}href="{url path='/admin/products/update' product_id=$PREVIOUS}"{else}disabled="disabled"{/if} class="btn btn-default" title="{intl l='Edit previous product'}"><span class="glyphicon glyphicon-arrow-left"></span></a>
<a href="{$URL}" target="_blank" class="btn btn-default" title="{intl l='Preview product page'}"><span class="glyphicon glyphicon-eye-open"></span></a>
<a {if $HAS_NEXT != 0}href="{url path='/admin/products/update' product_id=$NEXT}"{else}disabled="disabled"{/if} class="btn btn-default" title="{intl l='Edit next product'}"><span class="glyphicon glyphicon-arrow-right"></span></a>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="row">
<div class="col-md-12">
<ul class="nav nav-tabs" id="tabbed-menu">
<li>
<a href="#general"
{* data-href="{url path='/admin/products/general/tab' product_id=$product_id}" *}
data-toggle="tab">{intl l="General"}</a>
</li>
<ul class="nav nav-tabs" id="tabbed-menu">
<li><a href="#general" data-toggle="tab">{intl l="General"}</a></li>
<li><a href="#seo" data-toggle="tab">{intl l="SEO"}</a></li>
<li><a href="#details" data-toggle="tab">{intl l="Details"}</a></li>
<li>
<a href="#attributes"
data-href="{url path='/admin/products/attributes/tab' product_id=$ID}"
data-toggle="tab">{intl l="Attributes &amp; Features"}
</a>
</li>
<li>
<a href="#related"
data-href="{url path='/admin/products/related/tab' folder_id=$folder_id accessory_category_id=$accessory_category_id product_id=$ID}"
data-toggle="tab">{intl l="Associations"}
</a>
</li>
<li>
<a href="#images"
data-toggle="tab"
data-href="{url path="/admin/image/type/product/{$ID}/form-ajax"}"
data-callback="$.imageUploadManager.initImageDropZone">
{intl l="Images"}
</a>
</li>
<li>
<a href="#documents"
data-toggle="tab"
data-href="{url path="/admin/document/type/product/{$ID}/form-ajax"}"
data-callback="$.documentUploadManager.initDocumentDropZone">
{intl l="Documents"}
</a>
</li>
<li><a href="#modules" data-toggle="tab">{intl l="Modules"}</a></li>
</ul>
<li>
<a href="#details" data-toggle="tab">{intl l="Prices &amp; Stocks"}</a>
</li>
<div class="tab-content">
<li><a href="#attributes"
data-href="{url path='/admin/products/attributes/tab' product_id=$product_id}"
data-toggle="tab">{intl l="Attributes &amp; Features"}</a>
</li>
<div class="tab-pane fade" id="general">
{include file="includes/product-general-tab.html"}
</div>
<li>
<a href="#related"
data-href="{url path='/admin/products/related/tab' folder_id=$folder_id accessory_category_id=$accessory_category_id product_id=$product_id}"
data-toggle="tab">{intl l="Associations"}</a>
</li>
<div class="tab-pane fade" id="seo">
{form name="thelia.admin.seo"}
{include file="includes/seo-tab.html"
form = $form
formAction = "{url path='/admin/products/seo/save'}"
pageUrl = "{url path='/admin/products/update' product_id=$ID}"
closeUrl = $close_url
current_id = $product_id
}
{/form}
</div>
<li>
<a href="#images"
data-toggle="tab"
data-href="{url path="/admin/image/type/product/{$product_id}/form-ajax"}"
data-callback="$.imageUploadManager.initImageDropZone">
{intl l="Images"}
</a>
</li>
<li>
<a href="#documents"
data-toggle="tab"
data-href="{url path="/admin/document/type/product/{$product_id}/form-ajax"}"
data-callback="$.documentUploadManager.initDocumentDropZone">
{intl l="Documents"}
</a>
<li><a href="#modules" data-toggle="tab">{intl l="Modules"}</a></li>
</ul>
<div class="tab-pane fade" id="details">
{include file="includes/product-details-tab.html"}
</div>
<div class="tab-content">
<div class="tab-pane fade" id="attributes">
<div class="text-center"><span class="loading">{intl l="Please wait, loading"}</span></div>
</div>
<div class="tab-pane fade" id="general">
{include file="includes/product-general-tab.html"}
</div>
<div class="tab-pane fade" id="related">
<div class="text-center"><span class="loading">{intl l="Please wait, loading"}</span></div>
</div>
<div class="tab-pane fade" id="details">
{include file="includes/product-details-tab.html"}
</div>
<div class="tab-pane fade" id="images">
<div class="text-center"><span class="loading">{intl l="Please wait, loading"}</span></div>
</div>
<div class="tab-pane fade" id="attributes">
<div class="text-center"><span class="loading">{intl l="Please wait, loading"}</span></div>
</div>
<div class="tab-pane fade" id="documents">
<div class="text-center"><span class="loading">{intl l="Please wait, loading"}</span></div>
</div>
<div class="tab-pane fade" id="related">
<div class="text-center"><span class="loading">{intl l="Please wait, loading"}</span></div>
</div>
<div class="tab-pane fade" id="modules">
{module_include location='product-edit'}
</div>
<div class="tab-pane fade" id="images">
<div class="text-center"><span class="loading">{intl l="Please wait, loading"}</span></div>
</div>
<div class="tab-pane fade" id="documents">
<div class="text-center"><span class="loading">{intl l="Please wait, loading"}</span></div>
</div>
<div class="tab-pane fade" id="modules">
{module_include location='product-edit'}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{/loop}
</div>
</div>
</div>
{/loop}
</div>
</div>
</div>
{/block}
@@ -414,4 +416,8 @@ $(function() {
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='product-edit-js'}
{/block}

4
templates/backOffice/default/profile-edit.html
View File

@@ -303,4 +303,8 @@
<script src='{$asset_url}'></script>
{/javascripts}
{/block}
{block name="javascript-last-call"}
{module_include location='profile-edit-js'}
{/block}

4
templates/backOffice/default/profiles.html
View File

@@ -208,4 +208,8 @@ jQuery(function($) {
})
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='profiles-js'}
{/block}

4
templates/backOffice/default/search.html
View File

@@ -235,4 +235,8 @@
<script>
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='search-js'}
{/block}

4
templates/backOffice/default/shipping-configuration-edit.html
View File

@@ -165,4 +165,8 @@
});
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='shipping-configuration-edit-js'}
{/block}

4
templates/backOffice/default/shipping-configuration.html
View File

@@ -139,4 +139,8 @@
});
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='shipping-configuration-js'}
{/block}

4
templates/backOffice/default/shipping-zones-edit.html
View File

@@ -137,4 +137,8 @@
});
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='shipping-zones-edit-js'}
{/block}

4
templates/backOffice/default/shipping-zones.html
View File

@@ -63,4 +63,8 @@
</div>
</div>
{/block}
{block name="javascript-last-call"}
{module_include location='shipping-zones-js'}
{/block}

4
templates/backOffice/default/system-logs.html
View File

@@ -210,4 +210,8 @@ $(function() {
});
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='system-logs-js'}
{/block}

4
templates/backOffice/default/tax-edit.html
View File

@@ -157,4 +157,8 @@
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='tax-edit-js'}
{/block}

4
templates/backOffice/default/tax-rule-edit.html
View File

@@ -422,4 +422,8 @@
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='tax-rule-edit-js'}
{/block}

4
templates/backOffice/default/taxes-rules.html
View File

@@ -378,4 +378,8 @@ form_content = {$smarty.capture.tax_rule_delete_dialog nofilter}
})
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='taxes-rules-js'}
{/block}

4
templates/backOffice/default/template-edit.html
View File

@@ -119,4 +119,8 @@
$('#attribute_list_management').load("{url noamp='1' path='/admin/configuration/templates/attributes/list' template_id=$template_id}");
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='template-edit-js'}
{/block}

4
templates/backOffice/default/templates.html
View File

@@ -211,4 +211,8 @@
}
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='templates-js'}
{/block}

4
templates/backOffice/default/translations.html
View File

@@ -317,3 +317,7 @@
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='translations-js'}
{/block}

4
templates/backOffice/default/variable-edit.html
View File

@@ -114,4 +114,8 @@
</div>
</div>
{/block}
{block name="javascript-last-call"}
{module_include location='variable-edit-js'}
{/block}

4
templates/backOffice/default/variables.html
View File

@@ -279,4 +279,8 @@
});
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='variables-js'}
{/block}

3
templates/frontOffice/default/assets/less/thelia/account.less
View File

@@ -51,7 +51,8 @@
// Message if no order or no address
.deliveries-warning,
.address-warning,
.orders-warning {
.orders-warning,
.folder-warning {
clear: both;
.alert; .alert-warning;
margin-bottom: 0;

98
templates/frontOffice/default/assets/less/thelia/folder.less Normal file
View File

@@ -0,0 +1,98 @@
// Thelia : Folder
// Folder Info
.folder-chapo {}
.folder-description {
margin-bottom: 20px;
}
// Content List
#folder-contents {
.contents > ul { .contents-grid; }
}
.contents-grid,
.contents-list {
// Animation
@media (min-width: @screen-tablet) {
.content-image {
display: block;
overflow: hidden;
position: relative;
> .mask {
background-color: @brand-primary;
background-color: rgba(red(@brand-primary), green(@brand-primary), blue(@brand-primary), .4);
display: block;
.opacity(0);
overflow: visible;
position: absolute;
top: 0; left: 0;
visibility: hidden;
width: 100%; height: 100%;
.transition(opacity 300ms ease-in-out 50ms);
}
&:hover,
&:focus {
.mask {
visibility: visible;
.opacity(1);
}
}
}
}
}
// Contents Grid
.contents-grid {
.make-row();
.list-unstyled();
.item { .make-sm-column(4); .make-md-column(4); .clearfix(); } // default
&.content-col-2 > .item { .make-md-column(6); }
&.content-col-3 > .item { .make-md-column(4); }
&.content-col-4 > .item { .make-md-column(3); }
&.content-col-5 > .item { .make-md-column(2.4); }
&.content-col-6 > .item { .make-md-column(2); }
.item {
margin-bottom: @line-height-computed;
.content-image {
> img { .img-responsive(); width: 100%; }
> .mask {}
}
.content-info {
.name { margin: 4px 0; }
.description { .visible-xs; }
.short-description { display: block; margin-bottom: 5px; }
}
}
}
// Content List
.contents-list {
.list-unstyled();
.item {
+ .item { border-top: 1px solid #ededed; padding-top: 15px; }
> article {
.make-row();
margin-left: 0;
.content-image {
.make-sm-column(3);
margin-bottom: 15px; padding: 0;
> img { .img-responsive(); width: 100%; }
> .mask {}
}
.content-info {
.make-sm-column(6);
.name { margin-top: 0; }
.description {}
.short-description {}
}
}
}
}

3
templates/frontOffice/default/assets/less/thelia/import.less vendored
View File

@@ -28,6 +28,9 @@
@import "category";
@import "product";
// Thelia : Contents
@import "folder";
// Thelia : Pages
@import "page-home";
@import "page-error";

21
templates/frontOffice/default/category.html
View File

@@ -3,15 +3,30 @@
{* Body Class *}
{block name="body-class"}page-category{/block}
{* Page Title *}
{block name='no-return-functions' append}
{loop name="category.seo.title" type="category" id="{category attr="id"}"}
{$page_title = {$META_TITLE}}
{/loop}
{/block}
{* Meta *}
{block name="meta"}
{loop name="category.seo.meta" type="category" id="{category attr="id"}"}
{if $META_DESCRIPTION}<meta name="description" content="{$META_DESCRIPTION}">{/if}
{if $META_KEYWORDS}<meta name="keywords" content="{$META_KEYWORDS}">{/if}
{/loop}
{/block}
{* Breadcrumb *}
{block name='no-return-functions' append}
{$sBreadcrumb = []}
{$breadcrumbs = []}
{loop name="category_path" type="category-path" category="{category attr="id"}"}
{$breadcrumbs[] = ['title' => {$TITLE}, 'url'=> {$URL nofilter}]}
{/loop}
{/block}
{* Content *}
{block name="main-content"}
<div class="main layout-col-2-left">
{$limit={$smarty.get.limit|default:8}}
@@ -19,7 +34,7 @@
{$product_order={$smarty.get.order|default:'alpha'}}
<article class="col-main {$smarty.get.mode|default:"grid"}" role="main">
{ifloop rel="product_list"}
{assign var="amount" value="{count type="product" category={category attr="id"}}"}
{assign var="amount" value="{count type="product" category="{category attr="id"}"}"}
{include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order amount={$amount}}
<div id="category-products">
<div class="products-content">

55
templates/frontOffice/default/content.html
View File

@@ -1,36 +1,61 @@
{extends file="layout.tpl"}
{block name="no-return-functions"}
{* Body Class *}
{block name="body-class"}page-content{/block}
{* Page Title *}
{block name='no-return-functions' append}
{loop name="content.seo.title" type="content" id="{content attr="id"}"}
{$page_title = {$META_TITLE}}
{/loop}
{/block}
{block name="body-class"}page-content{/block}
{* Meta *}
{block name="meta"}
{loop name="content.seo.meta" type="content" id="{content attr="id"}"}
{if $META_DESCRIPTION}<meta name="description" content="{$META_DESCRIPTION}">{/if}
{if $META_KEYWORDS}<meta name="keywords" content="{$META_KEYWORDS}">{/if}
{/loop}
{/block}
{* Breadcrumb *}
{block name='no-return-functions' append}
{$breadcrumbs = []}
{loop type="content" name="content-breadcrumb" id="{content attr="id"}"}
{loop name="folder_path" type="folder-path" folder="{$DEFAULT_FOLDER}"}
{$breadcrumbs[] = ['title' => {$TITLE}, 'url'=> {$URL}]}
{/loop}
{$breadcrumbs[] = ['title' => {$TITLE}, 'url'=> {$URL}]}
{/loop}
{/block}
{block name="main-content"}
<div class="main layout-col-2-left" <!-- class="mainlayout-col-2-left -->">
<div class="main layout-col-2-left">
<article class="col-main" role="main" aria-labelledby="main-label">
{loop name="blog.article" type="content" current="yes"}
<h1>{$TITLE}</h1>
<p class="chapo">
{$CHAPO}
</p>
<p>{$DESCRIPTION nofilter}</p>
{loop name="blog.content" type="content" current="yes"}
<h1 id="main-label" class="page-header">{$TITLE}</h1>
{if $CHAPO}
<div class="chapo">
{$CHAPO}
</div>
{/if}
{if $DESCRIPTION}
<div class="description">
{$DESCRIPTION nofilter}
</div>
{/if}
{if $POSTSCRIPTUM}
<small class="postscriptum">
{$POSTSCRIPTUM}
</small>
{/if}
{/loop}
</article>
<aside class="col-left" role="complementary" itemscope itemtype="http://schema.org/WPSideBar">
{include file="includes/asides/articles.html"}
{include file="includes/asides/articles.html"}
</aside>
</div><!-- /.layout -->
{/block}
{block name="after-javascript-include"}{/block}

99
templates/frontOffice/default/folder.html Normal file
View File

@@ -0,0 +1,99 @@
{extends file="layout.tpl"}
{* Body Class *}
{block name="body-class"}page-folder{/block}
{* Page Title *}
{block name='no-return-functions' append}
{loop name="folder.seo.title" type="folder" id="{folder attr="id"}"}
{$page_title = {$META_TITLE}}
{/loop}
{/block}
{* Meta *}
{block name="meta"}
{loop name="folder.seo.meta" type="folder" id="{folder attr="id"}"}
{if $META_DESCRIPTION}<meta name="description" content="{$META_DESCRIPTION}">{/if}
{if $META_KEYWORDS}<meta name="keywords" content="{$META_KEYWORDS}">{/if}
{/loop}
{/block}
{* Breadcrumb *}
{block name='no-return-functions' append}
{$breadcrumbs = []}
{loop name="folder_path" type="folder-path" folder="{folder attr="id"}"}
{$breadcrumbs[] = ['title' => {$TITLE}, 'url'=> {$URL}]}
{/loop}
{/block}
{* Content *}
{block name="main-content"}
<div class="main">
<div class="col-main" role="main" aria-labelledby="main-label">
{loop name="folder" type="folder" id="{folder attr="id"}"}
<h1 id="main-label" class="page-header">{$TITLE}</h1>
{if $CHAPO}
<div class="folder-chapo">
{$CHAPO}
</div>
{/if}
{if $DESCRIPTION}
<div class="folder-description">
{$DESCRIPTION nofilter}
</div>
{/if}
<div id="folder-contents">
<div class="contents">
{ifloop rel="folder_content"}
<ul>
{loop name="folder_content" type="content" folder="$ID"}
<li class="item">
<article>
<a href="{$URL}" tabindex="-1" class="content-image">
{loop name="content_thumbnail" type="image" width="369" height="247" content=$ID limit="1"}
<img src="{$IMAGE_URL}" alt="{$TITLE}">
{/loop}
{elseloop rel="content_thumbnail"}
{images file='assets/img/280x196.png'}<img src="{$asset_url}" alt="{$TITLE}">{/images}
{/elseloop}
<span class="mask"></span>
</a>
<div class="content-info">
<h3 class="name"><a href="{$URL}">{$TITLE}</a></h3>
{if $CHAPO}
<div class="short-description">
{$CHAPO}
</div>
{/if}
</div>
</article><!-- /content -->
</li>
{/loop}
</ul>
{/ifloop}
{elseloop rel="folder_content"}
<div class="folder-warning">
{intl l="No Content in this folder."}
</div>
{/elseloop}
</div>
</div><!-- /#category-products -->
{if $POSTSCRIPTUM}
<small class="folder-postscriptum">
{$POSTSCRIPTUM}
</small>
{/if}
{/loop}
</div>
</div>
{/block}

10
templates/frontOffice/default/includes/asides/articles.html
View File

@@ -3,13 +3,9 @@
<div class="block-content">
<nav class="nav-categories">
<ul id="category" class="accordion">
{loop name="current_article" type="content" current="yes"}
{assign var="current_id" value={$ID}}
{/loop}
{loop name="blog.article" type="content" current_folder="yes" exclude="$current_id"}
<li><a href="{$URL}">{$TITLE}</a></li>
{/loop}
{loop name="blog.article" type="content" current_folder="yes" exclude="{content attr="id"}"}
<li><a href="{$URL}">{$TITLE}</a></li>
{/loop}
</ul>
</nav>
</div>

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

@@ -1,10 +1,3 @@
{* Declare assets directory, relative to template base directory *}
{declare_assets directory='assets'}
{block name="no-return-functions"}{/block}
{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>
<!--
______ __ __ ______ __ __ ______
@@ -24,6 +17,12 @@ the Free Software Foundation; either version 3 of the
GNU General Public License : http://www.gnu.org/licenses/
-->
{* Declare assets directory, relative to template base directory *}
{declare_assets directory='assets'}
{block name="no-return-functions"}{/block}
{assign var="store_name" value="{config key="store_name"}"}
{if not $store_name}{assign var="store_name" value="{intl l='Thelia V2'}"}{/if}
{* 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]-->
@@ -37,14 +36,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}{$store_name}{/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} - {/foreach}{$store_name}{/if}{/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="{$store_name}">
<meta name="description" content="{if $page_description}{$page_description}{else}{$store_name}{/if}">
<meta name="robots" content="noindex,nofollow">
{/block}

24
templates/frontOffice/default/product.html
View File

@@ -3,6 +3,21 @@
{* Body Class *}
{block name="body-class"}page-product{/block}
{* Page Title *}
{block name='no-return-functions' append}
{loop name="product.seo.title" type="product" id="{product attr="id"}"}
{$page_title = {$META_TITLE}}
{/loop}
{/block}
{* Meta *}
{block name="meta"}
{loop name="product.seo.meta" type="product" id="{product attr="id"}"}
{if $META_DESCRIPTION}<meta name="description" content="{$META_DESCRIPTION}">{/if}
{if $META_KEYWORDS}<meta name="keywords" content="{$META_KEYWORDS}">{/if}
{/loop}
{/block}
{* Breadcrumb *}
{block name='no-return-functions' append}
{$breadcrumbs = []}
@@ -14,7 +29,7 @@
{/loop}
{/block}
{* Content *}
{block name="main-content"}
<div class="main">
{loop name="product.details" type="product" id="{product attr="id"}"}
@@ -232,7 +247,7 @@
{/if}
</div>
</section>
</article><!-- /product -->
</article><!-- /#product -->
<ul class="pager">
{if $HAS_PREVIOUS == 1}
@@ -247,9 +262,6 @@
{/if}
</ul>
{/loop}
</div>
</div><!-- /.container -->
</div><!-- /.main -->
{/block}