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

2016-05-15 12:20:06 +00:00
parent 4c1e83cec1
commit 85c9f11b9f
19 changed files with 2266 additions and 67 deletions
@@ -0,0 +1,20 @@
+@echo off
+REM -- Prepare the Command Processor --
+SETLOCAL ENABLEEXTENSIONS
+SETLOCAL DISABLEDELAYEDEXPANSION
+
+::BatchSubstitude - parses a File line by line and replaces a substring"
+::syntax: BatchSubstitude.bat OldStr NewStr File
+::          OldStr [in] - string to be replaced
+::          NewStr [in] - string to replace with
+::          File   [in] - file to be parsed
+:$changed 20100115
+:$source http://www.dostips.com
+if "%~1"=="" findstr "^::" "%~f0"&GOTO:EOF
+for /f "tokens=1,* delims=]" %%A in ('"type %3|find /n /v """') do (
+    set "line=%%B"
+    if defined line (
+        call set "line=echo.%%line:%~1=%~2%%"
+        for /f "delims=" %%X in ('"echo."%%line%%""') do %%~X
+    ) ELSE echo.
+)
@@ -0,0 +1,8 @@
+@echo off
+for /f "delims== tokens=1,2" %%G in (version.txt) do set %%G=%%H
+set /a BUILD=BUILD+1
+>version.txt (@echo MAJOR=%MAJOR%
+@echo MINOR=%MINOR%
+@echo PATCH=%PATCH%
+@echo BUILD=%BUILD%
+)
@@ -1,6 +1,15 @@
-call uglifyjs .\js\libs\hello.min.js .\js\libs\ua-parser.min.js -o .\js\common.min.js
+call uglifyjs .\js\libs\hello.min.js .\js\libs\ua-parser.min.js .\js\libs\markerclusterer.js .\js\libs\clipboard.js -o .\js\common.min.js
 REM node r.js -o app.build_dev.js
 node r.js -o app.build_prod.js
-REM call cleancss -o .\css\loadingStyle.min.css .\css\loadingStyle.css
+
+CALL ReadAndIncreaseVersion.cmd
+set version=%MAJOR%.%MINOR%.%PATCH%.%BUILD%
+echo Set new version %version% in Manifest.js
+CALL BatchSubstitute.bat "Version:"X.X.X.X"," "Version:"%version%"," .\app-build_prod\manifest.js>.\app-build_prod\manifestNew.js
+del .\app-build_prod\manifest.js
+rename .\app-build_prod\manifestNew.js manifest.js
+
+
+
 call buildcss.cmd
 pause
@@ -15,7 +15,9 @@
    box-shadow: none!important; -moz-box-shadow: none!important; -webkit-box-shadow: none!important; -webkit-border-radius: 0 !important; border-radius: 0 !important;
 }

-#favoriteBtn:after { background:  url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAARVBMVEUAAADNzc3MzMzMzMzLy8vMzMzMzMzMzMzMzMzMzMzNzc3MzMzLy8vMzMzMzMzLy8vHx8fLy8vLy8vMzMzMzMzMzMzMzMzAH4KZAAAAFnRSTlMAnxSw69r1/VJBBr5y4pCCDacq1s8c3BtyNQAAASJJREFUWMPtl8tuhiAQRscbw03wOu//qI0hsQUHy6/poglnQwx+R5hZCPAD1YxId+A4K8iiGyphnnJ5Q2UYzQs8leLZ/CQoRvQJ4pxZuDXIOO2WdH5DOsHVt6nARXl1nU7oJcQ0t7uUTEtlXoCX9XEd6tusYIMUEVcoPPqsoLu0iCK6aT6GtVzQJoLQdNTPBTAcY1sFVVAFVfBvBNoP6o1g2YjQ6ccCK+hgXZ4JdnP+RewTgezpG7N/KjBzHBC2UJCnCqqgCv5E4N4K5EvBqF8KJHACVxpHC6xAFuYHCbxAj8HfNXd4pSEjAIWhQhIKaOPTesBSwKhf87th7yUWrzc+nvCivYhVTx8wTszW5vK84HeqTOn3s5Va3Ip0Dwpjz/V/AVKhx1hESgVcAAAAAElFTkSuQmCC") 50% 50% no-repeat;  background-size: 22px 22px; }
+#favoriteBtn:after { background:  url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAARVBMVEUAAADNzc3MzMzMzMzLy8vMzMzMzMzMzMzMzMzMzMzNzc3MzMzLy8vMzMzMzMzLy8vHx8fLy8vLy8vMzMzMzMzMzMzMzMzAH4KZAAAAFnRSTlMAnxSw69r1/VJBBr5y4pCCDacq1s8c3BtyNQAAASJJREFUWMPtl8tuhiAQRscbw03wOu//qI0hsQUHy6/poglnQwx+R5hZCPAD1YxId+A4K8iiGyphnnJ5Q2UYzQs8leLZ/CQoRvQJ4pxZuDXIOO2WdH5DOsHVt6nARXl1nU7oJcQ0t7uUTEtlXoCX9XEd6tusYIMUEVcoPPqsoLu0iCK6aT6GtVzQJoLQdNTPBTAcY1sFVVAFVfBvBNoP6o1g2YjQ6ccCK+hgXZ4JdnP+RewTgezpG7N/KjBzHBC2UJCnCqqgCv5E4N4K5EvBqF8KJHACVxpHC6xAFuYHCbxAj8HfNXd4pSEjAIWhQhIKaOPTesBSwKhf87th7yUWrzc+nvCivYhVTx8wTszW5vK84HeqTOn3s5Va3Ip0Dwpjz/V/AVKhx1hESgVcAAAAAElFTkSuQmCC") 50% 50% no-repeat;  background-size: 22px 22px; 
+    border-radius: 0em;
+}


 #infoBtn:after { background:  url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAATlBMVEUAAADMzMzMzMzMzMzLy8vMzMzLy8vNzc3MzMzMzMzLy8vMzMzMzMzGxsbMzMzLy8vMzMzNzc3MzMzMzMzMzMzLy8vMzMzLy8vLy8vMzMwz+9AJAAAAGXRSTlMA/bcP3Zo+HG73NJDOCIx7rFhUwfG/ZkkjXGUYMQAAAcBJREFUWMPNV1uygyAMFRAUVBC1ava/0XunxaEdCbHy0/NpDCQ5eVH9OgYhhpuqzWR5reEfuuZ2ar7Udj2DD7DeXT9DcQYJMK4uqZsHoHgYUl1IBhkwKQjrayBQZ/1oGZBgLa7fwSV0mL6Ei5Al9+M2tPAFEnFQDOFN7cbq02d14r9O60+v5FpObAokgIizLRVIgySAOQw82/aZ1Vj+71XA+YL5I4KAYDosTMje48gBQR/60ZiQ8ajfMLyAm2eJJhmKHcYBDs3luKRFrjrQwy30hAcUog8ebsKHA2xavIytMqrN+GczJDI+DUSbikTWRM/o0P4YftCpgvedXIN8RykO8y8le5q9ojcEvLwUeJCoAwRxgKuIH0RwgahFAxgGwsKGaLf6oJFgicPNH7rAkqYSySLy7SXeSJY84uFATSwfy5nM9HxL6nPja6cbSuVyLX0l8gz1YQlCSXkQiEQHx4ySSAyWkYqhyo62eMCI6M/54RrzVDhpN0kN10oitYgSLekFY9kOWaIz1+LCisP4qsy2jjpBoSpdskrXvNJFs3TVLV22S9f94gcHBTMDitkUP7rKn33Xz/DvD0/flDx9fxx/PN/lHL1sRwIAAAAASUVORK5CYII=") 50% 50% no-repeat;  background-size: 22px 22px; }
