Browse Source

Merge branch 'master' of http://git.lattuga.net/hacklabbo/Ilovexm23

cek@posta.indivia.net 7 years ago
parent
commit
847a04a405
5 changed files with 294 additions and 255 deletions
  1. 0 0
      res/splashscreen.png
  2. 169 137
      www/css/index.css
  3. 34 103
      www/index.html
  4. 87 11
      www/js/main.js
  5. 4 4
      www/js/query.js

+ 0 - 0
res/splashscreen.png


File diff suppressed because it is too large
+ 169 - 137
www/css/index.css


+ 34 - 103
www/index.html

@@ -25,13 +25,13 @@
     <!-- WARNING: for iOS 7, remove the width=device-width and height=device-height attributes. See https://issues.apache.org/jira/browse/CB-4323 -->
     <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height, target-densitydpi=device-dpi" />
     <!--meta http-equiv="Content-Security-Policy" content="default-src * 'self' gap: ; frame-src * 'self' gap:  http:  ; style-src * 'self' 'unsafe-inline' 'unsafe-eval'; script-src * 'self' 'unsafe-inline' 'unsafe-eval'; " /-->
-    
+
     <title>I love xm24</title>
-    
+
     <link rel="stylesheet" type="text/css" href="css/index.css" />
     <link rel="stylesheet" type="text/css" href="css/toastr.css" />
     <link rel="stylesheet" href="css/themes/default/jquery.mobile-1.4.5.min.css" />
-    
+
     <script type="text/javascript" src="js/vendor/jquery-1.10.2.min.js"></script>
 
     <!--script src="js/swipe-page.js"></script-->
@@ -48,89 +48,18 @@
     <script type="text/javascript" src="cordova.js"></script>
     <script type="text/javascript" src="js/push.js"></script>
     <script type="text/javascript" src="js/share.js"></script>
-    <script type="text/javascript">
-        $(document).on("mobileinit", function () {
-
-            $("body").pagecontainer({
-                defaults: true
-            });
-
-            $(".ui-loader").loader({
-                defaults: true
-            });
-            $("input").button();
-        });
-
-
-
-        $(document).on("pagecontainerchange", function () {    
-
-            var current = $(".ui-page-active").prop("id");     // Remove active class from nav buttons
-                
-            console.log("current" + current);
-            $("[data-role='navbar'] a.ui-btn-active").removeClass("ui-btn-active");     // Add active class to current nav button
-                
-            $("[data-role='navbar'] a").each(function () {
-                var href = $(this).prop("href");        
-                if (href.indexOf(current, href.length - current.length) !== -1) {            
-                    $(this).addClass("ui-btn-active");        
-                }    
-            });
-
-        });
-
-        $(document).on("pagecreate", function () {
-            $("body > [data-role='panel']").panel();
-            $("body > [data-role='panel'] [data-role='listview']").listview();
-            $("body > [data-role='header']").toolbar();
-            $("body > [data-role='footer']").toolbar();
-            $("body > [data-role='navbar']").navbar();
-            $("#navfooter").navbar();
-            postInList();
-        });
-
-        /*per inizio navigazione*/
-        var Site = function () {
-            this.homepage = "#index"; // the default page that is loaded
-            this.init();
-        };
-
-        Site.prototype.init = function () {
-
-            var self = this;
-
-            $(document).ready(function () {
-
-                // default page if no hash given
-                // this changes the hash, so the event is fired
-                // no need to call self.navigate
-
-
-                window.location.hash = self.homepage;
-            });
-        };
-        // On document ready
-        $(function () {
-            intercettaUrl();
-            new Site();
-
-            $(".minibox").click(function () {
-
-
-            });
-
-        });
-    </script>
 
 </head>
 
 <body>
     <!--panel -->
     <div data-role="panel" data-position="right" id="outside" data-theme="a" data-position-fixed="true" data-display="overlay" data-swipe-close="true">
-        <p><img src="image/xm-logo.png" class="rwd" /></p>
+        <p><img src="image/ilovexm24_puzzle-300x300.jpg" class="panel_logo" /></p>
         <ul data-role="listview">
-            <li><a class="nav" href="#ilove">I love XM24</a></li>
             <li><a class="nav" href="#info">Info</a></li>
+            <li><a class="nav" href="#ilove">I love XM24</a></li>
+            <li><a class="nav" href="#events">Events</a></li>
+            <li><a class="nav" href="#about">About</a></li>
             <li>
                 <input type="text" class="cerca" value="" placeholder="Cerca" data-clear-btn="true" />
             </li>
@@ -153,18 +82,20 @@
     </div>
 
     <!--/navbar -->
