Browse Source

Archivos modificados el 19-09-2016
modified: static/src/js/unitegallery.min.js
modified: views/theme.xml

Edgar Ortigoza 8 years ago
parent
commit
ab627a6266
2 changed files with 18 additions and 17 deletions
  1. 3 3
      static/src/js/unitegallery.min.js
  2. 15 14
      views/theme.xml

+ 3 - 3
static/src/js/unitegallery.min.js

@@ -4591,9 +4591,9 @@ function UGSlider() {
         CURRENTSLIDE_LOAD_END: "slider_current_loadend"
     };
     var Ee = {
-            slider_scale_mode: "fill",
-            slider_scale_mode_media: "fill",
-            slider_scale_mode_fullscreen: "down",
+            slider_scale_mode: "up",
+            slider_scale_mode_media: "up",
+            slider_scale_mode_fullscreen: "up",
             slider_item_padding_top: 0,
             slider_item_padding_bottom: 0,
             slider_item_padding_left: 0,

+ 15 - 14
views/theme.xml

@@ -181,9 +181,9 @@
                                                             <li>
                                                                 <a href="/web/login">Ingresar</a>
                                                             </li>
-                                                            <li>
+                                                            <!-- <li>
                                                                 <a href="/web/signup">Registrarse</a>
-                                                            </li>
+                                                            </li> -->
                                                         </t>
                                                     </ul>
                                                 </div>
@@ -308,7 +308,7 @@
                                             <a href="#">Afiliados</a>
                                         </li>
                                         <li>
-                                            <a href="#">Meet The Maker</a>
+                                            <a href="#">Encuentra un Representante</a>
                                         </li>
                                         <li>
                                             <a href="#">Contacto</a>
@@ -1137,8 +1137,15 @@
                             <t t-if="a.type != 'hidden'">
                                 <li t-if="a.value_ids and len(a.value_ids) &gt;1">
                                     <div>
-                                        <strong t-field="a.name"/>
+                                        <strong t-field="a.name" style="margin-top: 10px;"/>
                                     </div>
+                                    <t t-if="a.type == 'color'">
+                                        <t t-as="v" t-foreach="a.value_ids">
+                                            <label t-attf-class="css_attribute_color #{'active' if v.id in attrib_set else ''}" t-attf-style="background-color:#{v.color or v.name}">
+                                                <input name="attrib" t-att-checked="'checked' if v.id in attrib_set else ''" t-att-title="v.name" t-att-value="'%s-%s' % (a.id,v.id)" type="checkbox"/>
+                                            </label>
+                                        </t>
+                                    </t>
                                     <t t-if="a.type == 'select'">
                                         <select class="form-control" name="attrib">
                                             <option value=""/>
@@ -1148,9 +1155,9 @@
                                         </select>
                                     </t>
                                     <t t-if="a.type == 'radio'">
-                                        <ul class="nav nav-pills nav-stacked">
+                                        <ul class="nav nav-pills nav-stacked" style="overflow: auto; max-height:200px; columns: 2; -webkit- columns: 2;-moz- columns: 2;-o- columns: 2;">
                                             <t t-as="v" t-foreach="a.value_ids">
-                                                <li t-att-class="'active' if v.id in attrib_set else ''">
+                                                <li t-att-class="'active' if v.id in attrib_set else ''" style="margin-top: 0px;">
                                                     <label style="margin: 0 20px;">
                                                         <input name="attrib" t-att-checked="'checked' if v.id in attrib_set else ''" t-att-value="'%s-%s' % (a.id,v.id)" type="checkbox"/>
                                                         <span style="font-weight: normal" t-field="v.name"/>
@@ -1159,13 +1166,7 @@
                                             </t>
                                         </ul>
                                     </t>
-                                    <t t-if="a.type == 'color'">
-                                        <t t-as="v" t-foreach="a.value_ids">
-                                            <label t-attf-class="css_attribute_color #{'active' if v.id in attrib_set else ''}" t-attf-style="background-color:#{v.color or v.name}">
-                                                <input name="attrib" t-att-checked="'checked' if v.id in attrib_set else ''" t-att-title="v.name" t-att-value="'%s-%s' % (a.id,v.id)" type="checkbox"/>
-                                            </label>
-                                        </t>
-                                    </t>
+                                   
                                 </li>
                             </t>
                         </t>
@@ -1522,7 +1523,7 @@
         <xpath expr="//ul/li[last()]" position='after'>
             <t t-if="website.enable_first_last_pager and pager['page_count'] > 2">
                 <li t-att-class=" 'disabled' if pager['page']['num'] == pager['page_count'] else '' ">
-                    <a t-att-href="pager['page_last']['url'] if pager['page']['num'] != pager['page_count'] else ''">Segundo</a>
+                    <a t-att-href="pager['page_last']['url'] if pager['page']['num'] != pager['page_count'] else ''">Último</a>
                 </li>
             </t>
         </xpath>