Arregados errores de estilo, cambios varios

This commit is contained in:
Juan Ferrer Toribio 2016-01-10 14:10:51 +01:00
parent df1fe12980
commit be547ca6bc
7 changed files with 33 additions and 76 deletions

View File

@ -61,7 +61,7 @@
<htk-text form="iter" column="date_time" format="_%a, %e %b %Y at %T"/>
</p>
<p>
<htk-text form="iter" column="platform"/>,
<htk-text form="iter" column="platform"/> -
<htk-text form="iter" column="browser"/>
<htk-text form="iter" column="version"/>
</p>

View File

@ -57,7 +57,7 @@
<htk-text form="iter" column="last_activity" format="%T"/>
</p>
<p>
<htk-text form="iter" column="platform"/>,
<htk-text form="iter" column="platform"/> -
<htk-text form="iter" column="browser"/>
<htk-text form="iter" column="version"/>
</p>

View File

@ -47,17 +47,8 @@ Vn.Catalog = new Class
Vn.Node.remove (this.$('right-panel'));
}
,onSwitchViewClick: function ()
{
this.setView (this.view === Vn.Catalog.View.LIST ?
Vn.Catalog.View.GRID : Vn.Catalog.View.LIST);
}
,setView: function (view)
{
var grid = this.$('grid-view');
var node = grid.getNode ();
if (view === Vn.Catalog.View.GRID)
{
this.$('view-button').setProperties ({
@ -77,10 +68,17 @@ Vn.Catalog = new Class
var className = 'list-view';
}
var node = this.$('grid-view').getNode ();
node.className = className;
Vn.Cookie.set ('hedera_view', this.view);
}
,onSwitchViewClick: function ()
{
this.setView (this.view === Vn.Catalog.View.LIST ?
Vn.Catalog.View.GRID : Vn.Catalog.View.LIST);
}
,onBasketReady: function (form)
{
if (form.get ('method') != 'PICKUP')
@ -112,6 +110,14 @@ Vn.Catalog = new Class
if (sortField)
this.$('items-model').sortByName (sortField, sortWay);
this.hideMenu ();
}
,onFilterChange: function (param, newValue)
{
if (newValue)
this.hideMenu ();
}
,realmRenderer: function (builder, form)
@ -147,9 +153,7 @@ Vn.Catalog = new Class
,onTypeChange: function (param, newValue)
{
if (newValue)
this.hideMenu ();
this.onFilterChange (param, newValue);
this.refreshTitle ();
this.refreshFilter (undefined, newValue);
}

View File

@ -320,7 +320,7 @@ td.third-category
.list-view .item-info > .htk-button
{
float: right;
margin: -.3em;
margin: -0.3em;
padding: .3em;
}
.list-view .item-info > .htk-button > img
@ -434,7 +434,7 @@ td.third-category
height: 1.8em;
}
@media (max-width: 950px)
@media (max-width: 960px)
{
.catalog-actions > button.menu
{

View File

@ -2,11 +2,11 @@
<vn-group>
<vn-param id="realm" on-changed="onRealmChange"/>
<vn-param id="type" on-changed="onTypeChange"/>
<vn-param id="search"/>
<vn-param id="color"/>
<vn-param id="origin"/>
<vn-param id="category"/>
<vn-param id="producer"/>
<vn-param id="search" on-changed="onFilterChange"/>
<vn-param id="color" on-changed="onFilterChange"/>
<vn-param id="origin" on-changed="onFilterChange"/>
<vn-param id="category" on-changed="onFilterChange"/>
<vn-param id="producer" on-changed="onFilterChange"/>
<vn-hash-param key="realm" param="realm"/>
<vn-hash-param key="type" param="type"/>
<sql-filter type="AND" id="filter">
@ -182,53 +182,6 @@
</htk-repeater>
</div>
</div>
<!--
<div id="list-view" class="list-view">
<div class="box">
<htk-grid
id="items-grid"
class="items"
empty-message="_Choose filter from right menu"
show-header="false">
<htk-column-image
title="*"
class="icon"
column="Foto"
directory="catalog"
subdir="200x200"
show-full="true"
full-dir="900x900"
editable="true"/>
<vn-column-item
title="_Name"
column="Article"
renderer="nameRenderer"/>
<htk-column-text
title="_Siz"
column="Medida"/>
<htk-column-text
title="_Cat"
column="Categoria"/>
<htk-column-spin
title="_Aval"
column="available"/>
<htk-column-text
title="_Price"
column="price"
format="_from %.2d€"
class="price"/>
<htk-column-button
column="id"
image="image/add.svg"
tip="_AddToBasket"
on-clicked="onAddItemClick"/>
</htk-grid>
<p class="footer-message">
<t>IndicativePhotos</t>
</p>
</div>
</div>
-->
<div id="right-panel" class="right-panel" on-click="onRightPanelClick">
<div class="basket-info">
<p>

View File

@ -168,7 +168,7 @@
}
.vn-gui .user-info > span
{
max-width: 9em;
max-width: 8em;
display: inline-block;
text-overflow: ellipsis;
white-space: nowrap;
@ -305,16 +305,16 @@
opacity: 0;
transform: translateZ(0) translateX(-2em);
-webkit-transform: translateZ(0) translateX(0em);
-webkit-transform: translateZ(0) translateX(-2em);
}
.vn-gui .form-holder.show
{
transition: all 250ms ease-out;
-webkittransition: all 250ms ease-out;
opacity: 1;
transform: translateZ(0) translateX(0em);
-webkit-transform: translateZ(0) translateX(0em);
transition: all 250ms ease-out;
-webkit-transition: all 250ms ease-out;
}
/* Desktop */
@ -333,7 +333,7 @@
/* Mobile */
@media (max-width: 950px)
@media (max-width: 960px)
{
.action-bar span.label,
.htk-button > span

View File

@ -4,13 +4,13 @@
/* Standard */
@media screen
{
body { font-size: 11pt; }
body { font-size: 10pt; }
}
/* Desktop - Laptop 1360x768 */
@media (max-resolution: 119dpi) and (min-device-width: 1340px) and (max-device-width: 1899px)
{
body { font-size: 11pt; }
body { font-size: 10pt; }
}
/* Desktop - FHD 1920x1080 */