-    <div data-role="header" data-position="fixed" id="navheader" class="hide">
+    <div data-role="header" data-position="fixed" id="navheader">
         <div data-role="navbar" id="nav2" data-iconpos="left" data-theme="a">
             <ul class="downnav">
-                <li><a class="ui-mini nav" href="#index">Home</a> </li>
-                <li><a class="ui-mini" href="#outside">Menù</a> </li>
+                <li><a class="ui-mini" href="#outside" data-icon="bars">
+                    <img src="image/xm-logo.png" class="rwd" />
+                  </a>
+                </li>
             </ul>
         </div>
     </div>
     <!-- /header -->
 
     <!-- Home page -->
-    <div data-role="page" id="index" data-dom-cache="true" data-theme="a" class="ui-page">
+    <!-- <div data-role="page" id="index" data-dom-cache="true" data-theme="a" class="ui-page">
         <center><p><img src="image/xm-logo.png" class="rwd" /></p>
         <ul data-role="listview" data-inset="true">
             <li>
@@ -172,7 +103,7 @@
                     <img src="./image/ilovexm24_puzzle-300x300.jpg" class="ui-li-thumb">
                     <h2>I love XM24</h2>
                     <p>Bla blabla</p>
-                    <!--p class="ui-li-aside">iOS</p-->
+                    <!-p class="ui-li-aside">iOS</p-=>
                 </a>
             </li>
             <li>
@@ -180,7 +111,7 @@
                     <img src="./image/xm24-particolare2.jpeg" class="ui-li-thumb">
                     <h2>Info e comunicati</h2>
                     <p>Bla Bla blabla</p>
-                    <!--p class="ui-li-aside">BlackBerry</p-->
+                    <!--p class="ui-li-aside">BlackBerry</p-=>
                 </a>
             </li>
             <li>
@@ -192,11 +123,11 @@
             </li>
         </ul>
 </center>
-                <!--a class="minibox orange nav" href="#eventi"> Eventi</a>
+                <!=-a class="minibox orange nav" href="#eventi"> Eventi</a>
                 <a class="minibox green nav" href="#lab"> Laboratori</a>
                 <a class="minibox green nav" href="#ultime"> News</a>
                 <a class="minibox green nav" href="#tag"> Tag</a>
-                <a class="minibox blue nav" href="#quotidiano"> Un post a caso</a-->
+                <a class="minibox blue nav" href="#quotidiano"> Un post a caso</a ==>
 
         <br/ style="clear:both;">
             <div id="aggiornahome">Aggiorna i contenuti dal sito XM24 di tanto in tanto.
@@ -227,15 +158,14 @@
                 <input type="button" value="OK" onclick='$("#benvenuta").popup("close");alterContent(#info);' />
 
             </div>
-    </div>
-
+    </div> -->
 
-    </div>
-    <div data-role="page" id="events" data-prev="index" data-next="" data-dom-cache="true" data-theme="a" class="ui-page">
+    <div data-role="page" id="info" data-prev="index" data-next="" data-dom-cache="true" data-theme="a" class="ui-page">
         <div role="main" class="ui-content">
+          <!-- <center><p><img src="image/xm-logo.png" class="rwd" /></p></center> -->
             <div class="ui-body">
-                <p class="introlettera">EVENTI</p>
-                <p id="mostralista" class="listatovirgole listevoci">
+                <p class="introlettera">Info e comunicati</p>
+                <p id="mostralistainfo" class="listatovirgole listevoci">
                     <img class="gifloader" src="./image/ajax_loader_red_512.gif" />
                 </p>
             </div>
@@ -243,12 +173,12 @@
         </div>
         <!--chiude content -->
     </div>
-    <div data-role="page" id="ilove" data-prev="index" data-next="" data-dom-cache="true" data-theme="a" class="ui-page">
 
+    </div>
+    <div data-role="page" id="events" data-prev="index" data-next="" data-dom-cache="true" data-theme="a" class="ui-page">
         <div role="main" class="ui-content">
-
             <div class="ui-body">
-                <p class="introlettera">IO AMO XM</p>
+                <p class="introlettera">EVENTI</p>
                 <p id="mostralista" class="listatovirgole listevoci">
                     <img class="gifloader" src="./image/ajax_loader_red_512.gif" />
                 </p>
@@ -257,14 +187,13 @@
         </div>
         <!--chiude content -->
     </div>
-    <!-- chiude pagina -->
-    <div data-role="page" id="info" data-prev="index" data-next="" data-dom-cache="true" data-theme="a" class="ui-page">
+    <div data-role="page" id="ilove" data-prev="index" data-next="" data-dom-cache="true" data-theme="a" class="ui-page">
 
         <div role="main" class="ui-content">
 
             <div class="ui-body">
