git-svn-id: https://msi/svn/firstRepo/WebClient/branches/Manut_3.0.1@81 0f545695-f87b-41b6-9a03-7f16563b5454

.htaccess

@@ -1,4 +1,4 @@
-AddHandler application/x-httpd-php .html .htm
+#AddHandler application/x-httpd-php .html .htm
 <ifModule mod_gzip.c>
 	mod_gzip_on Yes
 	mod_gzip_dechunk Yes
@@ -24,13 +24,18 @@ AddOutputFilterByType DEFLATE text/css application/x-javascript text/html text/r
 
 <ifModule mod_rewrite.c>
 	RewriteEngine On
-        RewriteRule ^index.html$ index.php [L]
+	RewriteBase /
-	RewriteRule ^js/libs/(.*)\.[0-9]+\.js$ /WebClient_Manut/js/libs/$1.js [L]
+    #RewriteRule ^index.html$ index.php [L]
-	RewriteRule ^js/(.*)\.[0-9]+\.js$ /WebClient_Manut/js/$1.js [L]
+	RewriteRule ^.*js/libs/(.*)\.[0-9]+\.js$ /WebClient_Manut/js/libs/$1.js [L]
-	RewriteRule ^css/(.*)\.[0-9]+\.css$ /WebClient_Manut/css/$1.css [L]
+	RewriteRule ^.*js/(.*)\.[0-9]+\.js$ /WebClient_Manut/js/$1.js [L]
-	RewriteRule ^Resources/img/(.*)\.[0-9]+\.png$ /WebClient_Manut/Resources/img/$1.png [L]
+	RewriteRule ^r.*/.*js/(.*).js$ /WebClient_Manut/js/$1.js [L]
-	RewriteRule ^Resources/img/(.*)\.[0-9]+\.gif$ /WebClient_Manut/Resources/img/$1.gif [L]
+	RewriteRule ^r.*/.*js/(.*).html$ /WebClient_Manut/js/$1.html [L]
-	RewriteRule ^Resources/icons/(.*)\.[0-9]+\.png$ /WebClient_Manut/Resources/icons/$1.png [L]
+	RewriteRule ^.*css/(.*)\.[0-9]+\.css$ /WebClient_Manut/css/$1.css [L]
+	RewriteRule ^r.*/.*css/(.*).gif$ /WebClient_Manut/css/$1.gif [L]
+	#RewriteRule ^/Resources/img/(.*)\.[0-9]+\.png$ /WebClient_Manut/Resources/img/$1.png [L]
+	#RewriteRule ^/Resources/img/(.*)\.[0-9]+\.gif$ /WebClient_Manut/Resources/img/$1.gif [L]
+	#RewriteRule ^/Resources/icons/(.*)\.[0-9]+\.png$ /WebClient_Manut/Resources/icons/$1.png [L]
+	RewriteRule ^r(.*)/$ /WebClient_Manut/index.php?ricetta=$1 [L]
 </ifModule>
 
 <ifModule mod_headers.c>

build.cmd

@@ -1,4 +1,4 @@
-call uglifyjs .\js\libs\hello.min.js .\js\libs\ua-parser.min.js -o .\js\common.min.js
+call uglifyjs .\js\libs\hello.min.js .\js\libs\ua-parser.min.js .\js\libs\markerclusterer.js -o .\js\common.min.js
 REM node r.js -o app.build_dev.js
 node r.js -o app.build_prod.js
 REM call cleancss -o .\css\loadingStyle.min.css .\css\loadingStyle.css

index.php

@@ -12,16 +12,12 @@
         <meta property="og:locale" content="it_IT"/>
         <meta property="og:site_name" content="Il Lievitario"/>
         <meta itemprop="name" content="Home - Il Lievitario"/>
-<?php
+<?php        
-        $reqURI = $_SERVER['REQUEST_URI'];
         $ogFbTitle = "Home - Il Lievitario";
