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

// fixs btn-group

Browse Source
This commit is contained in:
Kevin Granger
2013-10-29 18:10:07 +01:00
parent 5fa36abcaf
commit aee725839e
6 changed files with 104 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+1 -1
View File
File diff suppressed because one or more lines are too long
admin-dev/themes/default/css/admin-theme/_admin-forms.sass
+2
View File
@@ -68,6 +68,8 @@ textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[ty
text-align: left
.btn-group-action
width: 175px
.btn-group
float: right
a
text-decoration: none
admin-dev/themes/default/template/controllers/modules/list.tpl
+60 -58
View File
@@ -109,67 +109,69 @@
</div>
</td>
<td>
<div class="btn-group btn-group-action">
{if isset($module->type) && $module->type == 'addonsMustHave'}
<a class="btn btn-default" href="{$module->addons_buy_url}" target="_blank">
<i class="icon-shopping-cart"></i> &nbsp;{if isset($module->id_currency) && isset($module->price)}{displayPrice price=$module->price currency=$module->id_currency}{/if}
</a>
{else}
{if isset($module->id) && $module->id gt 0}
{if isset($module->version_addons) && $module->version_addons}
<a class="btn btn-warning" href="{$module->options.update_url}">
<i class="icon-refresh"></i> {l s='Update it!'}
</a>
{elseif !isset($module->not_on_disk)}
{if $module->optionsHtml|count > 0}
{assign var=option value=$module->optionsHtml[0]}
{$option}
{/if}
{else}
<a class="btn btn-danger" {if !empty($module->options.uninstall_onclick)}onclick="{$module->options.uninstall_onclick}"{/if} href="{$module->options.uninstall_url}">
<i class="icon-minus-sign-alt"></i>&nbsp;{l s='Uninstall'}
</a>
{/if}
{else}
<a class="btn btn-success" href="{$module->options.install_url}">
<i class="icon-plus-sign-alt"></i>&nbsp;{l s='Install'}
<div class="btn-group-action">
<div class="btn-group">
{if isset($module->type) && $module->type == 'addonsMustHave'}
<a class="btn btn-default" href="{$module->addons_buy_url}" target="_blank">
<i class="icon-shopping-cart"></i> &nbsp;{if isset($module->id_currency) && isset($module->price)}{displayPrice price=$module->price currency=$module->id_currency}{/if}
</a>
{/if}
{if !isset($module->not_on_disk)}
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" >
<span class="caret">&nbsp;</span>
</button>
<ul class="dropdown-menu">
{foreach $module->optionsHtml key=key item=option}
{if $key != 0}
<li>{$option}</li>
{/if}
{/foreach}
{if isset($module->preferences) && isset($module->preferences['favorite']) && $module->preferences['favorite'] == 1}
<li>
<a class="action_module action_unfavorite toggle_favorite" data-module="{$module->name}" data-value="0" href="#">
<i class="icon-star"></i> {l s='Remove from Favorites'}
</a>
<a class="action_module action_favorite toggle_favorite" data-module="{$module->name}" data-value="1" href="#" style="display: none;">
<i class="icon-star"></i> {l s='Mark as Favorite'}
</a>
</li>
{else}
<li>
<a class="action_module action_unfavorite toggle_favorite" data-module="{$module->name}" data-value="0" href="#" style="display: none;">
<i class="icon-star"></i> {l s='Remove from Favorites'}
</a>
<a class="action_module action_favorite toggle_favorite" data-module="{$module->name}" data-value="1" href="#">
<i class="icon-star"></i> {l s='Mark as Favorite'}
</a>
</li>
{/if}
</ul>
{else}
&nbsp;
{if isset($module->id) && $module->id gt 0}
{if isset($module->version_addons) && $module->version_addons}
<a class="btn btn-warning" href="{$module->options.update_url}">
<i class="icon-refresh"></i> {l s='Update it!'}
</a>
{elseif !isset($module->not_on_disk)}
{if $module->optionsHtml|count > 0}
{assign var=option value=$module->optionsHtml[0]}
{$option}
{/if}
{else}
<a class="btn btn-danger" {if !empty($module->options.uninstall_onclick)}onclick="{$module->options.uninstall_onclick}"{/if} href="{$module->options.uninstall_url}">
<i class="icon-minus-sign-alt"></i>&nbsp;{l s='Uninstall'}
</a>
{/if}
{else}
<a class="btn btn-success" href="{$module->options.install_url}">
<i class="icon-plus-sign-alt"></i>&nbsp;{l s='Install'}
</a>
{/if}
{if !isset($module->not_on_disk)}
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" >
<span class="caret">&nbsp;</span>
</button>
<ul class="dropdown-menu">
{foreach $module->optionsHtml key=key item=option}
{if $key != 0}
<li>{$option}</li>
{/if}
{/foreach}
{if isset($module->preferences) && isset($module->preferences['favorite']) && $module->preferences['favorite'] == 1}
<li>
<a class="action_module action_unfavorite toggle_favorite" data-module="{$module->name}" data-value="0" href="#">
<i class="icon-star"></i> {l s='Remove from Favorites'}
</a>
<a class="action_module action_favorite toggle_favorite" data-module="{$module->name}" data-value="1" href="#" style="display: none;">
<i class="icon-star"></i> {l s='Mark as Favorite'}
</a>
</li>
{else}
<li>
<a class="action_module action_unfavorite toggle_favorite" data-module="{$module->name}" data-value="0" href="#" style="display: none;">
<i class="icon-star"></i> {l s='Remove from Favorites'}
</a>
<a class="action_module action_favorite toggle_favorite" data-module="{$module->name}" data-value="1" href="#">
<i class="icon-star"></i> {l s='Mark as Favorite'}
</a>
</li>
{/if}
</ul>
{else}
&nbsp;
{/if}
{/if}
{/if}
</div>
</div>
</td>
</tr>
admin-dev/themes/default/template/controllers/modules/page.tpl
+5 -2
View File
@@ -87,8 +87,11 @@
<div class="categoriesTitle col-lg-3">
<div class="list-group">
<form id="filternameForm" method="post" class="list-group-item form-horizontal">
<div class="input-group col-lg-12">
<input placeholder="{l s='Search'}" type="text" value="" name="moduleQuicksearch" id="moduleQuicksearch" autocomplete="off" />
<div class="input-group">
<input class="form-control" placeholder="{l s='Search'}" type="text" value="" name="moduleQuicksearch" id="moduleQuicksearch" autocomplete="off" />
<div class="input-group-addon">
<i class="icon-search"></i>
</div>
</div>
</form>
<a class="list-group-item {if isset($categoryFiltered.favorites)}active{/if}" href="{$currentIndex}&token={$token}&filterCategory=favorites">
admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_content.tpl
+18 -15
View File
@@ -128,21 +128,24 @@
{/if}
{/foreach}
{if $compiled_actions|count > 0}
<div class="btn-group{if $compiled_actions|count > 1} btn-group-action{/if}">
{$compiled_actions[0]|regex_replace:'/class\s*=\s*"(\w*)"/':'class="$1 btn btn-default"'}
{if $compiled_actions|count > 1}
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>&nbsp;
</button>
<ul class="dropdown-menu">
{foreach $compiled_actions AS $key => $action}
{if $key != 0}
<li>
{$action}
</li>
{/if}
{/foreach}
</ul>
{if $compiled_actions|count > 1}<div class="btn-group-action">{/if}
<div class="btn-group">
{$compiled_actions[0]|regex_replace:'/class\s*=\s*"(\w*)"/':'class="$1 btn btn-default"'}
{if $compiled_actions|count > 1}
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>&nbsp;
</button>
<ul class="dropdown-menu">
{foreach $compiled_actions AS $key => $action}
{if $key != 0}
<li>
{$action}
</li>
{/if}
{/foreach}
</ul>
{/if}
</div>
{/if}
</div>
{/if}
admin-dev/themes/default/template/helpers/list/list_content.tpl
+18 -15
View File
@@ -151,21 +151,24 @@
{/if}
{/foreach}
{if $compiled_actions|count > 0}
<div class="btn-group{if $compiled_actions|count > 1} btn-group-action{/if}">
{$compiled_actions[0]|regex_replace:'/class\s*=\s*"(\w*)"/':'class="$1 btn btn-default"'}
{if $compiled_actions|count > 1}
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>&nbsp;
</button>
<ul class="dropdown-menu">
{foreach $compiled_actions AS $key => $action}
{if $key != 0}
<li>
{$action}
</li>
{/if}
{/foreach}
</ul>
{if $compiled_actions|count > 1}<div class="btn-group-action">{/if}
<div class="btn-group">
{$compiled_actions[0]|regex_replace:'/class\s*=\s*"(\w*)"/':'class="$1 btn btn-default"'}
{if $compiled_actions|count > 1}
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>&nbsp;
</button>
<ul class="dropdown-menu">
{foreach $compiled_actions AS $key => $action}
{if $key != 0}
<li>
{$action}
</li>
{/if}
{/foreach}
</ul>
{/if}
</div>
{/if}
</div>
{/if}