@@ -55,6 +57,11 @@
    font-size: x-small;
 }

+#optionBtn:after { background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgAQMAAADYVuV7AAAABlBMVEUAAAD///+l2Z/dAAAAAXRSTlMAQObYZgAAABpJREFUOMtjGAVA8B8OaMkZfmA03EbDbXADAN367xG53E5/AAAAAElFTkSuQmCC') 50% 50% no-repeat;  background-size: 22px 22px; }
+
+#copyBtn:after { background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAOVBMVEUAAAD///////////////////////////////////////////////////////////////////////8KOjVvAAAAEnRSTlMAIPCgULBg4NBwz8AQgECQj28Efn8CAAABhElEQVRo3u2ZbWvDMAyEK7/HTdPm/v+PXQuj22I5jHIGG/x8bUGJfJHO0mUymVCQ3Wcg+10uLRCLN7ZBCGfwC+MuZAIOBPLzo8BR829QYJjnYKFgiS8AFd4rLFBZaAE8VDwtQIZKpgVAhXECRKgkXhlqeshyBRrKdH2gijCKaJEdaqnYMuoYYbYwNCjXtyI71IbjDtq/h6JlMqV5laeeiqZPk2Z032EXn4DkF6FK09wOv7OkqWeDLc20FX9hStMEhteMfpeKNFee11w1aVK9ZiikyfaaZGk6nGGF7DX50rQn2Qlsr1lKk+81dWnyvaZxjb1mHMcKNg+Q6ika5JCby1RQ5fH60PovFefFLr+KXe/lum3D0VvmXWuZXTd9xWu6qEq2Y+Ol5q2QLJst/UOyXdv3J2tFsrL7+J6bdn2FUiVbXgI7v8byL+K6ZM9HCf0PQ34kqyJDDKTYIzWdOOemH3rZNM5wvDbeH2dBUV+xDLMkqq+5hlnUna0aR1mW/vWyk8lE4wslI37NvbnQIgAAAABJRU5ErkJggg==') 50% 50% no-repeat;  background-size: 22px 22px; }
+
+
 h1{
    text-align: center;
    font-size: 1.5em;
@@ -35,6 +35,10 @@
    padding-right: 25px;
 }

