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

js/manifest.js

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

js/modules/maps/maps.js

@@ -124,7 +124,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/maps/mapsViewTemplate.
                             markers.push(new google.maps.Marker({
                                 map: self.map,
                                 icon: icon,
-                                title: place.name,
+                                title: unescape(place.name),
                                 position: place.geometry.location
                             }));
 
@@ -173,7 +173,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/maps/mapsViewTemplate.
                         position: new google.maps.LatLng(ele.Latitudine, ele.Longitudine),
                         icon: ele.TipoPM == "4"?self.iconPMGF:self.iconPM,
                         //label: ele.Name,
-                        title: ele.Name,
+                        title: $("<div/>").html(unescape(ele.Name)).text(),
                         map: self.map
                       });
                     

js/modules/search/foundItemTemplate.html

@@ -3,11 +3,6 @@
 <%} 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 ui-li-has-thumb">
-	<% if(item.firstImage === ""){ %>
-		<!--<img class="thmbImg emptyItemList">-->
-	<%}else{%>
-		<!--<img class="thmbImg" src='<%=data.images.getThumb(item.firstImage)%>'>-->
-	<%}%>
     <div class='ricettaTitolo'><%= unescape(item.titolo) %></div>
     <div class='ricettaAutore'><%= unescape(item.autore) %></div>
     <br><div class='ricettaAutore'>Diff.:&nbsp;&nbsp;</div>

js/modules/search/search.js

@@ -60,7 +60,7 @@ define(['jquery', 'underscore', 'backbone','text!modules/search/searchViewTempla
                 {
                     SearchView.__super__.render.call(this);
                     this.$el.append(this.header.$el);
-                    this.$el.append(this.template({data:this.collection.toJSON()}));
+                    this.$el.append(this.template());
                     this.$el.append(this.footer.$el);
 				}
 				this.$el.find('#nResult').val(Profile.data.risRic);

js/modules/settings/settings.js

@@ -193,6 +193,17 @@ define(['jquery', 'underscore', 'backbone','text!modules/settings/settingsViewTe
                 }
                 else
                     this.$el.find('#mapSpacc > :not(.ui-checkbox:has(#spacc-PMChk))').hide();
+
+                if(this.$el.find('#stato').val() !== "ITALIA")
+                {
+                    this.$el.find('#provTxt').parent().show();
+                    this.$el.find('#prov').parent().hide();
+                }
+                else
+                {
+                    this.$el.find('#provTxt').parent().hide();
+                    this.$el.find('#prov').parent().show();
+                }
             },
 
             //render the content into div of view
@@ -214,6 +225,8 @@ define(['jquery', 'underscore', 'backbone','text!modules/settings/settingsViewTe
                 this.$el.find('#spacc-PMChk').prop('checked', Profile.data.isSpacc==="0"?false:true);
                 this.$el.find('#email').val(Profile.data.email);
                 this.$el.find('#stato').val(Profile.data.dataSpacc.stato);
+                this.$el.find('#provTxt').parent().hide();
+                this.$el.find('#prov').parent().hide();
                 if(this.$el.find('#stato').val() !== "ITALIA")
                 {
                     this.$el.find('#provTxt').parent().show();

js/router.js

@@ -174,8 +174,8 @@ define(['jquery', 'underscore', 'backbone',
                 showSearch: function () {
                     // will render home view and navigate to homeView
                     var searchView = new SearchView();
-                    indexView.render();
-                    searchView.bind('renderCompleted:Search', this.changePage, this);
+                    searchView.render();
+                    this.changePage(searchView);
                 },
                 searchFn: function (nresult, categoria, difficolta, autore, titolo) {
                     var foundedItems = new FoundItemCollection({categoryId: categoria, difficolta: difficolta, titolo: titolo, autore: autore, nResult: nresult, indexItems: 0});