-                <p class="introlettera">Info e comunicati</p>
-                <p id="mostralistainfo" class="listatovirgole listevoci">
+                <p class="introlettera">IO AMO XM</p>
+                <p id="mostralista" class="listatovirgole listevoci">
                     <img class="gifloader" src="./image/ajax_loader_red_512.gif" />
                 </p>
             </div>
@@ -273,6 +202,8 @@
         <!--chiude content -->
     </div>
     <!-- chiude pagina -->
+
+    <!-- chiude pagina -->
     <div data-role="page" id="quotidiano" data-transition="slide" data-prev="index" data-next="" data-dom-cache="true" data-theme="a" class="ui-page">
         <div role="main" class="ui-content">
             <div class="ui-body"><img onclick='myJsonRandomPost("#titolosingleR", "#mostracontentsingleR");' src="./image/RICARICA.png" style="float:right;width:80px;cursor:pointer;" />
@@ -297,7 +228,7 @@
                 <p>
                     Aggiorna i contenuti dal sito XM24 di tanto in tanto.
                     <br/> Per iniziare da capo e riscaricare tutti i contenuti clicca su reset. </p>
-                
+
 
                     <center>
                         <img src="./image/icona_aggiorna.png" id="aggiorna" />
@@ -314,14 +245,14 @@
                         </fieldset>
 
                     </center>
-                
+
 
                 <p id="boxdata" style="display:none;">I tuoi diritti sono stati aggiornati l'ultima volta il <span id="datadiritti">2016/07/18</span> alle <span id="datadirittiora">00:00</span>.</p>
                 <img src="image/icona_aggiorna.gif" style="visibility:hidden;" id="aggiornamento" />
             </div>
-            
+
         </div>
-        
+
     </div>
    chiude pagina -->
     <div data-role="page" id="singleQpost" data-prev="index" data-next="" data-dom-cache="true" data-theme="a" class="ui-page">

+ 87 - 11
www/js/main.js