+.ui-page-theme-d #optionBtn{
+	background-color: #3b5998;
+}
+
 .ui-page-theme-d .ui-btn-left {
    background-color: #3b5998;
    border-color: #3b5998 !important;
@@ -42,15 +42,17 @@ require_once "../Service_Manut/utility.php";
            $query = "select medium_link, type_format from immagini where immagini.id_ricette = " . $ricetta . " and bCover = 1";
            $retObj = $mysqlconnetion->queryToObject($query);

+            if(count($retObj)>0){
            $ogFbImage2 = str_replace("?dl=0", "",$retObj[0]["medium_link"]);
            $ogFbTypeFormat = $retObj[0]["type_format"];
            
            if($ogFbImage2 != ""){
-            echo "<meta property='og:image' content='" . $ogFbImage2 . "'/>";
-            echo "<meta property='og:image:type' content='" . $ogFbTypeFormat . "'/>";
+                echo "<meta property='og:image' content='" . $ogFbImage2 . "'/>";
+                echo "<meta property='og:image:type' content='" . $ogFbTypeFormat . "'/>";
+            }
            }
            else{
-            echo "<meta property='og:image' content='" . $ogFbImage . "'/>";
+                echo "<meta property='og:image' content='" . $ogFbImage . "'/>";
            }
        }
        else{
@@ -62,6 +64,10 @@ require_once "../Service_Manut/utility.php";
        <meta property="og:url" content="<?php echo $ogFbUrl; ?>"/>
        <meta property="og:type" content="<?php echo $ogFbType; ?>"/>
        <meta property="og:description" content="<?php echo $ogFbDescription; ?>" />
+        <!-- END Meta tag per FB-->
+        <meta name="msapplication-TileColor" content="#3b5998">
+        <meta name="theme-color" content="#3b5998">
+        <meta name="msapplication-TileImage" content="https://dl.dropboxusercontent.com/s/pj3fk1lgc4cefwx/Icon~ipad%402x.png">
        <link rel="stylesheet" href="http://code.jquery.com/mobile/1.4.5/jquery.mobile-1.4.5.min.css" >        
        <link rel="stylesheet" href="css/style.min.<?php echo filemtime('css/style.min.css'); ?>.css">
        <link href='http://fonts.googleapis.com/css?family=Pompiere' rel='stylesheet' type='text/css'>
@@ -0,0 +1,740 @@
+/*!
+ * clipboard.js v1.5.10
+ * https://zenorocha.github.io/clipboard.js
+ *
+ * Licensed MIT © Zeno Rocha
+ */
+(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.Clipboard = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+var matches = require('matches-selector')
+
+module.exports = function (element, selector, checkYoSelf) {
+  var parent = checkYoSelf ? element : element.parentNode
+
+  while (parent && parent !== document) {
+    if (matches(parent, selector)) return parent;
+    parent = parent.parentNode
+  }
+}
+
+},{"matches-selector":5}],2:[function(require,module,exports){
+var closest = require('closest');
+
+/**
+ * Delegates event to a selector.
+ *
+ * @param {Element} element
+ * @param {String} selector
+ * @param {String} type
+ * @param {Function} callback
+ * @param {Boolean} useCapture
+ * @return {Object}
+ */
+function delegate(element, selector, type, callback, useCapture) {
+    var listenerFn = listener.apply(this, arguments);
+
+    element.addEventListener(type, listenerFn, useCapture);
+
+    return {
+        destroy: function() {
+            element.removeEventListener(type, listenerFn, useCapture);
+        }
+    }
+}
+
+/**
+ * Finds closest match and invokes callback.
+ *
+ * @param {Element} element
+ * @param {String} selector
+ * @param {String} type
+ * @param {Function} callback
+ * @return {Function}
+ */
+function listener(element, selector, type, callback) {
+    return function(e) {
+        e.delegateTarget = closest(e.target, selector, true);
+
+        if (e.delegateTarget) {
+            callback.call(element, e);
+        }
+    }
+}
+
+module.exports = delegate;
+
+},{"closest":1}],3:[function(require,module,exports){
+/**
+ * Check if argument is a HTML element.
+ *
+ * @param {Object} value
+ * @return {Boolean}
+ */
+exports.node = function(value) {
+    return value !== undefined
+        && value instanceof HTMLElement
+        && value.nodeType === 1;
+};
+
+/**
+ * Check if argument is a list of HTML elements.
+ *
+ * @param {Object} value
+ * @return {Boolean}
+ */
+exports.nodeList = function(value) {
+    var type = Object.prototype.toString.call(value);
+
+    return value !== undefined
+        && (type === '[object NodeList]' || type === '[object HTMLCollection]')
+        && ('length' in value)
+        && (value.length === 0 || exports.node(value[0]));
+};
+
+/**
+ * Check if argument is a string.
+ *
+ * @param {Object} value
+ * @return {Boolean}
+ */
+exports.string = function(value) {
+    return typeof value === 'string'
+        || value instanceof String;
+};
+
+/**
+ * Check if argument is a function.
+ *
+ * @param {Object} value
+ * @return {Boolean}
+ */
+exports.fn = function(value) {
+    var type = Object.prototype.toString.call(value);
+
+    return type === '[object Function]';
+};
+
+},{}],4:[function(require,module,exports){
+var is = require('./is');
+var delegate = require('delegate');
+
+/**
+ * Validates all params and calls the right
+ * listener function based on its target type.
+ *
+ * @param {String|HTMLElement|HTMLCollection|NodeList} target
+ * @param {String} type
+ * @param {Function} callback
+ * @return {Object}
+ */
+function listen(target, type, callback) {
+    if (!target && !type && !callback) {
+        throw new Error('Missing required arguments');
+    }
+
+    if (!is.string(type)) {
+        throw new TypeError('Second argument must be a String');
+    }
+
+    if (!is.fn(callback)) {
+        throw new TypeError('Third argument must be a Function');
+    }
+
+    if (is.node(target)) {
+        return listenNode(target, type, callback);
+    }
+    else if (is.nodeList(target)) {
+        return listenNodeList(target, type, callback);
+    }
+    else if (is.string(target)) {
+        return listenSelector(target, type, callback);
+    }
+    else {
+        throw new TypeError('First argument must be a String, HTMLElement, HTMLCollection, or NodeList');
+    }
+}
+
+/**
+ * Adds an event listener to a HTML element
+ * and returns a remove listener function.
+ *
+ * @param {HTMLElement} node
+ * @param {String} type
+ * @param {Function} callback
+ * @return {Object}
+ */
+function listenNode(node, type, callback) {
+    node.addEventListener(type, callback);
+
+    return {
+        destroy: function() {
+            node.removeEventListener(type, callback);
+        }
+    }
+}
+
+/**
+ * Add an event listener to a list of HTML elements
+ * and returns a remove listener function.
+ *
+ * @param {NodeList|HTMLCollection} nodeList
+ * @param {String} type
+ * @param {Function} callback
+ * @return {Object}
+ */
+function listenNodeList(nodeList, type, callback) {
+    Array.prototype.forEach.call(nodeList, function(node) {
+        node.addEventListener(type, callback);
+    });
+
+    return {
+        destroy: function() {
+            Array.prototype.forEach.call(nodeList, function(node) {
+                node.removeEventListener(type, callback);
+            });
+        }
+    }
+}
+
+/**
+ * Add an event listener to a selector
+ * and returns a remove listener function.
+ *
+ * @param {String} selector
+ * @param {String} type
+ * @param {Function} callback
+ * @return {Object}
+ */
+function listenSelector(selector, type, callback) {
+    return delegate(document.body, selector, type, callback);
+}
+
+module.exports = listen;
+
+},{"./is":3,"delegate":2}],5:[function(require,module,exports){
+
+/**
+ * Element prototype.
+ */
+
+var proto = Element.prototype;
+
+/**
+ * Vendor function.
+ */
+
+var vendor = proto.matchesSelector
+  || proto.webkitMatchesSelector
+  || proto.mozMatchesSelector
+  || proto.msMatchesSelector
+  || proto.oMatchesSelector;
+
+/**
+ * Expose `match()`.
+ */
+
+module.exports = match;
+
+/**
+ * Match `el` to `selector`.
+ *
+ * @param {Element} el
+ * @param {String} selector
+ * @return {Boolean}
+ * @api public
+ */
+
+function match(el, selector) {
+  if (vendor) return vendor.call(el, selector);
+  var nodes = el.parentNode.querySelectorAll(selector);
+  for (var i = 0; i < nodes.length; ++i) {
+    if (nodes[i] == el) return true;
+  }
+  return false;
+}
+},{}],6:[function(require,module,exports){
+function select(element) {
+    var selectedText;
+
+    if (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA') {
+        element.focus();
+        element.setSelectionRange(0, element.value.length);
+
+        selectedText = element.value;
+    }
+    else {
+        if (element.hasAttribute('contenteditable')) {
+            element.focus();
+        }
+
+        var selection = window.getSelection();
+        var range = document.createRange();
+
+        range.selectNodeContents(element);
+        selection.removeAllRanges();
+        selection.addRange(range);
+
+        selectedText = selection.toString();
+    }
+
+    return selectedText;
+}
+
+module.exports = select;
+
+},{}],7:[function(require,module,exports){
+function E () {
+	// Keep this empty so it's easier to inherit from
+  // (via https://github.com/lipsmack from https://github.com/scottcorgan/tiny-emitter/issues/3)
+}
+
+E.prototype = {
+	on: function (name, callback, ctx) {
+    var e = this.e || (this.e = {});
+
+    (e[name] || (e[name] = [])).push({
+      fn: callback,
+      ctx: ctx
+    });
+
+    return this;
+  },
+
+  once: function (name, callback, ctx) {
+    var self = this;
+    function listener () {
+      self.off(name, listener);
+      callback.apply(ctx, arguments);
+    };
+
+    listener._ = callback
+    return this.on(name, listener, ctx);
+  },
+
+  emit: function (name) {
+    var data = [].slice.call(arguments, 1);
+    var evtArr = ((this.e || (this.e = {}))[name] || []).slice();
+    var i = 0;
+    var len = evtArr.length;
+
+    for (i; i < len; i++) {
+      evtArr[i].fn.apply(evtArr[i].ctx, data);
+    }
+
+    return this;
+  },
+
+  off: function (name, callback) {
+    var e = this.e || (this.e = {});
+    var evts = e[name];
+    var liveEvents = [];
+
+    if (evts && callback) {
+      for (var i = 0, len = evts.length; i < len; i++) {
+        if (evts[i].fn !== callback && evts[i].fn._ !== callback)
+          liveEvents.push(evts[i]);
+      }
+    }
+
+    // Remove event from queue to prevent memory leak
+    // Suggested by https://github.com/lazd
+    // Ref: https://github.com/scottcorgan/tiny-emitter/commit/c6ebfaa9bc973b33d110a84a307742b7cf94c953#commitcomment-5024910
+
+    (liveEvents.length)
+      ? e[name] = liveEvents
+      : delete e[name];
+
+    return this;
+  }
+};
+
+module.exports = E;
+
+},{}],8:[function(require,module,exports){
+(function (global, factory) {
+    if (typeof define === "function" && define.amd) {
+        define(['module', 'select'], factory);
+    } else if (typeof exports !== "undefined") {
+        factory(module, require('select'));
+    } else {
+        var mod = {
+            exports: {}
+        };
+        factory(mod, global.select);
+        global.clipboardAction = mod.exports;
+    }
+})(this, function (module, _select) {
+    'use strict';
+
+    var _select2 = _interopRequireDefault(_select);
+
+    function _interopRequireDefault(obj) {
+        return obj && obj.__esModule ? obj : {
+            default: obj
+        };
+    }
+
+    var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
+        return typeof obj;
+    } : function (obj) {
+        return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj;
+    };
+
+    function _classCallCheck(instance, Constructor) {
+        if (!(instance instanceof Constructor)) {
+            throw new TypeError("Cannot call a class as a function");
+        }
+    }
+
+    var _createClass = function () {
+        function defineProperties(target, props) {
+            for (var i = 0; i < props.length; i++) {
+                var descriptor = props[i];
+                descriptor.enumerable = descriptor.enumerable || false;
+                descriptor.configurable = true;
+                if ("value" in descriptor) descriptor.writable = true;
+                Object.defineProperty(target, descriptor.key, descriptor);
+            }
+        }
+
+        return function (Constructor, protoProps, staticProps) {
+            if (protoProps) defineProperties(Constructor.prototype, protoProps);
+            if (staticProps) defineProperties(Constructor, staticProps);
+            return Constructor;
+        };
+    }();
+
+    var ClipboardAction = function () {
+        /**
+         * @param {Object} options
+         */
+
+        function ClipboardAction(options) {
+            _classCallCheck(this, ClipboardAction);
+
+            this.resolveOptions(options);
+            this.initSelection();
+        }
+
+        /**
+         * Defines base properties passed from constructor.
+         * @param {Object} options
+         */
+
+
+        ClipboardAction.prototype.resolveOptions = function resolveOptions() {
+            var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
+
+            this.action = options.action;
+            this.emitter = options.emitter;
+            this.target = options.target;
+            this.text = options.text;
+            this.trigger = options.trigger;
+
+            this.selectedText = '';
+        };
+
+        ClipboardAction.prototype.initSelection = function initSelection() {
+            if (this.text) {
+                this.selectFake();
+            } else if (this.target) {
+                this.selectTarget();
+            }
+        };
+
+        ClipboardAction.prototype.selectFake = function selectFake() {
+            var _this = this;
+
+            var isRTL = document.documentElement.getAttribute('dir') == 'rtl';
+
+            this.removeFake();
+
+            this.fakeHandler = document.body.addEventListener('click', function () {
+                return _this.removeFake();
+            });
+
+            this.fakeElem = document.createElement('textarea');
+            // Prevent zooming on iOS
+            this.fakeElem.style.fontSize = '12pt';
+            // Reset box model
+            this.fakeElem.style.border = '0';
+            this.fakeElem.style.padding = '0';
+            this.fakeElem.style.margin = '0';
+            // Move element out of screen horizontally
+            this.fakeElem.style.position = 'fixed';
+            this.fakeElem.style[isRTL ? 'right' : 'left'] = '-9999px';
+            // Move element to the same position vertically
+            this.fakeElem.style.top = (window.pageYOffset || document.documentElement.scrollTop) + 'px';
+            this.fakeElem.setAttribute('readonly', '');
+            this.fakeElem.value = this.text;
+
+            document.body.appendChild(this.fakeElem);
+
+            this.selectedText = (0, _select2.default)(this.fakeElem);
+            this.copyText();
+        };
+
+        ClipboardAction.prototype.removeFake = function removeFake() {
+            if (this.fakeHandler) {
+                document.body.removeEventListener('click');
+                this.fakeHandler = null;
+            }
+
+            if (this.fakeElem) {
+                document.body.removeChild(this.fakeElem);
+                this.fakeElem = null;
+            }
+        };
+
+        ClipboardAction.prototype.selectTarget = function selectTarget() {
+            this.selectedText = (0, _select2.default)(this.target);
+            this.copyText();
+        };
+
+        ClipboardAction.prototype.copyText = function copyText() {
+            var succeeded = undefined;
+
+            try {
+                succeeded = document.execCommand(this.action);
+            } catch (err) {
+                succeeded = false;
+            }
+
+            this.handleResult(succeeded);
+        };
+
+        ClipboardAction.prototype.handleResult = function handleResult(succeeded) {
+            if (succeeded) {
+                this.emitter.emit('success', {
+                    action: this.action,
+                    text: this.selectedText,
+                    trigger: this.trigger,
+                    clearSelection: this.clearSelection.bind(this)
+                });
+            } else {
+                this.emitter.emit('error', {
+                    action: this.action,
+                    trigger: this.trigger,
+                    clearSelection: this.clearSelection.bind(this)
+                });
+            }
+        };
+
+        ClipboardAction.prototype.clearSelection = function clearSelection() {
+            if (this.target) {
+                this.target.blur();
+            }
+
+            window.getSelection().removeAllRanges();
+        };
+
+        ClipboardAction.prototype.destroy = function destroy() {
+            this.removeFake();
+        };
+
+        _createClass(ClipboardAction, [{
+            key: 'action',
+            set: function set() {
+                var action = arguments.length <= 0 || arguments[0] === undefined ? 'copy' : arguments[0];
+
+                this._action = action;
+
+                if (this._action !== 'copy' && this._action !== 'cut') {
+                    throw new Error('Invalid "action" value, use either "copy" or "cut"');
+                }
+            },
+            get: function get() {
+                return this._action;
+            }
+        }, {
+            key: 'target',
+            set: function set(target) {
+                if (target !== undefined) {
+                    if (target && (typeof target === 'undefined' ? 'undefined' : _typeof(target)) === 'object' && target.nodeType === 1) {
+                        if (this.action === 'copy' && target.hasAttribute('disabled')) {
+                            throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');
+                        }
+
+                        if (this.action === 'cut' && (target.hasAttribute('readonly') || target.hasAttribute('disabled'))) {
+                            throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes');
+                        }
+
+                        this._target = target;
+                    } else {
+                        throw new Error('Invalid "target" value, use a valid Element');
+                    }
+                }
+            },
+            get: function get() {
+                return this._target;
+            }
+        }]);
+
+        return ClipboardAction;
+    }();
+
+    module.exports = ClipboardAction;
+});
+
+},{"select":6}],9:[function(require,module,exports){
+(function (global, factory) {
+    if (typeof define === "function" && define.amd) {
+        define(['module', './clipboard-action', 'tiny-emitter', 'good-listener'], factory);
+    } else if (typeof exports !== "undefined") {
+        factory(module, require('./clipboard-action'), require('tiny-emitter'), require('good-listener'));
+    } else {
+        var mod = {
+            exports: {}
+        };
+        factory(mod, global.clipboardAction, global.tinyEmitter, global.goodListener);
+        global.clipboard = mod.exports;
+    }
+})(this, function (module, _clipboardAction, _tinyEmitter, _goodListener) {
+    'use strict';
+
+    var _clipboardAction2 = _interopRequireDefault(_clipboardAction);
+
+    var _tinyEmitter2 = _interopRequireDefault(_tinyEmitter);
+
+    var _goodListener2 = _interopRequireDefault(_goodListener);
+
+    function _interopRequireDefault(obj) {
+        return obj && obj.__esModule ? obj : {
+            default: obj
+        };
+    }
+
+    function _classCallCheck(instance, Constructor) {
+        if (!(instance instanceof Constructor)) {
+            throw new TypeError("Cannot call a class as a function");
+        }
+    }
+
+    function _possibleConstructorReturn(self, call) {
+        if (!self) {
+            throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+        }
+
+        return call && (typeof call === "object" || typeof call === "function") ? call : self;
+    }
+
+    function _inherits(subClass, superClass) {
+        if (typeof superClass !== "function" && superClass !== null) {
+            throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+        }
+
+        subClass.prototype = Object.create(superClass && superClass.prototype, {
+            constructor: {
+                value: subClass,
+                enumerable: false,
+                writable: true,
+                configurable: true
+            }
+        });
+        if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
+    }
+
+    var Clipboard = function (_Emitter) {
+        _inherits(Clipboard, _Emitter);
+
+        /**
+         * @param {String|HTMLElement|HTMLCollection|NodeList} trigger
+         * @param {Object} options
+         */
+
+        function Clipboard(trigger, options) {
+            _classCallCheck(this, Clipboard);
+
+            var _this = _possibleConstructorReturn(this, _Emitter.call(this));
+
+            _this.resolveOptions(options);
+            _this.listenClick(trigger);
+            return _this;
+        }
+
+        /**
+         * Defines if attributes would be resolved using internal setter functions
+         * or custom functions that were passed in the constructor.
+         * @param {Object} options
+         */
+
+
+        Clipboard.prototype.resolveOptions = function resolveOptions() {
+            var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
+
+            this.action = typeof options.action === 'function' ? options.action : this.defaultAction;
+            this.target = typeof options.target === 'function' ? options.target : this.defaultTarget;
+            this.text = typeof options.text === 'function' ? options.text : this.defaultText;
+        };
+
+        Clipboard.prototype.listenClick = function listenClick(trigger) {
+            var _this2 = this;
+
+            this.listener = (0, _goodListener2.default)(trigger, 'click', function (e) {
+                return _this2.onClick(e);
+            });
+        };
+
+        Clipboard.prototype.onClick = function onClick(e) {
+            var trigger = e.delegateTarget || e.currentTarget;
+
+            if (this.clipboardAction) {
+                this.clipboardAction = null;
+            }
+
+            this.clipboardAction = new _clipboardAction2.default({
+                action: this.action(trigger),
+                target: this.target(trigger),
+                text: this.text(trigger),
+                trigger: trigger,
+                emitter: this
+            });
+        };
+
+        Clipboard.prototype.defaultAction = function defaultAction(trigger) {
+            return getAttributeValue('action', trigger);
+        };
+
+        Clipboard.prototype.defaultTarget = function defaultTarget(trigger) {
+            var selector = getAttributeValue('target', trigger);
+
+            if (selector) {
+                return document.querySelector(selector);
+            }
+        };
+
+        Clipboard.prototype.defaultText = function defaultText(trigger) {
+            return getAttributeValue('text', trigger);
+        };
+
+        Clipboard.prototype.destroy = function destroy() {
+            this.listener.destroy();
+
+            if (this.clipboardAction) {
+                this.clipboardAction.destroy();
+                this.clipboardAction = null;
+            }
+        };
+
+        return Clipboard;
+    }(_tinyEmitter2.default);
+
+    /**
+     * Helper function to retrieve attribute value.
+     * @param {String} suffix
+     * @param {Element} element
+     */
+    function getAttributeValue(suffix, element) {
+        var attribute = 'data-clipboard-' + suffix;
+
+        if (!element.hasAttribute(attribute)) {
+            return;
+        }
+
+        return element.getAttribute(attribute);
+    }
+
+    module.exports = Clipboard;
+});
+
+},{"./clipboard-action":8,"good-listener":4,"tiny-emitter":7}]},{},[9])(9)
+});
@@ -1,7 +1,7 @@
 var myManifest = {
    Debug: (window.location.port !== ""),
    Name: "Il Lievitario",
-    Version: "3.0.7.2",
+    Version: "X.X.X.X",
    Author: "Denis Ironi",
    Settings: {
        ShowStartMessage: true,
@@ -22,4 +22,4 @@ var myManifest = {
            return "AIzaSyBnai4MPffctg_ygCCincgjFUBQaytCH9k";
        return "AIzaSyCwZVaNHV_z79Uull23XpBlP-5jTkzI3rE";
    }
-};
+};
@@ -130,8 +130,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/home/homeViewTemplate.
                        }
                    });
                    this.freeWall.fitWidth();
