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/lib/commons-logging.jar b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/commons-logging.jar deleted file mode 100644 index 8758a96b..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/commons-logging.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/log4j.jar b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/log4j.jar deleted file mode 100644 index 068867eb..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/log4j.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/util-bridges.jar b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/util-bridges.jar deleted file mode 100644 index 7d7435fe..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/util-bridges.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/util-java.jar b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/util-java.jar deleted file mode 100644 index 1155f26e..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/util-java.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/util-taglib.jar deleted file mode 100644 index 796ab7f5..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/util-taglib.jar and /dev/null differ 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..20c6fb9a 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 @@ -11,6 +11,7 @@ position: fixed; width: calc(100% - 40px); z-index: 9999; + font-family: "Montserrat", sans-serif; } #cookies.cookiesHide { @@ -19,14 +20,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 +77,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 e9bc421f..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, @@ -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..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 @@ -1,14 +1,14 @@ <%@ 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.
+ i sorgenti del portale Paesaggistica.
-
+ 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 È stata inviata una mail all'indirizzo <%=ParamUtil.getString(request, "email")%> - contente l'indirizzo per scaricare i sorgenti del portale Sismica di Regione Siciliana + contente l'indirizzo per scaricare i sorgenti del portale Paesaggistica di Regione Siciliana <%@ include file="/html/sorgenti/footer.jsp"%> \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/WEB-INF/.gitignore new file mode 100644 index 00000000..840e7d31 --- /dev/null +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/WEB-INF/.gitignore @@ -0,0 +1 @@ +/classes/ diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/cookies.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/cookies.scss new file mode 100644 index 00000000..d2406f6e --- /dev/null +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/cookies.scss @@ -0,0 +1,16 @@ +#cookies { + background-color: rgba(0,0,0,0.9); + color: white; + border: none; + + .notifications-content { + font-size: em(14px, 11px); + } + + button { + background-color: $green-logo; + border-color: $green-logo; + border-radius: 0; + + } +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/fascicolo.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/fascicolo.scss index 4c71d435..5cd9a889 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/fascicolo.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/fascicolo.scss @@ -158,4 +158,9 @@ .module-group.first { padding-top: 15px; } + + .portlet-journal-content .journal-content-article p { + font-size:1.1em; + } + } diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/header.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/header.scss index 7fc0d387..86107bfb 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/header.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/header.scss @@ -4,6 +4,46 @@ background-color: $w; width: 100%; z-index: 1000; + + .flex-end-menu { + @media (min-width: 991px) { + display: flex !important; + align-items: flex-end; + } + } + + .logo-margin { margin-left:-120px !important; } + + .cont-payoff{ + text-align: center; + font-size: 15px; + align-self: center; + margin-left: 20px; + font-family: Merriweather, serif; + + .payoff1{ + margin-bottom: 10px; + font-size: 20px; + font-weight:bold; + } + + .payoff2{ + font-size: 15px; + line-height: 18px; + } + } + + .link-home{ + margin-left: 20px; + font-size: 18px; + color: #000; + font-weight: bold; + text-transform: uppercase; + margin-bottom: 3px; + font-family: Montserrat,sans-serif; + } + + .toggled & { padding-right: 250px; @@ -35,19 +75,25 @@ @include display-flex(); @include justify-content(space-between); @include align-items(center); + .site-title { margin: 0; - padding: 15px; + padding: 0; .logo-img { height: $height-header; width: auto; } } + + .navigation { + border-top: 0; + border-bottom: 0; + } .page-title { margin: 0; - padding: 15px; + padding: 2px 0; .img-site { height: $height-header; width: auto; @@ -64,11 +110,8 @@ @include flex-wrap(wrap); /*box-shadow: 0 0 2px black !important;*/ background-color: $w; - border-top: 2px solid $red-selected; - border-bottom: 2px solid $red-selected; - - - + border-top: 2px solid #e2001a; + border-bottom: 2px solid #e2001a; .main-menu { /*@include flex(1);*/ @@ -152,8 +195,9 @@ height: 35px; padding-left: 8px; padding-right: 8px; - background-color: $red-logo; - border-color: $red-logo; + background-color: $header-menu; + border-color: $header-menu; + border-radius: 0; .toggle { .toggle-line { @@ -162,7 +206,7 @@ margin-bottom: 4px; background-color: $w; transition: transform .5s; - border-radius: 25px; + border-radius: 0; } } diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/index.css b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/index.css index 55979dc2..d4f42a81 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/index.css +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/index.css @@ -82,4 +82,6 @@ @import url(allegato_variazione_soggetti.scss); -@import url(loader.scss); \ No newline at end of file +@import url(cookies.scss); + +@import url(loader.scss); diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/variable.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/variable.scss index 9e6913ae..3b3b4c39 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/variable.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/variable.scss @@ -13,6 +13,7 @@ $footer-link: #aaa; $header-menu: #333; $text-news: #555; $red-logo: #E2001A; +$green-logo: #2ABE31; $date-news: #b4b4b4; $table-header: #e2001a; $red-selected: #e2001a; @@ -35,7 +36,7 @@ $second-font: 'Montserrat', sans-serif; $base_font_size:14px; /* SIZE */ -$height-header: 60px; +$height-header: auto; $padding-top-container: 80px; $f: 100%; $desktop: 1200px; diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/images/favicon.ico b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/images/favicon.ico new file mode 100644 index 00000000..cf918668 Binary files /dev/null and b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/images/favicon.ico differ diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/templates/header.ftl b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/templates/header.ftl index f7b0e1c9..c99b9674 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/templates/header.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/templates/header.ftl @@ -1,16 +1,20 @@
-

