hexstudy/IlLievitario-App
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
hexstudy
2016-03-13 17:23:25 +00:00
parent 137b074d85
commit 8903d71a93
8 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/manifest.js
+1 -1
View File
@@ -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
+13 -5
View File
@@ -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>
<% }if(ricetta.link_fonte.length > 0){ %>
<h1 id="linkFonte" style="padding: 0px;"><a target="_blank" href="<%= ricetta.link_fonte%>">Link Fonte</a></h1>
<% }%>
<div data-role="none" style="display: inline-block;">
<p id="autore" style="padding: 0px;display: inline;">Autore: <%= unescape(ricetta.autore)%></p>
</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
+6 -4
View File
@@ -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*/);
$("#map-canvas").height(document.documentElement.clientHeight - 151 - self.$el.find('#searchPanel').height());
self.map = new google.maps.Map($("#map-canvas")[0], myOptions);
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);
// 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
+3 -4
View File
@@ -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="20">20</option>
<option value="25">25</option>
<option value="30">30</option>
<option value="25">25</option>
<option value="50">50</option>
<option value="100">100</option>
</select>
<label for="theme">Tema Grafico:</label>
<select name="theme" id="theme">