git-svn-id: https://msi/svn/firstRepo/WebClient/branches/NewRelease@75 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,18 +24,13 @@ AddOutputFilterByType DEFLATE text/css application/x-javascript text/html text/r
 
 <ifModule mod_rewrite.c>
 	RewriteEngine On
-	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]
+        RewriteRule ^index.html$ index.php [L]
+	RewriteRule ^js/libs/(.*)\.[0-9]+\.js$ /WebClient/js/libs/$1.js [L]
+	RewriteRule ^js/(.*)\.[0-9]+\.js$ /WebClient/js/$1.js [L]
+	RewriteRule ^css/(.*)\.[0-9]+\.css$ /WebClient/css/$1.css [L]
+	RewriteRule ^Resources/img/(.*)\.[0-9]+\.png$ /WebClient/Resources/img/$1.png [L]
+	RewriteRule ^Resources/img/(.*)\.[0-9]+\.gif$ /WebClient/Resources/img/$1.gif [L]
+	RewriteRule ^Resources/icons/(.*)\.[0-9]+\.png$ /WebClient/Resources/icons/$1.png [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 .\js\libs\markerclusterer.js -o .\js\common.min.js
+call uglifyjs .\js\libs\hello.min.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

css/base.style.css

@@ -234,16 +234,19 @@ label.error {
   border-bottom-right-radius: inherit;
 }
 
-.thmbImg
-{
+.imageRic{
+    position: absolute;
+    left: 0;
+    top: 0;
+    max-width: 5em;
     border-right: 2px solid #cdcdcd!important;
     width: 80px;
     height: 100%;
+    background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAMAAAC5zwKfAAAATlBMVEUAAADT09PMzMy+vr7KysrPz8/Q0NDOzs7V1dXY2NjS0tK7u7vJycnExMTCwsK2trba2tq/v7/i4uLb29vGxsaysrLc3NysrKympqafn5/59uVfAAAAAXRSTlMAQObYZgAAATlJREFUWMPt18luwzAMRVHzWSKpwUPsTP3/H23iIAWstJtSCLLQ2Qjg4kIrgeqapmma5h3S6AQ/fJ6MPReUxT8xYhhMvahMyO4uu5xdFKgYemlm7AYXFpCh6CMXkxxhKZIeislAAAj/DlL6JWi4I1H/GiyKdYIgrhQ8RjwoKgWDbIDQVwmeVr7z5CWagqXkvNqCpUnJEgSkvCJZgkp8Loq9JTgoAKoY/FoAaMVgtwRejzWD3RHPZ2eZrMG9OUjdIEs41QwmBY1Vgu5xSIQsNYK08v24rgDOV3twDG57/9QDYJiDUwBAmFzEjag56Ag3HBibcDEGT4odGoxBnmknkDGYDv3OOBmDrz4pmLo/JCLbslQ6KNnWuRJHb1o4S+A5GVbiQgaxRsvSXhDW4EzfioK4MXVN0zRN8wbf0o0Kwdr1WXcAAAAASUVORK5CYII=') 50% 50% no-repeat;
+    background-size: 80px 80px;
 }
-
-.emptyItemList
-{
-    content:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAMAAAC5zwKfAAAATlBMVEUAAADT09PMzMy+vr7KysrPz8/Q0NDOzs7V1dXY2NjS0tK7u7vJycnExMTCwsK2trba2tq/v7/i4uLb29vGxsaysrLc3NysrKympqafn5/59uVfAAAAAXRSTlMAQObYZgAAATlJREFUWMPt18luwzAMRVHzWSKpwUPsTP3/H23iIAWstJtSCLLQ2Qjg4kIrgeqapmma5h3S6AQ/fJ6MPReUxT8xYhhMvahMyO4uu5xdFKgYemlm7AYXFpCh6CMXkxxhKZIeislAAAj/DlL6JWi4I1H/GiyKdYIgrhQ8RjwoKgWDbIDQVwmeVr7z5CWagqXkvNqCpUnJEgSkvCJZgkp8Loq9JTgoAKoY/FoAaMVgtwRejzWD3RHPZ2eZrMG9OUjdIEs41QwmBY1Vgu5xSIQsNYK08v24rgDOV3twDG57/9QDYJiDUwBAmFzEjag56Ag3HBibcDEGT4odGoxBnmknkDGYDv3OOBmDrz4pmLo/JCLbslQ6KNnWuRJHb1o4S+A5GVbiQgaxRsvSXhDW4EzfioK4MXVN0zRN8wbf0o0Kwdr1WXcAAAAASUVORK5CYII=')
+.contentItem{
+    padding-left: 80px;
 }
 
 .freewallGallery {

css/style.css

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

index.php

@@ -8,23 +8,16 @@
         <meta name="mobile-web-app-capable" content="yes">
         <meta name="apple-mobile-web-app-capable" content="yes">
         <meta name="format-detection" content="telephone=no">
-        <!-- Meta tag per FB-->
-        <meta property="og:locale" content="it_IT"/>
-        <meta property="og:site_name" content="Il Lievitario"/>
-        <meta itemprop="name" content="Home - Il Lievitario"/>
-<?php        
-        $ogFbTitle = "Home - Il Lievitario";
-        $ogFbUrl = "";
-        $ogFbType = "website";
-        $ogFbImage = "http://app.gruppolapastamadre.it/previewLink.png";
-        $ogFbDescription = "Ricettario web del il Gruppo la pasta madre";
-?>
-        <meta property="og:title" content="<?php echo $ogFbTitle; ?>"/>
-        <meta property="og:url" content="<?php echo $ogFbUrl; ?>"/>
-        <meta property="og:type" content="<?php echo $ogFbType; ?>"/>
-        <meta property="og:image" content="<?php echo $ogFbImage; ?>"/>
-        <meta property="og:description" content="<?php echo $ogFbDescription; ?>" />
-        <meta property="description" content="<?php echo $ogFbDescription; ?>" />
+		<!-- Meta tag per FB-->
+		<meta property="og:locale" content="it_IT"/>
+		<meta property="og:site_name" content="Il Lievitario"/>
+		<meta property="og:title" content="Il Lievitario"/>
+		<meta itemprop="name" content="Home - Il Lievitario"/>
+		<meta property="og:url" content="http://app.gruppolapastamadre.it"/>
+		<meta property="og:type" content="website"/>
+		<meta property="og:image" content="http://app.gruppolapastamadre.it/previewLink.png"/>
+		<meta property="og:description" content="Ricettario web del il Gruppo la pasta madre" />
+		<meta property="description" content="Ricettario web del il Gruppo la pasta madre" />
         <link rel="stylesheet" href="http://code.jquery.com/mobile/1.4.5/jquery.mobile-1.4.5.min.css" >        
         <link rel="stylesheet" href="css/style.min.<?php echo filemtime('css/style.min.css'); ?>.css">
         <link href='http://fonts.googleapis.com/css?family=Pompiere' rel='stylesheet' type='text/css'>

js/classes/images.js

@@ -1,82 +0,0 @@
-	/* 
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-define(['jquery', 'backbone'],
-        function ($, Backbone) {
-
-            var Images = {                
-                prefix: "images",
-                getThumb: function (id) {
-                	var val = this._get(id);
-                    if(val.thumb !== "")
-                    	return val.thumb;
-
-                    var response = $.ajax({
-                        url: myManifest.Settings.DefaultURL + "/api/photo/thumbnail/" + id + "/1",
-                        type: 'GET',
-                        async: false
-                    }).responseText;
-                    val.thumb = response;
-					this._set(id, val);
-                    return val.thumb;
-                },
-                getMedium: function (id) {
-                	var val = this._get(id);
-                    if(val.medium !== "")
-                    	return val.medium;
-
-                    var response = $.ajax({
-                        url: myManifest.Settings.DefaultURL + "/api/photo/medium/" + id + "/1",
-                        type: 'GET',
-                        async: false
-                    }).responseText;
-                    val.medium = response;
-					this._set(id, val);
-                    return val.medium;
-                },
-                getFull: function (id) {
-                	var val = this._get(id);
-                    if(val.full !== "")
-                    	return val.full;
-
-                    var response = $.ajax({
-                        url: myManifest.Settings.DefaultURL + "/api/photo/" + id + "/1",
-                        type: 'GET',
-                        async: false
-                    }).responseText;
-                    val.full = response;
-					this._set(id, val);
-                    return val.full;
-                },
-                _set:function(id, item){
-                	var list = JSON.parse(window.localStorage.getItem(this.prefix));
-                	if(list !== null)
-                	{
-                		list[id] = item;
-                		window.localStorage.setItem(this.prefix, JSON.stringify(list));
-                	}
-                },
-                _get:function(id){
-                	var ret = null;
-                	var item = JSON.parse(window.localStorage.getItem(this.prefix));
-                    if(item === null){
-                    	item = {};
-                    	window.localStorage.setItem(this.prefix, JSON.stringify(item));
-                    	ret = { thumb: "", medium: "", full:""};
-                    }
-                	else if(item[id] === undefined){
-                		ret = { thumb: "", medium: "", full:""};
-                	}
-                	else{
-                		ret = item[id];
-                	}
-
-                	return ret;
-                }
-            };
-
-            return Images;
-        });

js/manifest.js

@@ -1,10 +1,9 @@
 var myManifest = {
     Debug: (window.location.port !== ""),
     Name: "Il Lievitario",
-    Version: "3.0.5.2",
+    Version: "3.0.4.0",
     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/model/categoryItem/categoryItemModel.js

@@ -7,6 +7,7 @@ function ($, _, Backbone){
                     ricetta_id: "",
                     titolo: '',
                     autore: '',
+                    firstImage: "",
                     valutazione: 0,
                     difficolta: 0,
                     categoria_name: 0

js/model/categoryItem/searchItemModel.js

@@ -7,6 +7,7 @@ function ($, _, Backbone){
                     ricetta_id: "",
                     titolo: '',
                     autore: '',
+                    firstImage: "",
                     valutazione: 0,
                     difficolta: 0,
                     categoria_name: 0

js/modules/category/category.js

@@ -1,6 +1,6 @@
 define(['jquery', 'underscore', 'backbone', 'text!modules/category/categoryViewTemplate.html',
-    'text!modules/category/categoryItemTemplate.html', 'modules/base/baseView', 'libs/fastclick', 'classes/debug', 'classes/images'],
-        function ($, _, Backbone, categoryViewTemplate, categoryItemTemplate, BaseView, FastClick, Debug, Images) {
+    'text!modules/category/categoryItemTemplate.html', 'modules/base/baseView', 'libs/fastclick', 'classes/debug'],
+        function ($, _, Backbone, categoryViewTemplate, categoryItemTemplate, BaseView, FastClick, Debug) {
 
             var CategoryView = BaseView.extend({
                 collection: null,
@@ -39,7 +39,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/category/categoryViewT
                          });*/
                         html = this.itemtemplate({
                             items: this.collection.toJSON(),
-                            images: Images
+                            myManifest: myManifest
                         });
 
                         $(html).appendTo($ul).enhanceWithin();

js/modules/category/categoryItemTemplate.html

@@ -3,29 +3,31 @@
 <%} else { for (var i = 0; i < data.items.length; i++) { %>
   <% 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">-->
-	<%}else{%>
-		<!--<img class="thmbImg" src='<%=data.images.getThumb(item.firstImage)%>'>-->
+	<div class="imageRic">
+	<% if(item.firstImage !== ""){ %>
+		<img src='<%=myManifest.Settings.DefaultURL%>/api/photo/thumbnail/<%=item.firstImage%>'>
 	<%}%>
-    <div class='ricettaTitolo'><%= unescape(item.titolo) %></div>
-    <div class='ricettaAutore'><%= unescape(item.autore) %></div>
-    <br><div class='ricettaAutore'>Diff.:&nbsp;&nbsp;</div>
-	<div id="valutazione">
-		<div role="text" data-role="none" aria-label="Molto Semplice" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=1){%>star-rating-on<%}%>">
-			<div data-role="none" title="Molto Semplice">1</div>
-		</div>
-		<div data-role="none" role="text" aria-label="Semplice" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=2){%>star-rating-on<%}%>">
-			<div data-role="none" title="Semplice">2</div>
-		</div>
-		<div data-role="none" role="text" aria-label="Normale" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=3){%>star-rating-on<%}%>">
-			<div data-role="none" title="Normale">3</div>
-		</div>
-		<div data-role="none" role="text" aria-label="Difficile" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=4){%>star-rating-on<%}%>">
-			<div data-role="none" title="Difficile">4</div>
-		</div>
-		<div data-role="none" role="text" aria-label="Molto Difficile" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=5){%>star-rating-on<%}%>">
-			<div data-role="none" title="Molto Difficile">5</div>
+	</div>
+	<div class="contentItem">
+	    <div class='ricettaTitolo'><%= unescape(item.titolo) %></div>
+	    <div class='ricettaAutore'><%= unescape(item.autore) %></div>
+	    <br><div class='ricettaAutore'>Diff.:&nbsp;&nbsp;</div>
+		<div id="valutazione">
+			<div role="text" data-role="none" aria-label="Molto Semplice" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=1){%>star-rating-on<%}%>">
+				<div data-role="none" title="Molto Semplice">1</div>
+			</div>
+			<div data-role="none" role="text" aria-label="Semplice" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=2){%>star-rating-on<%}%>">
+				<div data-role="none" title="Semplice">2</div>
+			</div>
+			<div data-role="none" role="text" aria-label="Normale" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=3){%>star-rating-on<%}%>">
+				<div data-role="none" title="Normale">3</div>
+			</div>
+			<div data-role="none" role="text" aria-label="Difficile" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=4){%>star-rating-on<%}%>">
+				<div data-role="none" title="Difficile">4</div>
+			</div>
+			<div data-role="none" role="text" aria-label="Molto Difficile" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=5){%>star-rating-on<%}%>">
+				<div data-role="none" title="Molto Difficile">5</div>
+			</div>
 		</div>
 	</div>
 </a></li>