- - <#assign logo_url = "${images_folder}/logo-rt.png" /> - - ${logo_description} - +

+ <#assign logo_url = "${images_folder}/logo-rs.png" /> + + ${logo_description} + +
+
Regione Siciliana
+
Dipartimento dei Beni Culturali
e dell'identità Siciliana
+
+

<#assign ddmTemplate_news = theme.getSetting("ddmTemplate-news") /> @@ -29,12 +33,35 @@
-

- - ${logo_description} - -

+

+ + ${logo_description} + +

+ +
+ + +
+
+ + <#assign liferay_portlet = PortalJspTagLibs["/WEB-INF/tld/liferay-portlet-ext.tld"] /> + + <#assign portlet_id = "2_WAR_notificationsportlet" /> + ${theme.runtime(portlet_id)} + +
+ + + + + + + + +
+
<#if has_navigation> diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/templates/navigation.ftl b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/templates/navigation.ftl index 38775a70..2c708ee0 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/templates/navigation.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/templates/navigation.ftl @@ -45,23 +45,5 @@ ${user_name}
-
- -
- - <#assign liferay_portlet = PortalJspTagLibs["/WEB-INF/tld/liferay-portlet-ext.tld"] /> - - <#assign portlet_id = "2_WAR_notificationsportlet" /> - ${theme.runtime(portlet_id)} - -
- - - - - - - - \ No newline at end of file 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/css/component/cookies.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/cookies.scss new file mode 100644 index 00000000..d2406f6e --- /dev/null +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/cookies.scss @@ -0,0 +1,16 @@ +#cookies { + background-color: rgba(0,0,0,0.9); + color: white; + border: none; + + .notifications-content { + font-size: em(14px, 11px); + } + + button { + background-color: $green-logo; + border-color: $green-logo; + border-radius: 0; + + } +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/fascicolo.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/fascicolo.scss index 4c71d435..5cd9a889 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/fascicolo.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/fascicolo.scss @@ -158,4 +158,9 @@ .module-group.first { padding-top: 15px; } + + .portlet-journal-content .journal-content-article p { + font-size:1.1em; + } + } diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/header.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/header.scss index 7fc0d387..86107bfb 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/header.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/header.scss @@ -4,6 +4,46 @@ background-color: $w; width: 100%; z-index: 1000; + + .flex-end-menu { + @media (min-width: 991px) { + display: flex !important; + align-items: flex-end; + } + } + + .logo-margin { margin-left:-120px !important; } + + .cont-payoff{ + text-align: center; + font-size: 15px; + align-self: center; + margin-left: 20px; + font-family: Merriweather, serif; + + .payoff1{ + margin-bottom: 10px; + font-size: 20px; + font-weight:bold; + } + + .payoff2{ + font-size: 15px; + line-height: 18px; + } + } + + .link-home{ + margin-left: 20px; + font-size: 18px; + color: #000; + font-weight: bold; + text-transform: uppercase; + margin-bottom: 3px; + font-family: Montserrat,sans-serif; + } + + .toggled & { padding-right: 250px; @@ -35,19 +75,25 @@ @include display-flex(); @include justify-content(space-between); @include align-items(center); + .site-title { margin: 0; - padding: 15px; + padding: 0; .logo-img { height: $height-header; width: auto; } } + + .navigation { + border-top: 0; + border-bottom: 0; + } .page-title { margin: 0; - padding: 15px; + padding: 2px 0; .img-site { height: $height-header; width: auto; @@ -64,11 +110,8 @@ @include flex-wrap(wrap); /*box-shadow: 0 0 2px black !important;*/ background-color: $w; - border-top: 2px solid $red-selected; - border-bottom: 2px solid $red-selected; - - - + border-top: 2px solid #e2001a; + border-bottom: 2px solid #e2001a; .main-menu { /*@include flex(1);*/ @@ -152,8 +195,9 @@ height: 35px; padding-left: 8px; padding-right: 8px; - background-color: $red-logo; - border-color: $red-logo; + background-color: $header-menu; + border-color: $header-menu; + border-radius: 0; .toggle { .toggle-line { @@ -162,7 +206,7 @@ margin-bottom: 4px; background-color: $w; transition: transform .5s; - border-radius: 25px; + border-radius: 0; } } diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/index.css b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/index.css index 55979dc2..d4f42a81 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/index.css +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/index.css @@ -82,4 +82,6 @@ @import url(allegato_variazione_soggetti.scss); -@import url(loader.scss); \ No newline at end of file +@import url(cookies.scss); + +@import url(loader.scss); diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/variable.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/variable.scss index 9e6913ae..3b3b4c39 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/variable.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/variable.scss @@ -13,6 +13,7 @@ $footer-link: #aaa; $header-menu: #333; $text-news: #555; $red-logo: #E2001A; +$green-logo: #2ABE31; $date-news: #b4b4b4; $table-header: #e2001a; $red-selected: #e2001a; @@ -35,7 +36,7 @@ $second-font: 'Montserrat', sans-serif; $base_font_size:14px; /* SIZE */ -$height-header: 60px; +$height-header: auto; $padding-top-container: 80px; $f: 100%; $desktop: 1200px; diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/images/favicon.ico b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/images/favicon.ico index 7871fca2..cf918668 100644 Binary files a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/images/favicon.ico and b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/images/favicon.ico differ diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/templates/header.ftl b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/templates/header.ftl index f7b0e1c9..c99b9674 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/templates/header.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/templates/header.ftl @@ -1,16 +1,20 @@
-

