From 203cbf766136026dd550a9f49526ef44a21728f1 Mon Sep 17 00:00:00 2001
From: Mattia MWG
Date: Mon, 3 Aug 2020 17:09:18 +0200
Subject: [PATCH 1/4] title paesaggistica
---
.../docroot/_diffs/templates/portal_normal.ftl | 2 +-
.../portos-private-fe-theme/docroot/templates/portal_normal.ftl | 2 +-
.../docroot/_diffs/templates/portal_normal.ftl | 2 +-
.../portos-private-theme/docroot/templates/portal_normal.ftl | 2 +-
.../docroot/_diffs/templates/portal_normal.ftl | 2 +-
.../portos-public-theme/docroot/templates/portal_normal.ftl | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/templates/portal_normal.ftl b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/templates/portal_normal.ftl
index 7518e2c9..e986186c 100644
--- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/templates/portal_normal.ftl
+++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/templates/portal_normal.ftl
@@ -5,7 +5,7 @@
" lang="${w3c_language_id}">
- ${htmlUtil.unescape(the_title)} - Sismica Sicilia
+ ${htmlUtil.unescape(the_title)} - Paesaggistica Sicilia
diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/templates/portal_normal.ftl b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/templates/portal_normal.ftl
index 7518e2c9..e986186c 100644
--- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/templates/portal_normal.ftl
+++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/templates/portal_normal.ftl
@@ -5,7 +5,7 @@
" lang="${w3c_language_id}">
-
${htmlUtil.unescape(the_title)} - Sismica Sicilia
+
${htmlUtil.unescape(the_title)} - Paesaggistica Sicilia
diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/_diffs/templates/portal_normal.ftl b/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/_diffs/templates/portal_normal.ftl
index 78a42dbc..cce6fa15 100644
--- a/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/_diffs/templates/portal_normal.ftl
+++ b/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/_diffs/templates/portal_normal.ftl
@@ -5,7 +5,7 @@
" lang="${w3c_language_id}">
-
${htmlUtil.unescape(the_title)} - Sismica Sicilia
+
${htmlUtil.unescape(the_title)} - Paesaggistica Sicilia
diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/templates/portal_normal.ftl b/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/templates/portal_normal.ftl
index 78a42dbc..cce6fa15 100644
--- a/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/templates/portal_normal.ftl
+++ b/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/templates/portal_normal.ftl
@@ -5,7 +5,7 @@
" lang="${w3c_language_id}">
-
${htmlUtil.unescape(the_title)} - Sismica Sicilia
+
${htmlUtil.unescape(the_title)} - Paesaggistica Sicilia
diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/portal_normal.ftl b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/portal_normal.ftl
index 2e30e9f1..a5fde9a4 100644
--- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/portal_normal.ftl
+++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/portal_normal.ftl
@@ -5,7 +5,7 @@
" lang="${w3c_language_id}">
-
${htmlUtil.unescape(the_title)} - Sismica Sicilia
+
${htmlUtil.unescape(the_title)} - Paesaggistica Sicilia
diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/portal_normal.ftl b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/portal_normal.ftl
index 2e30e9f1..a5fde9a4 100644
--- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/portal_normal.ftl
+++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/portal_normal.ftl
@@ -5,7 +5,7 @@
" lang="${w3c_language_id}">
-
${htmlUtil.unescape(the_title)} - Sismica Sicilia
+
${htmlUtil.unescape(the_title)} - Paesaggistica Sicilia
From 224df9fbb38241e1fd61a96c2f5c8ba70f092c2e Mon Sep 17 00:00:00 2001
From: Mattia MWG
Date: Tue, 4 Aug 2020 10:03:28 +0200
Subject: [PATCH 2/4] sorgenti paesaggistica
---
.../WEB-INF/src/it/mwg/sismica/fe/servlet/SorgentiServlet.java | 2 +-
.../portlets/portos-fe-portlet/docroot/html/sorgenti/form.jsp | 2 +-
.../portlets/portos-fe-portlet/docroot/html/sorgenti/header.jsp | 2 +-
.../themes/portos-public-theme/docroot/WEB-INF/.gitignore | 1 +
4 files changed, 4 insertions(+), 3 deletions(-)
create mode 100644 liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/WEB-INF/.gitignore
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/SorgentiServlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/SorgentiServlet.java
index e9bc421f..0b2d00a0 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/SorgentiServlet.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/SorgentiServlet.java
@@ -142,7 +142,7 @@ public class SorgentiServlet extends HttpServlet {
String scadenza = new SimpleDateFormat("dd/MM/yyyy").format(calendar.getTime());
String testo = "Gentile " + nome + " " + cognome
- + ". Puoi scaricare i sorgenti di Sismica Sicilia da qui: ";
+ + ". Puoi scaricare i sorgenti di Paesaggistica Sicilia da qui: ";
File[] lista = new File(PropsUtil.get("liferay.home") + "/" + folder).listFiles();
Arrays.sort(lista, new Comparator() {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/form.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/form.jsp
index d058fd10..18d2df10 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/form.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/form.jsp
@@ -1,7 +1,7 @@
<%@ include file="/html/sorgenti/header.jsp"%>
-
Sorgenti del portale Sismica Sicilia
+
Sorgenti del portale Paesaggistica Sicilia
Compila il form sottostante e riceverai per email il collegamento per scaricare
i sorgenti del portale Sismica.
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/header.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/header.jsp
index 970e26c9..62775c2a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/header.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/header.jsp
@@ -3,7 +3,7 @@
-
Sorgenti del portale Sismica Sicilia
+
Sorgenti del portale Paesaggistica Sicilia
Date: Fri, 7 Aug 2020 10:08:00 +0200
Subject: [PATCH 3/4] modifichefrontend
---
.../portos-cookies-portlet/.tern-project | 1 +
.../WEB-INF/src/content/Language.properties | 2 +-
.../src/content/Language_en.properties | 2 +-
.../docroot/css/main.css | 9 +++-
.../portos-cookies-portlet/docroot/view.jsp | 2 +-
.../sismica/fe/servlet/SorgentiServlet.java | 2 +-
.../docroot/html/sorgenti/form.jsp | 4 +-
.../docroot/html/sorgenti/invio_ok.jsp | 2 +-
.../docroot/_diffs/css/component/cookies.scss | 16 +++++++
.../_diffs/css/component/fascicolo.scss | 5 +++
.../docroot/_diffs/css/component/header.scss | 5 ++-
.../docroot/_diffs/css/component/index.css | 4 +-
.../_diffs/css/component/variable.scss | 1 +
.../docroot/_diffs/images/favicon.ico | Bin 0 -> 1150 bytes
.../docroot/css/component/cookies.scss | 16 +++++++
.../docroot/css/component/fascicolo.scss | 5 +++
.../docroot/css/component/header.scss | 5 ++-
.../docroot/css/component/index.css | 4 +-
.../docroot/css/component/variable.scss | 1 +
.../docroot/images/favicon.ico | Bin 1150 -> 1150 bytes
.../docroot/_diffs/images/favicon.ico | Bin 0 -> 1150 bytes
.../docroot/images/favicon.ico | Bin 1150 -> 1150 bytes
.../_diffs/css/component/carousel.scss | 40 ++++++++++++++++--
.../docroot/_diffs/css/component/cookie.scss | 6 ++-
.../docroot/_diffs/css/component/header.scss | 15 ++++++-
.../_diffs/css/component/mediaobject.scss | 13 ++++--
.../_diffs/css/component/variable.scss | 3 +-
.../docroot/_diffs/images/favicon.ico | Bin 0 -> 1150 bytes
.../docroot/_diffs/templates/footer.ftl | 6 ++-
.../docroot/_diffs/templates/header.ftl | 12 +++---
.../docroot/css/component/carousel.scss | 40 ++++++++++++++++--
.../docroot/css/component/cookie.scss | 6 ++-
.../docroot/css/component/header.scss | 15 ++++++-
.../docroot/css/component/mediaobject.scss | 13 ++++--
.../docroot/css/component/variable.scss | 3 +-
.../docroot/images/favicon.ico | Bin 1150 -> 1150 bytes
.../docroot/templates/footer.ftl | 6 ++-
.../docroot/templates/header.ftl | 12 +++---
38 files changed, 222 insertions(+), 54 deletions(-)
create mode 100644 liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.tern-project
create mode 100644 liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/cookies.scss
create mode 100644 liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/images/favicon.ico
create mode 100644 liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/cookies.scss
create mode 100644 liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/_diffs/images/favicon.ico
create mode 100644 liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/images/favicon.ico
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.tern-project b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.tern-project
new file mode 100644
index 00000000..a185ba0d
--- /dev/null
+++ b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.tern-project
@@ -0,0 +1 @@
+{"ide":{"scriptPaths":[]},"plugins":{"aui":{},"liferay":{},"yui":{}},"libs":["ecma5","browser"]}
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/src/content/Language.properties b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/src/content/Language.properties
index 787631ea..9ae18045 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/src/content/Language.properties
+++ b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/src/content/Language.properties
@@ -1 +1 @@
-cookie.accepted.message.accept=Accept
\ No newline at end of file
+cookie.accepted.message.accept=Accetto
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/src/content/Language_en.properties b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/src/content/Language_en.properties
index 787631ea..9ae18045 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/src/content/Language_en.properties
+++ b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/src/content/Language_en.properties
@@ -1 +1 @@
-cookie.accepted.message.accept=Accept
\ No newline at end of file
+cookie.accepted.message.accept=Accetto
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/css/main.css b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/css/main.css
index fdc4ec71..673d8868 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/css/main.css
+++ b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/css/main.css
@@ -19,14 +19,16 @@
#cookies.cookiesShow {
display: block;
+ text-align:center;
}
#cookies .notifications-content {
+ padding-top:12px;
}
#cookies .notifications-button {
float: right;
- padding: 5px 10px 10px 15px;
+ padding: 5px 10px 5px 15px;
}
#cookies .notifications-content p span.title {
@@ -74,4 +76,9 @@ input[type="button"].btn-primary:hover {
#cookies a {
text-decoration: none;
+ color: #fff;
+}
+
+#cookies a:hover {
+ text-decoration: underline;
}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/view.jsp
index 0c15e732..492629d1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/view.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/view.jsp
@@ -50,7 +50,7 @@
inputCssClass="btn btn-primary" value="cookie.accepted.message.accept" onclick="cookiesAccepted()"/>
-
+ Il sito utilizza cookies. Navigando ne accetti l'uso.
Informazioni
<%
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/SorgentiServlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/SorgentiServlet.java
index 0b2d00a0..6b4506f3 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/SorgentiServlet.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/SorgentiServlet.java
@@ -52,7 +52,7 @@ public class SorgentiServlet extends HttpServlet {
private static final int validita = 3;
private static final String folder = "condivisi";
- private static final String uri = "/portos-fe-portlet/sorgenti-sismica/";
+ private static final String uri = "/portos-fe-portlet/sorgenti-paesaggistica/";
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException,
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/form.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/form.jsp
index 18d2df10..0a00b41f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/form.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/form.jsp
@@ -3,12 +3,12 @@
Sorgenti del portale Paesaggistica Sicilia
Compila il form sottostante e riceverai per email il collegamento per scaricare
- i sorgenti del portale Sismica.
+ i sorgenti del portale Paesaggistica.