js/modules/home/home.js

@@ -23,15 +23,10 @@ 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;
@@ -130,7 +125,8 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/home/homeViewTemplate.
                         }
                     });
                     this.freeWall.fitWidth();
-                },                
+                },
+
                 onShowed: function ()
                 {
                     var self = this;
@@ -141,13 +137,7 @@ 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,15 +46,19 @@
         </div>
     </div>
 </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 data-role="popup" id="nuovoGruppo" data-history="false" data-dismissible="false">
+    <div data-role="header"><h1>IMPORTANTE</h1></div>
         <div role="main" class="ui-content">
         <p style="text-align: center;font-style: italic;">
-            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>
+            <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
         </p>
         <p style="text-align: center;">
-            <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>
+            <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>
         </p>
     </div>
-</div>
+</div>-->

js/modules/item/item.js

@@ -1,5 +1,5 @@
-define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.html', 'modules/base/baseView', 'classes/profile', 'classes/images', 'jQueryPlugins'],
-        function ($, _, Backbone, itemViewTemplate, BaseView, Profile, Images) {
+define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.html', 'modules/base/baseView', 'classes/profile', 'jQueryPlugins'],
+        function ($, _, Backbone, itemViewTemplate, BaseView, Profile) {
 
             var ItemView = BaseView.extend({
                 collRicetta: null,
@@ -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,12 +69,10 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
                         }
                     });
 
-                    var imgurl = Images.getThumb(48);*/
-
-                    /*var images = this.galleryWall.container.find('.brick');
+                    var images = this.galleryWall.container.find('.brick');
                     images.find('img').load(function() {
                         self.galleryWall.fitWidth();
-                    });*/
+                    });
 
 
                     $.mobile.loading('hide');
