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

// fixs UI

Browse Source
This commit is contained in:
Kevin Granger
2013-10-29 17:32:57 +01:00
parent c7fe91a0a9
commit 5fa36abcaf
13 changed files with 74 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+2 -2
View File
File diff suppressed because one or more lines are too long
admin-dev/themes/default/css/admin-theme.sass
-3
View File
@@ -4,9 +4,6 @@
@import "admin-theme/_bootstrap-init" @import "admin-theme/_bootstrap-init"
@import "admin-theme/_font-awesome" @import "admin-theme/_font-awesome"
@import url(http://fonts.googleapis.com/css?family=Josefin+Sans:200,400,700)
html, body html, body
min-height: 100% min-height: 100%
height: 100% height: 100%
admin-dev/themes/default/css/admin-theme/_admin-date-range-picker.sass
+6 -3
View File
@@ -7,7 +7,6 @@ $color-calendar-day: $color-bright
$color-calendar-outrange: #ccc $color-calendar-outrange: #ccc
$color-calendar-day-selected: $color-calendar $color-calendar-day-selected: $color-calendar
$color-calendar-day-selected-compare: $color-calendar-compare $color-calendar-day-selected-compare: $color-calendar-compare
@@ -214,8 +213,12 @@ $color-calendar-range-compare: lighten($color-calendar-compare,10%)
&.old &.old
color: $color-calendar-outrange color: $color-calendar-outrange
th th
&.next, &.prev &.next
width: 2em text-align: right
padding: 0 10px 0 0
&.prev
text-align: left
padding: 0 0 0 10px
&.next, &.prev, &.month-switch &.next, &.prev, &.month-switch
font-size: 1.3em font-size: 1.3em
line-height: 2em line-height: 2em
admin-dev/themes/default/css/admin-theme/_admin-header.sass
+11
View File
@@ -6,6 +6,17 @@
#header_shopname #header_shopname
@extend .navbar-brand @extend .navbar-brand
font: 300 1.3em/100% $headings-font-family font: 300 1.3em/100% $headings-font-family
position: relative
padding: 0 0 0 45px
margin: 0 20px 0 0
height: 38px
line-height: 38px
img
position: absolute
top: 0
left: 0
width: 38px
height: 38px
#header_notifs_icon_wrapper #header_notifs_icon_wrapper
@extend .hidden-xs @extend .hidden-xs
@extend .nav @extend .nav
admin-dev/themes/default/css/admin-theme/_admin-tables.sass
+1 -6
View File
@@ -8,6 +8,7 @@
border: none border: none
font-weight: normal font-weight: normal
vertical-align: top vertical-align: top
border-bottom: solid 1px darken(#CAE5F4,15%)
span.title_box span.title_box
color: black color: black
font-size: 1.1em font-size: 1.1em
@@ -36,12 +37,6 @@
text-align: center text-align: center
td.pointer td.pointer
cursor: pointer cursor: pointer
tr td:first-child, tr th:first-child
border-top-left-radius: 3px
border-bottom-left-radius: 3px
tr td:last-child,tr th:last-child
border-top-right-radius: 3px
border-bottom-right-radius: 3px
tr.filter tr.filter
background-color: lighten(#CAE5F4,5%) background-color: lighten(#CAE5F4,5%)
admin-dev/themes/default/css/admin-theme/_bootstrap-variables.scss
+2 -12
View File
@@ -1,14 +1,5 @@
// // // Font
// Variables @import url(http://fonts.googleapis.com/css?family=Ubuntu:300|Open+Sans&subset=latin,cyrillic-ext,greek-ext,greek,latin-ext,cyrillic,vietnamese);
// --------------------------------------------------
// Global values
// --------------------------------------------------
// Grays
// -------------------------
$gray-darker: lighten(#000, 13.5%) ; //#222 $gray-darker: lighten(#000, 13.5%) ; //#222
$gray-dark: lighten(#000, 20%) ; //#333 $gray-dark: lighten(#000, 20%) ; //#333
@@ -20,7 +11,6 @@ $gray-lighter: lighten(#000, 93.5%) ; //#eee
// ------------------------- // -------------------------
//$brand-primary: #EF1778 ; //moved to admin-theme sass //$brand-primary: #EF1778 ; //moved to admin-theme sass
$brand-success: #5cb85c ; $brand-success: #5cb85c ;
$brand-warning: #f0ad4e ; $brand-warning: #f0ad4e ;
$brand-danger: #d9534f ; $brand-danger: #d9534f ;
admin-dev/themes/default/js/calendar.js
+1 -11
View File
@@ -377,21 +377,11 @@ $( document ).ready(function() {
datepickerEnd.setCompare(true); datepickerEnd.setCompare(true);
} }
$('#datepickerExpand').click(function() { $('#datepickerExpand').on('click',function() {
$('#datepicker').removeClass('hide'); $('#datepicker').removeClass('hide');
$('#date-start').focus(); $('#date-start').focus();
}); });
$('#datepickerFrom').click(function() {
$('#datepicker').removeClass('hide');
$('#date-start').focus();
});
$('#datepickerTo').click(function() {
$('#datepicker').removeClass('hide');
$('#date-end').focus();
});
$('.submitDateDay').on('click',function(e){ $('.submitDateDay').on('click',function(e){
e.preventDefault; e.preventDefault;
setDayPeriod(); setDayPeriod();
admin-dev/themes/default/js/date-range-picker.js
+9 -2
View File
@@ -224,7 +224,7 @@
month = d.getMonth(), month = d.getMonth(),
currentDate = this.date.valueOf(); currentDate = this.date.valueOf();
this.picker.find('.daterangepicker-days th:eq(1)') this.picker.find('.daterangepicker-days th:eq(1)')
.text(year+' / '+DPGlobal.dates.months[month]); .text(year+' / '+DPGlobal.dates.months[month]).append('&nbsp;<small><i class="icon-angle-down"></i><small>');
var prevMonth = new Date(year, month-1, 28,0,0,0,0), var prevMonth = new Date(year, month-1, 28,0,0,0,0),
day = DPGlobal.getDaysInMonth(prevMonth.getFullYear(), prevMonth.getMonth()); day = DPGlobal.getDaysInMonth(prevMonth.getFullYear(), prevMonth.getMonth());
prevMonth.setDate(day); prevMonth.setDate(day);
@@ -343,6 +343,14 @@
//reset //reset
if (target.is('.day') && !target.is('.disabled')){ if (target.is('.day') && !target.is('.disabled')){
// reset process for a new range // reset process for a new range
if (start && end) {
if (!compare) {
click = 2 ;
$(".range").removeClass('range');
$(".start-selected").removeClass("start-selected");
$(".end-selected").removeClass("end-selected");
}
}
if(click === 2) { if(click === 2) {
if (compare) { if (compare) {
startCompare = null; startCompare = null;
@@ -423,7 +431,6 @@
}, },
updateRange: function() { updateRange: function() {
console.log("update");
$("#datepicker .day").each(function(){ $("#datepicker .day").each(function(){
var date_val = parseInt($(this).data('val'),10); var date_val = parseInt($(this).data('val'),10);
admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
+12 -21
View File
@@ -39,8 +39,7 @@
{/if} {/if}
<div id="calendar" class="panel"> <div id="calendar" class="panel">
<form action="{$action|escape}" method="post" id="calendar_form" name="calendar_form" class="form-inline"> <form action="{$action|escape}" method="post" id="calendar_form" name="calendar_form" class="form-inline">
<div class="row">
<div class="col-lg-6">
<div class="btn-group"> <div class="btn-group">
<button type="button" name="submitDateDay" class="btn btn-default submitDateDay"> <button type="button" name="submitDateDay" class="btn btn-default submitDateDay">
{l s='Day'} {l s='Day'}
@@ -61,32 +60,23 @@
{l s='Year'}-1 {l s='Year'}-1
</button> </button>
</div> </div>
</div>
<div class="col-lg-6"> <input type="hidden" name="datepickerFrom" id="datepickerFrom" value="{$datepickerFrom|escape}" class="form-control">
<div class="form-group">
<div class="input-group fixed-width-lg hide"> <input type="hidden" name="datepickerTo" id="datepickerTo" value="{$datepickerTo|escape}" class="form-control">
<label class="input-group-addon">{l s='From'}</label>
<input type="text" name="datepickerFrom" id="datepickerFrom" value="{$datepickerFrom|escape}" class="form-control"> <div class="form-group pull-right">
</div>
</div>
<div class="form-group">
<div class="input-group fixed-width-lg hide">
<label class="input-group-addon">{l s='To'}</label>
<input type="text" name="datepickerTo" id="datepickerTo" value="{$datepickerTo|escape}" class="form-control">
</div>
</div>
<div class="form-group">
<button id="datepickerExpand" class="btn btn-default" type="button"> <button id="datepickerExpand" class="btn btn-default" type="button">
<i class="icon-calendar-empty"></i>
{l s='From'}
<strong class="text-info">{$datepickerFrom|escape}</strong> <strong class="text-info">{$datepickerFrom|escape}</strong>
- - {l s='To'}
<strong class="text-info">{$datepickerTo|escape}</strong> <strong class="text-info">{$datepickerTo|escape}</strong>
- 13 Days - 13 Days
<i class="icon-calendar-empty"></i>
<i class="icon-caret-down"></i> <i class="icon-caret-down"></i>
</button> </button>
</div> </div>
</div>
</div>
{$calendar} {$calendar}
</form> </form>
</div> </div>
@@ -108,6 +98,7 @@
<section class="dash_news panel"> <section class="dash_news panel">
<h3><i class="icon-rss"></i> PrestaShop News</h3> <h3><i class="icon-rss"></i> PrestaShop News</h3>
<div class="dash_news_content"></div>
</section> </section>
<section id="dash_version" class="visible-lg"> <section id="dash_version" class="visible-lg">
admin-dev/themes/default/template/header.tpl
+7 -8
View File
@@ -224,7 +224,10 @@
<i class="icon-caret-down"></i> <i class="icon-caret-down"></i>
</button> </button>
<ul id="header_search_options" class="dropdown-menu"> <ul id="header_search_options" class="dropdown-menu">
<li class="search-all search-option active"><a href="#" data-value="0" data-placeholder="{l s='What are you looking for?'}"><i class="icon-search"></i> {l s='Everywhere'}</a></li> <li class="search-all search-option active">
<a href="#" data-value="0" data-placeholder="{l s='What are you looking for?'}" data-icon="icon-reorder">
<i class="icon-search"></i> {l s='Everywhere'}</a>
</li>
<li class="divider"></li> <li class="divider"></li>
<li class="search-book search-option"> <li class="search-book search-option">
<a href="#" data-value="1" data-placeholder="{l s='Product name, SKU, reference...'}" data-icon="icon-book"> <a href="#" data-value="1" data-placeholder="{l s='Product name, SKU, reference...'}" data-icon="icon-book">
@@ -290,20 +293,16 @@
{/if} {/if}
</script> </script>
<!-- js <!-- todo js
OK - size up search field on focus OK - size up search field on focus
- prevent blank search (?) - prevent blank search
OK - dropdown menu as select OK - dropdown menu as select
OK - fill input hidden field with data value from list item OK - fill input hidden field with data value from list item
OK - change icon in suffix OK - change icon in suffix
OK - set active on right list item OK - set active on right list item
OK - focus input field OK - focus input field
OK - change place holder OK - change place holder
- clear search (?) - keep focus state when search exists
(?) - keep focus state when keyword exists
old code sample:
<option value="1" {if {$search_type} == 1} selected="selected" {/if}>{l s='catalog'}</option>
--> -->
</form> </form>
admin-dev/themes/default/template/helpers/calendar/calendar.tpl
+10 -9
View File
@@ -17,7 +17,7 @@
<div class="datepicker2" data-date="{$date_to}" data-date-format="{$date_format}"></div> <div class="datepicker2" data-date="{$date_to}" data-date-format="{$date_format}"></div>
</div> </div>
{/if} {/if}
<div class="col-lg-4 clearfix"> <div class="col-sm-12 col-lg-4 pull-right">
<div id='datepicker-form' class='form-inline'> <div id='datepicker-form' class='form-inline'>
<div id='date-range' class='form-date-group'> <div id='date-range' class='form-date-group'>
<div class='form-date-heading'> <div class='form-date-heading'>
@@ -40,16 +40,16 @@
</div> </div>
<div class='form-date-body'> <div class='form-date-body'>
<label>{l s='From'}</label> <label>{l s='From'}</label>
<input class='date-input form-control' id='date-start' placeholder='Start' type='text' name="date_from" value="{$date_from}" data-date-format="{$date_format}" /> <input class='date-input form-control' id='date-start' placeholder='Start' type='text' name="date_from" value="{$date_from}" data-date-format="{$date_format}" tabindex="1" />
<label>{l s='to'}</label> <label>{l s='to'}</label>
<input class='date-input form-control' id='date-end' placeholder='End' type='text' name="date_to" value="{$date_to}" data-date-format="{$date_format}" /> <input class='date-input form-control' id='date-end' placeholder='End' type='text' name="date_to" value="{$date_to}" data-date-format="{$date_format}" tabindex="2" />
</div> </div>
</div> </div>
<div id="date-compare" class='form-date-group'> <div id="date-compare" class='form-date-group'>
<div class='form-date-heading'> <div class='form-date-heading'>
<span class="checkbox-title"> <span class="checkbox-title">
<label > <label >
<input type='checkbox' id="datepicker-compare" name="datepicker_compare"{if isset($compare_date_from) && isset($compare_date_to)} checked="checked"{/if}> <input type='checkbox' id="datepicker-compare" name="datepicker_compare"{if isset($compare_date_from) && isset($compare_date_to)} checked="checked"{/if} tabindex="3">
{l s='Compare to'} {l s='Compare to'}
</label> </label>
</span> </span>
@@ -61,17 +61,18 @@
</div> </div>
<div class="form-date-body" id="form-date-body-compare"{if is_null($compare_date_from) || is_null($compare_date_to)} style="display: none;"{/if}> <div class="form-date-body" id="form-date-body-compare"{if is_null($compare_date_from) || is_null($compare_date_to)} style="display: none;"{/if}>
<label>{l s='From'}</label> <label>{l s='From'}</label>
<input id="date-start-compare" class="date-input form-control" type="text" placeholder="Start" name="compare_date_from" value="{$compare_date_from}" data-date-format="{$date_format}" /> <input id="date-start-compare" class="date-input form-control" type="text" placeholder="Start" name="compare_date_from" value="{$compare_date_from}" data-date-format="{$date_format}" tabindex="4" />
<label>{l s='to'}</label> <label>{l s='to'}</label>
<input id="date-end-compare" class="date-input form-control" type="text" placeholder="End" name="compare_date_to" value="{$compare_date_to}" data-date-format="{$date_format}" /> <input id="date-end-compare" class="date-input form-control" type="text" placeholder="End" name="compare_date_to" value="{$compare_date_to}" data-date-format="{$date_format}"
tabindex="5" />
</div> </div>
</div> </div>
<div class='form-date-actions'> <div class='form-date-actions'>
<button class='btn btn-default' type='button' id="datepicker-cancel"> <button class='btn btn-link' type='button' id="datepicker-cancel" tabindex="7">
<i class='icon-remove text-danger'></i> <i class='icon-remove'></i>
{l s='Cancel'} {l s='Cancel'}
</button> </button>
<button class='btn btn-default pull-right' type='submit' name="submitDateRange"> <button class='btn btn-default pull-right' type='submit' name="submitDateRange" tabindex="6">
<i class='icon-ok text-success'></i> <i class='icon-ok text-success'></i>
{l s='Apply'} {l s='Apply'}
</button> </button>
admin-dev/themes/default/template/helpers/list/list_header.tpl
+7 -7
View File
@@ -243,15 +243,15 @@
</tr> </tr>
{if !$simple_header && $show_filters} {if !$simple_header && $show_filters}
<tr class="nodrag nodrop filter {if $row_hover}row_hover{/if}"> <tr class="nodrag nodrop filter {if $row_hover}row_hover{/if}">
<td class="text-center"> <th class="text-center">
{if $has_bulk_actions} {if $has_bulk_actions}
-- --
{/if} {/if}
</td> </th>
{* Filters (input, select, date or bool) *} {* Filters (input, select, date or bool) *}
{foreach $fields_display AS $key => $params} {foreach $fields_display AS $key => $params}
<td {if isset($params.align)} class="{$params.align}" {/if}> <th {if isset($params.align)} class="{$params.align}" {/if}>
{if isset($params.search) && !$params.search} {if isset($params.search) && !$params.search}
-- --
{else} {else}
@@ -293,14 +293,14 @@
<input type="text" class="filter" name="{$list_id}Filter_{if isset($params.filter_key)}{$params.filter_key}{else}{$key}{/if}" value="{$params.value|escape:'htmlall':'UTF-8'}" {if isset($params.width) && $params.width != 'auto'} style="width:{$params.width}px"{/if} /> <input type="text" class="filter" name="{$list_id}Filter_{if isset($params.filter_key)}{$params.filter_key}{else}{$key}{/if}" value="{$params.value|escape:'htmlall':'UTF-8'}" {if isset($params.width) && $params.width != 'auto'} style="width:{$params.width}px"{/if} />
{/if} {/if}
{/if} {/if}
</td> </th>
{/foreach} {/foreach}
{if $shop_link_type} {if $shop_link_type}
<td>--</td> <th>--</th>
{/if} {/if}
{if $has_actions} {if $has_actions}
<td class="actions"> <th class="actions">
{if $show_filters} {if $show_filters}
<span class="pull-right"> <span class="pull-right">
{*Search must be before reset for default form submit*} {*Search must be before reset for default form submit*}
@@ -314,7 +314,7 @@
{/if} {/if}
</span> </span>
{/if} {/if}
</td> </th>
{/if} {/if}
</tr> </tr>
{/if} {/if}
js/admin-dashboard.js
+6 -7
View File
@@ -204,16 +204,15 @@ function getBlogRss()
}, },
dataType: 'json', dataType: 'json',
success : function(jsonData){ success : function(jsonData){
if (!jsonData.has_errors) if (!jsonData.has_errors) {
{ for (var article in jsonData.rss) {
for (var article in jsonData.rss) article_html = '<article><h4><a href="'+jsonData.rss[article].link+'">'+jsonData.rss[article].title+'</a></h4><p>'+jsonData.rss[article].short_desc+' <a href="'+jsonData.rss[article].link+'">'+read_more+'</a><p></article><hr/>';
{ $('.dash_news .dash_news_content').append(article_html);
article_html = '<article><strong>'+jsonData.rss[article].title+'</strong><br>'+jsonData.rss[article].short_desc+'<br/><a href="'+jsonData.rss[article].link+'">'+read_more+'</a></article><br>';
$('.dash_news h4').after(article_html);
} }
} }
else else {
$('.dash_news').hide(); $('.dash_news').hide();
}
}, },
error : function(data){ error : function(data){
//@TODO display errors //@TODO display errors