-        $ogFbUrl = "http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
+        $ogFbUrl = "";
         $ogFbType = "website";
         $ogFbImage = "http://app.gruppolapastamadre.it/previewLink.png";
         $ogFbDescription = "Ricettario web del il Gruppo la pasta madre";
-        echo $_SERVER['REQUEST_URI'];
-        if(strpos($reqURI, "/#ricetta/") !== false)
-        {}
 ?>
         <meta property="og:title" content="<?php echo $ogFbTitle; ?>"/>
         <meta property="og:url" content="<?php echo $ogFbUrl; ?>"/>

js/manifest.js

@@ -1,9 +1,10 @@
 var myManifest = {
     Debug: (window.location.port !== ""),
     Name: "Il Lievitario",
-    Version: "3.0.3.8",
+    Version: "3.0.5.2",
     Author: "Denis Ironi",
     Settings: {
+        ShowStartMessage: true,
         DefaultURL: (window.location.port === "" ? "http://" + window.location.host + "/Service": "http://" + window.location.hostname + ":" + window.location.port + "/Service_Manut"),
         JQueryVersion: "1.11.1",
         JQueryMobileVersion: "1.4.5",

js/modules/home/home.js

@@ -23,10 +23,15 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/home/homeViewTemplate.
                     }
                 },
                 events: {
+                    "click #noSpacc": "noSpacc",
                 },
 
                 freeWall: null,
 
+                noSpacc: function(){
+                    window.localStorage.setItem("noSpacc", 1);
+                },
+
                 calculateSize: function(){
                     var size = 100;
                     var widthDevice = (window.innerWidth > 0) ? window.innerWidth : screen.width;
@@ -125,8 +130,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/home/homeViewTemplate.
                         }
                     });
                     this.freeWall.fitWidth();
-                },
+                },                
-
                 onShowed: function ()
                 {
                     var self = this;
@@ -137,7 +141,13 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/home/homeViewTemplate.
                     {
                         this.changePicture(Profile.data.picture);
                     }
-
+                    if(myManifest.Settings.ShowStartMessage && 
+                       Profile.data.isSpacc === "0" &&
+                       window.localStorage.getItem("noSpacc") === null)
+                    {
+                        this.$el.find("#nomeUtente").text(Profile.data.name);
+                        this.$el.find("#messaggioSpacciatore").popup("open");
+                    }
                     //Debug.writeMessage(myManifest.Agent.ua);
                 },
                 onClosing: function () {

js/modules/home/homeViewTemplate.html

@@ -46,19 +46,15 @@
         </div>
     </div>
 </div>
-<!--<div data-role="popup" id="nuovoGruppo" data-history="false" data-dismissible="false">
+<div data-role="popup" id="messaggioSpacciatore" data-history="false" data-dismissible="false">
-    <div data-role="header"><h1>IMPORTANTE</h1></div>
+    <div data-role="header"><h1>Messaggio per la comunità</h1></div>
         <div role="main" class="ui-content">
         <p style="text-align: center;font-style: italic;">
-            <img src="https://dl.dropboxusercontent.com/s/xnbrbbe7eejkfv2/festa.png"><br><br>
+            Ciao <b id="nomeUtente"></b> visualizzi questo messaggio perchè fai parte di questo grande gruppo<br><br>Ci chiedavamo se volessi diventare <i>"Spacciatore di Pasta madre"</i>
-            Le admin <br><br><b>Alessia, Elena e Francesca</b><br><br>hanno RIFONDATO IL GRUPPO!!<br>
-            <br>"<b>Gruppo La Pasta Madre</b>"<br>
-            <br>vuoi chiedere di diventare membro?
-            <br>Se sei già membro premi si e poi torna indietro con il browser
         </p>
         <p style="text-align: center;">
-            <a id="goFbGroup" href="#" class="ui-btn ui-corner-all ui-shadow ui-btn-inline ui-btn-b" data-rel="back">Si</a>
+            <a id="goFbGroup" href="#settingsView1" class="ui-btn ui-corner-all ui-shadow ui-btn-inline ui-btn-d">Si</a>
-            <a href="#" class="ui-btn ui-corner-all ui-shadow ui-btn-inline ui-btn-b" data-rel="back" data-transition="flow">No</a>
+            <a href="#" id="noSpacc" class="ui-btn ui-corner-all ui-shadow ui-btn-inline ui-btn-d" data-rel="back" data-transition="flow">No</a>
         </p>
     </div>
-</div>-->
+</div>

js/modules/maps/maps.js

@@ -5,6 +5,8 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/maps/mapsViewTemplate.
 
                 map: null,
                 markers: [],
+                openedInfoWindows: [],
+                markerClicked: false,
                 //initialize template
                 template: _.template(mapsViewTemplate),
                 infoWindowtemplate: _.template(infoWindowTemplate),
@@ -76,11 +78,15 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/maps/mapsViewTemplate.
                         mapTypeControl: false,
                         zoomControlOptions: {
                             position: google.maps.ControlPosition.RIGHT_CENTER
-                        },
+                        }
                     };
