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
This commit is contained in:
Kevin Granger committed 2013-10-09 20:28:15 +02:00
2 parents 5b509c2c20 6245b05b6e
commit 9de6ec0379
12 files changed
+24 -39
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
+1 -2
View File
@@ -17,13 +17,12 @@
</div> </div>
<div class="col-lg-2"> <div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt="">
{$language.iso_code} {$language.iso_code}
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{foreach from=$languages item=language} {foreach from=$languages item=language}
<li><a href="javascript:hideOtherLanguage({$language.id_lang});" tabindex="-1"><img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt=""> {$language.name}</a></li> <li><a href="javascript:hideOtherLanguage({$language.id_lang});" tabindex="-1">{$language.name}</a></li>
{/foreach} {/foreach}
</ul> </ul>
</div> </div>
admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
-6
View File
@@ -31,12 +31,6 @@
var read_more = '{l s='Read more'}' var read_more = '{l s='Read more'}'
</script> </script>
<div class="page-head">
<h2 class="page-title">
{l s='Dashboard'}
</h2>
</div>
<div id="dashboard"> <div id="dashboard">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
admin-dev/themes/default/template/controllers/products/features.tpl
+1 -3
View File
@@ -82,15 +82,13 @@
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt="">
{$language.iso_code} {$language.iso_code}
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{foreach from=$languages item=language} {foreach from=$languages item=language}
<li> <li>
<a href="javascript:hideOtherLanguage({$language.id_lang});"> <a href="javascript:hideOtherLanguage({$language.id_lang});">{$language.iso_code}</a>
<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt=""> {$language.iso_code}</a>
</li> </li>
{/foreach} {/foreach}
</ul> </ul>
admin-dev/themes/default/template/controllers/products/informations.tpl
+2 -4
View File
@@ -434,15 +434,13 @@
</div> </div>
<div class="col-lg-2"> <div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt=""> {$language.iso_code} {$language.iso_code}
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{foreach from=$languages item=language} {foreach from=$languages item=language}
<li> <li>
<a href="javascript:hideOtherLanguage({$language.id_lang});"> <a href="javascript:hideOtherLanguage({$language.id_lang});">{$language.name}</a>
<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt=""> {$language.name}
</a>
</li> </li>
{/foreach} {/foreach}
</ul> </ul>
admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
+1 -2
View File
@@ -48,14 +48,13 @@
</div> </div>
<div class="col-lg-2"> <div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" tabindex="-1"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" tabindex="-1">
<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt="">
{$language.iso_code} {$language.iso_code}
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{foreach from=$languages item=language} {foreach from=$languages item=language}
<li> <li>
<a href="javascript:hideOtherLanguage({$language.id_lang});"><img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt="" tabindex="-1"> {$language.name}</a> <a href="javascript:hideOtherLanguage({$language.id_lang});">{$language.name}</a>
</li> </li>
{/foreach} {/foreach}
</ul> </ul>
admin-dev/themes/default/template/controllers/products/textarea_lang.tpl
+1 -2
View File
@@ -36,13 +36,12 @@
</div> </div>
<div class="col-lg-2"> <div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt="">
{$language.iso_code} {$language.iso_code}
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{foreach from=$languages item=language} {foreach from=$languages item=language}
<li><a href="javascript:hideOtherLanguage({$language.id_lang});"><img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt=""> {$language.name}</a></li> <li><a href="javascript:hideOtherLanguage({$language.id_lang});">{$language.name}</a></li>
{/foreach} {/foreach}
</ul> </ul>
</div> </div>
admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl
+1 -5
View File
@@ -59,17 +59,13 @@
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown"> <button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt="">
{$language.iso_code} {$language.iso_code}
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{foreach from=$languages item=language_flag} {foreach from=$languages item=language_flag}
<li> <li>
<a href="javascript:hideOtherLanguage({$language_flag.id_lang});" tabindex="-1"> <a href="javascript:hideOtherLanguage({$language_flag.id_lang});" tabindex="-1">{$language_flag.name}</a>
<img src="{$base_url}/img/l/{$language_flag.id_lang|intval}.jpg" alt="">
{$language_flag.name}
</a>
</li> </li>
{/foreach} {/foreach}
</ul> </ul>
admin-dev/themes/default/template/header.tpl
+1 -1
View File
@@ -301,7 +301,7 @@
{* end display_header*} {* end display_header*}
{else} {else}
<body> <body{if isset($lite_display) && $lite_display} class="display-modal"{/if}>
<div id="main"> <div id="main">
<div id="content" class="page-content"> <div id="content" class="page-content">
{/if} {/if}
admin-dev/themes/default/template/helpers/form/form.tpl
+2 -6
View File
@@ -139,13 +139,12 @@
</div> </div>
<div class="col-lg-2"> <div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown"> <button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt="">
{$language.iso_code} {$language.iso_code}
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{foreach from=$languages item=language} {foreach from=$languages item=language}
<li><a href="javascript:hideOtherLanguage({$language.id_lang});" tabindex="-1"><img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt=""> {$language.name}</a></li> <li><a href="javascript:hideOtherLanguage({$language.id_lang});" tabindex="-1">{$language.name}</a></li>
{/foreach} {/foreach}
</ul> </ul>
</div> </div>
@@ -424,16 +423,13 @@
</div> </div>
<div class="col-lg-2"> <div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown"> <button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt="">
{$language.iso_code} {$language.iso_code}
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{foreach from=$languages item=language} {foreach from=$languages item=language}
<li> <li>
<a href="javascript:hideOtherLanguage({$language.id_lang});" tabindex="-1"> <a href="javascript:hideOtherLanguage({$language.id_lang});" tabindex="-1">{$language.name}</a>
<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt=""> {$language.name}
</a>
</li> </li>
{/foreach} {/foreach}
</ul> </ul>
admin-dev/themes/default/template/helpers/form/form_group.tpl
+4 -4
View File
@@ -26,11 +26,11 @@
{if count($groups) && isset($groups)} {if count($groups) && isset($groups)}
<table class="table"> <table class="table">
<thead> <thead>
<th> <th class="fixed-width-xs">
<input type="checkbox" name="checkme" id="checkme" class="noborder" onclick="checkDelBoxes(this.form, 'groupBox[]', this.checked)" /> <span class="title_box"><input type="checkbox" name="checkme" id="checkme" class="noborder" onclick="checkDelBoxes(this.form, 'groupBox[]', this.checked)" /></span>
</th> </th>
<th>{l s='ID'}</th> <th class="fixed-width-xs"><span class="title_box">{l s='ID'}</span></th>
<th>{l s='Group name'}</th> <th><span class="title_box">{l s='Group name'}</span></th>
</thead> </thead>
<tbody> <tbody>
{foreach $groups as $key => $group} {foreach $groups as $key => $group}
admin-dev/themes/default/template/helpers/options/options.tpl
+2 -4
View File
@@ -242,14 +242,13 @@
</div> </div>
<div class="col-lg-2"> <div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<img src="{$base_url}/img/l/{$id_lang|intval}.jpg" alt="">
<!-- name --> <!-- name -->
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{foreach $languages as $language} {foreach $languages as $language}
<li> <li>
<a href="javascript:hideOtherLanguage({$language.id_lang});"><img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt=""> {$language.name}</a> <a href="javascript:hideOtherLanguage({$language.id_lang});">{$language.name}</a>
</li> </li>
{/foreach} {/foreach}
</ul> </ul>
@@ -271,14 +270,13 @@
</div> </div>
<div class="col-lg-2"> <div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<img src="{$base_url}/img/l/{$id_lang|intval}.jpg" alt="">
<!-- name --> <!-- name -->
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{foreach $languages as $language} {foreach $languages as $language}
<li> <li>
<a href="javascript:hideOtherLanguage({$language.id_lang});"><img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt=""> {$language.name}</a> <a href="javascript:hideOtherLanguage({$language.id_lang});">{$language.name}</a>
</li> </li>
{/foreach} {/foreach}
</ul> </ul>
controllers/admin/AdminDashboardController.php
+8
View File
@@ -52,6 +52,14 @@ class AdminDashboardControllerCore extends AdminController
__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/nv.d3.css', __PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/nv.d3.css',
)); ));
} }
public function initPageHeaderToolbar()
{
parent::initPageHeaderToolbar();
$this->page_header_toolbar_title = $this->l('Dashboard');
$this->page_header_toolbar_btn = array();
}
protected function getOptionFields() protected function getOptionFields()
{ {