git-svn-id: https://msi/svn/firstRepo/WebClient/branches/NewRelease@60 0f545695-f87b-41b6-9a03-7f16563b5454

js/app.js

@@ -51,9 +51,12 @@ define(['jquery', 'underscore', 'backbone', 'router', 'classes/profile', 'classe
                         gender = json.gender;
                     }
 
-                    if(gender !== "")
+                    if(gender === undefined)
                         gender = "unknown";
 
+                    if(email === undefined)
+                        email = "";
+
                     Debug.writeMessage('Your name is ' + json.name + ' in the social ' + auth.network + ", ID=" + id + ", DisplayName: "+ displayName + ", email:"+ email);
 
                     Profile._loadProfile(id, function (retVal) {

js/manifest.js

@@ -1,7 +1,7 @@
 var myManifest = {
     Debug: (window.location.port !== ""),
     Name: "Il Lievitario",
-    Version: "3.1.1.0",
+    Version: "3.0.1.5",
     Author: "Denis Ironi",
     Settings: {
         DefaultURL: (window.location.port === "" ? "http://" + window.location.host + "/Service": "http://" + window.location.hostname + ":" + window.location.port + "/Service_Manut"),

js/modules/category/categoryItemTemplate.html

@@ -4,9 +4,9 @@
   <% var item = data.items[i]; %>
 <li><a href="#ricetta/<%= item.ricetta_id%>" class="ui-btn ui-btn-icon-right ui-icon-carat-r ui-li-has-thumb">
 	<% if(item.firstImage === ""){ %>
-		<img class="thmbImg emptyItemList">
+		<!--<img class="thmbImg emptyItemList">-->
 	<%}else{%>
-		<img class="thmbImg" src='<%=data.images.getThumb(item.firstImage)%>'>
+		<!--<img class="thmbImg" src='<%=data.images.getThumb(item.firstImage)%>'>-->
 	<%}%>
     <div class='ricettaTitolo'><%= unescape(item.titolo) %></div>
     <div class='ricettaAutore'><%= unescape(item.autore) %></div>

js/modules/item/item.js

@@ -58,7 +58,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
                     var self = this;
                     $('body').scrollTop(0);
                     
-                    this.galleryWall = new Freewall("#Gallery");
+                    /*this.galleryWall = new Freewall("#Gallery");
                     this.galleryWall.reset({
                         selector: '.brick',
                         animate: true,
@@ -69,7 +69,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
                         }
                     });
 
-                    var imgurl = Images.getThumb(48);
+                    var imgurl = Images.getThumb(48);*/
 
                     /*var images = this.galleryWall.container.find('.brick');
                     images.find('img').load(function() {
@@ -94,14 +94,14 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
                                         ricetta: self.collRicetta.toJSON()[0],
                                         ingredienti: self.collIngredienti.toJSON(),
                                         profile: Profile,
-                                        images: Images,
+                                        //images: Images,
                                     }));
 
                                     self.scrollPositions = [];
                                     self.$arrayContent = self.$el.find('div[data-role="content"]');
                                     self.$arrayNavBar = self.$el.find('div[data-role="navbar"] a');
                                     
-                                    self.$photos = self.$el.find('#contentFoto a');
+                                    /*self.$photos = self.$el.find('#contentFoto a');
                                     self.$el.find('#contentFoto a img').load(function(){
                                         countImgLoaded++;
                                         if(self.$photos.length == countImgLoaded)
@@ -127,7 +127,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
                                         });
                                         
                                     });
-                                    
+                                    */
                                     for (var i = self.$arrayContent.length - 1; i >= 0; i--) {
                                         self.scrollPositions.push(0);
                                     };
@@ -181,8 +181,8 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
                     $(this.$arrayContent[this.indexContent]).show();
                     $(this.$arrayNavBar[this.indexContent]).addClass('ui-btn-active');
                     $(this.$arrayNavBar[this.indexContent]).addClass('ui-state-persist');
-                    if(this.indexContent == 2)
+                    /*if(this.indexContent == 2)
-                        this.galleryWall.fitWidth();
+                        this.galleryWall.fitWidth();*/
                 }
             });
             return ItemView;

js/modules/item/itemViewTemplate.html

@@ -34,7 +34,7 @@
     <p id='procedimento'><%= ricetta.procedimento%></p>
     <p style="font-size: xx-small;font-weight: lighter;">La proprietà del materiale pubblicato nel Lievitario , salvo diversa indicazione, è dei rispettivi autori. E’ vietata la ripubblicazione, anche parziale, di tutto il materiale pubblicato nel sito Lievitario senza preventiva autorizzazione scritta.</p>
 </div>
-<div id="contentFoto" data-role="content" style="display: none;">
+<!--<div id="contentFoto" data-role="content" style="display: none;">
     <h1>Foto</h1>
     <div id="Gallery" class="freewallGallery">
         <% _.each(ricetta.foto, function(fotoID) {%>
@@ -42,7 +42,7 @@
         <%});%>
 	</div>
 </div>
-<!--<div id="contentVideo" data-role="content" data-theme="d" style="display: none;" data-iscroll>
+<div id="contentVideo" data-role="content" data-theme="d" style="display: none;" data-iscroll>
     <h1>Video</h1>
     <p id='video'></p>
 </div>-->
@@ -51,8 +51,8 @@
 	    <ul>
 	        <li><a href="" class="ui-btn-active ui-state-persist">Ingredienti</a></li>
 	        <li><a href="">Procedimento</a></li>
-	        <li><a href="">Foto</a></li>
+	        <!--<li><a href="">Foto</a></li>
-	        <!--<li><a href="">Video</a></li>-->
+	        <li><a href="">Video</a></li>-->
 	    </ul>
 	</div><!-- /navbar -->
     <% if(ricetta.autore.length > 0){ %>

js/modules/settings/settings.js

@@ -92,7 +92,7 @@ define(['jquery', 'underscore', 'backbone','text!modules/settings/settingsViewTe
                                         Profile.data.dataSpacc.provincia + "+" + Profile.data.dataSpacc.stato + "&sensor=false",
                             Type: "GET"
                         }).then(function ( response ) {
-                            if(response.results.length == 1)
+                            if(response.results.length > 0)
                             {
                                Profile.data.dataSpacc.lat = response.results[0].geometry.location.lat;
                                Profile.data.dataSpacc.long = response.results[0].geometry.location.lng;