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

css/IlLievitario.css

@@ -255,3 +255,10 @@ html .ui-alt-icon .ui-radio-off:after {
 	background-color: white;
     opacity: 0.8;
 }
+
+#linkFonte{
+	background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAAeFBMVEUAAADMzMzMzMzNzc3MzMzMzMzNzc3MzMzMzMzMzMzNzc3IyMjMzMzMzMzMzMzMzMzMzMzMzMzNzc3Ly8vMzMzMzMzMzMzMzMzMzMzMzMzMzMzNzc3MzMzNzc3MzMzMzMzMzMzNzc3MzMzNzc3MzMzNzc3MzMzMzMwIwWCTAAAAJ3RSTlMAeLA4aPnBtuVAGgvu1cqfllAhE+mOY0323s+5qZOEf3JwbmBI+Nq+bgA+AAACAklEQVRYw6SU2XqCMBCFDxiWkFJl0Va7uFSd93/D1hNpEj9irf43JEM4swbEMM1muuoPIod+Nd00Bv+iUkUmAVmhKtyI2T7LKM/bm+JYlBKlXOAvXmq5Sv2Ca7R56JDbPAwpbxFFP4lHr5CcnglU79ufNCKooPLHFoMA2mPQEYVRZmKxPVh1cALoVsMrMsMIxVAl5lF28AXQlYx+qHER9Z+aKZ8aoQA0zVOTRmJQQtZoWYhP+ALkk+m3WAtRCND87LU5R7JEKECWZ8/NK6V00H/bvwao+FaNCSj6qIDGdrOFI7cJTiYTVqDXE8uMTs8b3QeHJPfmV+7CTXUtd1HjzELuZAFiSrmT0lBgy81b+sObHaZfakbq9pcntxTggH+4ZFKQsI2W1AX+wbvB/x/HonPWXVxg53x1HL1qmI/CmwcdF9Be/wtOnFsQDmQXF+g4giCDYzOEMmRTIi6A8uJwZtDYYpA9RSMCLu49XPEbbLzb+3Vaz68JzE+GL+9+bwLT7vJ8MmrYBe7evaDWrGdEwFVu7SX8jpw6CclpShxMufAMdJfb9ZxrLOUhlsjkIbLv0uuABgAYhmEYf9YGYQKX/m9t0gf0FfoR+xt7kHqUe5l6nTdQOtI6VDfWu1i62rZct94bMBZxGrIW8xY0F3Ubth/3XzheeV66XvtePF99X75b/wFwBjZwYQt79AAAAABJRU5ErkJggg==') 50% 50% no-repeat;
+	width: 24px;
+	height: 24px;
+	background-size: 24px 24px;
+}

index.php

@@ -72,7 +72,7 @@ require_once "../Service_Manut/utility.php";
         <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 src="https://maps.googleapis.com/maps/api/js?libraries=places"></script>
+        <script async defer src="https://maps.googleapis.com/maps/api/js?libraries=places,drawing"></script>
         <script type='text/javascript' src="js/common.min.<?php echo filemtime('js/common.min.js'); ?>.js"></script>
         <script type='text/javascript'>
 <?php echo file_get_contents("js/manifest.js"); ?>

js/manifest.js

@@ -1,7 +1,7 @@
 var myManifest = {
     Debug: (window.location.port !== ""),
     Name: "Il Lievitario",
-    Version: "3.0.6.0",
+    Version: "3.0.6.1",
     Author: "Denis Ironi",
     Settings: {
         ShowStartMessage: true,

js/modules/item/itemViewTemplate.html

@@ -28,6 +28,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>
+<% if(ricetta.foto != null && ricetta.foto.length > 0){ %>
 <div id="contentFoto" data-role="content" style="display: none;">
     <h1>Foto</h1>
     <div id="Gallery" class="freewallGallery">
@@ -37,6 +38,7 @@
         <%});%>
 	</div>
 </div>
+<% }%>
 <div id="contentVideo" data-role="content" data-theme="d" style="display: none;" data-iscroll>
     <h1>Video</h1>
     <p id='video'></p>
@@ -46,15 +48,21 @@
 	    <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>
+	        <% if(ricetta.foto != null && ricetta.foto.length > 0){ %><li><a href="">Foto</a></li><% }%>
 	        <!--<li><a href="">Video</a></li>-->
 	    </ul>
 	</div><!-- /navbar -->
+            <div data-role="none" style="text-align: center;">
     <% if(ricetta.autore.length > 0){ %>
-	<h1 id="autore" style="padding: 0px;">Autore: <%= unescape(ricetta.autore)%></h1>
+            <div data-role="none" style="display: inline-block;">
-    <% }if(ricetta.link_fonte.length > 0){ %>
+	<p id="autore" style="padding: 0px;display: inline;">Autore: <%= unescape(ricetta.autore)%></p>
-    <h1 id="linkFonte" style="padding: 0px;"><a target="_blank" href="<%= ricetta.link_fonte%>">Link Fonte</a></h1>
+            </div>
-    <% }%>
+    <% }  if(ricetta.link_fonte.length > 0){ %>
+    <div data-role="none" style="display: inline-block;">
+    <a data-role="none" target="_blank" href="<%= ricetta.link_fonte%>"><div id="linkFonte"></div></a>
+    </div>
+    <% } %>
+            </div>
 </div>
 <div data-role="popup" id="fullPhotoPopupDialog">
     <a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-a ui-icon-delete ui-btn-icon-notext ui-btn-right">Close</a>

js/modules/maps/maps.js

@@ -78,9 +78,9 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/maps/mapsViewTemplate.
                             position: google.maps.ControlPosition.RIGHT_CENTER
                         },
                     };
-                    $("#map-canvas").width(document.documentElement.clientWidth - 32/*Padding content*/);
+                    self.$el.find("#map-canvas").width(document.documentElement.clientWidth - 32/*Padding content*/);
-                    $("#map-canvas").height(document.documentElement.clientHeight - 151 - self.$el.find('#searchPanel').height());
+                    self.$el.find("#map-canvas").height(document.documentElement.clientHeight - 151 - self.$el.find('#searchPanel').height());
-                    self.map = new google.maps.Map($("#map-canvas")[0], myOptions);
+                    self.map = new google.maps.Map(self.$el.find("#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];
@@ -200,7 +200,9 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/maps/mapsViewTemplate.
                         $("#map-canvas").width(document.documentElement.clientWidth - 32/*Padding content*/);
                         $("#map-canvas").height(document.documentElement.clientHeight - 151 - self.$el.find('#searchPanel').height());
                     });
-                    
+                },
+                onShowing: function(){
+                    var self = this;
                     if ( navigator.geolocation ) {
                         function success(pos) {
                             // Location found, show map with these coordinates

js/modules/settings/settingsViewTemplate.html

@@ -11,10 +11,9 @@
 			<label for="nResult">Numero Risultati Ricerca:</label>
 			<select name="nResult" id="nResult">
 				<option value="10" selected="true">10</option>
-				<option value="15">15</option>
+	            <option value="25">25</option>
-				<option value="20">20</option>
+	            <option value="50">50</option>
-				<option value="25">25</option>
+	            <option value="100">100</option>
-				<option value="30">30</option>
 			</select>
 			<label for="theme">Tema Grafico:</label>
 			<select name="theme" id="theme">