@@ -109,6 +109,7 @@ function getParameterByName(name, url) {
 function display_results(contenitore, messaggio) {
     $(contenitore).text(messaggio);
 };
+
 $(function () {
     $("form").submit(function () {
         return false;
@@ -136,23 +137,98 @@ function setFirstRun() {
         }
     }
 };
+
 /*per link in browser di default */
 document.addEventListener("deviceready", onDeviceReady, false);
 //le cose all'inizio
+
+
+
+    $(document).on("mobileinit", function () {
+
+        $("body").pagecontainer({
+            defaults: true
+        });
+
+        $(".ui-loader").loader({
+            defaults: true
+        });
+        $("input").button();
+    });
+
+
+
+    $(document).on("pagecontainerchange", function () {    
+
+        var current = $(".ui-page-active").prop("id");     // Remove active class from nav buttons
+            
+        console.log("current" + current);
+        $("[data-role='navbar'] a.ui-btn-active").removeClass("ui-btn-active");     // Add active class to current nav button
+            
+        $("[data-role='navbar'] a").each(function () {
+            var href = $(this).prop("href");        
+            if (href.indexOf(current, href.length - current.length) !== -1) {            
+                $(this).addClass("ui-btn-active");        
+            }    
+        });
+
+    });
+
+    $(document).on("pagecreate", function () {
+        $("body > [data-role='panel']").panel();
+        $("body > [data-role='panel'] [data-role='listview']").listview();
+        $("body > [data-role='header']").toolbar();
+        $("body > [data-role='footer']").toolbar();
+        $("body > [data-role='navbar']").navbar();
+        $("#navfooter").navbar();
+        postInList();
+    });
+
+    /*per inizio navigazione*/
+    var Site = function () {
+        this.homepage = "#index"; // the default page that is loaded
+        this.init();
+    };
+
+    Site.prototype.init = function () {
+
+        var self = this;
+
+        $(document).ready(function () {
+
+            // default page if no hash given
+            // this changes the hash, so the event is fired
+            // no need to call self.navigate
+
+
+            window.location.hash = self.homepage;
+        });
+    };
+    // On document ready
+    $(function () {
+        // intercettaUrl();
+        // new Site();
+        // $(".minibox").click(function () {});
+    });
+
 function onDeviceReady() {
     // console.log('deviceready');
     createDB();
     setFirstRun();
-    $("#navheader").addClass("hide");
-    $("#navfooter").addClass("hide");
     $("a.nav").on("click", function (event) {
         // Prevent the usual navigation behavior
         event.preventDefault();
         hrefseguente = $(this).attr("href");
         alterContent(hrefseguente);
     });
+    // eliminare le due righe:
+    $("body > [data-role='header']").toolbar();
+    $("[data-role='navbar']").navbar();
+    alterContent("#info");
 };
 
+
+
 function overlayblock() {
     $(".overlaynero").toggleClass("hide");
 }
@@ -160,7 +236,7 @@ function overlayblock() {
 function checkConnection(code, msgConnect) {
     var msgTitle = "Non sei connesso";
     msgConnect = msgConnect ||  "Occore essere connessi per poter ricevere i nuovi articoli";
-    
+
     var networkState = navigator.connection.type;
     var states = {};
     states[Connection.UNKNOWN] = 'Unknown connection';
@@ -498,9 +574,9 @@ function cercaMe() {
                     var dTime = new Date(time);
                     if (dTime.getTime() <= lastUpdateDate) {
                         //key mi dice l'indice'
-                        items.push("<li><a href='#singleQpost' data-post='" + id + "'>" + title + "</a><br/><small>" + cleanTime + "</small>|</li>");
+                        items.push("<li><a href='#singleQpost' data-post='" + id + "'>" + title + "</a><br/><small>" + cleanTime + "</small></li>");
                     } else {
-                        items.push("<p><a href='#' onclick='aggiornaora();' style='color:#666;' data-post='" + id + "'>" + title + "</a><br/><small>" + cleanTime + "</small>|</p>");
+                        items.push("<p><a href='#' onclick='aggiornaora();' style='color:#666;' data-post='" + id + "'>" + title + "</a><br/><small>" + cleanTime + "</small></p>");
                     }
                 });
                 $("<ul/>", {
@@ -576,11 +652,11 @@ function JSONErrorHandler(jqXHR, textStatus, errorThrown) {
 
 function cerca() {
     var ret = checkConnection('ERR_CERCA');
-    
+
     if (ret) {
         cercaMe();
-    } 
-    
+    }
+
     return ret;
 };
 
@@ -593,7 +669,7 @@ function mostraEsperto() {
     if (ret) {
         myJsonPage(2167, '#espertotitle', '#mostraesperto');
     }
-    
+
     return ret;
 };
 
@@ -602,7 +678,7 @@ function checkAndUpdate() {
     if (ret) {
         update();
     }
-    
+
     return ret;
 };
 
@@ -610,7 +686,7 @@ function checkAndReset() {
     var ret = checkConnection('ERR_ESPERTO');
     if (ret) {
         resetAndUpdate();
-    } 
+    }
 
     return ret;
 };

+ 4 - 4
www/js/query.js

@@ -22,10 +22,10 @@ function myJsonCategory(Qcategory, div, addTagCategory) {
                      }
                  });
                  //key mi dice l'indice'
-                 items.push("<li class='"+ cattag +"'><a href='#singleQpost' data-post='" + id + "'>" + title + "</a><br/><small>" + cleanTime + "</small>|<span>" + tag + "</span>|</li>");
+                 items.push("<li class='"+ cattag +"'><a href='#singleQpost' data-post='" + id + "'>" + title + "</a><br/><small>" + cleanTime + "</small><span>" + tag + "</span>|</li>");
              }
             else {*/
-                items.push("<li><a href='#singleQpost' data-post='" + id + "'>" + title + "</a><br/><small>" + cleanTime + "</small>|</li>");
+                items.push("<li><a href='#singleQpost' data-post='" + id + "'>" + title + "</a><br/><small>" + cleanTime + "</small></li>");
 
         }
         $("<ul/>", {
@@ -56,7 +56,7 @@ function myJsonLastPage(div) {
                         var splitTime = time.split("T");
                         var cleanTime = splitTime[0];
                         //key mi dice l'indice'
-                        items.push("<li><a href='#singleQpost' data-post='" + id + "'>" + title + "</a><br/><small>" + cleanTime + "</small>|");
+                        items.push("<li><a href='#singleQpost' data-post='" + id + "'>" + title + "</a><br/><small>" + cleanTime + "</small>");
                     }
                     $("<ul/>", {
                         "class": "my-new-list"
@@ -92,7 +92,7 @@ function myJsonCategoryPaginated(Qcategory, div, pageNumber) {
             var splitTime = time.split("T");
             var cleanTime = splitTime[0];
             //key mi dice l'indice'
-            items.push("<li><a href='#singleQpost' data-post='" + id + "'>" + title + "</a><br/><small>" + cleanTime + "</small>|</li>");
+            items.push("<li><a href='#singleQpost' data-post='" + id + "'>" + title + "</a><br/><small>" + cleanTime + "</small></li>");
         }
         $("<ul/>", {
             "class": "my-new-list"

Some files were not shown because too many files changed in this diff