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@52 0f545695-f87b-41b6-9a03-7f16563b5454

Browse Source
This commit is contained in:
hexstudy
2016-01-18 22:18:39 +00:00
parent b4882d0006
commit bcd5752f87
14 changed files with 119 additions and 3294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/modules/category/categoryItemTemplate.html
+2 -2
View File
@@ -3,11 +3,11 @@
<%} 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">
<% if(item.firstImage === ""){ %>
<!--<% if(item.firstImage === ""){ %>
<img src='Resources\img\ricettaND_80.png'>
<%}else{%>
<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>
js/modules/item/item.js
+19 -54
View File
@@ -6,10 +6,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
collIngredienti: null,
fetchedRicetta: false,
fetchedIngredienti: false,
IMG_WIDTH: 500,
currentImg: 0,
maxImages: 3,
speed: 500,
galleryWall: null,
//initialize template
template: _.template(itemViewTemplate),
initialize: function (options) {
@@ -58,14 +55,24 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
);
},
onShowed: function(){
var self = this;
$('body').scrollTop(0);
this.$el.find("#Gallery").swipe({
triggerOnTouchEnd: true,
swipeStatus: this._swipeStatus,
allowPageScroll: "vertical",
threshold: 75
});
this.galleryWall = new Freewall("#Gallery");
this.galleryWall.reset({
selector: '.brick',
animate: true,
cellW: 150,
cellH: 'auto',
onResize: function() {
self.galleryWall.fitWidth();
}
});
var images = this.galleryWall.container.find('.brick');
images.find('img').load(function() {
self.galleryWall.fitWidth();
});
},
//render the content into div of view
render: function () {
@@ -76,8 +83,6 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
var ric = self.collRicetta.toJSON()[0];
this.maxImages = ric.foto.length;
Profile.existRicettaBloccoNote(ric.ricetta_id,
function (exist) {
self.$el.append(self.template({
@@ -125,48 +130,6 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
return this;
}
},
/**
* Catch each phase of the swipe.
* move : we drag the div
* cancel : we animate back to where we were
* end : we animate to the next image
*/
_swipeStatus: function (event, phase, direction, distance) {
//If we are moving before swipe, and we are going L or R in X mode, or U or D in Y mode then drag.
if (phase == "move" && (direction == "left" || direction == "right")) {
var duration = 0;
if (direction == "left") {
scrollImages((this.IMG_WIDTH * this.currentImg) + distance, duration);
} else if (direction == "right") {
scrollImages((this.IMG_WIDTH * this.currentImg) - distance, duration);
}
} else if (phase == "cancel") {
scrollImages(this.IMG_WIDTH * this.currentImg, this.speed);
} else if (phase == "end") {
if (direction == "right") {
self._previousImage();
} else if (direction == "left") {
self._nextImage();
}
}
},
_previousImage: function () {
this.currentImg = Math.max(this.currentImg - 1, 0);
scrollImages(this.IMG_WIDTH * this.currentImg, this.speed);
},
_nextImage: function() {
this.currentImg = Math.min(this.currentImg + 1, this.maxImages - 1);
this._scrollImages(this.IMG_WIDTH * this.currentImg, this.speed);
},
/**
* Manually update the position of the imgs on drag
*/
_scrollImages: function (distance, duration) {
imgs.css("transition-duration", (duration / 1000).toFixed(1) + "s");
//inverse the number we set in the css
var value = (distance < 0 ? "" : "-") + Math.abs(distance).toString();
imgs.css("transform", "translate(" + value + "px,0)");
},
goToContent: function (newIndex)
{
if (this.$arrayContent.length > newIndex && newIndex >= 0)
@@ -174,6 +137,8 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
this.scrollPositions[this.indexContent] = $('body').scrollTop();
this.indexContent = newIndex;
this.switchContent();
if(this.indexContent == 2)
this.galleryWall.fitWidth();
$('body').scrollTop(this.scrollPositions[this.indexContent]);
}
},
js/modules/item/itemViewTemplate.html
+6 -21
View File
@@ -4,27 +4,12 @@
<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>
<style>
#Gallery {
float: left;
display: inline;
padding: 0;
margin: 0;
/*width: 1510px;*/
transition-property: transform;
transition-duration: 0.5s;
transition-timing-function: ease-out;
/*apply a transform to kick in the hardware acceleration. Without this, the first
time we add the transform you get odd rendering of the divs (half missing) */
transform: translate(0, 0);
.freewallGallery {
margin: 15px;
}
#Gallery img {
padding: 0;
.brick img {
margin: 0;
/*width: 500px;
height: 340px;*/
/*apply a transform to kick in the hardware acceleration. Without this, the first
time we add the transform you get odd rendering of the divs (half missing) */
transform: translate(0, 0);
display: block;
}
</style>
<div id="contentIngredienti" data-role="content">
@@ -50,9 +35,9 @@
</div>
<div id="contentFoto" data-role="content" style="display: none;">
<h1>Foto</h1>
<div id="Gallery">
<div id="Gallery" class="freewallGallery">
<% _.each(ricetta.foto, function(fotoID) {%>
<img src='<%=myManifest.Settings.DefaultURL%>/api/photo/<%=fotoID.ID%>'>
<div class='brick' style='width:250px;'><img src='<%=myManifest.Settings.DefaultURL%>/api/photo/<%=fotoID.ID%>' style="width: 100%;"></div>
<%});%>
</div>
</div>
js/modules/settings/settings.js
+54 -4
View File
@@ -15,7 +15,21 @@ define(['jquery', 'underscore', 'backbone','text!modules/settings/settingsViewTe
events: {
"click #saveBtn": "saveBtn",
"change #spacc-PMChk": "spaccPMClick"
"change #spacc-PMChk": "spaccPMClick",
"change #stato": "statoChange"
},
statoChange: function(){
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();
}
},
saveBtn:function(e){
@@ -34,13 +48,21 @@ define(['jquery', 'underscore', 'backbone','text!modules/settings/settingsViewTe
if(Profile.data.isSpacc==="1")
{
Profile.data.email = this.$el.find('#email').val();
Profile.data.dataSpacc.provincia = this.$el.find('#prov').val();
Profile.data.dataSpacc.stato = this.$el.find('#stato').val();
if(this.$el.find('#stato').val() !== "ITALIA"){
Profile.data.dataSpacc.provincia = this.$el.find('#provTxt').val();
}
else{
Profile.data.dataSpacc.provincia = this.$el.find('#prov').val();
}
Profile.data.dataSpacc.comune = this.$el.find('#comune').val();
Profile.data.dataSpacc.cap = this.$el.find('#CAP').val();
Profile.data.dataSpacc.tipopm = this.$el.find('#tPM').val();
Profile.data.dataSpacc.privacy = this.$el.find('#privacyChk').prop('checked')?"1":"0";
if(Profile.data.email === "" ||
Profile.data.dataSpacc.stato === "" ||
Profile.data.dataSpacc.provincia === "" ||
Profile.data.dataSpacc.comune === "" ||
Profile.data.dataSpacc.cap === "" ||
@@ -66,7 +88,7 @@ define(['jquery', 'underscore', 'backbone','text!modules/settings/settingsViewTe
url: "http://maps.google.com/maps/api/geocode/json?address=" +
Profile.data.dataSpacc.comune + "+" +
Profile.data.dataSpacc.comune + "+" +
Profile.data.dataSpacc.provincia + "+italia&sensor=false",
Profile.data.dataSpacc.provincia + "+" + Profile.data.dataSpacc.stato + "&sensor=false",
                Type: "GET"
            }).then(function ( response ) {
if(response.results.length == 1)
@@ -111,7 +133,21 @@ define(['jquery', 'underscore', 'backbone','text!modules/settings/settingsViewTe
else
this.$el.find('#mapSpacc > :not(.ui-checkbox:has(#spacc-PMChk))').show();
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();
}
$( "#autocomplete_comune" ).on( "filterablebeforefilter", function ( e, data ) {
if(self.$el.find('#stato').val() !== "ITALIA")
return;
        var $ul = $( this ),
            $input = $( data.input ),
            value = $input.val(),
@@ -163,12 +199,26 @@ define(['jquery', 'underscore', 'backbone','text!modules/settings/settingsViewTe
this.$el.append(this.template());
this.$el.append(this.footer.$el);
}
this.$el.find('#nResult').val(Profile.data.risRic);
this.$el.find('#theme').val(Profile.data.tema);
this.$el.find('#spacc-PMChk').prop('checked', Profile.data.isSpacc==="0"?false:true);
this.$el.find('#email').val(Profile.data.email);
this.$el.find('#prov').val(Profile.data.dataSpacc.provincia);
this.$el.find('#stato').val(Profile.data.dataSpacc.stato);
if(this.$el.find('#stato').val() !== "ITALIA")
{
this.$el.find('#provTxt').parent().show();
this.$el.find('#prov').parent().hide();
this.$el.find('#provTxt').val(Profile.data.dataSpacc.provincia);
}
else
{
this.$el.find('#provTxt').parent().hide();
this.$el.find('#prov').parent().show();
this.$el.find('#prov').val(Profile.data.dataSpacc.provincia);
}
this.$el.find('#comune').val(Profile.data.dataSpacc.comune);
this.$el.find('#CAP').val(Profile.data.dataSpacc.cap);
this.$el.find('#tPM').val(Profile.data.dataSpacc.tipopm);
js/modules/settings/settingsViewTemplate.html
+33
View File
@@ -29,7 +29,40 @@
<input type="checkbox" name="spacc-PMChk" id="spacc-PMChk">
<label for="email">Email:</label>
<input type="text" name="email" id="email" placeholder="Inserire proprio indirizzo di posta...">
<label for="stato">Stato:</label>
<select name="stato" id="stato">
<option value='AUSTRIA'>Austria</option>
<option value='BELGIO'>Belgio</option>
<option value='BULGARIA'>Bulgaria</option>
<option value='CIPRO'>Cipro</option>
<option value='CROAZIA'>Croazia</option>
<option value='DANIMARCA'>Danimarca</option>
<option value='ESTONIA'>Estonia</option>
<option value='FINLANDIA'>Finlandia</option>
<option value='FRANCIA'>Francia</option>
<option value='GERMANIA'>Germania</option>
<option value='GRECIA'>Grecia</option>
<option value='ITALIA' selected="true">Italia</option>
<option value='IRLANDA'>Irlanda</option>
<option value='LETTONIA'>Lettonia</option>
<option value='LITUANIA'>Lituania</option>
<option value='LUSSEMBURGO'>Lussemburgo</option>
<option value='MALTA'>Malta</option>
<option value='NORVEGIA'>Norvegia</option>
<option value='PAESI BASSI'>Paesi Bassi</option>
<option value='POLONIA'>Polonia</option>
<option value='PORTOGALLO'>Portogallo</option>
<option value='REGNOUNITO'>RegnoUnito</option>
<option value='REP.CECA'>Rep.Ceca</option>
<option value='SLOVACCHIA'>Slovacchia</option>
<option value='SLOVENIA'>Slovenia</option>
<option value='ROMANIA'>Romania</option>
<option value='SPAGNA'>Spagna</option>
<option value='SVEZIA'>Svezia</option>
<option value='UNGHERIA'>Ungheria</option>
</select>
<label for="prov">Provincia:</label>
<input type="text" name="provTxt" id="provTxt" placeholder="Inserire propria provincia...">
<select name="prov" id="prov">
<option value='AG'>AG</option>
<option value='AL'>AL</option>