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

2016-03-06 22:02:12 +00:00
parent 2e557160f9
commit 8ba6571a7b
8 changed files with 87 additions and 58 deletions
@@ -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]
-	RewriteRule ^js/libs/(.*)\.[0-9]+\.js$ /WebClient_Manut/js/libs/$1.js [L]
-	RewriteRule ^js/(.*)\.[0-9]+\.js$ /WebClient_Manut/js/$1.js [L]
-	RewriteRule ^css/(.*)\.[0-9]+\.css$ /WebClient_Manut/css/$1.css [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]
+	RewriteBase /
+    #RewriteRule ^index.html$ index.php [L]
+	RewriteRule ^.*js/libs/(.*)\.[0-9]+\.js$ /WebClient_Manut/js/libs/$1.js [L]
+	RewriteRule ^.*js/(.*)\.[0-9]+\.js$ /WebClient_Manut/js/$1.js [L]
+	RewriteRule ^r.*/.*js/(.*).js$ /WebClient_Manut/js/$1.js [L]
+	RewriteRule ^r.*/.*js/(.*).html$ /WebClient_Manut/js/$1.html [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>
@@ -13,40 +13,11 @@
        <meta property="og:site_name" content="Il Lievitario"/>
        <meta itemprop="name" content="Home - Il Lievitario"/>
 <?php        
-function get_current_url() {
-  $url  = 'http' . ($_SERVER['HTTPS'] == 'on' ? 's' : '') . '://'
-        . $_SERVER['SERVER_NAME']
-        . ($_SERVER['SERVER_PORT'] !== 80  ? ':' . $_SERVER['SERVER_PORT'] : '')
-        . $_SERVER['REQUEST_URI'];
-  return $url;
-}
-
-        require_once "../Service_Manut/config.inc.php";
-
-        // inclusione del file contenente la classe
-        require_once "../Service_Manut/MySqlClass.php";
-        require_once "../Service_Manut/utility.php";
-
-        $reqURI = $_SERVER['SCRIPT_FILENAME'];
        $ogFbTitle = "Home - Il Lievitario";
-        $ogFbUrl = get_current_url();
+        $ogFbUrl = "";
        $ogFbType = "website";
        $ogFbImage = "http://app.gruppolapastamadre.it/previewLink.png";
        $ogFbDescription = "Ricettario web del il Gruppo la pasta madre";
-        $posRic = strpos($reqURI, "/#ricetta/");
-        if( $posRic !== false)
-        {
-            $idRicetta = substr($reqURI, $posRic + 10);
-            $ogFbType = "article";
-            $mysqlconnetion = new MysqlClass;
-            $query = "SELECT categorie.name AS categoria_name, " .
-             "titolo, procedimento, autore, valutazione FROM ricette " . 
-             "INNER JOIN categorie ON categorie.ID = ricette.id_categoria WHERE ricette.ID = " . $itemID;
-            $retObj = $mysqlconnetion->queryToObject($query);
-            $ogFbTitle = html_entity_decode($retObj[0]["titolo"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
-            $ogFbTitle = $ogFbTitle . " di " . html_entity_decode($retObj[0]["autore"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1');
-            $ogFbDescription = substr(html_entity_decode($retObj[0]["procedimento"], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1'), 0, 30);
-        }
 ?>
        <meta property="og:title" content="<?php echo $ogFbTitle; ?>"/>
        <meta property="og:url" content="<?php echo $ogFbUrl; ?>"/>
@@ -1,9 +1,10 @@
 var myManifest = {
    Debug: (window.location.port !== ""),
    Name: "Il Lievitario",
-    Version: "3.0.3.8",
+    Version: "3.0.4.1",
    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",
@@ -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;
@@ -126,7 +131,6 @@ 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 () {
@@ -46,19 +46,15 @@
        </div>
    </div>
 </div>
-<!--<div data-role="popup" id="nuovoGruppo" data-history="false" data-dismissible="false">
-    <div data-role="header"><h1>IMPORTANTE</h1></div>
+<div data-role="popup" id="messaggioSpacciatore" data-history="false" data-dismissible="false">
+    <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>
-            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
+            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>
        </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 href="#" class="ui-btn ui-corner-all ui-shadow ui-btn-inline ui-btn-b" data-rel="back" data-transition="flow">No</a>
+            <a id="goFbGroup" href="#settingsView1" class="ui-btn ui-corner-all ui-shadow ui-btn-inline ui-btn-d">Si</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>
@@ -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();
                }
@@ -219,6 +258,10 @@ define(['jquery', 'underscore', 'backbone','text!modules/settings/settingsViewTe
                    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);

@@ -60,6 +60,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>
@@ -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) {
-                    var settingsView = new SettingsView();
+                showSettings: function (tab) {
+                    if(tab==null)
+                        tab = 0;
+                    var settingsView = new SettingsView(tab);
                    settingsView.render();
                    this.changePage(settingsView);
                },