-                    $("#map-canvas").width(document.documentElement.clientWidth - 32/*Padding content*/);
+                    self.$el.find("#map-canvas").width(document.documentElement.clientWidth - 32/*Padding content*/);
-                    $("#map-canvas").height(document.documentElement.clientHeight - 151 - self.$el.find('#searchPanel').height());
+                    self.$el.find("#map-canvas").height(document.documentElement.clientHeight - 151 - self.$el.find('#searchPanel').height());
-                    self.map = new google.maps.Map($("#map-canvas")[0], myOptions);
+                    self.map = new google.maps.Map(self.$el.find("#map-canvas")[0], myOptions);
+
+                    self.map.addListener("dragend", function(){
+                        self.markerClicked = true;
+                    });
 
                     // Create the search box and link it to the UI element.
                     var input = $('<input id="pac-input" data-role="none" class="controls" type="text" placeholder="Ricerca località..." style="display:none;">')[0];
@@ -140,32 +146,47 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/maps/mapsViewTemplate.
 
                     self.map.addListener('bounds_changed', function() {
                         var bound = self.map.getBounds();
-                        searchBox.setBounds(bound);
+                        searchBox.setBounds(bound);                        
-                        var latLngFrom = bound.getNorthEast();
-                        var latLngTo = bound.getSouthWest();
-                        $.ajax({
-                            url: myManifest.Settings.DefaultURL + "/api/spacciatori/bound/" + latLngFrom.lat() + "/"+ latLngFrom.lng() + "/" + latLngTo.lat() + "/"+ latLngTo.lng(),
-                            //dataType: "json",
-                            //async: false,
-                            type: 'GET',
-                            success: function (resp) {                                
-                                resp.forEach(function(ele, index){
-                                    var key = "|" + ele.Latitudine+ "|" + ele.Longitudine+ "|";
-                                    if(!self.markers[key])
-                                    {
-                                        self._makeMarker(ele, key);
-                                    }
-                                    else if(!self.markers[key][ele.ID])
-                                    {
-                                        ele.Latitudine = parseFloat(ele.Latitudine) + (Math.random() / 500);
-                                        ele.Longitudine = parseFloat(ele.Longitudine) + (Math.random() / 500);
-                                        self._makeMarker(ele, key);
-                                    }
-                                });
-                            }
-                        });
                     });
                     $("#pac-input").show();
