git-svn-id: https://msi/svn/firstRepo/WebClient/branches/Manut_2.2.3@24 0f545695-f87b-41b6-9a03-7f16563b5454

.htaccess

@@ -15,12 +15,12 @@ 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$ /IlLievitarioManut/js/libs/$1.js [L]
+	RewriteRule ^js/libs/(.*)\.[0-9]+\.js$ /WebClient_Manut/js/libs/$1.js [L]
-	RewriteRule ^js/(.*)\.[0-9]+\.js$ /IlLievitarioManut/js/$1.js [L]
+	RewriteRule ^js/(.*)\.[0-9]+\.js$ /WebClient_Manut/js/$1.js [L]
-	RewriteRule ^css/(.*)\.[0-9]+\.css$ /IlLievitarioManut/css/$1.css [L]
+	RewriteRule ^css/(.*)\.[0-9]+\.css$ /WebClient_Manut/css/$1.css [L]
-	RewriteRule ^Resources/img/(.*)\.[0-9]+\.png$ /IlLievitarioManut/Resources/img/$1.png [L]
+	RewriteRule ^Resources/img/(.*)\.[0-9]+\.png$ /WebClient_Manut/Resources/img/$1.png [L]
-	RewriteRule ^Resources/img/(.*)\.[0-9]+\.gif$ /IlLievitarioManut/Resources/img/$1.gif [L]
+	RewriteRule ^Resources/img/(.*)\.[0-9]+\.gif$ /WebClient_Manut/Resources/img/$1.gif [L]
-	RewriteRule ^Resources/icons/(.*)\.[0-9]+\.png$ /IlLievitarioManut/Resources/icons/$1.png [L]
+	RewriteRule ^Resources/icons/(.*)\.[0-9]+\.png$ /WebClient_Manut/Resources/icons/$1.png [L]
 </ifModule>
 
 <ifModule mod_headers.c>

build.cmd

@@ -1,5 +1,6 @@
+call uglifyjs .\js\openfb.js .\js\opengplus.js .\js\libs\ua-parser.min.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
-call cleancss -o .\css\style.min.css .\css\style.css
+call cleancss --s0 --skip-rebase -o .\css\style.min.css .\css\style.css
 pause

css/base.style.css

@@ -9,7 +9,8 @@
 .ui-icon-myHome:after {
     background: url("https://dl.dropboxusercontent.com/s/w5evmv0suijf2jd/house.png") 50% 50% no-repeat; background-size: 22px 22px;
     margin-top: -15px !important;
-    width: 30px!important; height: 30px!important; margin-left: -15px !important; box-shadow: none!important; -moz-box-shadow: none!important; -webkit-box-shadow: none!important; -webkit-border-radius: 0 !important; border-radius: 0 !important;
+    width: 30px!important; height: 30px!important; margin-left: -15px !important; 
+    box-shadow: none!important; -moz-box-shadow: none!important; -webkit-box-shadow: none!important; -webkit-border-radius: 0 !important; border-radius: 0 !important;
 }
 
 #favoriteBtn:after { background:  url("https://dl.dropboxusercontent.com/s/ptt4475xkrv0chu/favorite.png") 50% 50% no-repeat;  background-size: 22px 22px; }
@@ -26,23 +27,23 @@
 #saveBtn:after { background:  url("https://dl.dropboxusercontent.com/s/dsqkblkv9zgqyab/save.png") 50% 50% no-repeat;  background-size: 22px 22px;
     box-shadow: none!important; -moz-box-shadow: none!important; -webkit-box-shadow: none!important; -webkit-border-radius: 0 !important; border-radius: 0 !important;}
 
