various/fix: corrections

7e2ccb48 · Sven Franck · 355d2a9a · 7e2ccb48 · 7e2ccb48 · 7e2ccb48
Commit 7e2ccb48 authored Jul 31, 2013 by Sven Franck
6 changed files
--- a/modules/core/extensions/extensions.css
+++ b/modules/core/extensions/extensions.css
@@ -10,6 +10,13 @@
  border: 0;
  background-color: transparent;
 }
+.ui-input-search input {
+  padding-left: 0.25em;
+  padding-right: 4.5em;
+}
+.ui-input-search .ui-input-clear {
+    right: 2em !important;
+}
 /* =========================== carousel widget ========================*/
 .ui-carousel {
  list-style: none outside none;

--- a/modules/core/extensions/extensions.js
+++ b/modules/core/extensions/extensions.js
@@ -120,7 +120,6 @@ define([
            }
            // remove existing barrel
            if (create === undefined) {
-              console.log($("#ui-carousel-barrel-" + this.uuid ));
              $("#ui-carousel-barrel-" + this.uuid ).remove();
            }
            // this always needs to go before the slider

--- a/modules/ui/item/item.html
+++ b/modules/ui/item/item.html
@@ -5,35 +5,25 @@
    <title>Item Module</title>
  </head>
  <body>
-    <div data-role="fieldcontain" class="info_wrap">
+    <div class="info_wrap">

-        <!-- header -->
-        <h3>Brand1 - Item1</h3>
-        <!-- title description -->
-        <p>Item description, blabla foo...</p>
-        <!-- price -->
-        <p>19.95€</p>
+        <!-- dimensions_template -->

-        <!-- dimensions -->
-        <ul data-role="listview" data-inset="true" class="sizewrap">
-          <li data-icon="false"><a href="#">S</a></li>
-          <li data-icon="false"><a href="#">M</a></li>
-          <li data-icon="false"><a href="#">L</a></li>
-          <li data-icon="false"><a href="#">XL</a></li>
-          <li data-icon="false"><a href="#">XXL</a></li>
-        </ul>
+        <a href="#"
+          class="translate"
+          data-role="button"
+          data-i18n="item.add_basket"
+          data-icon="plus"
+          data-iconpos="left"
+          data-inline="true">Add to basket</a>

-        <!-- dimensions -->
-        <ul data-role="listview" data-inset="true" class="color_wrap">
-          <li data-icon="flase"><a href="#"><img src="red.jpg" alt=""><span class="color_text">Red</span></img></a></li>
-          <li data-icon="flase"><a href="#"><img src="blue.jpg" alt=""><span class="color_text">Blue</span></a></li>
-          <li data-icon="flase"><a href="#"><img src="black.jpg" alt=""><span class="color_text">Black</span></a></li>
-          <li data-icon="flase"><a href="#"><img src="white.jpg" alt=""><span class="color_text">White</span></a></li>
-        </ul>
-
-        <!-- add to basket -->
-        <a data-role="button" class="translate" data-i18n="item.add_basket" data-icon="plus" data-iconpos="left" data-inline="true" href="#">Add to basket</a>
-        <a data-role="button" class="translate" data-i18n="item.finish_order" data-icon="arrow-r" data-iconpos="left" data-inline="true" href="basket.html">Finish Order</a>
+        <a href="basket.html"
+          class="translate"
+          data-role="button"
+          data-i18n="item.finish_order"
+          data-icon="arrow-r"
+          data-iconpos="left"
+          data-inline="true">Finish Order</a>
      </div>
  </body>
 </html>

--- a/modules/ui/items/items.js
+++ b/modules/ui/items/items.js
@@ -63,10 +63,10 @@ define([
            item = response.rows[i].value;

            if (item.price === item.original_price) {
-              price = item.price + "€";
+              price = item.price + item.currency;
            } else {
-              price = "<span class='rebate'>" + item.price + "€</span> (" +
-                item.original_price + "€)";
+              price = "<span class='rebate'>" + item.price + item.currency +
+                "</span> (" + item.original_price + item.currency +")";
            }

            str += "<li data-icon='false'>" +

--- a/modules/ui/media/media.css
+++ b/modules/ui/media/media.css
 /* scope CSS? */
-.media_wrap {
-  width: 50%;
-  display: inline-block;
-}
-@media (max-width: 40em) {
-  .media_wrap{
-    width: 100%;
-  }
-}
\ No newline at end of file
--- a/modules/ui/products/products.html
+++ b/modules/ui/products/products.html
@@ -37,7 +37,7 @@
    <!-- content -->
    <div data-role="content" class="ui-content products_content">

-      <!-- refine panel trigger -->
+      <!-- refine panel trigger
      <a href="#search_panel"
        class="translate products_element"
        data-i18n="search.refine"
@@ -46,6 +46,7 @@
        data-iconpos="notext"
        data-icon="grid">
      </a>
+       -->

      <!-- global search -->
      <div id="searchbar"