-                },
-
+                },                
                onShowed: function ()
                {
                    var self = this;
@@ -30,7 +30,23 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
                },
                events: {
                    "click #favoriteBtn": "favBtn",
-                    "click #backBtn": "backBtn"
+                    "click #backBtn": "backBtn",
+                    "click #optionBtn": "optionBtn",
+                    "click #copyBtn": "copyBtn"
+                },
+                copyBtn: function(e) {
+                    e.preventDefault();
+                },
+                optionBtn: function(e) {
+                    e.preventDefault();
+                    var self = this;                    
+                    self.$el.find('#optionPopupDialog').popup("open");
+
+                    if(myManifest.Agent.browser.name == "Safari" || myManifest.Agent.browser.name == "Mobile Safari"){
+                        var field = self.$el.find('#copyField');
+                        field.val(window.location.href);
+                        field[0].setSelectionRange(0, field[0].value.length);
+                    }
                },
                backBtn: function (e) {
                    e.preventDefault();
@@ -51,6 +67,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
                            function (msg) {
                                var favBtn = self.$el.find('#favoriteBtn');
                                favBtn.addClass('ui-disabled');
+                                self.$el.find('#optionPopupDialog').popup("close");
                            }
                    );
                },
@@ -74,7 +91,8 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
                        self.galleryWall.fitWidth();
                    });

