Merge branch 'master' of https://github.com/thelia/thelia
This commit is contained in:
@@ -261,7 +261,23 @@
|
||||
</div>
|
||||
|
||||
<div class="tab-pane fade" id="modules">
|
||||
{module_include location='category-edit'}
|
||||
<div class="form-container">
|
||||
{include
|
||||
file = "includes/inner-form-toolbar.html"
|
||||
hide_submit_buttons = true
|
||||
page_url = {$pageUrl}
|
||||
close_url = {$closeUrl}
|
||||
current_tab = "modules"
|
||||
}
|
||||
</div>
|
||||
|
||||
{module_include location='category-edit' countvar='module_count'}
|
||||
|
||||
{if $countvar == 0}
|
||||
<div class="alert alert-info">
|
||||
{intl l="There is currently no active module here."}
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -97,7 +97,7 @@
|
||||
{$myparent=$DEFAULT_FOLDER}
|
||||
{loop name="fold-parent" type="folder-tree" visible="*" folder="0"}
|
||||
<option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px" {if $myparent == $ID}selected="selected"{/if}>{$TITLE}</option>
|
||||
{/loop }
|
||||
{/loop}
|
||||
|
||||
</select>
|
||||
</div>
|
||||
@@ -156,7 +156,23 @@
|
||||
</div>
|
||||
|
||||
<div class="tab-pane fade" id="modules">
|
||||
{module_include location='content-edit'}
|
||||
<div class="form-container">
|
||||
{include
|
||||
file = "includes/inner-form-toolbar.html"
|
||||
hide_submit_buttons = true
|
||||
page_url = {$pageUrl}
|
||||
close_url = {$closeUrl}
|
||||
current_tab = "modules"
|
||||
}
|
||||
</div>
|
||||
|
||||
{module_include location='content-edit' countvar='module_count'}
|
||||
|
||||
{if $countvar == 0}
|
||||
<div class="alert alert-info">
|
||||
{intl l="There is currently no active module here."}
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -142,7 +142,23 @@
|
||||
</div>
|
||||
|
||||
<div class="tab-pane fade" id="modules">
|
||||
{module_include location='folder-edit'}
|
||||
<div class="form-container">
|
||||
{include
|
||||
file = "includes/inner-form-toolbar.html"
|
||||
hide_submit_buttons = true
|
||||
page_url = {$pageUrl}
|
||||
close_url = {$closeUrl}
|
||||
current_tab = "modules"
|
||||
}
|
||||
</div>
|
||||
|
||||
{module_include location='folder-edit' countvar='module_count'}
|
||||
|
||||
{if $countvar == 0}
|
||||
<div class="alert alert-info">
|
||||
{intl l="There is currently no active module here."}
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -16,7 +16,12 @@ Parameters:
|
||||
<ul class="nav nav-pills">
|
||||
{loop name="lang_list" type="lang"}
|
||||
<li {if $ID == $edit_language_id}class="active"{/if}>
|
||||
<a class="language-change-button" data-language-id="{$ID}" href="{url path={$page_url|default:$current_url nofilter} edit_language_id=$ID}" title="{intl l='Edit information in %lng' lng=$TITLE}">
|
||||
{if $current_tab}
|
||||
{$lang_url = {url path={$page_url|default:$current_url nofilter} edit_language_id=$ID current_tab=$current_tab}}
|
||||
{else}
|
||||
{$lang_url = {url path={$page_url|default:$current_url nofilter} edit_language_id=$ID}}
|
||||
{/if}
|
||||
<a class="language-change-button" data-language-id="{$ID}" href="{$lang_url nofilter}" title="{intl l='Edit information in %lng' lng=$TITLE}">
|
||||
<img src="{image file="../assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" />
|
||||
</a>
|
||||
</li>
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
hide_submit_buttons = false
|
||||
page_url = {$pageUrl}
|
||||
close_url = {$closeUrl}
|
||||
current_tab = "seo"
|
||||
}
|
||||
|
||||
{* Hidden field *}
|
||||
|
||||
@@ -109,7 +109,23 @@
|
||||
</div>
|
||||
|
||||
<div class="tab-pane fade" id="modules">
|
||||
{module_include location='product-edit'}
|
||||
<div class="form-container">
|
||||
{include
|
||||
file = "includes/inner-form-toolbar.html"
|
||||
hide_submit_buttons = true
|
||||
page_url = {$pageUrl}
|
||||
close_url = {$closeUrl}
|
||||
current_tab = "modules"
|
||||
}
|
||||
</div>
|
||||
|
||||
{module_include location='product-edit' countvar='module_count'}
|
||||
|
||||
{if $countvar == 0}
|
||||
<div class="alert alert-info">
|
||||
{intl l="There is currently no active module here."}
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user