@@ -97,14 +95,13 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
                                         ricetta: ric,
                                         ingredienti: self.collIngredienti.toJSON(),
                                         profile: Profile,
-                                        //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)
@@ -130,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);
                                     };
@@ -184,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)
-                        this.galleryWall.fitWidth();*/
+                    if(this.indexContent == 2)
+                        this.galleryWall.fitWidth();
                 }
             });
             return ItemView;

js/modules/item/itemViewTemplate.html

@@ -3,14 +3,30 @@
     <h3 id='titoloRicetta'><%= unescape(ricetta.titolo)%></h3>
     <a id="backBtn" href="#" class="nav-glyphish-example ui-btn ui-icon-myHome ui-btn-icon-notext ui-btn-right" data-icon="custom"></a>
 </div>
+<% 
+    var widthImg = 320;
+    if( myManifest.Agent.device.type != "" )
+    {
+        /*prendo la larghezza del viewport e sottraggo il 10perc, poi divito per le due colonne*/
+        widthImg = (myManifest.Settings.Device.Width - (myManifest.Settings.Device.Width / 10)) / 2;
+        if(widthImg>320)
+            widthImg = 320;
+    }
+%>
 <div id="contentIngredienti" data-role="content">
-    <h1>Ingredienti</h1>    
-    <% _.each(ingredienti, function(ingrediente) {
-    if(ingrediente.id_tipo_ingredienti == 152)/*Intestazione*/{%>
-        <h2 class="intestazione"><%= unescape(ingrediente.note) %></h2>
-    <%}else if(ingrediente.id_tipo_ingredienti == 22)/*Nota-Paragrafo*/{%>
-        <p class="nota"><%= unescape(ingrediente.note) %></p>
-    <%}else{%><li class="ingrediente"><div class="nomeIngrediente"><%= ingrediente.nome_ingrediente %></div><%= ": " + ingrediente.quantita %> <%= ingrediente.unita %><div class="notaIngrediente"> <%= unescape(ingrediente.note) %></div></li><%}}); %>    
+	<h1>Ingredienti</h1>
+    <center><p id='ingredienti'>
+        <% _.each(ingredienti, function(ingrediente) {
+        var liStyle = "";
+        var qty = ": " + ingrediente.quantita;
+        var nome_ingr = ingrediente.nome_ingrediente;
+        if(ingrediente.id_tipo_ingredienti == 22)
+        {
+            liStyle="list-style-type: none;";
+            qty = "";
+            nome_ingr = "";
+        } %> <li style="<%= liStyle %>"><b><%= nome_ingr %></b><%= qty %> <%= ingrediente.unita %> <%= unescape(ingrediente.note) %></li><br> <% }); %>
+    </p></center>
     <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="contentProcedimento" data-role="content" style="display: none;">