+
+                    var markersArray = [];
+                    var latLngFrom = new google.maps.LatLng(85, -180);
+                    var latLngTo = new google.maps.LatLng(-85, 180);
+                    $.ajax({
+                        url: myManifest.Settings.DefaultURL + "/api/spacciatori/bound/" + latLngFrom.lat() + "/"+ latLngFrom.lng() + "/" + latLngTo.lat() + "/"+ latLngTo.lng(),
+                        //dataType: "json",
+                        //async: false,
+                        type: 'GET',
+                        success: function (resp) {                                
+                            resp.forEach(function(ele, index){
+                                var key = "|" + ele.Latitudine+ "|" + ele.Longitudine+ "|";
+                                if(!self.markers[key])
+                                {
+                                    markersArray.push(self._makeMarker(ele, key));
+                                }
+                                else if(!self.markers[key][ele.ID])
+                                {
+                                    ele.Latitudine = parseFloat(ele.Latitudine) + (Math.random() / 500);
+                                    ele.Longitudine = parseFloat(ele.Longitudine) + (Math.random() / 500);
+                                    markersArray.push(self._makeMarker(ele, key));
+                                }
+                            });
+
+                            markerClusterer = new MarkerClusterer(self.map, markersArray, {
+                              maxZoom: 15
+                              // ,styles: {
+                              //       url: '../images/pin.png',
+                              //       height: 48,
+                              //       width: 30,
+                              //       anchor: [-18, 0],
+                              //       textColor: '#ffffff',
+                              //       textSize: 10,
+                              //       iconAnchor: [15, 48]
+                              //     }
+                            });
+                        }
+                    });
                 },
                 _makeMarker: function(ele,key){
                     var self = this;
@@ -174,7 +195,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/maps/mapsViewTemplate.
                         icon: ele.TipoPM == "4"?self.iconPMGF:self.iconPM,
                         //label: ele.Name,
                         title: $("<div/>").html(unescape(ele.Name)).text(),
-                        map: self.map
+                        //map: self.map
                       });
                     
                     if(!self.markers[key])
@@ -183,24 +204,34 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/maps/mapsViewTemplate.
                     self.markers[key][ele.ID] = marker;
 
                     var infowindow = new google.maps.InfoWindow({
-                        content: self.infoWindowtemplate({item: ele})
+                        content: self.infoWindowtemplate({item: ele}),
+                        closeclick: function(){
+                            var index = openedInfoWindows.indexOf(this);
+                            if (index > -1) {
+                                self.openedInfoWindows.splice(index, 1);
+                            }
+                        }
                       });
 
                     marker.addListener('click', function() {
+                        self.markerClicked = true;
+                        self.openedInfoWindows.push(infowindow);
                         infowindow.open(self.map, marker);
                     });
