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_4.0.0@85 0f545695-f87b-41b6-9a03-7f16563b5454

Browse Source
This commit is contained in:
hexstudy
2016-05-16 15:52:25 +00:00
parent 38daf2c82d
commit 0acf60e400
7 changed files with 86 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.htaccess
+10 -10
View File
@@ -26,16 +26,16 @@ AddOutputFilterByType DEFLATE text/css application/x-javascript text/html text/r
RewriteEngine On RewriteEngine On
RewriteBase / RewriteBase /
#RewriteRule ^index.html$ index.php [L] #RewriteRule ^index.html$ index.php [L]
RewriteRule ^.*js/libs/(.*)\.[0-9]+\.js$ /WebClient/js/libs/$1.js [L] RewriteRule ^.*js/libs/(.*)\.[0-9]+\.js$ /WebClient_Manut/js/libs/$1.js [L]
RewriteRule ^.*js/(.*)\.[0-9]+\.js$ /WebClient/js/$1.js [L] RewriteRule ^.*js/(.*)\.[0-9]+\.js$ /WebClient_Manut/js/$1.js [L]
RewriteRule ^r.*/.*js/(.*).js$ /WebClient/js/$1.js [L] RewriteRule ^r.*/.*js/(.*).js$ /WebClient_Manut/js/$1.js [L]
RewriteRule ^r.*/.*js/(.*).html$ /WebClient/js/$1.html [L] RewriteRule ^r.*/.*js/(.*).html$ /WebClient_Manut/js/$1.html [L]
RewriteRule ^.*css/(.*)\.[0-9]+\.css$ /WebClient/css/$1.css [L] RewriteRule ^.*css/(.*)\.[0-9]+\.css$ /WebClient_Manut/css/$1.css [L]
RewriteRule ^r.*/.*css/(.*).gif$ /WebClient/css/$1.gif [L] RewriteRule ^r.*/.*css/(.*).gif$ /WebClient_Manut/css/$1.gif [L]
#RewriteRule ^/Resources/img/(.*)\.[0-9]+\.png$ /WebClient/Resources/img/$1.png [L] #RewriteRule ^/Resources/img/(.*)\.[0-9]+\.png$ /WebClient_Manut/Resources/img/$1.png [L]
#RewriteRule ^/Resources/img/(.*)\.[0-9]+\.gif$ /WebClient/Resources/img/$1.gif [L] #RewriteRule ^/Resources/img/(.*)\.[0-9]+\.gif$ /WebClient_Manut/Resources/img/$1.gif [L]
#RewriteRule ^/Resources/icons/(.*)\.[0-9]+\.png$ /WebClient/Resources/icons/$1.png [L] #RewriteRule ^/Resources/icons/(.*)\.[0-9]+\.png$ /WebClient_Manut/Resources/icons/$1.png [L]
RewriteRule ^r(.*)/$ /WebClient/index.php?ricetta=$1 [L] RewriteRule ^r(.*)/$ /WebClient_Manut/index.php?ricetta=$1 [L]
</ifModule> </ifModule>
<ifModule mod_headers.c> <ifModule mod_headers.c>
css/base.style.css
+30
View File
@@ -320,4 +320,34 @@ label.error {
.cappelli-5{ .cappelli-5{
background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAAQCAMAAAC2lwjzAAAA1VBMVEUAAADYBATUBQVKEhLpAgLnAgL0AQHvAQFzDw+AERHPBQXoAwPmAgLCBgbFBQWzBwe1BgajCgrDBgaFDw9OFBS1BgaKDQ2YDAyuCQm0CAjFBgb6AABxERHqAgLPBQXoAgLSBQWdCgrhAgJrERHEBgbABgasCAiiCQljEhKBDg6gCQl0ERG6BwcYGBi1CAiyCAg1Fxe4CAjABgZ3EBCiCws4GBhwERHSBQW0CgqHCgpJFhYxExNyDAxdDQ3/AAD8AAD0AQH3AQHtAgLcBATwAgLgAwP5AQHDLfveAAAAPnRSTlMA/v0H/v757hsK/v76+OvIooqFdFZJJP7+/v7s6+vq5t/e19bNubSop5+alY5zc3JgXlJNRT87MzAvLRoUEx15MDIAAADNSURBVDjLrc1HloNADEVRFQUGnFO7c845dzt+qQB7/0sy2McrUL2jydVAIkreb1rtl5//8ZzK9E67tWXEzfg4vuv1//SmySkbbgiAKJOzX7Vpr8aMAGWZC/lZbfoSYLvIVw08ql1+qI5XzuGiodo0OmdscuXcW7UpvS2AFTZdjfQm2zORM+wYEn+qXTWo52E9PCzCZj/1YXpjAJwFB53Ei20X24oPL6bkQkQYQMd6MU1P9gNjTMYDPyb7eh2Ik+XRt9q7ZsOHy1b7aeHHa6BIpJhrAv6ZAAAAAElFTkSuQmCC') 50% 50% no-repeat; background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAAQCAMAAAC2lwjzAAAA1VBMVEUAAADYBATUBQVKEhLpAgLnAgL0AQHvAQFzDw+AERHPBQXoAwPmAgLCBgbFBQWzBwe1BgajCgrDBgaFDw9OFBS1BgaKDQ2YDAyuCQm0CAjFBgb6AABxERHqAgLPBQXoAgLSBQWdCgrhAgJrERHEBgbABgasCAiiCQljEhKBDg6gCQl0ERG6BwcYGBi1CAiyCAg1Fxe4CAjABgZ3EBCiCws4GBhwERHSBQW0CgqHCgpJFhYxExNyDAxdDQ3/AAD8AAD0AQH3AQHtAgLcBATwAgLgAwP5AQHDLfveAAAAPnRSTlMA/v0H/v757hsK/v76+OvIooqFdFZJJP7+/v7s6+vq5t/e19bNubSop5+alY5zc3JgXlJNRT87MzAvLRoUEx15MDIAAADNSURBVDjLrc1HloNADEVRFQUGnFO7c845dzt+qQB7/0sy2McrUL2jydVAIkreb1rtl5//8ZzK9E67tWXEzfg4vuv1//SmySkbbgiAKJOzX7Vpr8aMAGWZC/lZbfoSYLvIVw08ql1+qI5XzuGiodo0OmdscuXcW7UpvS2AFTZdjfQm2zORM+wYEn+qXTWo52E9PCzCZj/1YXpjAJwFB53Ei20X24oPL6bkQkQYQMd6MU1P9gNjTMYDPyb7eh2Ik+XRt9q7ZsOHy1b7aeHHa6BIpJhrAv6ZAAAAAElFTkSuQmCC') 50% 50% no-repeat;
}
.noti_bubble {
position: absolute;
top: 0px;
right: 2px;
/*
padding: 2px;
background-color: red;
color: white;
font-weight: 700;
font-size: .75em;
border-radius: 50%;
width: 15px;
text-align: center;*/
background: radial-gradient( center -9px, circle closest-side, #395184 0, #38c 26px );
background: -moz-radial-gradient( center -9px, circle closest-side, #395184 0, #38c 26px );
background: -ms-radial-gradient( center -9px, circle closest-side, #395184 0, #38c 26px );
background: -o-radial-gradient( center -9px, circle closest-side, #395184 0, #38c 26px );
background: -webkit-radial-gradient( center -9px, circle closest-side, #395184 0, #38c 26px );
background-color: #38c;
border: 1px solid white;
border-radius: 12px; /* must be 1/2 of ( border-width*2 + width ) */
box-shadow: 1px 1px 1px black;
color: white;
font: bold 17px/15px Helvetica, Verdana, Tahoma;
height: 18px; /* height + padding-top must equal width */
padding-top: 2px; /* height + padding-top must equal width */
text-align: center;
width: 20px;
} }
css/style.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
js/modules/category/categoryItemTemplate.html
+3 -2
View File
@@ -4,9 +4,10 @@
<% var item = data.items[i]; %> <% var item = data.items[i]; %>
<li><a href="r<%= item.ricetta_id%>/#ricetta/<%= item.ricetta_id%>" class="ui-btn ui-btn-icon-right ui-icon-carat-r ui-li-has-thumb"> <li><a href="r<%= item.ricetta_id%>/#ricetta/<%= item.ricetta_id%>" class="ui-btn ui-btn-icon-right ui-icon-carat-r ui-li-has-thumb">
<div class="imageRic"> <div class="imageRic">
<% if(item.firstImage !== ""){ %> <% if(item.firstImage !== ""){ %>
<img data-src='<%=myManifest.Settings.DefaultURL%>/api/photo/thumbnail/<%=item.firstImage%>'> <img data-src='<%=myManifest.Settings.DefaultURL%>/api/photo/thumbnail/<%=item.firstImage%>'>
<%}%> <div class="noti_bubble"><%=item.countImages%></div>
<%}%>
</div> </div>
<div class="contentItem"> <div class="contentItem">
<div class='ricettaTitolo'><%= unescape(item.titolo) %></div> <div class='ricettaTitolo'><%= unescape(item.titolo) %></div>
js/modules/item/item.js
+38 -17
View File
@@ -7,6 +7,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
fetchedRicetta: false, fetchedRicetta: false,
fetchedIngredienti: false, fetchedIngredienti: false,
galleryWall: null, galleryWall: null,
currentPhotoIndex: null,
//initialize template //initialize template
template: _.template(itemViewTemplate), template: _.template(itemViewTemplate),
initialize: function (options) { initialize: function (options) {
@@ -95,6 +96,23 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
self.switchContent(); self.switchContent();
$.mobile.loading('hide'); $.mobile.loading('hide');
}, },
loadImage: function(){
var self = this;
$.mobile.loading('show', {
text: 'Caricamento immagine...',
textVisible: true,
//theme: 'z',
html: ""
});
var photoID = $(self.$photos[self.currentPhotoIndex]).attr("data-photoid");
self.$el.find('#photoFull').attr("src" , myManifest.Settings.DefaultURL + "/api/photo/" + photoID);
self.$el.find('#photoFull').load(function(){
$.mobile.loading('hide');
self.$el.find('#fullPhotoPopupDialog').popup("open");
});
},
//render the content into div of view //render the content into div of view
render: function () { render: function () {
if (this.fetchedIngredienti && this.fetchedRicetta) if (this.fetchedIngredienti && this.fetchedRicetta)
@@ -128,22 +146,9 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
}); });
self.$photos.on("click", function(e){ self.$photos.on("click", function(e){
e.preventDefault(); e.preventDefault();
$.mobile.loading('show', { self.currentPhotoIndex = self.$photos.index(this);
text: 'Caricamento immagine...', self.loadImage();
textVisible: true,
//theme: 'z',
html: ""
});
var photoID = $(this).attr("data-photoid");
self.$el.find('#photoFull').attr("src" , myManifest.Settings.DefaultURL + "/api/photo/" + photoID);
self.$el.find('#photoFull').load(function(){
$.mobile.loading('hide');
self.$el.find('#fullPhotoPopupDialog').popup("open");
});
}); });
for (var i = self.$arrayContent.length - 1; i >= 0; i--) { for (var i = self.$arrayContent.length - 1; i >= 0; i--) {
@@ -167,7 +172,23 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
self.$arrayContent.on("swiperight", function (e) { self.$arrayContent.on("swiperight", function (e) {
var index = jQuery.inArray(this, self.$arrayContent); var index = jQuery.inArray(this, self.$arrayContent);
self.goToContent(index - 1); self.goToContent(index - 1);
}); });
self.$el.find('#fullPhotoPopupDialog div').
on("swiperight", function (e) {
self.currentPhotoIndex--;
if(self.currentPhotoIndex < 0)
self.currentPhotoIndex = 0;
else
self.loadImage();
}).on("swipeleft", function (e) {
self.currentPhotoIndex++;
if(self.currentPhotoIndex > self.$photos.length - 1)
self.currentPhotoIndex = self.$photos.length -1;
else
self.loadImage();
});
if(myManifest.Agent.browser.name != "Safari" || myManifest.Agent.browser.name != "Mobile Safari"){ if(myManifest.Agent.browser.name != "Safari" || myManifest.Agent.browser.name != "Mobile Safari"){
new Clipboard('#copyBtn', { new Clipboard('#copyBtn', {
js/modules/note/noteItemTemplate.html
+1 -1
View File
@@ -3,7 +3,7 @@
<%} else { for (var i = 0; i < data.length; i++) { %> <%} else { for (var i = 0; i < data.length; i++) { %>
<% var item = data[i]; %> <% var item = data[i]; %>
<li> <li>
<a href="#ricetta/<%= item.ricetta_id%>"> <a href="r<%= item.ricetta_id%>/#ricetta/<%= item.ricetta_id%>">
<div id="itemID" style="display: none;"><%= item.ricetta_id%></div> <div id="itemID" style="display: none;"><%= item.ricetta_id%></div>
<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>
version.txt
+3 -3
View File
@@ -1,4 +1,4 @@
MAJOR=3 MAJOR=4
MINOR=0 MINOR=0
PATCH=9 PATCH=1
BUILD=9 BUILD=1