-
+                    self.indexContent = 0;
+                    self.switchContent();
                    $.mobile.loading('hide');
                },
                //render the content into div of view
@@ -149,7 +167,17 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
                                    self.$arrayContent.on("swiperight", function (e) {
                                        var index = jQuery.inArray(this, self.$arrayContent);
                                        self.goToContent(index - 1);
-                                    });
+                                    });                                    
+
+                                    if(myManifest.Agent.browser.name != "Safari" || myManifest.Agent.browser.name != "Mobile Safari"){
+                                        new Clipboard('#copyBtn', {
+                                            text: function(trigger) {
+                                                self.$el.find('#optionPopupDialog').popup("close");
+                                                return window.location.href;
+                                            }
+                                        });
+                                    }
+
                                    self.trigger("renderCompleted:Item", self);
                                }
                        );
@@ -178,9 +206,15 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/item/itemViewTemplate.
                    this.$arrayContent.hide();
                    this.$arrayNavBar.removeClass('ui-btn-active');
                    this.$arrayNavBar.removeClass('ui-state-persist');
-                    $(this.$arrayContent[this.indexContent]).show();
-                    $(this.$arrayNavBar[this.indexContent]).addClass('ui-btn-active');
-                    $(this.$arrayNavBar[this.indexContent]).addClass('ui-state-persist');
+                    var content = $(this.$arrayContent[this.indexContent]);
+                    if(content.css('min-height') == "0px" || content.css('min-height') == ""){
+                        var minHeight = myManifest.Settings.Device.Height - $('[data-role="header"]').height() - $('[data-role="footer"]').height() - 37;
+                        content.css('min-height', minHeight);
+                    }
+                    content.show();
+                    var navBarItem = $(this.$arrayNavBar[this.indexContent]);
+                    navBarItem.addClass('ui-btn-active');
+                    navBarItem.addClass('ui-state-persist');
                    if(this.indexContent == 2)
                        this.galleryWall.fitWidth();
                }