@@ -18,13 +34,26 @@
     <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;">
+    <h1>Foto</h1>
+    <div id="Gallery" class="freewallGallery">
+        <% _.each(ricetta.foto, function(fotoID) {%>
+            <div class='brick' style='width:<%=widthImg%>px;'><a id="photo_<%=fotoID.ID%>" data-role="none" data-photoid="<%=fotoID.ID%>" href="">
+                <img src='<%=myManifest.Settings.DefaultURL%>/api/photo/medium/<%=fotoID.ID%>' class="imageborder imageborder-<%=profile.data.tema%>"></a></div>
+        <%});%>
+	</div>
+</div>
+<div id="contentVideo" data-role="content" data-theme="d" style="display: none;" data-iscroll>
+    <h1>Video</h1>
+    <p id='video'></p>
+</div>
 <div data-role="footer" data-position="fixed" data-tap-toggle="false">
 	<div data-role="navbar">
 	    <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="">Video</a></li>-->
+	        <li><a href="">Foto</a></li>
+	        <!--<li><a href="">Video</a></li>-->
 	    </ul>
 	</div><!-- /navbar -->
     <% if(ricetta.autore.length > 0){ %>

js/modules/maps/maps.js

@@ -5,8 +5,6 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/maps/mapsViewTemplate.
 
                 map: null,
                 markers: [],
-                openedInfoWindows: [],
-                markerClicked: false,
                 //initialize template
                 template: _.template(mapsViewTemplate),
                 infoWindowtemplate: _.template(infoWindowTemplate),
@@ -78,15 +76,11 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/maps/mapsViewTemplate.
                         mapTypeControl: false,
                         zoomControlOptions: {
                             position: google.maps.ControlPosition.RIGHT_CENTER
-                        }
+                        },
                     };