- - <#assign logo_url = "${images_folder}/logo-rt.png" /> - - ${logo_description} - +

+ <#assign logo_url = "${images_folder}/logo-rs.png" /> + + ${logo_description} + +
+
Regione Siciliana
+
Dipartimento dei Beni Culturali
e dell'identità Siciliana
+
+

<#assign ddmTemplate_news = theme.getSetting("ddmTemplate-news") /> @@ -29,12 +33,35 @@
-

- - ${logo_description} - -

+

+ + ${logo_description} + +

+ +
+ + +
+
+ + <#assign liferay_portlet = PortalJspTagLibs["/WEB-INF/tld/liferay-portlet-ext.tld"] /> + + <#assign portlet_id = "2_WAR_notificationsportlet" /> + ${theme.runtime(portlet_id)} + +
+ + + + + + + + +
+
<#if has_navigation> diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/templates/navigation.ftl b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/templates/navigation.ftl index 38775a70..2c708ee0 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/templates/navigation.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/templates/navigation.ftl @@ -45,23 +45,5 @@ ${user_name}
-
- -
- - <#assign liferay_portlet = PortalJspTagLibs["/WEB-INF/tld/liferay-portlet-ext.tld"] /> - - <#assign portlet_id = "2_WAR_notificationsportlet" /> - ${theme.runtime(portlet_id)} - -
- - - - - - - - \ No newline at end of file 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/images/favicon.ico b/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/_diffs/images/favicon.ico new file mode 100644 index 00000000..cf918668 Binary files /dev/null and b/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/_diffs/images/favicon.ico differ 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/images/favicon.ico b/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/images/favicon.ico index 7871fca2..cf918668 100644 Binary files a/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/images/favicon.ico and b/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/images/favicon.ico differ 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/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/WEB-INF/.gitignore new file mode 100644 index 00000000..840e7d31 --- /dev/null +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/WEB-INF/.gitignore @@ -0,0 +1 @@ +/classes/ diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/carousel.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/carousel.scss index d4eeedaf..1d217461 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/carousel.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/carousel.scss @@ -37,6 +37,54 @@ position: absolute; top: 0; right: 0; + width: 100%; + padding-right: 0px; + + .list-group-item { + position: relative; + .info-item { + position: relative; + top: 50%; + @include transform(translate3D(0, -50%, 0)); + + h4 { + font-weight:bold; + font-size:16px; + } + p { + font-size:13px; + } + + } + + .btn-carousel { + position: absolute; + right: 0; + top: 50%; + @include transform(translate3D(0, -50%, 0)); + } + } + +} + +#myCarousel .list-group-item { + border-radius: 0px; + cursor: pointer; +} + +#myCarousel .list-group-item.active { + background-color: transparent !important; + border-color: #ddd !important; + color: $header-menu !important; +} + +/* +#myCarousel .list-group { + opacity: 0; + position: absolute; + top: 0; + right: 0; + width: 100%; padding-right: 0px; transition: opacity $speed; @@ -115,7 +163,7 @@ #myCarousel .list-group .active { background-color: rgba( 52, 52, 52, 0.7 ); -} +}*/ .carousel-inner { @@ -162,10 +210,11 @@ } @media (max-width: 991px) { - .carousel-caption p, - #myCarousel .list-group { + .carousel-caption p { display: none; } + + /* ,#myCarousel .list-group*/ } .carousel-controls { diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/cookie.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/cookie.scss index 5fced315..90e3f0b0 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/cookie.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/cookie.scss @@ -8,7 +8,9 @@ } button { - background-color: $red-logo; - border-color: $red-logo; + background-color: $green-logo; + border-color: $green-logo; + border-radius: 0; + } } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/header.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/header.scss index 86475808..fabd757d 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/header.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/header.scss @@ -4,8 +4,44 @@ width: 100%; z-index: 1000; box-shadow: 0 0 5px $b!important; - - + + + .flex-end-menu { + @media (min-width: 991px) { + display: flex; + align-items: flex-end; + } + } + + .cont-payoff{ + text-align: center; + font-size: 15px; + align-self: center; + margin-left: 20px; + + .payoff1{ + margin-bottom: 10px; + font-size: 20px; + font-weight:bold; + } + + .payoff2{ + font-size: 15px; + line-height: 18px; + } + } + + .link-home{ + margin-left: 20px; + font-size: 18px; + color: #000; + font-weight: bold; + text-transform: uppercase; + margin-bottom: 3px; + font-family: Montserrat,sans-serif; + } + + .toggled &{ padding-right: 250px; @@ -46,6 +82,7 @@ .page-title { margin: 0; + padding:2px 0; .img-site { height: $height-header; width: auto; @@ -95,8 +132,9 @@ height: 35px; padding-left: 8px; padding-right: 8px; - background-color: $red-logo; - border-color: $red-logo; + background-color: $header-menu; + border-color: $header-menu; + border-radius: 0; .toggle { .toggle-line { @@ -105,7 +143,7 @@ margin-bottom: 4px; background-color: $w; transition: transform .5s; - border-radius: 25px; + border-radius: 0; } } @@ -255,6 +293,12 @@ header { transition: all .5s ease; top: 0; } + +main { + padding-top:90px; +} + +/* header.nav-up { top: -60px; @@ -262,6 +306,9 @@ header.nav-up { top: 0px; } } +*/ + +header.nav-up { top:0px; } .user-notification { margin: 0px!important; diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/mediaobject.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/mediaobject.scss index b3df794f..d8cf3e3e 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/mediaobject.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/mediaobject.scss @@ -5,6 +5,11 @@ padding: 50px; vertical-align: top; + + .page_description { + font-size: 1.1em; + } + @media (max-width: $tablet) { padding-top: 40px; padding-bottom: 40px; @@ -45,15 +50,15 @@ .container-icon { width: em(210px); - height: em(210px); - border-radius: 50%; + height: em(140px); + /*border-radius: 50%;*/ margin: 0 auto; @include display-flex(); @include justify-content(center); @include align-items(center); .mediaobject_icon { - font-size: em(110px); + font-size: em(36px); color: $w; } } @@ -80,6 +85,8 @@ } } } + + .page_description:before { content: ""; diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/variable.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/variable.scss index 6699bee0..54ddb4ec 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/variable.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/variable.scss @@ -11,6 +11,7 @@ $footer-link: #aaa; $header-menu: #333; $text-news: #555; $red-logo: #E2001A; +$green-logo: #2ABE31; $date-news: #b4b4b4; $red-selected: #e2001a; $table-header: #e2001a; @@ -33,7 +34,7 @@ $second-font: 'Montserrat', sans-serif; $base_font_size:14px; /* SIZE */ -$height-header: 60px; +$height-header: auto; $f: 100%; $desktop: 1200px; $tablet: 992px; diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/images/favicon.ico b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/images/favicon.ico new file mode 100644 index 00000000..cf918668 Binary files /dev/null and b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/images/favicon.ico differ diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/footer.ftl b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/footer.ftl index b750eb04..76ef13f7 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/footer.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/footer.ftl @@ -84,8 +84,10 @@
- <#assign logo_url = "${images_folder}/logo-rs.png" /> - ${logo_description} + + <#assign logo_url = "${images_folder}/logo-rs.png" /> + ${logo_description} +
diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/header.ftl b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/header.ftl index a47f1530..72bc048c 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/header.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/header.ftl @@ -1,22 +1,28 @@
-