@@ -1,5 +1,5 @@
 <div data-role="header" data-position="fixed" data-tap-toggle="false">
-    <a id="favoriteBtn" href="#" class="nav-glyphish-example ui-btn ui-icon-myHome ui-btn-icon-notext ui-btn-left" data-icon="custom"></a>
+    <a id="optionBtn" href="#" class="nav-glyphish-example ui-btn ui-icon-myHome ui-btn-icon-notext ui-btn-left" data-icon="custom"></a>
    <h3 id='titoloRicetta'><%= unescape(ricetta.titolo)%></h3>
    <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>
@@ -39,10 +39,10 @@
 	</div>
 </div>
 <% }%>
-<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>
    <p id='video'></p>
-</div>
+</div> -->
 <div data-role="footer" data-position="fixed" data-tap-toggle="false">
 	<div data-role="navbar">
 	    <ul>
@@ -52,16 +52,16 @@
 	        <!--<li><a href="">Video</a></li>-->
 	    </ul>
 	</div><!-- /navbar -->
-            <div data-role="none" style="text-align: center;">
-    <% if(ricetta.autore.length > 0){ %>
-            <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;">
+            <div data-role="none">
+    <% if(ricetta.link_fonte.length > 0){ %>
+    <div data-role="none" style="display: inline-block;margin-right: 5px;margin-top: 4px;margin-left: 5px;">
    <a data-role="none" target="_blank" href="<%= ricetta.link_fonte%>"><div id="linkFonte"></div></a>
    </div>
-    <% } %>
+    <% } if(ricetta.autore.length > 0){ %>
+            <div data-role="none" style="display: inline-block;vertical-align: super;margin-left: 5px;">
+                <p id="autore" style="padding: 0px;display: inline;">Autore: <%= unescape(ricetta.autore)%></p>
+            </div>
+    <% }  %>
            </div>
 </div>
 <div data-role="popup" id="fullPhotoPopupDialog">
