dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source 
Conflicts:
	admin-dev/themes/default/template/controllers/modules/configure.tpl
This commit is contained in:
Kevin Granger
2013-11-18 10:23:23 +01:00
parent a0f73d20e5 68c8e9da57
commit 73ec191fb0
140 changed files with 3166 additions and 1338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl
+1 -1
View File
@@ -32,7 +32,7 @@
</button>
<ul class="dropdown-menu">
{foreach from=$module_languages item=language}
<li><a href="{$tradlink}{$language['iso_code']}#{$module_name}">{$language.name}</a></li>
<li><a href="{$trad_link}{$language['iso_code']}#{$module_name}">{$language.name}</a></li>
{/foreach}
</ul>
</div>
admin-dev/themes/default/template/controllers/modules/configure.tpl
+21 -3
View File
@@ -25,19 +25,37 @@
<div class="bootstrap">
<div class="page-head">
<h2 class="page-title">
{l s='Configure'} : {$module_name}
{l s='Configure:'} {$module_display_name} ({$module_name})
</h2>
<div class="page-bar toolbarBox">
<div class="btn-toolbar">
<ul class="cc_button nav nav-pills pull-right">
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_hooklink}" title="{l s='Manage hooks'}">
<a id="desc-module-hook" class="toolbar_btn" href="{$module_disable_link}" title="{l s='Disable'}">
<i class="process-icon-off"></i>
<div>{l s='Disable'}</div>
</a>
</li>
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_uninstall_link}" title="{l s='Uninstall'}">
<i class="process-icon-minus-sign-alt"></i>
<div>{l s='Uninstall'}</div>
</a>
</li>
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_reset_link}" title="{l s='Reset'}">
<i class="process-icon-share-alt"></i>
<div>{l s='Reset'}</div>
</a>
</li>
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_hook_link}" title="{l s='Manage hooks'}">
<i class="process-icon-anchor"></i>
<div>{l s='Manage hooks'}</div>
</a>
</li>
<li>
<a id="desc-module-back" class="toolbar_btn" href="{$backlink}" title="{l s='Back'}">
<a id="desc-module-back" class="toolbar_btn" href="{$back_link}" title="{l s='Back'}">
<i class="process-icon-back" ></i>
<div>{l s='Back'}</div>
</a>