-                    self.$el.find("#map-canvas").width(document.documentElement.clientWidth - 32/*Padding content*/);
-                    self.$el.find("#map-canvas").height(document.documentElement.clientHeight - 151 - self.$el.find('#searchPanel').height());
-                    self.map = new google.maps.Map(self.$el.find("#map-canvas")[0], myOptions);
-
-                    self.map.addListener("dragend", function(){
-                        self.markerClicked = true;
-                    });
+                    $("#map-canvas").width(document.documentElement.clientWidth - 32/*Padding content*/);
+                    $("#map-canvas").height(document.documentElement.clientHeight - 151 - self.$el.find('#searchPanel').height());
+                    self.map = new google.maps.Map($("#map-canvas")[0], myOptions);
 
                     // 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];
@@ -130,7 +124,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/maps/mapsViewTemplate.
                             markers.push(new google.maps.Marker({
                                 map: self.map,
                                 icon: icon,
-                                title: unescape(place.name),
+                                title: place.name,
                                 position: place.geometry.location
                             }));
 
@@ -146,47 +140,32 @@ 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;
@@ -194,8 +173,8 @@ 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: $("<div/>").html(unescape(ele.Name)).text(),
-                        //map: self.map
+                        title: ele.Name,
+                        map: self.map
                       });
                     
                     if(!self.markers[key])