@@ -70,6 +70,20 @@
        <img id="photoFull" src='' style="width: 100%;">
    </div>
 </div>
+<div data-role="popup" id="optionPopupDialog">
+    <div data-role="header">
+        <h1>Opzioni</h1>
+    </div>
+    <div role="main" class="ui-content">
+        <a id="favoriteBtn" href="" class="ui-btn ui-btn-icon-left">Agg. al Blocco</a>
+<% if(myManifest.Agent.browser.name != "Safari" && myManifest.Agent.browser.name != "Mobile Safari"){%>
+        <a id="copyBtn" href="" class="ui-btn ui-btn-icon-left">Copia Link</a>        
+<%}else{%>
+        <p>Link da condividere</p>
+        <input type="text" id="copyField" />
+<%}%>
+    </div>
+</div>
 <div data-role="popup" id="popupDialog">
    <div data-role="header">
        <h1>Informazione</h1>
@@ -5,6 +5,8 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/maps/mapsViewTemplate.

                map: null,
                markers: [],
+                openedInfoWindows: [],
+                markerClicked: false,
                //initialize template
                template: _.template(mapsViewTemplate),
                infoWindowtemplate: _.template(infoWindowTemplate),
@@ -76,12 +78,16 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/maps/mapsViewTemplate.
                        mapTypeControl: false,
                        zoomControlOptions: {
                            position: google.maps.ControlPosition.RIGHT_CENTER
-                        },
+                        }
                    };
                    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);

+                    self.map.addListener("dragend", function(){
+                        self.markerClicked = true;
+                    });
+
                    // 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];
                    self.$el.find('div[data-role="content"]')[0].appendChild(input);
@@ -140,32 +146,47 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/maps/mapsViewTemplate.

                    self.map.addListener('bounds_changed', function() {
                        var bound = self.map.getBounds();
-                        searchBox.setBounds(bound);
-                        var latLngFrom = bound.getNorthEast();
-                        var latLngTo = bound.getSouthWest();
-                        $.ajax({
-                            url: myManifest.Settings.DefaultURL + "/api/spacciatori/bound/" + latLngFrom.lat() + "/"+ latLngFrom.lng() + "/" + latLngTo.lat() + "/"+ latLngTo.lng(),
-                            //dataType: "json",
-                            //async: false,
-                            type: 'GET',
-                            success: function (resp) {                                
-                                resp.forEach(function(ele, index){
-                                    var key = "|" + ele.Latitudine+ "|" + ele.Longitudine+ "|";
-                                    if(!self.markers[key])
-                                    {
-                                        self._makeMarker(ele, key);
-                                    }
-                                    else if(!self.markers[key][ele.ID])
-                                    {
-                                        ele.Latitudine = parseFloat(ele.Latitudine) + (Math.random() / 500);
-                                        ele.Longitudine = parseFloat(ele.Longitudine) + (Math.random() / 500);
-                                        self._makeMarker(ele, key);
-                                    }
-                                });
-                            }
-                        });
+                        searchBox.setBounds(bound);                        
                    });
                    $("#pac-input").show();
