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/Manut_3.0.1@63 0f545695-f87b-41b6-9a03-7f16563b5454

Browse Source
This commit is contained in:
hexstudy
2016-02-09 08:10:01 +00:00
parent 46023ef8ed
commit 327c2e577d
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app.build_prod.js
+1
View File
@@ -21,6 +21,7 @@
baseUrl: "js", baseUrl: "js",
//- this is the directory that the new files will be. it will be created if it doesn't exist //- this is the directory that the new files will be. it will be created if it doesn't exist
dir: "./app-build_prod", dir: "./app-build_prod",
removeCombined: true,
paths: { paths: {
jquery: 'empty:', jquery: 'empty:',
underscore: 'libs/underscore-min', underscore: 'libs/underscore-min',
js/manifest.js
+1 -1
View File
@@ -1,7 +1,7 @@
var myManifest = { var myManifest = {
Debug: (window.location.port !== ""), Debug: (window.location.port !== ""),
Name: "Il Lievitario", Name: "Il Lievitario",
Version: "3.0.1.5", Version: "3.0.1.7",
Author: "Denis Ironi", Author: "Denis Ironi",
Settings: { Settings: {
DefaultURL: (window.location.port === "" ? "http://" + window.location.host + "/Service": "http://" + window.location.hostname + ":" + window.location.port + "/Service_Manut"), DefaultURL: (window.location.port === "" ? "http://" + window.location.host + "/Service": "http://" + window.location.hostname + ":" + window.location.port + "/Service_Manut"),
js/modules/category/categoryItemTemplate.html
+2 -2
View File
@@ -4,9 +4,9 @@
<% var item = data.items[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"> <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 === ""){ %> <% if(item.firstImage === ""){ %>
<!--<img class="thmbImg emptyItemList">--> <img class="thmbImg emptyItemList">
<%}else{%> <%}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='ricettaTitolo'><%= unescape(item.titolo) %></div>
<div class='ricettaAutore'><%= unescape(item.autore) %></div> <div class='ricettaAutore'><%= unescape(item.autore) %></div>
js/modules/item/item.js
+9 -9
View File
@@ -58,7 +58,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
var self = this; var self = this;
$('body').scrollTop(0); $('body').scrollTop(0);
/*this.galleryWall = new Freewall("#Gallery"); this.galleryWall = new Freewall("#Gallery");
this.galleryWall.reset({ this.galleryWall.reset({
selector: '.brick', selector: '.brick',
animate: true, animate: true,
@@ -69,12 +69,12 @@ 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'); var images = this.galleryWall.container.find('.brick');
images.find('img').load(function() { images.find('img').load(function() {
self.galleryWall.fitWidth(); self.galleryWall.fitWidth();
});*/ });
$.mobile.loading('hide'); $.mobile.loading('hide');
@@ -94,14 +94,14 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
ricetta: self.collRicetta.toJSON()[0], ricetta: self.collRicetta.toJSON()[0],
ingredienti: self.collIngredienti.toJSON(), ingredienti: self.collIngredienti.toJSON(),
profile: Profile, profile: Profile,
//images: Images, images: Images,
})); }));
self.scrollPositions = []; self.scrollPositions = [];
self.$arrayContent = self.$el.find('div[data-role="content"]'); self.$arrayContent = self.$el.find('div[data-role="content"]');
self.$arrayNavBar = self.$el.find('div[data-role="navbar"] a'); 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(){ self.$el.find('#contentFoto a img').load(function(){
countImgLoaded++; countImgLoaded++;
if(self.$photos.length == 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--) { for (var i = self.$arrayContent.length - 1; i >= 0; i--) {
self.scrollPositions.push(0); self.scrollPositions.push(0);
}; };
@@ -181,8 +181,8 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
$(this.$arrayContent[this.indexContent]).show(); $(this.$arrayContent[this.indexContent]).show();
$(this.$arrayNavBar[this.indexContent]).addClass('ui-btn-active'); $(this.$arrayNavBar[this.indexContent]).addClass('ui-btn-active');
$(this.$arrayNavBar[this.indexContent]).addClass('ui-state-persist'); $(this.$arrayNavBar[this.indexContent]).addClass('ui-state-persist');
/*if(this.indexContent == 2) if(this.indexContent == 2)
this.galleryWall.fitWidth();*/ this.galleryWall.fitWidth();
} }
}); });
return ItemView; return ItemView;
js/modules/item/itemViewTemplate.html
+4 -4
View File
@@ -34,7 +34,7 @@
<p id='procedimento'><%= ricetta.procedimento%></p> <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> <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>
<!--<div id="contentFoto" data-role="content" style="display: none;"> <div id="contentFoto" data-role="content" style="display: none;">
<h1>Foto</h1> <h1>Foto</h1>
<div id="Gallery" class="freewallGallery"> <div id="Gallery" class="freewallGallery">
<% _.each(ricetta.foto, function(fotoID) {%> <% _.each(ricetta.foto, function(fotoID) {%>
@@ -45,14 +45,14 @@
<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> <h1>Video</h1>
<p id='video'></p> <p id='video'></p>
</div>--> </div>
<div data-role="footer" data-position="fixed" data-tap-toggle="false"> <div data-role="footer" data-position="fixed" data-tap-toggle="false">
<div data-role="navbar"> <div data-role="navbar">
<ul> <ul>
<li><a href="" class="ui-btn-active ui-state-persist">Ingredienti</a></li> <li><a href="" class="ui-btn-active ui-state-persist">Ingredienti</a></li>
<li><a href="">Procedimento</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> </ul>
</div><!-- /navbar --> </div><!-- /navbar -->
<% if(ricetta.autore.length > 0){ %> <% if(ricetta.autore.length > 0){ %>