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

Add import description

Browse Source 
modifié:         core/lib/Thelia/Config/Resources/import.xml
	modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductStockImport.php
	modifié:         templates/backOffice/default/ajax/export-modal.html
	modifié:         templates/backOffice/default/ajax/import-modal.html
	modifié:         templates/backOffice/default/export-page.html
	modifié:         templates/backOffice/default/export.html
	modifié:         templates/backOffice/default/import-page.html
	modifié:         templates/backOffice/default/import.html
This commit is contained in:
Benjamin Perche
2014-07-22 16:35:25 +02:00
parent 8a39b1215e
commit 749d55102c
8 changed files with 115 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
templates/backOffice/default/ajax/export-modal.html
View File

@@ -9,6 +9,15 @@
<h4 class="modal-title" id="export-modal-label">Export: {$TITLE}</h4>
</div>
<div class="modal-body">
{if $DESCRIPTION}
<div class="row">
<div class="col-md-12">
<div class="alert alert-info">
{$DESCRIPTION nofilter}
</div>
</div>
</div>
{/if}
<div class="row">
<div class="col-md-12">
{ifloop rel="export-formatters"}

9
templates/backOffice/default/ajax/import-modal.html
View File

@@ -9,6 +9,15 @@
<h4 class="modal-title" id="import-modal-label">Import: {$TITLE}</h4>
</div>
<div class="modal-body">
{if $DESCRIPTION}
<div class="row">
<div class="col-md-12">
<div class="alert alert-info">
{$DESCRIPTION nofilter}
</div>
</div>
</div>
{/if}
<div class="row">
<div class="col-md-12">
{form_field form=$form field="language"}

10
templates/backOffice/default/export-page.html
View File

@@ -39,6 +39,16 @@
{intl l='Export'}: {$TITLE}
</div>
{if $DESCRIPTION}
<div class="row">
<div class="col-md-12">
<div class="alert alert-info">
{$DESCRIPTION nofilter}
</div>
</div>
</div>
{/if}
<form action="{$URL}" method="post" {form_enctype form=$form}>
{form_hidden_fields form=$form}
<div class="row">

2
templates/backOffice/default/export.html
View File

@@ -100,7 +100,7 @@
<a href="#category_{$category_title}" class="btn-show-export-modal" data-id="{$ID}" data-url="{$URL}">{$TITLE}</a>
</td>
<td>
{$DESCRIPTION}
{$DESCRIPTION nofilter}
</td>
<td>
<a href="{url path="/admin/export/position/up/{if $url_category}?{$url_category}{/if}{$ID}#category_{$category_title}"}">

9
templates/backOffice/default/import-page.html
View File

@@ -46,6 +46,15 @@
{intl l='Import'}: {$TITLE}
</div>
{if $DESCRIPTION}
<div class="row">
<div class="col-md-12">
<div class="alert alert-info">
{$DESCRIPTION nofilter}
</div>
</div>
</div>
{/if}
<form action="{$URL}" method="post" {form_enctype form=$form}>
{form_hidden_fields form=$form}
<div class="row">

46
templates/backOffice/default/import.html
View File

@@ -51,29 +51,26 @@
{$TITLE}
</caption>
<thead>
<tr>
<th class="col-md-1">
<a href="{url path="/admin/import"}?{if $url_category}{$url_category}&{/if}import_order=id{if $import_order == "id"}_reverse{/if}">
{intl l="ID"}
</a>
</th>
<th class="col-md-2">
<a href="{url path="/admin/import"}?{if $url_category}{$url_category}&{/if}import_order=alpha{if $import_order == "alpha"}_reverse{/if}">
{intl l="Name"}
</a>
</th>
<th class="col-md-6">
{intl l="Description"}
</th>
<th class="col-md-2">
<a href="{url path="/admin/import"}?{if $url_category}{$url_category}&{/if}import_order=manual{if $import_order == "manual"}_reverse{/if}">
{intl l="Position"}
</a>
</th>
<th class="col-md-1">
{intl l="Actions"}
</th>
</tr>
<tr>
<th class="col-md-1">
<a href="{url path="/admin/import"}?{if $url_category}{$url_category}&{/if}import_order=id{if $import_order == "id"}_reverse{/if}">
{intl l="ID"}
</a>
</th>
<th class="col-md-8">
<a href="{url path="/admin/import"}?{if $url_category}{$url_category}&{/if}import_order=alpha{if $import_order == "alpha"}_reverse{/if}">
{intl l="Name"}
</a>
</th>
<th class="col-md-2">
<a href="{url path="/admin/import"}?{if $url_category}{$url_category}&{/if}import_order=manual{if $import_order == "manual"}_reverse{/if}">
{intl l="Position"}
</a>
</th>
<th class="col-md-1">
{intl l="Actions"}
</th>
</tr>
</thead>
<tbody>
{loop name="import-categ-list" type="import" order=$import_order category=$ID}
@@ -84,9 +81,6 @@
<td>
<a href="#category_{$category_title}" class="btn-show-import-modal" data-id="{$ID}" data-url="{$URL}">{$TITLE}</a>
</td>
<td>
{$DESCRIPTION}
</td>
<td>
<a href="{url path="/admin/import/position/up/{if $url_category}?{$url_category}{/if}{$ID}"}">
<span class="glyphicon glyphicon-arrow-up"></span>