@@ -204,34 +183,24 @@ 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}),
-                        closeclick: function(){
-                            var index = openedInfoWindows.indexOf(this);
-                            if (index > -1) {
-                                self.openedInfoWindows.splice(index, 1);
-                            }
-                        }
+                        content: self.infoWindowtemplate({item: ele})
                       });
 
                     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
@@ -245,18 +214,6 @@ 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/search/foundItemTemplate.html

@@ -3,24 +3,31 @@
 <%} 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">
-    <div class='ricettaTitolo'><%= unescape(item.titolo) %></div>
-    <div class='ricettaAutore'><%= unescape(item.autore) %></div>
-    <br><div class='ricettaAutore'>Diff.:&nbsp;&nbsp;</div>
-	<div id="valutazione">
-		<div role="text" data-role="none" aria-label="Molto Semplice" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=1){%>star-rating-on<%}%>">
-			<div data-role="none" title="Molto Semplice">1</div>
-		</div>
-		<div data-role="none" role="text" aria-label="Semplice" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=2){%>star-rating-on<%}%>">
-			<div data-role="none" title="Semplice">2</div>
-		</div>
-		<div data-role="none" role="text" aria-label="Normale" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=3){%>star-rating-on<%}%>">
-			<div data-role="none" title="Normale">3</div>
-		</div>
-		<div data-role="none" role="text" aria-label="Difficile" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=4){%>star-rating-on<%}%>">
-			<div data-role="none" title="Difficile">4</div>
-		</div>
-		<div data-role="none" role="text" aria-label="Molto Difficile" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=5){%>star-rating-on<%}%>">
-			<div data-role="none" title="Molto Difficile">5</div>
+	<div class="imageRic">
+	<% if(item.firstImage !== ""){ %>
+		<img src='<%=myManifest.Settings.DefaultURL%>/api/photo/thumbnail/<%=item.firstImage%>'>
+	<%}%>
+	</div>
+	<div class="contentItem">
+	    <div class='ricettaTitolo'><%= unescape(item.titolo)%> - <%= unescape(item.categoria_name)%></div>
+	    <div class='ricettaAutore'><%= unescape(item.autore) %></div>
+	    <br><div class='ricettaAutore'>Diff.:&nbsp;&nbsp;</div>
+		<div id="valutazione">
+			<div role="text" data-role="none" aria-label="Molto Semplice" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=1){%>star-rating-on<%}%>">
+				<div data-role="none" title="Molto Semplice">1</div>
+			</div>
+			<div data-role="none" role="text" aria-label="Semplice" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=2){%>star-rating-on<%}%>">
+				<div data-role="none" title="Semplice">2</div>
+			</div>
+			<div data-role="none" role="text" aria-label="Normale" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=3){%>star-rating-on<%}%>">
+				<div data-role="none" title="Normale">3</div>
+			</div>
+			<div data-role="none" role="text" aria-label="Difficile" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=4){%>star-rating-on<%}%>">
+				<div data-role="none" title="Difficile">4</div>
+			</div>
+			<div data-role="none" role="text" aria-label="Molto Difficile" class="star-rating rater-0 star star-rating-applied star-rating-live <% if(parseInt(item.difficolta)>=5){%>star-rating-on<%}%>">
+				<div data-role="none" title="Molto Difficile">5</div>
+			</div>
 		</div>
 	</div>
 </a></li>

