Suite à MAJ 2.3.4, il manquait des choses dans des templates

This commit is contained in:
2020-05-03 09:13:06 +02:00
parent 35a800ca0e
commit 3f71343401
212 changed files with 1396 additions and 7451 deletions

View File

@@ -25,8 +25,8 @@
<select name="additional_folder_id" id="additional_folder_id" class="form-control">
<option value="">{intl l='Select a folder...'}</option>
{loop name="folders" type="folder-tree" folder="0" exclude=$exclude_from_tree backend_context="1" lang="$edit_language_id" return_url=false}
<option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px" {if $DEFAULT_FOLDER==$ID}disabled="disabled"{/if}>
{$TITLE} {if $DEFAULT_FOLDER==$ID}{intl l=' (default)'}{/if}
<option value="{$ID}" {if $DEFAULT_FOLDER==$ID}disabled="disabled"{/if}>
{option_offset l=$LEVEL label={$TITLE}}{if $DEFAULT_FOLDER==$ID}{intl l=' (default)'}{/if}
</option>
{/loop}
</select>
@@ -97,4 +97,4 @@
</div>
{* -- End folders management ------------------------------------- *}
</div>
</div>
</div>

View File

@@ -73,20 +73,15 @@
</li>
{loop name="order-status-list" type="order-status"}
{assign "orderStatusCode" "order_$CODE"}
{if #$orderStatusCode# == ''}
{assign "defaultLabel" "label-default"}
{assign "orderStatusLabel" $CODE}
{else}
{assign "defaultLabel" ''}
{assign "orderStatusLabel" #$orderStatusCode#}
{/if}
{$count = {count type="order" customer="*" backend_context="1" status={$ID}}}
{if $count}
<li role="menuitem">
<a class="clearfix" data-target="{url path="admin/orders/$LABEL"}" href="{url path="admin/orders" status={$ID}}">
<span class="pull-left">{$TITLE}</span>
<span class="label {$defaultLabel} label-{$orderStatusLabel} pull-right">{count type="order" customer="*" backend_context="1" status={$ID}}</span>
<span class="label pull-right" style="background-color: {$COLOR};">{$count}</span>
</a>
</li>
{/if}
{/loop}
{hookblock name="main.top-menu-order" fields="id,class,url,title"}
{forhook rel="main.top-menu-order"}

View File

@@ -72,9 +72,12 @@
</thead>
<tbody>
{loop type="module" name="module.{$module_type}" module_type={$module_type|default:1} order=$module_order backend_context=1}
{$hidden = $smarty.post.hidden|default:'0'}
{loop type="module" name="module.{$module_type}" module_type={$module_type|default:1} order=$module_order backend_context=1 hidden=$hidden }
{loop type="auth" role="ADMIN" name="can_view_module.{$module_type}" access="VIEW" resource="admin.module" module=$CODE}
<tr id="module-{$ID}" {if ! $EXISTS}class="warning"{/if}>
<tr id="module-{$ID}" {if ! $EXISTS || $MANDATORY}class="warning"{/if}>
<td>{$ID}</td>
<td nowrap>
<a href="#" class="module-information text-info" data-id="{$ID}" title="{intl l='Get more information about this module'}"><span class="glyphicon glyphicon-question-sign"></span></a>
@@ -86,7 +89,9 @@
{if $EXISTS}
<td class="text-center">
<div class="make-switch switch-small module-activation" data-id="{$ID}" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
{if $MANDATORY ne 1 || $ACTIVE eq 0}
<div class="make-switch switch-small module-activation" data-mandatory="{$MANDATORY}" data-id="{$ID}" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
<input type="checkbox" {if $ACTIVE}checked{/if}>
</div>
<noscript>
@@ -96,6 +101,10 @@
<a title="{intl l="activate %title module" title={$TITLE}}" href="{url path="/admin/module/toggle-activation/%id" id=$ID}">{intl l="activation"}</a>
{/if}
</noscript>
{else}
<i class="glyphicon glyphicon-ban-circle text-danger" aria-hidden="true"></i>
{/if}
</td>
<td class="text-center">
@@ -116,7 +125,7 @@
</td>
{/if}
{hook name="modules.table-row" location="modules_table_row" }
{hook name="modules.table-row" location="modules_table_row" module_code={$CODE} }
<td class="actions">
{if $module_type == 2}
@@ -165,9 +174,11 @@
{/loop}
{/if}
{if $MANDATORY ne 1}
{loop type="auth" name="can_delete" role="ADMIN" resource="admin.module" access="DELETE"}
<a class="module-delete-action" title="{intl l='Delete this module'}" href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
{/loop}
{/if}
</div>
</td>
</tr>

View File

@@ -1,4 +1,4 @@
<div class="col-md-8 install-module-col">
<div class="col-md-6 install-module-col">
<div class="general-block-decorator">
<div class="title title-without-tabs">
@@ -40,19 +40,41 @@
</div>
</div>
<div class="col-md-4 install-module-col">
<div class="col-md-6 install-module-col">
<div class="general-block-decorator">
<div class="title title-without-tabs">
{intl l="Search a module"}
</div>
<p>{intl l="Discover all our modules on <a href='http://thelia.net/modules' target='_blank'>Thelia Modules</a> !"}</p>
<form action="http://thelia.net/modules/search" method="get" target="_blank">
<div class="input-group">
<input type="text" class="form-control" id="q" name="q" placeholder="{intl l='Search on Thelia Modules'}">
<span class="input-group-btn">
<button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-search"></span></button>
</span>
<div class="row">
<div class="col-md-7">
<p>{intl l="Discover all our modules on <a href='http://thelia.net/modules' target='_blank'>Thelia Modules</a> !"}</p>
<form action="http://thelia.net/modules/search" method="get" target="_blank">
<div class="input-group">
<input type="text" class="form-control" id="q" name="q" placeholder="{intl l='Search on Thelia Modules'}">
<span class="input-group-btn">
<button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-search"></span></button>
</span>
</div>
</form>
</div>
</form>
<div class="col-md-5">
<p>{intl l="Display protected modules ?"}</p>
<form action="{url path="admin/modules"}" method="post">
{$visible = $smarty.post.visible|default:'0'}
<div class="input-group">
<select name="hidden" class="form-control">
<option value="0">{intl l='No'}</option>
<option value="1" {if $visible} selected {/if}>{intl l='Yes'}</option>
</select>
<span class="input-group-btn">
<button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-eye-open"></span></button>
</span>
</div>
</form>
</div>
</div>
</div>
</div>

View File

@@ -1,5 +1,9 @@
{capture name="module_include"}
{hook name="$hook" location="$location" id="$id" view="$view" countvar="module_count"}
{if $location}
{hook name="$hook" location="$location" id="$id" view="$view" countvar="module_count"}
{else}
{hook name="$hook" id="$id" view="$view" countvar="module_count"}
{/if}
{/capture}
{if trim($smarty.capture.module_include) == ''}

View File

@@ -64,7 +64,7 @@
<option value="0" disabled>{intl l="Top level"}</option>
{loop name="cat-parent" type="category-tree" category="0" visible="*" product="0" return_url=false}
<option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px" {if $DEFAULT_CATEGORY == $ID}selected="selected"{/if}>{$TITLE}</option>
<option value="{$ID}" {if $DEFAULT_CATEGORY == $ID}selected="selected"{/if}>{option_offset l=$LEVEL+1 label={$TITLE}}</option>
{/loop}
</select>

View File

@@ -427,7 +427,7 @@
{/form_field}
{form_field field='weight' value_key=$idx}
<td {if $error}class="has-error"{/if}><input required class="form-control text-right input-sm" type="text" name="{$name}" value="{$value}" /></td>
<td {if $error}class="has-error"{/if}><input class="form-control text-right input-sm" type="text" name="{$name}" value="{$value}" /></td>
{/form_field}
@@ -694,7 +694,7 @@
</ul>
</div>
</div>
{loop type="product_sale_elements" name="product_sale_elements_combination_form" product=$product_id default="yes"}
{loop type="product_sale_elements" name="product_sale_elements_combination_form" product=$product_id default="yes" limit=1 backend_context=1}
<div class="col-md-6">
{form_field field='price'}
<div class="form-group {if $error}has-error{/if}">