+
+                    var markersArray = [];
+                    var latLngFrom = new google.maps.LatLng(85, -180);
+                    var latLngTo = new google.maps.LatLng(-85, 180);
+                    $.ajax({
+                        url: myManifest.Settings.DefaultURL + "/api/spacciatori/bound/" + latLngFrom.lat() + "/"+ latLngFrom.lng() + "/" + latLngTo.lat() + "/"+ latLngTo.lng(),
+                        //dataType: "json",
+                        //async: false,
+                        type: 'GET',
+                        success: function (resp) {                                
+                            resp.forEach(function(ele, index){
+                                var key = "|" + ele.Latitudine+ "|" + ele.Longitudine+ "|";
+                                if(!self.markers[key])
+                                {
+                                    markersArray.push(self._makeMarker(ele, key));
+                                }
+                                else if(!self.markers[key][ele.ID])
+                                {
+                                    ele.Latitudine = parseFloat(ele.Latitudine) + (Math.random() / 500);
+                                    ele.Longitudine = parseFloat(ele.Longitudine) + (Math.random() / 500);
+                                    markersArray.push(self._makeMarker(ele, key));
+                                }
+                            });
+
+                            markerClusterer = new MarkerClusterer(self.map, markersArray, {
+                              maxZoom: 15
+                              // ,styles: {
+                              //       url: '../images/pin.png',
+                              //       height: 48,
+                              //       width: 30,
+                              //       anchor: [-18, 0],
+                              //       textColor: '#ffffff',
+                              //       textSize: 10,
+                              //       iconAnchor: [15, 48]
+                              //     }
+                            });
+                        }
+                    });
                },
                _makeMarker: function(ele,key){
                    var self = this;
@@ -174,7 +195,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/maps/mapsViewTemplate.
                        icon: ele.TipoPM == "4"?self.iconPMGF:self.iconPM,
                        //label: ele.Name,
                        title: $("<div/>").html(unescape(ele.Name)).text(),
-                        map: self.map
+                        //map: self.map
                      });
                    
                    if(!self.markers[key])
@@ -183,26 +204,34 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/maps/mapsViewTemplate.
                    self.markers[key][ele.ID] = marker;

                    var infowindow = new google.maps.InfoWindow({
-                        content: self.infoWindowtemplate({item: ele})
+                        content: self.infoWindowtemplate({item: ele}),
+                        closeclick: function(){
+                            var index = openedInfoWindows.indexOf(this);
+                            if (index > -1) {
+                                self.openedInfoWindows.splice(index, 1);
+                            }
+                        }
                      });

                    marker.addListener('click', function() {
+                        self.markerClicked = true;
+                        self.openedInfoWindows.push(infowindow);
                        infowindow.open(self.map, marker);
                    });
+
+                    return marker;
                },
                onShowed: function(){
                    if(this.map)
-                        return;
+                         return;

                    var self = this;

                    $( window ).resize( function(){
                        $("#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
@@ -216,6 +245,18 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/maps/mapsViewTemplate.
                    } else {
                        self._drawMap(self.defaultLatLng);  // No geolocation support, show default map
                    }
+
+                    $("#map-canvas").click(function(){
+                        if(self.markerClicked){
+                            self.markerClicked = false;
+                            return;
+                        }
+                        self.openedInfoWindows.forEach(function(item, index){
+                            item.close();
+                        });
+
+                        self.openedInfoWindows = [];
+                    });
                },
                onClosing: function(){
                    var self = this;
@@ -63,7 +63,8 @@ define(['jquery', 'underscore', 'backbone','text!modules/search/searchViewTempla
                    this.$el.append(this.template());
                    this.$el.append(this.footer.$el);
 				}
-				this.$el.find('#nResult').val(Profile.data.risRic);
+                if(Profile.data.risRic)
+				    this.$el.find('#nResult').val(Profile.data.risRic);
 				this.trigger("renderCompleted:Search", this);
                this.$el.find("#searchBtn").addClass("ui-btn-active");
                return this;
@@ -141,6 +141,11 @@ define(['jquery', 'underscore', 'backbone',
                    //categoryView.bind('renderCompleted:Category',this.changePage,this);
                },
                showItem: function (itemId) {
+                    // Ricodifica dei link vecchi
+                    if(window.location.href.indexOf("r" + itemId) == -1)
+                    {
+                        window.location.href = "r" + itemId + "/#ricetta/" + itemId;   
+                    }
                    $.mobile.loading('show', {
                        text: 'Caricamento ricetta...',
                        textVisible: true,
@@ -5,8 +5,8 @@
 * Copyright (C), 2011 - 2012 - Joost de Valk, [email protected]
 */
 // inclusione del file contenente la classe
-require_once "./Service/MySqlClass.php";
-require_once "./Service/utility.php";
+require_once "../Service_Manut/MySqlClass.php";
+require_once "../Service_Manut/utility.php";

 // Get the keys so we can check quickly

@@ -33,21 +33,24 @@ function dinamicSite() {
        $date = DateTime::createFromFormat('Y-m-d H:i:s', $lastModified[0]["lastModified"], new DateTimeZone("Europe/Rome"));
        
        $lastDate = date_format($date, $W3C_datetime_format_php) . $timezone_offset;
-	?>
+    ?>
    <url>
        <loc><?php echo $url . $catStr; ?></loc>
        <lastmod><?php echo $lastDate; ?></lastmod>
    </url><?php
    
-        $query = "select ID as ricetta_id, titolo from ricette where ID_CATEGORIA = " . $value["category_id"] . " order by titolo, autore";
+        $query = "select ID as ricetta_id, titolo, Data_modifica from ricette where ID_CATEGORIA = " . $value["category_id"] . " order by titolo, autore";
        $ricItems = $mysqlconnetion->queryToObject($query);
        
        foreach ($ricItems as $keyRic => $valueRic)
        {
-            $itemStr= "#ricetta/" . $valueRic["ricetta_id"];
+            $itemStr= "r". $valueRic["ricetta_id"] . "/#ricetta/" . $valueRic["ricetta_id"];
+            $date = DateTime::createFromFormat('Y-m-d H:i:s', $valueRic["Data_modifica"], new DateTimeZone("Europe/Rome"));        
+        $lastDate = date_format($date, $W3C_datetime_format_php) . $timezone_offset;
        ?>
    <url>
        <loc><?php echo $url . $itemStr; ?></loc>
+        <lastmod><?php echo $lastDate; ?></lastmod>
    </url><?php
        }
    }
@@ -0,0 +1,4 @@
+MAJOR=3
+MINOR=0
+PATCH=9
+BUILD=9