+
+                    return marker;
                 },
                 onShowed: function(){
                     if(this.map)
-                        return;
+                         return;
 
                     var self = this;
 
                     $( window ).resize( function(){
                         $("#map-canvas").width(document.documentElement.clientWidth - 32/*Padding content*/);
                         $("#map-canvas").height(document.documentElement.clientHeight - 151 - self.$el.find('#searchPanel').height());
-                    });
+                    });                    
-                    
+
                     if ( navigator.geolocation ) {
                         function success(pos) {
                             // Location found, show map with these coordinates
@@ -214,6 +245,18 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/maps/mapsViewTemplate.
                     } else {
                         self._drawMap(self.defaultLatLng);  // No geolocation support, show default map
                     }
+
+                    $("#map-canvas").click(function(){
+                        if(self.markerClicked){
+                            self.markerClicked = false;
+                            return;
+                        }
+                        self.openedInfoWindows.forEach(function(item, index){
+                            item.close();
+                        });
+
+                        self.openedInfoWindows = [];
+                    });
                 },
                 onClosing: function(){
                     var self = this;

js/modules/settings/settings.js

@@ -6,10 +6,12 @@ define(['jquery', 'underscore', 'backbone','text!modules/settings/settingsViewTe
             //initialize template
             template:_.template(settingsViewTemplate),
             _flagSave: false,
+            activateTab: 0,
 
-            initialize: function () {
+            initialize: function (tab) {
                 var self = this;
                 this.id = "SettingsView";
+                this.activateTab = tab;
                 SettingsView.__super__.initialize.call(this);                
             },
 
@@ -133,8 +135,45 @@ define(['jquery', 'underscore', 'backbone','text!modules/settings/settingsViewTe
                     });
                 }
             },
+            onShowing: function (){
+                if (!Profile.isConnected()) {
+                    $('h1').hide();
+                    $('[data-role="tabs"]').hide();
+                    $('#saveBtn').hide();
+                    return;
+                }
+                if(this.activateTab === "1"){
+                    var contents = this.$el.find('div[data-role="tabs"] > .ui-content');
+                    var navbars = this.$el.find('div[data-role="navbar"] a');
+                    $(contents[0]).hide();                    
+                    $(navbars[0]).removeClass('ui-btn-active');
+                    $(navbars[0]).removeClass('ui-state-persist');
+
+                    $(contents[1]).show();
+                    $(navbars[1]).addClass('ui-btn-active');
+                    $(navbars[1]).addClass('ui-state-persist');
+                }
+            },
             onShowed: function(){
                 var self = this;
+
+                if(this.activateTab === "1"){
+                    
+                    var intervalID = setInterval(function(){
+                        $('[for="spacc-PMChk"]').attr("style", "border: 4px red solid; border-style: dashed;");
+                    }, 500);
+
+                    var intervalID2 = setInterval(function(){
+                        $('[for="spacc-PMChk"]').attr("style", "border: 4px red solid; border-style: solid;");
+                    }, 1000);
+
+                    setTimeout(function(){
+                        clearInterval(intervalID);
+                        clearInterval(intervalID2);
+                        $('[for="spacc-PMChk"]').attr("style", "");
+                    }, 5000);
+                }
+
                 if(Profile.data.isSpacc==="0"){
                     this.$el.find('#mapSpacc > :not(.ui-checkbox:has(#spacc-PMChk))').hide();
                 }
@@ -218,6 +257,10 @@ define(['jquery', 'underscore', 'backbone','text!modules/settings/settingsViewTe
                     this.$el.append(this.template());
                     this.$el.append(this.footer.$el);
                 }
+                
+                var navbars = this.$el.find('div[data-role="navbar"] a');
+                $(navbars[0]).addClass('ui-btn-active');
+                $(navbars[0]).addClass('ui-state-persist');
 
                 this.$el.find('#nResult').val(Profile.data.risRic);
                 this.$el.find('#theme').val(Profile.data.tema);

js/modules/settings/settingsViewTemplate.html

@@ -11,10 +11,9 @@
 			<label for="nResult">Numero Risultati Ricerca:</label>
 			<select name="nResult" id="nResult">
 				<option value="10" selected="true">10</option>
-				<option value="15">15</option>
+	            <option value="25">25</option>
-				<option value="20">20</option>
+	            <option value="50">50</option>
-				<option value="25">25</option>
+	            <option value="100">100</option>
-				<option value="30">30</option>
 			</select>
 			<label for="theme">Tema Grafico:</label>
 			<select name="theme" id="theme">
@@ -60,6 +59,7 @@
 				<option value='ROMANIA'>Romania</option>
 				<option value='SLOVACCHIA'>Slovacchia</option>
 				<option value='SLOVENIA'>Slovenia</option>
+				<option value='SUDAFRICA'>SudAfrica</option>
 				<option value='SPAGNA'>Spagna</option>
 				<option value='USA'>Stati Uniti D'America</option>
 				<option value='SVEZIA'>Svezia</option>

js/router.js

@@ -55,7 +55,7 @@ define(['jquery', 'underscore', 'backbone',
                     'searchView': 'showSearch',
                     'mapsView': 'showMaps',
                     'debugView': 'showDebug',
-                    'settingsView': 'showSettings',
+                    'settingsView(:tab)': 'showSettings',
                     'donationView': 'showDonation',
                     'search/:nresult/:categoria/:difficolta/:autore/*titolo': 'searchFn',
                     'converterView': 'showConverter',
@@ -71,8 +71,10 @@ define(['jquery', 'underscore', 'backbone',
                     homeView.render();
                     this.changePage(homeView);
                 },
-                showSettings: function (actions) {
+                showSettings: function (tab) {
-                    var settingsView = new SettingsView();
+                    if(tab==null)
+                        tab = 0;
+                    var settingsView = new SettingsView(tab);
                     settingsView.render();
                     this.changePage(settingsView);
                 },