- - <#assign logo_url = "${images_folder}/logo-rs-testo.png" /> - - ${logo_description} - +

+ <#assign logo_url = "${images_folder}/logo-rs.png" /> + + ${logo_description} + +
+
Regione Siciliana
+
Dipartimento dei Beni Culturali
e dell'identità Siciliana
+
+

-

+

${logo_description} +

+ <#if has_navigation> <#include "${full_templates_path}/navigation.ftl" /> 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/css/component/carousel.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/carousel.scss index d4eeedaf..1d217461 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/carousel.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/carousel.scss @@ -37,6 +37,54 @@ position: absolute; top: 0; right: 0; + width: 100%; + padding-right: 0px; + + .list-group-item { + position: relative; + .info-item { + position: relative; + top: 50%; + @include transform(translate3D(0, -50%, 0)); + + h4 { + font-weight:bold; + font-size:16px; + } + p { + font-size:13px; + } + + } + + .btn-carousel { + position: absolute; + right: 0; + top: 50%; + @include transform(translate3D(0, -50%, 0)); + } + } + +} + +#myCarousel .list-group-item { + border-radius: 0px; + cursor: pointer; +} + +#myCarousel .list-group-item.active { + background-color: transparent !important; + border-color: #ddd !important; + color: $header-menu !important; +} + +/* +#myCarousel .list-group { + opacity: 0; + position: absolute; + top: 0; + right: 0; + width: 100%; padding-right: 0px; transition: opacity $speed; @@ -115,7 +163,7 @@ #myCarousel .list-group .active { background-color: rgba( 52, 52, 52, 0.7 ); -} +}*/ .carousel-inner { @@ -162,10 +210,11 @@ } @media (max-width: 991px) { - .carousel-caption p, - #myCarousel .list-group { + .carousel-caption p { display: none; } + + /* ,#myCarousel .list-group*/ } .carousel-controls { diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/cookie.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/cookie.scss index 5fced315..90e3f0b0 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/cookie.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/cookie.scss @@ -8,7 +8,9 @@ } button { - background-color: $red-logo; - border-color: $red-logo; + background-color: $green-logo; + border-color: $green-logo; + border-radius: 0; + } } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/header.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/header.scss index 86475808..fabd757d 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/header.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/header.scss @@ -4,8 +4,44 @@ width: 100%; z-index: 1000; box-shadow: 0 0 5px $b!important; - - + + + .flex-end-menu { + @media (min-width: 991px) { + display: flex; + align-items: flex-end; + } + } + + .cont-payoff{ + text-align: center; + font-size: 15px; + align-self: center; + margin-left: 20px; + + .payoff1{ + margin-bottom: 10px; + font-size: 20px; + font-weight:bold; + } + + .payoff2{ + font-size: 15px; + line-height: 18px; + } + } + + .link-home{ + margin-left: 20px; + font-size: 18px; + color: #000; + font-weight: bold; + text-transform: uppercase; + margin-bottom: 3px; + font-family: Montserrat,sans-serif; + } + + .toggled &{ padding-right: 250px; @@ -46,6 +82,7 @@ .page-title { margin: 0; + padding:2px 0; .img-site { height: $height-header; width: auto; @@ -95,8 +132,9 @@ height: 35px; padding-left: 8px; padding-right: 8px; - background-color: $red-logo; - border-color: $red-logo; + background-color: $header-menu; + border-color: $header-menu; + border-radius: 0; .toggle { .toggle-line { @@ -105,7 +143,7 @@ margin-bottom: 4px; background-color: $w; transition: transform .5s; - border-radius: 25px; + border-radius: 0; } } @@ -255,6 +293,12 @@ header { transition: all .5s ease; top: 0; } + +main { + padding-top:90px; +} + +/* header.nav-up { top: -60px; @@ -262,6 +306,9 @@ header.nav-up { top: 0px; } } +*/ + +header.nav-up { top:0px; } .user-notification { margin: 0px!important; diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/mediaobject.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/mediaobject.scss index b3df794f..d8cf3e3e 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/mediaobject.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/mediaobject.scss @@ -5,6 +5,11 @@ padding: 50px; vertical-align: top; + + .page_description { + font-size: 1.1em; + } + @media (max-width: $tablet) { padding-top: 40px; padding-bottom: 40px; @@ -45,15 +50,15 @@ .container-icon { width: em(210px); - height: em(210px); - border-radius: 50%; + height: em(140px); + /*border-radius: 50%;*/ margin: 0 auto; @include display-flex(); @include justify-content(center); @include align-items(center); .mediaobject_icon { - font-size: em(110px); + font-size: em(36px); color: $w; } } @@ -80,6 +85,8 @@ } } } + + .page_description:before { content: ""; diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/variable.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/variable.scss index 6699bee0..54ddb4ec 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/variable.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/variable.scss @@ -11,6 +11,7 @@ $footer-link: #aaa; $header-menu: #333; $text-news: #555; $red-logo: #E2001A; +$green-logo: #2ABE31; $date-news: #b4b4b4; $red-selected: #e2001a; $table-header: #e2001a; @@ -33,7 +34,7 @@ $second-font: 'Montserrat', sans-serif; $base_font_size:14px; /* SIZE */ -$height-header: 60px; +$height-header: auto; $f: 100%; $desktop: 1200px; $tablet: 992px; diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/images/favicon.ico b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/images/favicon.ico index 7871fca2..cf918668 100644 Binary files a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/images/favicon.ico and b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/images/favicon.ico differ diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/footer.ftl b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/footer.ftl index b750eb04..76ef13f7 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/footer.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/footer.ftl @@ -84,8 +84,10 @@
- <#assign logo_url = "${images_folder}/logo-rs.png" /> - ${logo_description} + + <#assign logo_url = "${images_folder}/logo-rs.png" /> + ${logo_description} +
diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/header.ftl b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/header.ftl index a47f1530..72bc048c 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/header.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/header.ftl @@ -1,22 +1,28 @@
-

- - <#assign logo_url = "${images_folder}/logo-rs-testo.png" /> - - ${logo_description} - +

+ <#assign logo_url = "${images_folder}/logo-rs.png" /> + + ${logo_description} + +
+
Regione Siciliana
+
Dipartimento dei Beni Culturali
e dell'identità Siciliana
+
+

-

+

${logo_description} +

+ <#if has_navigation> <#include "${full_templates_path}/navigation.ftl" /> 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
Nome