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/template/controllers/dashboard/helpers/view/view.tpl
+12 -21
View File
@@ -39,8 +39,7 @@
{/if}
<div id="calendar" class="panel">
<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">
<button type="button" name="submitDateDay" class="btn btn-default submitDateDay">
{l s='Day'}
@@ -61,32 +60,23 @@
{l s='Year'}-1
</button>
</div>
</div>
<div class="col-lg-6">
<div class="form-group">
<div class="input-group fixed-width-lg hide">
<label class="input-group-addon">{l s='From'}</label>
<input type="text" name="datepickerFrom" id="datepickerFrom" value="{$datepickerFrom|escape}" class="form-control">
</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">
<input type="hidden" name="datepickerFrom" id="datepickerFrom" value="{$datepickerFrom|escape}" class="form-control">
<input type="hidden" name="datepickerTo" id="datepickerTo" value="{$datepickerTo|escape}" class="form-control">
<div class="form-group pull-right">
<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>
-
- {l s='To'}
<strong class="text-info">{$datepickerTo|escape}</strong>
- 13 Days
<i class="icon-calendar-empty"></i>
<i class="icon-caret-down"></i>
</button>
</div>
</div>
</div>
{$calendar}
</form>
</div>
@@ -108,6 +98,7 @@
<section class="dash_news panel">
<h3><i class="icon-rss"></i> PrestaShop News</h3>
<div class="dash_news_content"></div>
</section>
<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>
</button>
<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="search-book search-option">
<a href="#" data-value="1" data-placeholder="{l s='Product name, SKU, reference...'}" data-icon="icon-book">
@@ -290,20 +293,16 @@
{/if}
</script>
<!-- js
<!-- todo js
OK - size up search field on focus
- prevent blank search
(?) - prevent blank search
OK - dropdown menu as select
OK - fill input hidden field with data value from list item
OK - change icon in suffix
OK - set active on right list item
OK - focus input field
OK - change place holder
- clear search
(?) - keep focus state when keyword exists
old code sample:
<option value="1" {if {$search_type} == 1} selected="selected" {/if}>{l s='catalog'}</option>
(?) - keep focus state when search exists
-->
</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>
{/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='date-range' class='form-date-group'>
<div class='form-date-heading'>
@@ -40,16 +40,16 @@
</div>
<div class='form-date-body'>
<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>
<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 id="date-compare" class='form-date-group'>
<div class='form-date-heading'>
<span class="checkbox-title">
<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'}
</label>
</span>
@@ -61,17 +61,18 @@
</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}>
<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>
<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 class='form-date-actions'>
<button class='btn btn-default' type='button' id="datepicker-cancel">
<i class='icon-remove text-danger'></i>
<button class='btn btn-link' type='button' id="datepicker-cancel" tabindex="7">
<i class='icon-remove'></i>
{l s='Cancel'}
</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>
{l s='Apply'}
</button>
admin-dev/themes/default/template/helpers/list/list_header.tpl
+7 -7
View File
@@ -243,15 +243,15 @@
</tr>
{if !$simple_header && $show_filters}
<tr class="nodrag nodrop filter {if $row_hover}row_hover{/if}">
<td class="text-center">
<th class="text-center">
{if $has_bulk_actions}
--
{/if}
</td>
</th>
{* Filters (input, select, date or bool) *}
{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}
--
{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} />
{/if}
{/if}
</td>
</th>
{/foreach}
{if $shop_link_type}
<td>--</td>
<th>--</th>
{/if}
{if $has_actions}
<td class="actions">
<th class="actions">
{if $show_filters}
<span class="pull-right">
{*Search must be before reset for default form submit*}
@@ -314,7 +314,7 @@
{/if}
</span>
{/if}
</td>
</th>
{/if}
</tr>
{/if}