added filtering on first page, search activated

7a77ef03 · Sven Franck · 64af4704 · 7a77ef03 · 7a77ef03 · 64af4704
Commit 7a77ef03 authored Mar 26, 2013 by Sven Franck
9 changed files
--- a/css/css.css
+++ b/css/css.css
@@ -64,8 +64,6 @@ table.table-inline { width: auto !important; display: table !important; }

 /* remove dotted abbr border */
 abbr[title]{border: 0 none !important;}
-/* spacing */
-div.ui-body h2 { margin: 0.5em 0 0; }

 /* follow us */
 .float_left {float:left; padding: 0.5em 1em; margin: 0; }

--- a/data/machine_parameters.json
+++ b/data/machine_parameters.json
--- a/data/old_stats.json
+++ b/data/old_stats.json
--- a/gadgets/configure.html
+++ b/gadgets/configure.html
--- a/gadgets/results.html
+++ b/gadgets/results.html
@@ -79,9 +79,9 @@
    <div data-slot="true" data-slot-id="6">
      <label for="form_results_view" data-i18n="results.sorting" class="select">Sort</label>
      <select data-theme="f" id="form_provider_view" name="form_provider_view">
-        <option value="default" class="t" selected="selected" data-placeholder="true" data-i18n="gen.providers">Providers</option>
+        <option value="default" class="t" disabled data-i18n="gen.providers">Providers</option>
+        <option value="all" class="t" selected="selected" data-placeholder="true" data-i18n="gen.all">Show all</option>
      </select> 
-      <!-- <a href="providers.html" data-role="button" class="t show_providers" data-i18n-target=".ui-btn-text" data-i18n="[title]gen.providers_info;gen.providers"></a> -->
    </div>
    <div data-slot="true" data-slot-id="5">
      <a href="index.html"  data-role="button" data-icon="back" data-iconpos="right" data-theme="b" class="t start_over" data-i18n-target=".ui-btn-text" data-i18n="[title]tx.start_over_info;[html]tx.start_over"></a>
@@ -216,15 +216,10 @@
                for (i = 0; i < response.length; i += 1) {
                  var entry = response[i];

-                  // clean up old records JIO here or just mark for deletion?
-                  if (entry["ts"] < $.fn.fauna.items_good_until) {
-                    $.fn.fauna.jio_item_config.delete({"_id":entry["_id"]})
-                  }
-
-                  if (entry["alias"] !== "") {
+                  if (entry["provider"] !== "") {
                    // add an option to the select
-                    machine_alias = entry["alias"];
-                    machine_img = "../img/providers/" + entry["alias"].toLowerCase() + ".png";
+                    machine_alias = entry["provider"];
+                    machine_img = "../img/providers/" + entry["provider"].toLowerCase() + ".png";
                  } else {
                    machine_alias = entry["_id"];
                    machine_img = "";
@@ -352,8 +347,7 @@
            }
          })
          .on('change.results_filter', '#form_provider_view', function () {
-            console.log($(this).val());
-            var val = $(this).val() === "default" ? "" : $(this).val();
+            var val = $(this).val() === "all" ? "" : $(this).val();
            renderData(false, gadget.sort_field, gadget.sort_direction, val);
          })
          .on('click.details_popup', '.popup_trigger', function () {

--- a/gadgets/social.html
+++ b/gadgets/social.html
@@ -9,7 +9,6 @@
  <body>
  <div class="menu_social">
    <div>
-      <p class="super t follow_us" data-i18n="soc.fw"></p>
      <div data-role="controlgroup" data-type="horizontal" data-theme="c" class="action_menu">
        <a href="#" id="follow_twitter" data-role="button" data-icon="tw" data-theme="c" class="t scale-a" data-i18n-target=".ui-btn-text" data-i18n="[title]soc.tw_fw;[html]soc.tw"></a>
        <a href="#" id="follow_facebook" data-role="button" data-icon="fb" data-theme="c" class="t scale-a" data-i18n-target=".ui-btn-text" data-i18n="[title]soc.fb_fw;[html]soc.fb"></a>

--- a/lang/de-DE/gen.json
+++ b/lang/de-DE/gen.json
@@ -9,12 +9,16 @@
      "en": "English",
      "fr": "Français"
    },
+    "show_all":"Alle anzeigen",
+    "found": "Provider gefunden",
+    "please_select": "Bitte wählen",
+    "all": "Alle anzeigen",
    "criteria": "Kriterien:",
    "feature_name":"Auswahl",
    "feature_range":"Leistung",
    "feature_info":"Info",
    "disclaimer":"Disclaimer: Angezeigte Preise basieren auf frei verfügbarern Informationen der jeweiligen Anbieter. CloudQuote übernimmt keine Gewähr für angezeigte Preise. Fehler und Irrtümer sind vorbehalten. Sollten Sie eine falsche Angabe bemerken, nehmen Sie bitte Kontakt mit uns auf. Vielen Dank!",
-    "copyright":"Copyright &copy; 2013",
+    "copyright":"Copyright 2013",
    "nexedi":"NEXEDI SA",
    "reserved":"- Alle Rechte vorbehalten.",
    "about": "CloudQuote",

--- a/lang/en-EN/gen.json
+++ b/lang/en-EN/gen.json
@@ -9,14 +9,18 @@
      "en": "English",
      "fr": "Français"
    },
+    "show_all":"Show all",
+    "found": "providers found",
+    "please_select": "Please select",
+    "all": "Show all",
    "criteria": "Criteria:",
    "feature_name":"Feature",
    "feature_range":"Range",
    "feature_info":"Info",
    "disclaimer":"Disclaimer: Price calculations are done based on the public information made available by the respective providers. CloudQuote takes NO responsibilty for any of these price indications. Errors might occur. Should you find any errors please don't hesitate to contact us.",
-    "copyright":"Copyright &copy; 2013 ",
+    "copyright":"Copyright 2013 ",
    "nexedi":"NEXEDI SA",
-    "reserved":"- All rights reservered",
+    "reserved":"- All rights reserved",
    "about": "CloudQuote",
    "contact": "Contact",
    "notice": "Legal Notice",

--- a/lang/fr-FR/gen.json
+++ b/lang/fr-FR/gen.json
@@ -9,6 +9,10 @@
      "en": "Anglais",
      "fr": "Français"
    },
+    "show_all":"Mpntrer tout"
+    "found": "fournisseur trouvés",
+    "please_select": "Sélectionner",
+    "all": "Montrer Tout",
    "criteria": "Critères:",
    "feature_name":"Caractéristique",
    "feature_range":"Gamme",