-.loginfb {
+.loginfb:before {
-    content: url('https://www.dropbox.com/s/vsc19gan0ihjptr/fblogin.png');
+    content: url('https://dl.dropboxusercontent.com/s/vsc19gan0ihjptr/fblogin.png');
     width: 200px;
 }
 
-.logoutfb {
+.logoutfb:before {
-    content: url('https://www.dropbox.com/s/sdbe56vqxeqevph/fblogout.png');
+    content: url('https://dl.dropboxusercontent.com/s/sdbe56vqxeqevph/fblogout.png');
     width: 200px;
 }
 
-.logingplus {
+.logingplus:before {
-    content: url('https://www.dropbox.com/s/k43w3cfzowlynhk/gpluslogin.png');
+    content: url('https://dl.dropboxusercontent.com/s/k43w3cfzowlynhk/gpluslogin.png');
     width: 200px;
 }
 
-.logoutgplus {
+.logoutgplus:before {
-    content: url('https://www.dropbox.com/s/nnprsunm8zg31en/gpluslogout.png');
+    content: url('https://dl.dropboxusercontent.com/s/nnprsunm8zg31en/gpluslogout.png');
     width: 200px;
 }
 
@@ -117,6 +118,15 @@ div.ricettaAutore{
     -webkit-touch-callout: none;
 }
 
+.selectable {
+    -webkit-user-select: auto;
+    -moz-user-select: auto;
+    -ms-user-select: auto;
+    -o-user-select: auto;
+    user-select: auto;
+    -webkit-touch-callout: auto;
+}
+
 textarea {
     -webkit-user-select: auto !important;
 }

css/jquery.rating.css

@@ -1,9 +1,9 @@
 /* jQuery.Rating Plugin CSS - http://www.fyneworks.com/jquery/star-rating/ */
-div.rating-cancel,div.star-rating{float:left;width:24px;height:24px;text-indent:-999em;cursor:pointer;display:block;background:transparent;overflow:hidden}
+div.rating-cancel,div.star-rating{float:left;width:16px;height:16px;text-indent:-999em;cursor:pointer;display:block;background:transparent;overflow:hidden}
-div.rating-cancel,div.rating-cancel a{background:url(delete.png) no-repeat 0 -24px}
+div.rating-cancel,div.rating-cancel a{background:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAgCAYAAAAbifjMAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOwgAADsIBFShKgAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAABAZJREFUSEuVlGtIHFcUx++6YaPGB2ow3WqiCa2apmo0tkrQSExqrCVak7gVs6SPL6FQUGPB9RH8YkFBKPigii8oguL7rbvia0VQ/BBajCFQKCQxJsXo2mzdjbs7p/87O6luNt0kf/hx7sz9nzN3Zu497FXNz8/76fX65OXl5ZtLS0u3gWZxcfHG7Oxs5MzMzAHJ9nqNjY0dhEkHswHszs3NCYgConl6evox5n6SrM6ampqKBvcBuWJycrJpYGDAW0rbk06n6wcCDNzkChP4WkqzC4kZWq2W3paJiQkDOComd3V1KUZHR/V4f+JgTCMjIw7we+Pj4zxR9Ei+PLHA4ODgkaGhodXh4WHirKyskMViEdnd3SWTyUQ7OztkNBoJH1T0cJBTVV5e7sZ6e3uV/f399/BhiLO6ukr7ZbPZxGK8CP+IL319fX3VWL2coZInBgs9PT3EwYoIRQn3HOju7hbn93FLfAWujo6OvM7OTnoXUOBDKV2UrL29fQEIgN6AGThvqNbW1pS2trZNQG9A29TU5C+l/SdZQUGBR0NDg7q5ufkOilleTWxpadnC3FB9fX1Udna2XMqzi/8O4FlaWhpSUVGRVVVVVVtXV3e3sbFxE0XXampqdJWVlfnwxGk0mgBEp0Mlw00F8C8rKwtHTEFUFRcXq0EOxuklJSWxIKiwsPAQ5t2kvD3hl8vwu+T8VfhTsJqjiCeKiopCkRAIfAB/iHPyflFurp/w7ffJQt6PN623NLet+UUa6w95N17kfhNJyc5Ld5CQlnZQyPxKR1m5BuHq9V3hmlqwXVULGJttmTmPbRmq/+8HQmpWtC39yn364hq5wpZ2pUk4m+HcD2wXL/cLn2UKlPoluQIek3DhsmM/EM5dzKDkz+ltsSWlGYSkVHs/oI+yFZb483pr/AUS+eQ8WWOSyXpago9jwdlUsiZesns4cSn2fvD84/gj/0QnrppOnyOOubqWzDi6O+gDRkTD9jZtPHtGT54+JaPqO9FjJ6mKGHNjxohYpTHi03vGkwnEefHzL/ZGIMlqtYpNZRtFnmdcFz2cvyMSqrsYtvSa8oznVmjMguF4LHG2IxMRz9BWUJQDhmAQGiN6RN/xmL1+sHH4VN5G4Cl6F/46fNKxH6z7hC2se4UJT7zCyBXwmNd9P3DeUA/ZsZRHspDNNVkIueKR7Jj2AQt27gfBjHlo3d5T/86Ud/5k71sesCB6yUPwB1Nu/caUQ4MsMAp+x34A8RPm6e7uHpKg8MpSyb1qf2W+d/XMf3OS+a3Vy3x1KjeP/HB2IA6+AODcD4DCh/n4eyu8w+VyeQquVUANcnCdjhgLgsAh8NojzYvwpXl4M+8Ad+bOt+oJEAoCgQ9QgH3JjP0LiOu08eQI5iQAAAAASUVORK5CYII=') no-repeat 0 -16px}
-div.star-rating,div.star-rating a{background:url(star.png) no-repeat 0 0px}
+div.star-rating,div.star-rating a{background:url('data:image/png;base64,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') no-repeat 0 0px}
-div.rating-cancel a,div.star-rating a{display:block;width:24px;height:100%;background-position:0 0px;border:0}
+div.rating-cancel a,div.star-rating a{display:block;width:16px;height:100%;background-position:0 0px;border:0}
-div.star-rating-on a{background-position:0 -24px!important}
+div.star-rating-on a{background-position:0 -16px!important}
 div.star-rating-hover a{background-position:0 -48px}
 /* Read Only CSS */
 div.star-rating-readonly a{cursor:default !important}

css/style.css

@@ -1,3 +1,5 @@
+@import url("jquery.mobile.icons.min.css");
+@import url("IlLievitario.min.css");
 @import url("loadingStyle.css");
 @import url("base.style.css");
 @import url("mobile.style.css") screen;

index.php

@@ -4,50 +4,43 @@
     <title>Il Lievitario</title>
     <meta name="google" value="notranslate" />
     <meta http-equiv="expires" content="0">
-	<meta http-equiv="Pragma" content="no-cache">
+    <meta http-equiv="Pragma" content="no-cache">
-	<meta http-equiv="X-UA-Compatible" content="IE=9">
     <meta name="mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="format-detection" content="telephone=no">    
-    <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jquerymobile/1.4.3/jquery.mobile.structure.min.css" >
+    <link rel="stylesheet" href="http://code.jquery.com/mobile/1.4.3/jquery.mobile-1.4.3.min.css" >        
-        <link rel="stylesheet" href="css/jquery.mobile.icons.min.<?php echo filemtime('css/jquery.mobile.icons.min.css'); ?>.css">
+    <link rel="stylesheet" href="css/style.min.<?php echo filemtime('css/style.min.css'); ?>.css">    
-        <link rel="stylesheet" href="css/IlLievitario.min.<?php echo filemtime('css/IlLievitario.min.css'); ?>.css">
+    <link rel="shortcut icon" sizes="196x196" href="https://dl.dropboxusercontent.com/s/l26w7lk0zwnpehf/Icon_Android196.png">
-    	<link rel="stylesheet" href="css/style.min.<?php echo filemtime('css/style.min.css'); ?>.css">    
+    <link rel="apple-touch-icon" href="https://dl.dropboxusercontent.com/s/9cc174ato4hckl5/Icon.png" />
-        <link rel="shortcut icon" sizes="196x196" href="https://dl.dropboxusercontent.com/s/l26w7lk0zwnpehf/Icon_Android196.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://dl.dropboxusercontent.com/s/onehseqh6cusbo0/Icon~ipad.png" />
-        <link rel="apple-touch-icon" href="https://dl.dropboxusercontent.com/s/9cc174ato4hckl5/Icon.png" />
+    <link rel="apple-touch-icon" sizes="114x114" href="https://dl.dropboxusercontent.com/s/tcxl91zd502mapa/Icon%402x.png" />
-        <link rel="apple-touch-icon" sizes="72x72" href="https://dl.dropboxusercontent.com/s/onehseqh6cusbo0/Icon~ipad.png" />
+    <link rel="apple-touch-icon" sizes="144x144" href="https://dl.dropboxusercontent.com/s/pj3fk1lgc4cefwx/Icon~ipad%402x.png" />
-        <link rel="apple-touch-icon" sizes="114x114" href="https://dl.dropboxusercontent.com/s/tcxl91zd502mapa/Icon%402x.png" />
-        <link rel="apple-touch-icon" sizes="144x144" href="https://dl.dropboxusercontent.com/s/pj3fk1lgc4cefwx/Icon~ipad%402x.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1, minimal-ui"/>
     <meta http-equiv="Access-Control-Allow-Origin" content="*"/>
-    <script type='text/javascript' src="js/libs/ua-parser.min.<?php echo filemtime('js/libs/ua-parser.min.js'); ?>.js"></script>    
+    <script type='text/javascript' src="js/common.min.<?php echo filemtime('js/common.min.js'); ?>.js"></script>
-    <script type='text/javascript' src="js/openfb.<?php echo filemtime('js/openfb.js'); ?>.js"></script>
+    <script type='text/javascript'>
-    <script type='text/javascript' src="js/opengplus.<?php echo filemtime('js/opengplus.js'); ?>.js"></script>
+            if(openFB && window.location &&
-	<script type='text/javascript'>
+                 window.location.href.indexOf("access_token") != -1 &&
-		if(openFB && window.location &&
+                 window.localStorage.getItem("tryLogin")=="fb") {
-                     window.location.href.indexOf("access_token") != -1 &&
+        openFB.oauthCallback(window.location.href);
-                     window.localStorage.getItem("tryLogin")=="fb") {
+        window.location.href = "#syncView/tokenFound";
-            openFB.oauthCallback(window.location.href);
+    }
-            window.location.href = "#syncView/tokenFound";
+            else if(openGPlus && window.location &&
-        }
+            window.location.href.indexOf("access_token") != -1 &&
-		else if(openGPlus && window.location &&
+            window.localStorage.getItem("tryLogin")=="gplus") {
-                window.location.href.indexOf("access_token") != -1 &&
+        openGPlus.oauthCallback(window.location.href);
-                window.localStorage.getItem("tryLogin")=="gplus") {
+        window.location.href = "#syncView/tokenFound";
-            openGPlus.oauthCallback(window.location.href);
+    }
-            window.location.href = "#syncView/tokenFound";
+    <?php echo file_get_contents("js/manifest.js"); ?>
-        }
+    </script>
-		<?php echo file_get_contents("js/manifest.js"); ?>
+    <script data-main="js/config.<?php echo filemtime('js/libs/require.js'); ?>" src="js/libs/require.<?php echo filemtime('js/libs/require.js'); ?>.js"></script>
-	</script>
-    <!--<script type='text/javascript' src="js/manifest.<?php echo filemtime('js/manifest.js'); ?>.js"></script>-->
-    <script data-main="js/config" src="js/libs/require.<?php echo filemtime('js/libs/require.js'); ?>.js"></script>
 </head>
 <body style="background-color: #1d1d1d;">
 	<?php include_once("analyticstracking.php") ?>
     <div id="loadingFrm" style="text-align: center;">
-        <img src="https://dl.dropboxusercontent.com/s/6qrdp9mbi1rb92k/sfondo.png" class="loadingSfondo">
+        <div class="loadingSfondo">
         <div class="loadingText">
             <div style="color: #ffffff;"><b>Caricamento...</b></div>
-            <img src="https://dl.dropboxusercontent.com/s/mw90t9oay2v9jev/loading.gif">
         </div>
     </div>
 </body>

js/classes/profile.js

@@ -11,11 +11,6 @@ define(['jquery', 'backbone'],
                     if (this.data.type == null)
                         this.loadProfile();
                 }
-                else
-                {
-                    this.data.risRic = window.localStorage.getItem("risRic");
-                    this.data.tema = window.localStorage.getItem("tema");
-                }
                 return this;
             },
 

js/config.js

@@ -1,5 +1,6 @@
 var pathJquery = "http://ajax.googleapis.com/ajax/libs/jquery/" + myManifest.Settings.JQueryVersion + "/jquery.min";
-var pathJqueryMobile = "http://ajax.googleapis.com/ajax/libs/jquerymobile/"+ myManifest.Settings.JQueryMobileVersion + "/jquery.mobile.min";
+var pathJqueryMobile = "http://code.jquery.com/mobile/"+ myManifest.Settings.JQueryMobileVersion + "/jquery.mobile-"+ myManifest.Settings.JQueryMobileVersion + ".min";
+//var pathJqueryMobile = "http://ajax.googleapis.com/ajax/libs/jquerymobile/"+ myManifest.Settings.JQueryMobileVersion + "/jquery.mobile.min";
 
 requirejs.config({
     baseUrl: 'js',

js/manifest.js

@@ -1,11 +1,11 @@
 var myManifest = {
     Debug: false,
     Name: "Il Lievitario",
-    Version: "2.2.3",
+    Version: "2.3.0",
     Author: "Denis Ironi",
     Settings: {
-        //DefaultURL: "http://localhost:8081/Service",
+        DefaultURL: "http://localhost:8081/Service_Manut",
-        DefaultURL: "http://app.gruppolapastamadre.it/Service",
+        //DefaultURL: "http://app.gruppolapastamadre.it/Service",
         JQueryVersion: "1.11.1",
         JQueryMobileVersion: "1.4.3",
         Device:{

js/modules/about/about.js

@@ -1,5 +1,5 @@
-define(['jquery', 'underscore', 'backbone','text!modules/about/aboutViewTemplate.html', 'modules/base/baseView'], 
+define(['jquery', 'underscore', 'backbone','text!modules/about/aboutViewTemplate.html', 'modules/base/baseView', 'classes/profile'], 
-function($, _, Backbone, aboutViewTemplate, BaseView){
+function($, _, Backbone, aboutViewTemplate, BaseView, Profile){
 
   var AboutView = BaseView.extend({
 
@@ -18,7 +18,7 @@ function($, _, Backbone, aboutViewTemplate, BaseView){
         //$el is cached jQuery object for the view's element.
         //append the compiled template into view div container
         this.$el.append(this.header.$el);
-        this.$el.append(this.template( { app: myManifest }));
+        this.$el.append(this.template( { app: myManifest, profile: Profile }));
         this.$el.append(this.footer.$el);
         this.$el.find("#infoBtn").addClass("ui-btn-active");
         //$("#homeBtn").addClass("ui-btn-active");        

js/modules/about/aboutViewTemplate.html

@@ -7,6 +7,7 @@
 		<b>Sviluppatore:</b> <%= app.Author %><br><br>
 		<br><b>Dettagli Sviluppo: </b><br>S.O.:<%= app.Agent.os.name %><br>Versione: <%= app.Agent.os.version %><br><br>
 		<b>Librerie Usate: </b><br>JQuery:<%= app.Settings.JQueryVersion %><br>JQueryMobile: <%= app.Settings.JQueryMobileVersion %><br>
+		<div class="selectable"><b>Key Sync: </b><%= profile.getKeySave() %><br></div>
 		<br><br>
 		<b>Ringraziamenti a</b>
 		<br><br>

js/modules/category/category.js

@@ -31,6 +31,18 @@ function($, _, Backbone, categoryViewTemplate, categoryItemTemplate, BaseView){
         $ul.listview( "refresh" );
         $ul.trigger( "updatelayout");
         
+        $ul.find('input[type=radio].star').rating({
+            callback: function (value, link) {
+                var tip = $('#hover-test');
+                if (value === undefined)
+                {
+                    $('#hover-test').html("Nessuna" || 'value: ');
+                }
+                else
+                    $('#hover-test').html(link.title || 'value: ' + value);
+            }
+        });
+                    
         $.mobile.loading( 'hide' );
         //$( '[data-alpha="true"]' ).alphascroll();
     },

js/modules/category/categoryItemTemplate.html

@@ -2,5 +2,17 @@
     <h1>Nessuna ricetta trovata</h1>
 <%} else { for (var i = 0; i < data.length; i++) { %>
   <% var item = data[i]; %>
-	<li><a href="#ricetta/<%= item.ricetta_id%>" class="ui-btn ui-btn-icon-right ui-icon-carat-r"><div class='ricettaTitolo'><%= unescape(item.titolo) %></div><div class='ricettaAutore'><%= unescape(item.autore) %></div></a></li>
+	<li><a href="#ricetta/<%= item.ricetta_id%>" class="ui-btn ui-btn-icon-right ui-icon-carat-r">
+            <div class='ricettaTitolo'><%= unescape(item.titolo) %></div>
+            <div class='ricettaAutore'><%= unescape(item.autore) %></div>
+            <div id="valutazione" style="clear:both;">
+                <form id="difficoltaFrm" data-role="none">
+                    <input name="difficolta" <% if(item.difficolta==="1"){%>checked="checked"<%}%> type="radio" data-role="none" value="1" disabled="disabled" title="Molto Semplice" class="star"/>
+                    <input name="difficolta" <% if(item.difficolta==="2"){%>checked="checked"<%}%> type="radio" data-role="none" value="2" disabled="disabled" title="Semplice" class="star"/>
+                    <input name="difficolta" <% if(item.difficolta==="3"){%>checked="checked"<%}%> type="radio" data-role="none" value="3" disabled="disabled" title="Normale" class="star"/>
+                    <input name="difficolta" <% if(item.difficolta==="4"){%>checked="checked"<%}%> type="radio" data-role="none" value="4" disabled="disabled" title="Difficile" class="star"/>
+                    <input name="difficolta" <% if(item.difficolta==="5"){%>checked="checked"<%}%> type="radio" data-role="none" value="5" disabled="disabled" title="Molto Difficile" class="star"/>
+                    </form>
+            </div>            
+        </a></li>
 <% }} %>

js/modules/faq/faqViewTemplate.html

@@ -18,7 +18,7 @@
             <div data-role="collapsible"><h4>Quando posso iniziare ad usare la PM autodrodotta? Quando posso mettere in frigorifero?</h4><p>	La tua Pm sarà pronta all'utilizzo quando raddoppierà costantemente in 4 ore, ovvero avrà raggiunto un equilibrio accettabile tra lieviti e lactobacilli. Da questo momento potrai conservarla in frigorifero e rinfrescarla meno frequentemente.	</p></div></li>
         <li data-role="collapsible" data-iconpos="left" data-inset="false"><h2>PM. Il Mantenimento (Rinfresco, fermentazione, collasso...)	</h2>	<div data-role="collapsible"><h4>Cos'è il rinfresco (o rigenero)?</h4><p>La Pasta Madre è un organismo vivo e per questo necessita di nutrimento:<br>
             aggiungendo acqua e farina alla tua pm, le dai ""da mangiare"". I lieviti nutrendosi fanno partire la fermentazione e gonfiano la pm creando bolle d'aria.</p></div>
-			<div data-role="collapsible"><h4>L'esubero di pasta madre</h4><p>"Esubero... chi era costui???"<br>
+                        <div data-role="collapsible"><h4>L'esubero di pasta madre</h4><p>"Esubero... chi era costui???"<br>
 E' in assoluto la domanda più ricorrente qua dentro, la FAQ delle FAQ insomma, fiumi di discussioni in merito: chi lo definisce in un modo, chi in un altro, chi ne ha il frigo pieno, chi non lo conosce, chi lo butta, chi panifica solo con quello... ma in sintesi: <b>cosa sarebbe l'esubero?</b><br><br>
 Secondo il dizionario l'esubero è un'eccedenza, un avanzo, ma nel nostro ambito specifico, che è quello della panificazione con lievito madre, direi che possiamo trovarci in accordo nel definirlo <b>pasta madre di avanzo</b> (ebbene sì anche l'esubero è pasta madre!) <b>che non abbia subito un rinfresco recente.</b><br><br>
 La pasta madre come ben sappiamo è <u>un impasto di acqua e farina colonizzato da particolari microrganismi (lieviti e lactobacilli) che le fanno avere potere fermentante, essi sono un qualcosa di vivo e per continuare a fare il proprio lavoro devono essere nutriti con quantitativi prestabiliti di acqua e farina. Una volta nutrita attraverso il rinfresco, la nostra pasta madre aumenta di volume raggiungendo un apice di crescita, dopo il quale (ed è fisiologico), raggiunge il collasso e tende ad inacidirsi.<br><br> 
@@ -91,8 +91,8 @@ Detto questo vorrei fare alcune considerazioni: <br><br>
             <b>Biga:</b> è un preimpasto ottenuto miscelando acqua, farina e lievito in proporzioni tali che risulti piuttosto asciutto; alle volte può essere inteso anche come pasta madre (solida) rinfrescata, ad esempio nel libro di Annalisa De Luca<br><br>
             <b>Buratto:</b> è un setaccio e per estensione un tipo di farina di frumento setacciata appunto nel Buratto<br><br>
             <b>Burro a Pomata:</b> burro morbido, consistenza di una pomata/dentifricio/cremoso<br><br>
-			<b>Campana (lievitazione a):</b> far lievitare l'impasto sul piano di lavoro con ciotola rovesciata sopra a mo' di copertura<br><br>
+                        <b>Campana (lievitazione a):</b> far lievitare l'impasto sul piano di lavoro con ciotola rovesciata sopra a mo' di copertura<br><br>
-			<b>Esubero:</b> lievito madre non rinfescato e che avanza dopo la scorta standard e il rinfresco (vedere anche PM. Il Mantenimento (Rinfresco, fermentazione, collasso...) -> L'esubero di pasta madre)<br><br>
+                        <b>Esubero:</b> lievito madre non rinfescato e che avanza dopo la scorta standard e il rinfresco (vedere anche PM. Il Mantenimento (Rinfresco, fermentazione, collasso...) -> L'esubero di pasta madre)<br><br>
             <b>Olio EVO:</b> Extra Vergine Oil (olio extravergine di Oliva)<br><br>
             <b>Cottura a fessura:</b> cottura con un oggetto - cucchiaio, mestolo piatto- che impedisca allo sportello del forno di chiudersi perfettamente (serve a far uscire l'umidità)<br><br>
             <b>Forno STATICO/VENTILATO:</b> il forno con la ventola spenta/accesa<br><br>

js/modules/home/homeViewTemplate.html

@@ -15,6 +15,7 @@
         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>

js/modules/item/itemViewTemplate.html

@@ -15,7 +15,7 @@
             liStyle="list-style-type: none;";
             qty = "";
             nome_ingr = "";
-        } %> <li style="<%= liStyle %>"><b><%= nome_ingr %></b><%= qty %> <%= ingrediente.unita %> <%= ingrediente.note %></li><br> <% }); %>
+        } %> <li style="<%= liStyle %>"><b><%= nome_ingr %></b><%= qty %> <%= ingrediente.unita %> <%= unescape(ingrediente.note) %></li><br> <% }); %>
     </p></center>
 </div>
 <div id="contentProcedimento" data-role="content" style="display: none;">

js/modules/search/search.js

@@ -33,23 +33,14 @@ define(['jquery', 'underscore', 'backbone','text!modules/search/searchViewTempla
             render: function () {
                 //this.header.title = "pippo";
                 SearchView.__super__.render.call(this);
-                //this.el is the root element of Backbone.View. By default, it is a div.
-                //$el is cached jQuery object for the view's element.
-                //append the compiled template into view div container
                 this.$el.append(this.header.$el);
                 this.$el.append(this.template({data:this.collection.toJSON()}));
                 this.$el.append(this.footer.$el);
 
                 this.$el.find('#nResult').val(Profile.data.risRic);
-//                this.$el.find('#search').on("click", function(e){
-//                    e.preventDefault();
-//
-//                });
                 this.trigger("renderCompleted:Search", this);
 
                 this.$el.find("#searchBtn").addClass("ui-btn-active");
-                //$("#homeBtn").addClass("ui-btn-active");
-                //return to enable chained calls
                 return this;
             }
         });

js/modules/sync/sync.js

@@ -122,23 +122,23 @@ define(['jquery', 'underscore', 'backbone','text!modules/sync/syncViewTemplate.h
                     if (Profile.isFbConnected()) {
                         this.$el.find("#fblogin").show();
                         this.$el.find("#gpluslogin").hide();
-                        this.$el.find("#loginFbImg").removeClass("loginfb");
+                        this.$el.find("#fblogin").removeClass("loginfb");
-                        this.$el.find("#loginFbImg").addClass("logoutfb");
+                        this.$el.find("#fblogin").addClass("logoutfb");
                     }
 
                     if (Profile.isGPlusConnected()) {
                         this.$el.find("#gpluslogin").show();
                         this.$el.find("#fblogin").hide();
-                        this.$el.find("#loginGPlusImg").removeClass("logingplus");
+                        this.$el.find("#gpluslogin").removeClass("logingplus");
-                        this.$el.find("#loginGPlusImg").addClass("logoutgplus");
+                        this.$el.find("#gpluslogin").addClass("logoutgplus");
                     }
                 }
                 else
                 {
-                    this.$el.find("#loginFbImg").removeClass("logoutfb");
+                    this.$el.find("#fblogin").removeClass("logoutfb");
-                    this.$el.find("#loginFbImg").addClass("loginfb");
+                    this.$el.find("#fblogin").addClass("loginfb");
-                    this.$el.find("#loginGPlusImg").removeClass("logoutgplus");
+                    this.$el.find("#gpluslogin").removeClass("logoutgplus");
-                    this.$el.find("#loginGPlusImg").addClass("logingplus");
+                    this.$el.find("#gpluslogin").addClass("logingplus");
                 }
             },
 

js/modules/sync/syncViewTemplate.html

@@ -3,8 +3,8 @@
     <div style="text-align: center;">
         Qui puoi collegarti con l'account che preferisci<br>per avere la sincronizzazione dei tuoi dati su qualsiasi dispositivo che userai<br>
         Scegli il tipo di account e premi il tasto qui sotto per effettuare il login<br><br>
-        <a id="fblogin" href=""><img id="loginFbImg" class="loginfb"/><br></a>
+        <a id="fblogin" href="" class="loginfb"></a><br>
-        <a id="gpluslogin" href=""><img id="loginGPlusImg" class="logingplus"/></a>
+        <a id="gpluslogin" href="" class="logingplus"></a>
         <div data-role="popup" id="popupLogin" data-overlay-theme="a" data-theme="a" data-corners="false" data-tolerance="15,15">
             <a href="#" data-rel="back" class="ui-btn ui-btn-b ui-corner-all ui-shadow ui-btn-a ui-icon-delete ui-btn-icon-notext ui-btn-right">Close</a>
             <iframe id="urlLogin" src="" width="497" height="298" seamless=""></iframe>

js/openfb.js

@@ -155,6 +155,19 @@ var openFB = (function () {
     function logout() {
         tokenStore['fbtoken'] = undefined;
     }
+	
+	function createHttpReq(callbackFn){
+		var request;
+		if (window.XDomainRequest) {
+		  request = new window.XDomainRequest();
+		  request.onload = callbackFn;
+		  }
+		  else {
+			request = new XMLHttpRequest();
+			request.onreadystatechange = callbackFn;
+		  }
+		return request;
+	}
 
     /**
      * Lets you make any Facebook Graph API request.
@@ -169,14 +182,13 @@ var openFB = (function () {
 
         var method = obj.method || 'GET',
             params = obj.params || {},
-            xhr = new XMLHttpRequest(),
             url;
 
         params['access_token'] = tokenStore['fbtoken'];
 
         url = 'https://graph.facebook.com' + obj.path + '?' + toQueryString(params);
 
-        xhr.onreadystatechange = function () {
+        var xhr = createHttpReq( function() {
             if (xhr.readyState === 4) {
                 if (xhr.status === 200) {
                     if (obj.success) obj.success(JSON.parse(xhr.responseText));
@@ -185,7 +197,7 @@ var openFB = (function () {
                     if (obj.error) obj.error(error);
                 }
             }
-        };
+        });
 
         xhr.open(method, url, true);
         xhr.send();

js/opengplus.js

@@ -156,6 +156,19 @@ var openGPlus = (function () {
     function logout() {
         tokenStore['gplustoken'] = undefined;
     }
+	
+	function createHttpReq(callbackFn){
+		var request;
+    if (window.XDomainRequest) {
+      request = new window.XDomainRequest();
+	  request.onload = callbackFn;
+      }
+      else {
+        request = new XMLHttpRequest();
+		request.onreadystatechange = callbackFn;
+      }
+    return request;
+	}
 
     /**
      * Lets you make any Facebook Graph API request.
@@ -171,14 +184,14 @@ var openGPlus = (function () {
         var method = obj.method || 'GET',
             baseUrl = obj.baseUrl || 'https://www.googleapis.com/plus/v1/',
             params = obj.params || {},
-            xhr = new XMLHttpRequest(),
             url;
 
         params['access_token'] = tokenStore['gplustoken'];
 
         url = baseUrl + obj.path + '?' + toQueryString(params);
 
-        xhr.onreadystatechange = function () {
+        //xhr.onreadystatechange =
+		var xhr = createHttpReq(function () {
             if (xhr.readyState === 4) {
                 if (xhr.status === 200) {
                     if (obj.success) obj.success(JSON.parse(xhr.responseText));
@@ -187,7 +200,7 @@ var openGPlus = (function () {
                     if (obj.error) obj.error(error);
                 }
             }
-        };
+        });
 
         xhr.open(method, url, true);
         xhr.send();

js/router.js

@@ -172,7 +172,7 @@ define(['jquery', 'underscore', 'backbone',
                     $('input[type=radio].star').rating({
                         callback: function (value, link) {
                             var tip = $('#hover-test');
-                            if (value == undefined)
+                            if (value === undefined)
                             {
                                 $('#hover-test').html("Nessuna" || 'value: ');
                             }

nbproject/private/private.xml

@@ -2,6 +2,20 @@
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group/>
+        <group>
+            <file>file:/E:/Sviluppo/IlLievitario/WebClient_Manut/js/router.js</file>
+            <file>file:/E:/Sviluppo/IlLievitario/WebClient_Manut/js/modules/category/category.js</file>
+            <file>file:/E:/Sviluppo/IlLievitario/WebClient_Manut/js/model/category/categoryModel.js</file>
+            <file>file:/E:/Sviluppo/IlLievitario/WebClient_Manut/css/base.style.css</file>
+            <file>file:/E:/Sviluppo/IlLievitario/WebClient_Manut/js/modules/sync/syncViewTemplate.html</file>
+            <file>file:/E:/Sviluppo/IlLievitario/WebClient_Manut/css/jquery.rating.css</file>
+            <file>file:/E:/Sviluppo/IlLievitario/WebClient_Manut/index.php</file>
+            <file>file:/E:/Sviluppo/IlLievitario/WebClient_Manut/js/model/categoryItem/categoryItemModel.js</file>
+            <file>file:/E:/Sviluppo/IlLievitario/WebClient_Manut/js/modules/home/homeViewTemplate.html</file>
+            <file>file:/E:/Sviluppo/IlLievitario/WebClient_Manut/js/manifest.js</file>
+            <file>file:/E:/Sviluppo/IlLievitario/WebClient_Manut/js/modules/category/categoryItemTemplate.html</file>
+            <file>file:/E:/Sviluppo/IlLievitario/WebClient_Manut/js/modules/sync/sync.js</file>
+            <file>file:/E:/Sviluppo/IlLievitario/WebClient_Manut/js/modules/item/itemViewTemplate.html</file>
+        </group>
     </open-files>
 </project-private>