js/modules/search/search.js

@@ -63,8 +63,7 @@ define(['jquery', 'underscore', 'backbone','text!modules/search/searchViewTempla
                     this.$el.append(this.template());
                     this.$el.append(this.footer.$el);
 				}
-                if(Profile.data.risRic)
-				    this.$el.find('#nResult').val(Profile.data.risRic);
+				this.$el.find('#nResult').val(Profile.data.risRic);
 				this.trigger("renderCompleted:Search", this);
                 this.$el.find("#searchBtn").addClass("ui-btn-active");
                 return this;

js/modules/settings/settings.js

@@ -6,12 +6,10 @@ define(['jquery', 'underscore', 'backbone','text!modules/settings/settingsViewTe
             //initialize template
             template:_.template(settingsViewTemplate),
             _flagSave: false,
-            activateTab: 0,
 
-            initialize: function (tab) {
+            initialize: function () {
                 var self = this;
                 this.id = "SettingsView";
-                this.activateTab = tab;
                 SettingsView.__super__.initialize.call(this);                
             },
 
@@ -135,45 +133,8 @@ 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();
                 }
@@ -232,17 +193,6 @@ 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
@@ -257,10 +207,6 @@ 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);
@@ -268,8 +214,6 @@ 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/modules/settings/settingsViewTemplate.html

@@ -11,9 +11,10 @@
 			<label for="nResult">Numero Risultati Ricerca:</label>
 			<select name="nResult" id="nResult">
 				<option value="10" selected="true">10</option>
-	            <option value="25">25</option>
-	            <option value="50">50</option>
-	            <option value="100">100</option>
+				<option value="15">15</option>
+				<option value="20">20</option>
+				<option value="25">25</option>
+				<option value="30">30</option>
 			</select>
 			<label for="theme">Tema Grafico:</label>
 			<select name="theme" id="theme">
@@ -59,7 +60,6 @@
 				<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(:tab)': 'showSettings',
+                    'settingsView': 'showSettings',
                     'donationView': 'showDonation',
                     'search/:nresult/:categoria/:difficolta/:autore/*titolo': 'searchFn',
                     'converterView': 'showConverter',
@@ -71,10 +71,8 @@ define(['jquery', 'underscore', 'backbone',
                     homeView.render();
                     this.changePage(homeView);
                 },
-                showSettings: function (tab) {
-                    if(tab==null)
-                        tab = 0;
-                    var settingsView = new SettingsView(tab);
+                showSettings: function (actions) {
+                    var settingsView = new SettingsView();
                     settingsView.render();
                     this.changePage(settingsView);
                 },
@@ -174,7 +172,6 @@ define(['jquery', 'underscore', 'backbone',
                     this.changePage(mapsView);
                 },
                 showSearch: function () {
-                    // will render home view and navigate to homeView
                     var searchView = new SearchView();
                     searchView.render();
                     this.changePage(searchView);