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:
Jerome Nadaud
2013-10-25 15:55:39 +02:00
parent f89c8ed008 aa322e4777
commit f472f3e848
18 changed files with 365 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+4 -5
View File
File diff suppressed because one or more lines are too long
admin-dev/themes/default/css/admin-theme.sass
+4 -5
View File
@@ -116,12 +116,10 @@ input[type="text"],input[type="search"],input[type="password"], textarea, select
.panel-footer
margin: 15px -20px -20px
height: 73px
.panel-footer
.btn.pull-right
margin-left: 3px
//todo: fix focus firefox
*:focus
outline: none!important
-moz-outline: none!important
-moz-user-focus: ignore!important
//components
@import "admin-theme/admin-header"
@@ -142,3 +140,4 @@ input[type="text"],input[type="search"],input[type="password"], textarea, select
@import "admin-theme/admin-carrier-wizard"
@import "admin-theme/admin-modules"
@import "admin-theme/admin-dashboard"
@import "admin-theme/admin-search"
admin-dev/themes/default/css/admin-theme/_admin-search.sass
+8
View File
@@ -0,0 +1,8 @@
.adminsearch
#content
.panel .panel
padding: 0
margin: 0
border: none
@include border-radius(0)
@include box-shadow(0)
admin-dev/themes/default/template/controllers/login/content.tpl
+4 -4
View File
@@ -79,7 +79,7 @@
</div>
<div class="form-group">
<a href="#" class="show-forgot-password pull-right" >
{l s='Lost password'}&hellip;
{l s='Lost password'}
</a>
<label class="control-label" for="passwd">
{l s='Password'}
@@ -138,16 +138,16 @@
id="email_forgot"
class="form-control"
autofocus="autofocus"
tabindex="1"
tabindex="5"
placeholder="test@example.com" />
</div>
</div>
<div class="panel-footer">
<button href="#" class="btn btn-default show-login-form" tabindex="3">
<button href="#" class="btn btn-default show-login-form" tabindex="7">
<i class="icon-caret-left"></i>
{l s='Back to login'}
</button>
<button class="btn btn-default pull-right" name="submitLogin" type="submit" tabindex="2">
<button class="btn btn-default pull-right" name="submitLogin" type="submit" tabindex="6">
<i class="icon-ok text-success"></i>
{l s='Send'}
</button>
admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
+66 -43
View File
@@ -29,19 +29,32 @@ $(function() {
});
</script>
{if isset($features)}
<div class="panel">
{if !$features}
<h3>{l s='No features matching your query'} : {$query}</h3>
{if !$nb_results}
<h2>{l s='There are no results matching your query "%s".' sprintf=$query}</h2>
{else}
<h2>
{if $nb_results == 1}
{l s='1 result matches your query "%s".' sprintf=$query}
{else}
<h3>{l s='Features matching your query'} : {$query}</h3>
{l s='%d results match your query "%s".' sprintf=[$nb_results|intval, $query]}
{/if}
</h2>
{if isset($features)}
<div class="panel">
<h3>
{if $features|@count == 1}
{l s='1 feature'}
{else}
{l s='%d features' sprintf=$features|@count}
{/if}
</h3>
<table class="table">
<tbody>
{foreach $features key=key item=feature}
{foreach $feature key=k item=val name=feature_list}
<tr>
<td><strong>{if $smarty.foreach.feature_list.first}{$key}{/if}</strong></td>
<td>
<a href="{$val.link}">{$val.value}</a>
</td>
@@ -50,16 +63,18 @@ $(function() {
{/foreach}
</tbody>
</table>
{/if}
</div>
{/if}
{/if}
{if isset($modules)}
{if isset($modules) && $modules}
<div class="panel">
{if !$modules}
<h3>{l s='No modules matching your query'} : {$query}</h3>
{else}
<h3>{l s='Modules matching your query'} : {$query}</h3>
<h3>
{if $modules|@count == 1}
{l s='1 module'}
{else}
{l s='%d modules' sprintf=$modules|@count}
{/if}
</h3>
<table class="table">
<tbody>
{foreach $modules key=key item=module}
@@ -70,16 +85,18 @@ $(function() {
{/foreach}
</tbody>
</table>
{/if}
</div>
{/if}
{/if}
{if isset($categories)}
{if isset($categories) && $categories}
<div class="panel">
{if !$categories}
<h3>{l s='No categories matching your query'} : {$query}</h3>
{else}
<h3>{l s='Categories matching your query'} : {$query}</h3>
<h3>
{if $categories|@count == 1}
{l s='1 category'}
{else}
{l s='%d categories' sprintf=$categories|@count}
{/if}
</h3>
<table cellspacing="0" cellpadding="0" class="table">
{foreach $categories key=key item=category}
<tr class="alt_row">
@@ -87,39 +104,45 @@ $(function() {
</tr>
{/foreach}
</table>
{/if}
</div>
{/if}
{/if}
{if isset($products)}
{if isset($products) && $products}
<div class="panel">
{if !$products}
<h3>{l s='There are no products matching your query'} : {$query}</h3>
{else}
<h3>{l s='Products matching your query'} : {$query}</h3>
<h3>
{if $products|@count == 1}
{l s='1 product'}
{else}
{l s='%d products' sprintf=$products|@count}
{/if}
</h3>
{$products}
{/if}
</div>
{/if}
{/if}
{if isset($customers)}
{if isset($customers) && $customers}
<div class="panel">
{if !$customers}
<h3>{l s='There are no customers matching your query'} : {$query}</h3>
{else}
<h3>{l s='Customers matching your query'} : {$query}</h3>
<h3>
{if $customers|@count == 1}
{l s='1 customer'}
{else}
{l s='%d customers' sprintf=$customers|@count}
{/if}
</h3>
{$customers}
{/if}
</div>
{/if}
{/if}
{if isset($orders)}
{if isset($orders) && $orders}
<div class="panel">
{if !$orders}
<h3>{l s='There are no orders matching your query'} : {$query}</h3>
{else}
<h3>{l s='Orders matching your query'} : {$query}</h3>
<h3>
{if $orders|@count == 1}
{l s='1 order'}
{else}
{l s='%d orders' sprintf=$orders|@count}
{/if}
</h3>
{$orders}
{/if}
</div>
{/if}
{/if}
{/if}
admin-dev/themes/default/template/header.tpl
+1 -1
View File
@@ -105,7 +105,7 @@
</head>
{if $display_header}
<body class="{if $employee->bo_menu}page-sidebar {* page-sidebar-closed *}{else}page-topbar{/if}">
<body class="{if $employee->bo_menu}page-sidebar {* page-sidebar-closed *}{else}page-topbar{/if} {$smarty.get.controller|escape|strtolower}">
{* begin HEADER *}
<header id="header">