From 44e5eab68d37a1f1e15105db555c4a8c51c2b2f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pawe=C5=82czak?= Date: Wed, 30 Sep 2015 13:13:24 +0200 Subject: [PATCH 01/10] Seo changes --- .../icm/saos/webapp/WebappConfiguration.java | 1 + .../main/resources/message/common.properties | 12 ++ .../resources/message/common_pl.properties | 22 +- .../main/resources/saos.version.properties | 2 +- .../src/main/webapp/WEB-INF/sitemap.xml | 23 ++ .../static/javascript/judgmentDetails.js | 5 - .../static/stylesheet/scss/newLayout.scss | 2 +- .../src/main/webapp/WEB-INF/tags/enum.tag | 3 +- saos-webapp/src/main/webapp/WEB-INF/tiles.xml | 14 +- .../WEB-INF/view/analysis/analysisMeta.jsp | 7 + .../webapp/WEB-INF/view/common/pageTitle.jsp | 11 - .../WEB-INF/view/details/judgmentDetails.jsp | 9 - .../view/details/judgmentDetailsMeta.jsp | 203 ++++++++++++++++++ .../webapp/WEB-INF/view/home/homeContent.jsp | 12 +- .../webapp/WEB-INF/view/home/homeMeta.jsp | 6 + .../WEB-INF/view/home/homeNavigation.jsp | 8 +- .../view/search/judgmentSearchMeta.jsp | 6 + .../WEB-INF/view/template/mainTemplate.jsp | 6 +- .../WEB-INF/view/template/pageDescription.jsp | 13 -- 19 files changed, 298 insertions(+), 67 deletions(-) create mode 100644 saos-webapp/src/main/webapp/WEB-INF/sitemap.xml create mode 100644 saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp delete mode 100644 saos-webapp/src/main/webapp/WEB-INF/view/common/pageTitle.jsp create mode 100644 saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp create mode 100644 saos-webapp/src/main/webapp/WEB-INF/view/home/homeMeta.jsp create mode 100644 saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp delete mode 100644 saos-webapp/src/main/webapp/WEB-INF/view/template/pageDescription.jsp diff --git a/saos-webapp/src/main/java/pl/edu/icm/saos/webapp/WebappConfiguration.java b/saos-webapp/src/main/java/pl/edu/icm/saos/webapp/WebappConfiguration.java index f3586f02..93c87d38 100644 --- a/saos-webapp/src/main/java/pl/edu/icm/saos/webapp/WebappConfiguration.java +++ b/saos-webapp/src/main/java/pl/edu/icm/saos/webapp/WebappConfiguration.java @@ -78,6 +78,7 @@ public TilesConfigurer tilesConfigurer() { public void addResourceHandlers(ResourceHandlerRegistry registry) { registry.addResourceHandler("/static/**").addResourceLocations("/WEB-INF/static/").setCachePeriod(3600*24*7); registry.addResourceHandler("/robots.txt").addResourceLocations("/WEB-INF/").setCachePeriod(0); + registry.addResourceHandler("/sitemap.xml").addResourceLocations("/WEB-INF/sitemap.xml").setCachePeriod(0); registry.addResourceHandler("/files/judgments/**").addResourceLocations(ResourceUtils.FILE_URL_PREFIX + judgmentsContentPath).setCachePeriod(600); } diff --git a/saos-webapp/src/main/resources/message/common.properties b/saos-webapp/src/main/resources/message/common.properties index 4a113c19..704385fa 100644 --- a/saos-webapp/src/main/resources/message/common.properties +++ b/saos-webapp/src/main/resources/message/common.properties @@ -30,6 +30,8 @@ button.resetForm = Czyść formularz button.close = Zamknij button.look = Zobacz +meta.language = english + message.noJavascript = Obsługa języka JavaScript w przeglądarce internetowej jest wyłączona. Włącz ponownie JavaScript, aby korzystać z pełnej funkcjonalności serwisu. /* Page titles */ @@ -154,6 +156,7 @@ judgment.lowerCourtJudgments = Wyroki sądu niższej instancji /* Labels for landing page aka home */ home.meta.pageDescription = Codziennie aktualizowana otwarta baza orzeczeń polskich sądów. Szukaj, przeglądaj, analizuj. +home.meta.keywords = orzeczenia, saos, system analizy orzeczeń sądowych, wyroki sądowe, baza orzeczeń, orzecnictwo sądów powszechnych, orzeczenia sn, orzeczenia kio, orzeczenia tk, portal orzeczeń home.beta.message = Serwis znajduje się obecnie w fazie testów i dodawania ostatnich drobnych funkcjonalności. Będziemy bardzo wdzięczni za wszelkie uwagi i sugestie dotyczące działania serwisu. Prosimy o przesyłanie wszelkich opinii na adres home.welcome.text = Serwis SAOS gromadzi i udostępnia dane orzeczeń polskich sądów. Ułatwia ich przeszukiwanie, przeglądanie oraz zbiorczą analizę. Umożliwia również pobranie metadanych i treści wszystkich zgromadzonych orzeczeń poprzez programowe API. home.header.idea = Idea Serwisu @@ -187,6 +190,7 @@ context.date.anyValue = Dowolna /* Judgment search view */ search.meta.pageDescription = Wyszukiwarka orzeczeń sądowych. Przeszukuj setki tysięcy orzeczeń polskich sądów wg dowolnych kryteriów. +search.meta.keywords = wyszukiwarka, wyszukiwarka orzeczeń, orzeczenia, saos, system analizy orzeczeń sądowych, wyroki sądowe, baza orzeczeń, orzecnictwo sądów powszechnych, orzeczenia sn, orzeczenia kio, orzeczenia tk judgmentSearch.form.header = Wyszukiwarka judgmentSearch.form.moreFields = Zobacz dodatkowe pola wyszukiwania judgmentSearch.form.lessFields = Ukryj dodatkowe pola wyszukiwania @@ -288,6 +292,13 @@ courtCriteriaFormSection.hint.administrativeCourt.content = Dane nie zostały na /* Judgment details view */ +details.meta.judgment = Orzeczenie +details.meta.decisionReleasedBy = wydane przez +details.meta.resolutionReleasedBy = wydana przez +details.meta.sentenceReleasedBy = wydany przez +details.meta.withSignature = o sygnaturze +details.meta.containing = w składzie +judgmentDetails.meta.keywords = orzeczenie judgmentDetails.button.fullText = Zobacz pełny tekst orzeczenia judgmentDetails.header = Orzeczenie judgmentDetails.judgmentFullText = Pełny tekst orzeczenia @@ -355,6 +366,7 @@ judgmentDetails.linkTooltip.referencedRegulations = Pokaż orzeczenia z takim po /* Analysis */ analysis.meta.pageDescription = Wizualna analiza orzeczeń sądowych. Badaj, porównuj i analizuj trendy w polskim orzecznictwie. +analysis.meta.keywords = analiza, analiza orzeczeń, orzeczenia, saos, system analizy orzeczeń sądowych, wyroki sądowe, baza orzeczeń, orzecnictwo sądów powszechnych, orzeczenia sn, orzeczenia kio, orzeczenia tk analysis.header = Kryteria analizy analysis.skipLinks.analysis = Go to analysis form analysis.skipLinks.charts = Go to charts diff --git a/saos-webapp/src/main/resources/message/common_pl.properties b/saos-webapp/src/main/resources/message/common_pl.properties index a4b75675..98f9fdc4 100644 --- a/saos-webapp/src/main/resources/message/common_pl.properties +++ b/saos-webapp/src/main/resources/message/common_pl.properties @@ -30,6 +30,10 @@ button.resetForm = Czyść formularz button.close = Zamknij button.look = Zobacz +meta.language = polish + +saos.logo.alt = portal orzeczeń polskiego sądownictwa + message.noJavascript = Obsługa języka JavaScript w przeglądarce internetowej jest wyłączona. Włącz ponownie JavaScript, aby korzystać z pełnej funkcjonalności serwisu. /* Page titles */ @@ -153,7 +157,8 @@ judgment.judgmentResult = Skrócony wynik sprawy judgment.lowerCourtJudgments = Wyroki sądu niższej instancji /* Labels for landing page aka home */ -home.meta.pageDescription = Codziennie aktualizowana otwarta baza orzeczeń polskich sądów. Szukaj, przeglądaj, analizuj. +home.meta.pageDescription = Codziennie aktualizowana otwarta baza orzeczeń polskich sądów. Szukaj, przeglądaj, analizuj orzeczenia i wyroki sądowe. +home.meta.keywords = orzeczenia, saos, system analizy orzeczeń sądowych, wyroki sądowe, baza orzeczeń, orzecnictwo sądów powszechnych, orzeczenia sn, orzeczenia kio, orzeczenia tk, portal orzeczeń home.beta.message = Serwis znajduje się obecnie w fazie testów i dodawania ostatnich drobnych funkcjonalności. Będziemy bardzo wdzięczni za wszelkie uwagi i sugestie dotyczące działania serwisu. Prosimy o przesyłanie wszelkich opinii na adres home.welcome.text = Serwis SAOS gromadzi i udostępnia dane orzeczeń polskich sądów. Ułatwia ich przeszukiwanie, przeglądanie oraz zbiorczą analizę. Umożliwia również pobranie metadanych i treści wszystkich zgromadzonych orzeczeń poprzez programowe API. home.header.idea = Idea Serwisu @@ -164,9 +169,9 @@ home.navigation.api = Programowe API home.navigation.search.desc = Wyszukiwanie i przeglądanie orzeczeń. home.navigation.analysis.desc = Analiza zbiorcza zgromadzonych danych. home.navigation.api.desc = Punkt wejścia serwisów API REST
(dla programistów). -home.navigation.search.imageAlt = "Ikona lupy" -home.navigation.analysis.imageAlt = "Ikona wykresu" -home.navigation.api.imageAlt = "Ikona tagu" +home.navigation.search.imageAlt = Ikona lupy +home.navigation.analysis.imageAlt = Ikona wykresu +home.navigation.api.imageAlt = Ikona tagu partners.icm.imageAlt = Logo ICM i napis UNIWERSYTET WARSZAWSKI - przeniesienie do strony ICM partners.ncbir.imageAlt = Logo Narodowego Centrum Badań i Rozwoju - kliknij aby przejść do strony @@ -186,6 +191,7 @@ context.date.anyValue = Dowolna /* Judgment search view */ search.meta.pageDescription = Wyszukiwarka orzeczeń sądowych. Przeszukuj setki tysięcy orzeczeń polskich sądów wg dowolnych kryteriów. +search.meta.keywords = wyszukiwarka, wyszukiwarka orzeczeń, orzeczenia, saos, system analizy orzeczeń sądowych, wyroki sądowe, baza orzeczeń, orzecnictwo sądów powszechnych, orzeczenia sn, orzeczenia kio, orzeczenia tk, portal orzeczeń judgmentSearch.form.header = Wyszukiwarka judgmentSearch.form.moreFields = Zobacz dodatkowe pola wyszukiwania judgmentSearch.form.lessFields = Ukryj dodatkowe pola wyszukiwania @@ -287,6 +293,13 @@ courtCriteriaFormSection.hint.administrativeCourt.content = Dane nie zostały na /* Judgment details view */ +details.meta.judgment = Orzeczenie +details.meta.decisionReleasedBy = wydane przez +details.meta.resolutionReleasedBy = wydana przez +details.meta.sentenceReleasedBy = wydany przez +details.meta.withSignature = o sygnaturze +details.meta.containing = w składzie +judgmentDetails.meta.keywords = orzeczenie judgmentDetails.button.fullText = Zobacz pełny tekst orzeczenia judgmentDetails.header = Orzeczenie judgmentDetails.judgmentFullText = Pełny tekst orzeczenia @@ -354,6 +367,7 @@ judgmentDetails.linkTooltip.referencedRegulations = Pokaż orzeczenia z takim po /* Analysis */ analysis.meta.pageDescription = Wizualna analiza orzeczeń sądowych. Badaj, porównuj i analizuj trendy w polskim orzecznictwie. +analysis.meta.keywords = analiza, analiza orzeczeń, orzeczenia, saos, system analizy orzeczeń sądowych, wyroki sądowe, baza orzeczeń, orzecnictwo sądów powszechnych, orzeczenia sn, orzeczenia kio, orzeczenia tk analysis.header = Kryteria analizy analysis.skipLinks.analysis = Przejdź do formularza analizy analysis.skipLinks.charts = Przejdź do wykresów diff --git a/saos-webapp/src/main/resources/saos.version.properties b/saos-webapp/src/main/resources/saos.version.properties index 23135990..e1496067 100644 --- a/saos-webapp/src/main/resources/saos.version.properties +++ b/saos-webapp/src/main/resources/saos.version.properties @@ -1,2 +1,2 @@ #Generated by Gradle -saos.version=0.9.5 +saos.version=0.9.6-SNAPSHOT diff --git a/saos-webapp/src/main/webapp/WEB-INF/sitemap.xml b/saos-webapp/src/main/webapp/WEB-INF/sitemap.xml new file mode 100644 index 00000000..d7cc4334 --- /dev/null +++ b/saos-webapp/src/main/webapp/WEB-INF/sitemap.xml @@ -0,0 +1,23 @@ + + + + https://www.saos.org.pl/ + 2015-09-30 + monthly + + + https://www.saos.org.pl/search + 2015-09-30 + daily + + + https://www.saos.org.pl/analysis + 2015-09-30 + monthly + + + https://www.saos.org.pl/help + 2015-09-30 + daily + + diff --git a/saos-webapp/src/main/webapp/WEB-INF/static/javascript/judgmentDetails.js b/saos-webapp/src/main/webapp/WEB-INF/static/javascript/judgmentDetails.js index 6fcf14cf..9ea2c20d 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/static/javascript/judgmentDetails.js +++ b/saos-webapp/src/main/webapp/WEB-INF/static/javascript/judgmentDetails.js @@ -5,11 +5,6 @@ */ var jsInitInJudgmentDetails = function(options) { - - if (options.pageTitle !== undefined) { - $(document).attr("title", options.pageTitle + " " + $(document).attr("title")); - } - //Corrections info section $("#corrections-toggle").click(function() { diff --git a/saos-webapp/src/main/webapp/WEB-INF/static/stylesheet/scss/newLayout.scss b/saos-webapp/src/main/webapp/WEB-INF/static/stylesheet/scss/newLayout.scss index 1c591e02..9e005c35 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/static/stylesheet/scss/newLayout.scss +++ b/saos-webapp/src/main/webapp/WEB-INF/static/stylesheet/scss/newLayout.scss @@ -173,7 +173,7 @@ a, .hint { padding: 70px; } - div.welcome-text { + h2.welcome-text { bottom: 0; color: $white; font: { diff --git a/saos-webapp/src/main/webapp/WEB-INF/tags/enum.tag b/saos-webapp/src/main/webapp/WEB-INF/tags/enum.tag index 6a7ba39b..e0421dc0 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/tags/enum.tag +++ b/saos-webapp/src/main/webapp/WEB-INF/tags/enum.tag @@ -5,5 +5,6 @@ - + + \ No newline at end of file diff --git a/saos-webapp/src/main/webapp/WEB-INF/tiles.xml b/saos-webapp/src/main/webapp/WEB-INF/tiles.xml index 47bf7486..d4a686e5 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/tiles.xml +++ b/saos-webapp/src/main/webapp/WEB-INF/tiles.xml @@ -3,8 +3,7 @@ - - + @@ -20,21 +19,19 @@ - - + - - + - + @@ -54,8 +51,7 @@ - - + diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp new file mode 100644 index 00000000..b24913d2 --- /dev/null +++ b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp @@ -0,0 +1,7 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ include file="/WEB-INF/view/common/taglibs.jsp" %> + + + +<spring:message code="pageTitle.analysis" /> - <spring:message code="saos.fullname"/> + diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/common/pageTitle.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/common/pageTitle.jsp deleted file mode 100644 index ad995055..00000000 --- a/saos-webapp/src/main/webapp/WEB-INF/view/common/pageTitle.jsp +++ /dev/null @@ -1,11 +0,0 @@ -<%@ include file="/WEB-INF/view/common/taglibs.jsp" %> - - - - - <spring:message code="${title}" /> - <spring:message code="saos.fullname"/> - - - <spring:message code="saos.fullname"/> - - diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetails.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetails.jsp index 8c5e15b9..c65ef690 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetails.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetails.jsp @@ -1,14 +1,6 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/WEB-INF/view/common/taglibs.jsp" %> - -
@@ -28,7 +20,6 @@ $(document).ready(function() {
- diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp new file mode 100644 index 00000000..ff8c20f5 --- /dev/null +++ b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp @@ -0,0 +1,203 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ include file="/WEB-INF/view/common/taglibs.jsp" %> + + + + +<%-- JudgmentType --%> + + + + + + + + + + + +<%-- CaseNumbers --%> + + + + + + + + + + + +<%-- CourtType --%> + + + + + + + + + +<%-- CommonCourtJudgment properties --%> + + + <%-- CommonCourt --%> + + + + + + + + + <%-- CommonCourtDivision --%> + + + + + + + + + +<%-- SupremeCourtJudgment properties --%> + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- Judges --%> + + + + + + + + + + + + + + + + + + +<%-- Keywords --%> + + + + + + + + + + + + + + + + + + +<%-- LegalBases --%> + + + + + + + + + + + + + + + + + + + + + + +<%-- Meta description --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- title --%> +<c:out value="${metaCaseNumbers}" /> <spring:message code='pageTitle.judgmentDetails' /> - <spring:message code="saos.fullname"/> diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/home/homeContent.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/home/homeContent.jsp index 531c1dcb..1e4a8613 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/home/homeContent.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/home/homeContent.jsp @@ -9,9 +9,9 @@
<spring:message code="home.navigation.search.imageAlt" /> -

+

-

+

@@ -30,9 +30,9 @@

<spring:message code="home.navigation.analysis.imageAlt" /> -

+

-

+

@@ -49,9 +49,9 @@

<spring:message code="home.navigation.api.imageAlt" /> -

+

-

+

diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/home/homeMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/home/homeMeta.jsp new file mode 100644 index 00000000..d4e0ab48 --- /dev/null +++ b/saos-webapp/src/main/webapp/WEB-INF/view/home/homeMeta.jsp @@ -0,0 +1,6 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ include file="/WEB-INF/view/common/taglibs.jsp" %> + + + +<spring:message code="pageTitle.home" /> - <spring:message code="saos.fullname"/> diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/home/homeNavigation.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/home/homeNavigation.jsp index 5748d6e0..1c7c2093 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/home/homeNavigation.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/home/homeNavigation.jsp @@ -4,17 +4,17 @@

- " /> + - " /> - <spring:message code=" /> + <spring:message code= - " />

-
+

-

+ \ No newline at end of file diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp new file mode 100644 index 00000000..dbe0d60a --- /dev/null +++ b/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp @@ -0,0 +1,6 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ include file="/WEB-INF/view/common/taglibs.jsp" %> + + + +<spring:message code="pageTitle.judgmentSearch" /> - <spring:message code="saos.fullname"/> diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/template/mainTemplate.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/template/mainTemplate.jsp index 12c6c92c..4c2cfc43 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/template/mainTemplate.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/template/mainTemplate.jsp @@ -11,14 +11,14 @@ + + - <%@ include file="pageDescription.jsp" %> + - - <%@ include file="/WEB-INF/view/common/pageTitle.jsp" %> <%-- have to overwrite the font-face declaration because firefox does not work with fontface relative urls --%> diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/template/pageDescription.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/template/pageDescription.jsp deleted file mode 100644 index 670b03db..00000000 --- a/saos-webapp/src/main/webapp/WEB-INF/view/template/pageDescription.jsp +++ /dev/null @@ -1,13 +0,0 @@ -<%@ include file="/WEB-INF/view/common/taglibs.jsp" %> - - - -<%-- Page description only for the root of the given page, for example for /search but not for /search?dateFrom... - Search engines usually omit page descriptions if they are the same for many pages ---%> - - - - - - \ No newline at end of file From 2f1749a150c139cfe97a0428a6287b8affbf594e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pawe=C5=82czak?= Date: Thu, 1 Oct 2015 12:15:27 +0200 Subject: [PATCH 02/10] #941. Seo improvements. --- .../src/main/resources/message/common.properties | 8 ++++---- .../src/main/resources/message/common_pl.properties | 6 +++--- .../src/main/resources/saos.default.properties | 5 ++++- saos-webapp/src/main/webapp/WEB-INF/sitemap.xml | 4 ++-- .../WEB-INF/static/stylesheet/scss/newLayout.scss | 11 +++++------ .../main/webapp/WEB-INF/view/analysis/analysis.jsp | 4 ++-- .../WEB-INF/view/analysis/analysisContent.jsp | 2 +- .../webapp/WEB-INF/view/analysis/analysisMeta.jsp | 9 +++++++++ .../webapp/WEB-INF/view/common/openGraphMeta.jsp | 12 ++++++++++++ .../main/webapp/WEB-INF/view/common/saosLogo.jsp | 13 +++++++++++++ .../WEB-INF/view/details/judgmentDetailsContent.jsp | 2 +- .../WEB-INF/view/details/judgmentDetailsMeta.jsp | 10 +++++++++- .../view/details/judgmentDetailsNavigation.jsp | 7 +------ .../src/main/webapp/WEB-INF/view/home/homeMeta.jsp | 8 ++++++++ .../webapp/WEB-INF/view/home/homeNavigation.jsp | 11 +---------- .../WEB-INF/view/search/judgmentSearchContent.jsp | 2 +- .../WEB-INF/view/search/judgmentSearchMeta.jsp | 9 +++++++++ .../view/search/judgmentSearchNavigation.jsp | 3 +-- .../webapp/WEB-INF/view/template/mainTemplate.jsp | 8 +++++--- 19 files changed, 91 insertions(+), 43 deletions(-) create mode 100644 saos-webapp/src/main/webapp/WEB-INF/view/common/openGraphMeta.jsp create mode 100644 saos-webapp/src/main/webapp/WEB-INF/view/common/saosLogo.jsp diff --git a/saos-webapp/src/main/resources/message/common.properties b/saos-webapp/src/main/resources/message/common.properties index 704385fa..58dc7713 100644 --- a/saos-webapp/src/main/resources/message/common.properties +++ b/saos-webapp/src/main/resources/message/common.properties @@ -190,7 +190,7 @@ context.date.anyValue = Dowolna /* Judgment search view */ search.meta.pageDescription = Wyszukiwarka orzeczeń sądowych. Przeszukuj setki tysięcy orzeczeń polskich sądów wg dowolnych kryteriów. -search.meta.keywords = wyszukiwarka, wyszukiwarka orzeczeń, orzeczenia, saos, system analizy orzeczeń sądowych, wyroki sądowe, baza orzeczeń, orzecnictwo sądów powszechnych, orzeczenia sn, orzeczenia kio, orzeczenia tk +search.meta.keywords = wyszukiwarka, wyszukiwarka orzeczeń, orzeczenia, saos, system analizy orzeczeń sądowych, wyroki sądowe, baza orzeczeń, orzecnictwo sądów powszechnych, orzeczenia sn, orzeczenia kio, orzeczenia tk, portal orzeczeń judgmentSearch.form.header = Wyszukiwarka judgmentSearch.form.moreFields = Zobacz dodatkowe pola wyszukiwania judgmentSearch.form.lessFields = Ukryj dodatkowe pola wyszukiwania @@ -297,8 +297,8 @@ details.meta.decisionReleasedBy = wydane przez details.meta.resolutionReleasedBy = wydana przez details.meta.sentenceReleasedBy = wydany przez details.meta.withSignature = o sygnaturze -details.meta.containing = w składzie -judgmentDetails.meta.keywords = orzeczenie +details.meta.containing = w składzie sędziowskim +judgmentDetails.meta.keywords = orzeczenie, portal orzeczeń judgmentDetails.button.fullText = Zobacz pełny tekst orzeczenia judgmentDetails.header = Orzeczenie judgmentDetails.judgmentFullText = Pełny tekst orzeczenia @@ -366,7 +366,7 @@ judgmentDetails.linkTooltip.referencedRegulations = Pokaż orzeczenia z takim po /* Analysis */ analysis.meta.pageDescription = Wizualna analiza orzeczeń sądowych. Badaj, porównuj i analizuj trendy w polskim orzecznictwie. -analysis.meta.keywords = analiza, analiza orzeczeń, orzeczenia, saos, system analizy orzeczeń sądowych, wyroki sądowe, baza orzeczeń, orzecnictwo sądów powszechnych, orzeczenia sn, orzeczenia kio, orzeczenia tk +analysis.meta.keywords = analiza, analiza orzeczeń, orzeczenia, saos, system analizy orzeczeń sądowych, wyroki sądowe, baza orzeczeń, orzecnictwo sądów powszechnych, orzeczenia sn, orzeczenia kio, orzeczenia tk, portal orzeczeń analysis.header = Kryteria analizy analysis.skipLinks.analysis = Go to analysis form analysis.skipLinks.charts = Go to charts diff --git a/saos-webapp/src/main/resources/message/common_pl.properties b/saos-webapp/src/main/resources/message/common_pl.properties index 98f9fdc4..fd0910a7 100644 --- a/saos-webapp/src/main/resources/message/common_pl.properties +++ b/saos-webapp/src/main/resources/message/common_pl.properties @@ -298,8 +298,8 @@ details.meta.decisionReleasedBy = wydane przez details.meta.resolutionReleasedBy = wydana przez details.meta.sentenceReleasedBy = wydany przez details.meta.withSignature = o sygnaturze -details.meta.containing = w składzie -judgmentDetails.meta.keywords = orzeczenie +details.meta.containing = w składzie sędziowskim +judgmentDetails.meta.keywords = orzeczenie, portal orzeczeń judgmentDetails.button.fullText = Zobacz pełny tekst orzeczenia judgmentDetails.header = Orzeczenie judgmentDetails.judgmentFullText = Pełny tekst orzeczenia @@ -367,7 +367,7 @@ judgmentDetails.linkTooltip.referencedRegulations = Pokaż orzeczenia z takim po /* Analysis */ analysis.meta.pageDescription = Wizualna analiza orzeczeń sądowych. Badaj, porównuj i analizuj trendy w polskim orzecznictwie. -analysis.meta.keywords = analiza, analiza orzeczeń, orzeczenia, saos, system analizy orzeczeń sądowych, wyroki sądowe, baza orzeczeń, orzecnictwo sądów powszechnych, orzeczenia sn, orzeczenia kio, orzeczenia tk +analysis.meta.keywords = analiza, analiza orzeczeń, orzeczenia, saos, system analizy orzeczeń sądowych, wyroki sądowe, baza orzeczeń, orzecnictwo sądów powszechnych, orzeczenia sn, orzeczenia kio, orzeczenia tk, portal orzeczeń analysis.header = Kryteria analizy analysis.skipLinks.analysis = Przejdź do formularza analizy analysis.skipLinks.charts = Przejdź do wykresów diff --git a/saos-webapp/src/main/resources/saos.default.properties b/saos-webapp/src/main/resources/saos.default.properties index f9e3392b..d0b9f94a 100644 --- a/saos-webapp/src/main/resources/saos.default.properties +++ b/saos-webapp/src/main/resources/saos.default.properties @@ -96,4 +96,7 @@ piwik.siteId = 0 # ehcache configuration file path -ehcache.configurationFilePath = classpath:ehcache.xml \ No newline at end of file +ehcache.configurationFilePath = classpath:ehcache.xml + +# domain name +domain.name = https://saos.org.pl \ No newline at end of file diff --git a/saos-webapp/src/main/webapp/WEB-INF/sitemap.xml b/saos-webapp/src/main/webapp/WEB-INF/sitemap.xml index d7cc4334..6d56260e 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/sitemap.xml +++ b/saos-webapp/src/main/webapp/WEB-INF/sitemap.xml @@ -3,7 +3,7 @@ https://www.saos.org.pl/ 2015-09-30 - monthly + weekly https://www.saos.org.pl/search @@ -13,7 +13,7 @@ https://www.saos.org.pl/analysis 2015-09-30 - monthly + weekly https://www.saos.org.pl/help diff --git a/saos-webapp/src/main/webapp/WEB-INF/static/stylesheet/scss/newLayout.scss b/saos-webapp/src/main/webapp/WEB-INF/static/stylesheet/scss/newLayout.scss index 9e005c35..7a8a602f 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/static/stylesheet/scss/newLayout.scss +++ b/saos-webapp/src/main/webapp/WEB-INF/static/stylesheet/scss/newLayout.scss @@ -355,7 +355,6 @@ a, .hint { } .saos-logo { - @include background-image("saosLogoNoText.png"); background-size: 300px auto; background-repeat: no-repeat; cursor: pointer; @@ -514,7 +513,7 @@ a, .hint { width: 100%; } - h1 { + .content-header { border: { color: $dark; style: solid; @@ -582,7 +581,7 @@ a, .hint { .search-form { padding-bottom: 50px; - padding-top: 250px; + padding-top: 180px; position: relative; @@ -617,7 +616,7 @@ a, .hint { .content { - h1 { + .content-header { span { font: { @@ -672,7 +671,7 @@ a, .hint { } .judgment-details { - padding-top: 250px; + padding-top: 180px; padding-bottom: 50px; position: relative; @@ -857,7 +856,7 @@ a, .hint { #analysisFormDiv { - padding-top: 250px; + padding-top: 180px; padding-bottom: 50px; position: relative; } diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysis.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysis.jsp index c8b8e3f6..2791e395 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysis.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysis.jsp @@ -9,8 +9,8 @@
<%@ include file="../common/navigationMenu.jsp" %> - - + + <%@ include file="../common/saosLogo.jsp" %>
diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisContent.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisContent.jsp index 8abb5301..ea2b9356 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisContent.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisContent.jsp @@ -20,7 +20,7 @@ $(document).ready(function() {
-

+

diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp index b24913d2..52e8c1f1 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp @@ -1,7 +1,16 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/WEB-INF/view/common/taglibs.jsp" %> + + + +<%-- Open graph ogp.me --%> +<%@ include file="../common/openGraphMeta.jsp" %> + - "> + + + <spring:message code="pageTitle.analysis" /> - <spring:message code="saos.fullname"/> diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/common/openGraphMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/common/openGraphMeta.jsp new file mode 100644 index 00000000..a2e51e49 --- /dev/null +++ b/saos-webapp/src/main/webapp/WEB-INF/view/common/openGraphMeta.jsp @@ -0,0 +1,12 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ include file="/WEB-INF/view/common/taglibs.jsp" %> + + +<%-- Open graph ogp.me --%> + + + + + + + diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/common/saosLogo.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/common/saosLogo.jsp new file mode 100644 index 00000000..536c212f --- /dev/null +++ b/saos-webapp/src/main/webapp/WEB-INF/view/common/saosLogo.jsp @@ -0,0 +1,13 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ include file="/WEB-INF/view/common/taglibs.jsp" %> + + +

+ + - " /> + + + + <spring:message code= - " /> + +

diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsContent.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsContent.jsp index e7f725fb..e261bff4 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsContent.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsContent.jsp @@ -3,7 +3,7 @@ <%-- Judgment content --%> -

+

diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp index ff8c20f5..50ed9c76 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp @@ -175,7 +175,7 @@ - + @@ -199,5 +199,13 @@ + +<%-- Open graph ogp.me --%> +<%@ include file="../common/openGraphMeta.jsp" %> + - "> + + + + <%-- title --%> <c:out value="${metaCaseNumbers}" /> <spring:message code='pageTitle.judgmentDetails' /> - <spring:message code="saos.fullname"/> diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsNavigation.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsNavigation.jsp index ec71977d..9c1b02d9 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsNavigation.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsNavigation.jsp @@ -2,9 +2,7 @@ <%@ include file="/WEB-INF/view/common/taglibs.jsp" %> - - - +<%@ include file="../common/saosLogo.jsp" %>
@@ -24,9 +22,6 @@ - - -
    diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/home/homeMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/home/homeMeta.jsp index d4e0ab48..9fe4bf7a 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/home/homeMeta.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/home/homeMeta.jsp @@ -1,6 +1,14 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/WEB-INF/view/common/taglibs.jsp" %> + + +<%-- Open graph ogp.me --%> +<%@ include file="../common/openGraphMeta.jsp" %> + - "> + + + <spring:message code="pageTitle.home" /> - <spring:message code="saos.fullname"/> diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/home/homeNavigation.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/home/homeNavigation.jsp index 1c7c2093..77703fe1 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/home/homeNavigation.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/home/homeNavigation.jsp @@ -2,16 +2,7 @@ <%@ include file="/WEB-INF/view/common/taglibs.jsp" %> -

    - - - " /> - - - - <spring:message code= - " /> - -

    - +<%@ include file="../common/saosLogo.jsp" %>

    diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchContent.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchContent.jsp index 6ff4b19d..f97fa887 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchContent.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchContent.jsp @@ -4,7 +4,7 @@ -

    +

    diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp index dbe0d60a..f0a8fb12 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp @@ -1,6 +1,15 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/WEB-INF/view/common/taglibs.jsp" %> + + + +<%-- Open graph ogp.me --%> +<%@ include file="../common/openGraphMeta.jsp" %> + - "> + + + <spring:message code="pageTitle.judgmentSearch" /> - <spring:message code="saos.fullname"/> diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchNavigation.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchNavigation.jsp index 0dcfe728..bf86aea7 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchNavigation.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchNavigation.jsp @@ -2,8 +2,7 @@ <%@ include file="/WEB-INF/view/common/taglibs.jsp" %> - - +<%@ include file="../common/saosLogo.jsp" %>
    diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/template/mainTemplate.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/template/mainTemplate.jsp index 4c2cfc43..84ff7765 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/template/mainTemplate.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/template/mainTemplate.jsp @@ -10,11 +10,13 @@ - - - + + <%-- bing verification --%> + + + From 9e53d09b0a365fe363ed7260e45e1aa664672988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pawe=C5=82czak?= Date: Thu, 1 Oct 2015 12:40:26 +0200 Subject: [PATCH 03/10] #941. Indentation fix. --- .../src/main/resources/message/common.properties | 10 ++++++---- .../src/main/resources/saos.default.properties | 2 +- saos-webapp/src/main/webapp/WEB-INF/sitemap.xml | 6 +++--- .../src/main/webapp/WEB-INF/tags/enum.tag | 2 +- .../webapp/WEB-INF/view/analysis/analysis.jsp | 4 ++-- .../WEB-INF/view/details/judgmentDetails.jsp | 8 +++++++- .../WEB-INF/view/template/mainTemplate.jsp | 16 ++++++++-------- 7 files changed, 28 insertions(+), 20 deletions(-) diff --git a/saos-webapp/src/main/resources/message/common.properties b/saos-webapp/src/main/resources/message/common.properties index 58dc7713..0ebf9b86 100644 --- a/saos-webapp/src/main/resources/message/common.properties +++ b/saos-webapp/src/main/resources/message/common.properties @@ -32,6 +32,8 @@ button.look = Zobacz meta.language = english +saos.logo.alt = portal orzeczeń polskiego sądownictwa + message.noJavascript = Obsługa języka JavaScript w przeglądarce internetowej jest wyłączona. Włącz ponownie JavaScript, aby korzystać z pełnej funkcjonalności serwisu. /* Page titles */ @@ -155,7 +157,7 @@ judgment.judgmentResult = Skrócony wynik sprawy judgment.lowerCourtJudgments = Wyroki sądu niższej instancji /* Labels for landing page aka home */ -home.meta.pageDescription = Codziennie aktualizowana otwarta baza orzeczeń polskich sądów. Szukaj, przeglądaj, analizuj. +home.meta.pageDescription = Codziennie aktualizowana otwarta baza orzeczeń polskich sądów. Szukaj, przeglądaj, analizuj orzeczenia i wyroki sądowe. home.meta.keywords = orzeczenia, saos, system analizy orzeczeń sądowych, wyroki sądowe, baza orzeczeń, orzecnictwo sądów powszechnych, orzeczenia sn, orzeczenia kio, orzeczenia tk, portal orzeczeń home.beta.message = Serwis znajduje się obecnie w fazie testów i dodawania ostatnich drobnych funkcjonalności. Będziemy bardzo wdzięczni za wszelkie uwagi i sugestie dotyczące działania serwisu. Prosimy o przesyłanie wszelkich opinii na adres home.welcome.text = Serwis SAOS gromadzi i udostępnia dane orzeczeń polskich sądów. Ułatwia ich przeszukiwanie, przeglądanie oraz zbiorczą analizę. Umożliwia również pobranie metadanych i treści wszystkich zgromadzonych orzeczeń poprzez programowe API. @@ -167,9 +169,9 @@ home.navigation.api = Programowe API home.navigation.search.desc = Wyszukiwanie i przeglądanie orzeczeń. home.navigation.analysis.desc = Analiza zbiorcza zgromadzonych danych. home.navigation.api.desc = Punkt wejścia serwisów API REST
    (dla programistów). -home.navigation.search.imageAlt = "Ikona lupy" -home.navigation.analysis.imageAlt = "Ikona wykresu" -home.navigation.api.imageAlt = "Ikona tagu" +home.navigation.search.imageAlt = Ikona lupy +home.navigation.analysis.imageAlt = Ikona wykresu +home.navigation.api.imageAlt = Ikona tagu partners.icm.imageAlt = Logo ICM i napis UNIWERSYTET WARSZAWSKI - przeniesienie do strony ICM diff --git a/saos-webapp/src/main/resources/saos.default.properties b/saos-webapp/src/main/resources/saos.default.properties index d0b9f94a..3cd0c308 100644 --- a/saos-webapp/src/main/resources/saos.default.properties +++ b/saos-webapp/src/main/resources/saos.default.properties @@ -99,4 +99,4 @@ piwik.siteId = 0 ehcache.configurationFilePath = classpath:ehcache.xml # domain name -domain.name = https://saos.org.pl \ No newline at end of file +domain.name = https://saos.org.pl diff --git a/saos-webapp/src/main/webapp/WEB-INF/sitemap.xml b/saos-webapp/src/main/webapp/WEB-INF/sitemap.xml index 6d56260e..d96c4daf 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/sitemap.xml +++ b/saos-webapp/src/main/webapp/WEB-INF/sitemap.xml @@ -1,14 +1,14 @@ - https://www.saos.org.pl/ + https://www.saos.org.pl/ 2015-09-30 weekly https://www.saos.org.pl/search 2015-09-30 - daily + daily https://www.saos.org.pl/analysis @@ -18,6 +18,6 @@ https://www.saos.org.pl/help 2015-09-30 - daily + daily diff --git a/saos-webapp/src/main/webapp/WEB-INF/tags/enum.tag b/saos-webapp/src/main/webapp/WEB-INF/tags/enum.tag index e0421dc0..18ee66f9 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/tags/enum.tag +++ b/saos-webapp/src/main/webapp/WEB-INF/tags/enum.tag @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysis.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysis.jsp index 2791e395..dc686dd6 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysis.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysis.jsp @@ -8,8 +8,8 @@
    - <%@ include file="../common/navigationMenu.jsp" %> - + <%@ include file="../common/navigationMenu.jsp" %> + <%@ include file="../common/saosLogo.jsp" %>
    diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetails.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetails.jsp index c65ef690..edffd457 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetails.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetails.jsp @@ -1,6 +1,12 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/WEB-INF/view/common/taglibs.jsp" %> - + + +
    diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/template/mainTemplate.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/template/mainTemplate.jsp index 84ff7765..3b8f6a84 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/template/mainTemplate.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/template/mainTemplate.jsp @@ -9,14 +9,14 @@ - - - - - <%-- bing verification --%> - - - + + + + + <%-- bing verification --%> + + + From 3da870f4064b102afb94e2bfc61f6df66e45495c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pawe=C5=82czak?= Date: Thu, 1 Oct 2015 12:53:23 +0200 Subject: [PATCH 04/10] #941. Another indentation fix --- .../src/main/webapp/WEB-INF/sitemap.xml | 40 +++++++++---------- .../webapp/WEB-INF/view/analysis/analysis.jsp | 6 +-- .../WEB-INF/view/template/mainTemplate.jsp | 20 +++++----- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/saos-webapp/src/main/webapp/WEB-INF/sitemap.xml b/saos-webapp/src/main/webapp/WEB-INF/sitemap.xml index d96c4daf..cc08bbd2 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/sitemap.xml +++ b/saos-webapp/src/main/webapp/WEB-INF/sitemap.xml @@ -1,23 +1,23 @@ - - https://www.saos.org.pl/ - 2015-09-30 - weekly - - - https://www.saos.org.pl/search - 2015-09-30 - daily - - - https://www.saos.org.pl/analysis - 2015-09-30 - weekly - - - https://www.saos.org.pl/help - 2015-09-30 - daily - + + https://www.saos.org.pl/ + 2015-09-30 + weekly + + + https://www.saos.org.pl/search + 2015-09-30 + daily + + + https://www.saos.org.pl/analysis + 2015-09-30 + weekly + + + https://www.saos.org.pl/help + 2015-09-30 + daily + diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysis.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysis.jsp index dc686dd6..47149cce 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysis.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysis.jsp @@ -8,10 +8,10 @@
    - <%@ include file="../common/navigationMenu.jsp" %> - - <%@ include file="../common/saosLogo.jsp" %> + <%@ include file="../common/navigationMenu.jsp" %> + <%@ include file="../common/saosLogo.jsp" %> +
    diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/template/mainTemplate.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/template/mainTemplate.jsp index 3b8f6a84..8bdeaf13 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/template/mainTemplate.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/template/mainTemplate.jsp @@ -9,16 +9,16 @@ - - - - - <%-- bing verification --%> - - - - - + + + + + <%-- bing verification --%> + + + + + From d66d8020c799810f57f9b88cf60da97227bc93e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pawe=C5=82czak?= Date: Tue, 6 Oct 2015 10:25:52 +0200 Subject: [PATCH 05/10] Fix #941. CR --- .../main/resources/message/common.properties | 9 +- .../resources/message/common_pl.properties | 9 +- .../main/resources/saos.default.properties | 3 +- .../static/stylesheet/scss/newLayout.scss | 2 +- .../src/main/webapp/WEB-INF/tags/enum.tag | 3 +- .../webapp/WEB-INF/view/analysis/analysis.jsp | 15 +++ .../WEB-INF/view/analysis/analysisContent.jsp | 18 +-- .../WEB-INF/view/analysis/analysisMeta.jsp | 4 +- .../WEB-INF/view/common/openGraphMeta.jsp | 12 +- .../webapp/WEB-INF/view/common/saosLogo.jsp | 17 ++- .../view/details/judgmentDetailsContent.jsp | 2 +- .../view/details/judgmentDetailsMeta.jsp | 107 ++++++------------ .../webapp/WEB-INF/view/home/homeContent.jsp | 12 +- .../webapp/WEB-INF/view/home/homeMeta.jsp | 4 +- .../WEB-INF/view/home/homeNavigation.jsp | 15 ++- .../view/search/judgmentSearchContent.jsp | 2 +- .../view/search/judgmentSearchMeta.jsp | 4 +- 17 files changed, 107 insertions(+), 131 deletions(-) diff --git a/saos-webapp/src/main/resources/message/common.properties b/saos-webapp/src/main/resources/message/common.properties index 0ebf9b86..c234a50a 100644 --- a/saos-webapp/src/main/resources/message/common.properties +++ b/saos-webapp/src/main/resources/message/common.properties @@ -1,4 +1,5 @@ saos.fullname = System Analizy Orzeczeń Sądowych +saos.fullnameAndShortcut = System Analizy Orzeczeń Sądowych - SAOS choose = Wybierz more = Więcej @@ -295,12 +296,12 @@ courtCriteriaFormSection.hint.administrativeCourt.content = Dane nie zostały na /* Judgment details view */ details.meta.judgment = Orzeczenie -details.meta.decisionReleasedBy = wydane przez -details.meta.resolutionReleasedBy = wydana przez -details.meta.sentenceReleasedBy = wydany przez +details.meta.releasedBy.neuter = wydane przez +details.meta.releasedBy.feminine = wydana przez +details.meta.releasedBy.masculine = wydany przez details.meta.withSignature = o sygnaturze details.meta.containing = w składzie sędziowskim -judgmentDetails.meta.keywords = orzeczenie, portal orzeczeń +judgmentDetails.meta.keywords = orzeczenie, portal orzeczeń judgmentDetails.button.fullText = Zobacz pełny tekst orzeczenia judgmentDetails.header = Orzeczenie judgmentDetails.judgmentFullText = Pełny tekst orzeczenia diff --git a/saos-webapp/src/main/resources/message/common_pl.properties b/saos-webapp/src/main/resources/message/common_pl.properties index fd0910a7..109c9872 100644 --- a/saos-webapp/src/main/resources/message/common_pl.properties +++ b/saos-webapp/src/main/resources/message/common_pl.properties @@ -1,4 +1,5 @@ saos.fullname = System Analizy Orzeczeń Sądowych +saos.fullnameAndShortcut = System Analizy Orzeczeń Sądowych - SAOS choose = Wybierz more = Więcej @@ -294,12 +295,12 @@ courtCriteriaFormSection.hint.administrativeCourt.content = Dane nie zostały na /* Judgment details view */ details.meta.judgment = Orzeczenie -details.meta.decisionReleasedBy = wydane przez -details.meta.resolutionReleasedBy = wydana przez -details.meta.sentenceReleasedBy = wydany przez +details.meta.releasedBy.neuter = wydane przez +details.meta.releasedBy.feminine = wydana przez +details.meta.releasedBy.masculine = wydany przez details.meta.withSignature = o sygnaturze details.meta.containing = w składzie sędziowskim -judgmentDetails.meta.keywords = orzeczenie, portal orzeczeń +judgmentDetails.meta.keywords = orzeczenie, portal orzeczeń judgmentDetails.button.fullText = Zobacz pełny tekst orzeczenia judgmentDetails.header = Orzeczenie judgmentDetails.judgmentFullText = Pełny tekst orzeczenia diff --git a/saos-webapp/src/main/resources/saos.default.properties b/saos-webapp/src/main/resources/saos.default.properties index 3cd0c308..c4c25d9c 100644 --- a/saos-webapp/src/main/resources/saos.default.properties +++ b/saos-webapp/src/main/resources/saos.default.properties @@ -98,5 +98,4 @@ piwik.siteId = 0 # ehcache configuration file path ehcache.configurationFilePath = classpath:ehcache.xml -# domain name -domain.name = https://saos.org.pl + diff --git a/saos-webapp/src/main/webapp/WEB-INF/static/stylesheet/scss/newLayout.scss b/saos-webapp/src/main/webapp/WEB-INF/static/stylesheet/scss/newLayout.scss index 7a8a602f..98e894ea 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/static/stylesheet/scss/newLayout.scss +++ b/saos-webapp/src/main/webapp/WEB-INF/static/stylesheet/scss/newLayout.scss @@ -173,7 +173,7 @@ a, .hint { padding: 70px; } - h2.welcome-text { + div.welcome-text { bottom: 0; color: $white; font: { diff --git a/saos-webapp/src/main/webapp/WEB-INF/tags/enum.tag b/saos-webapp/src/main/webapp/WEB-INF/tags/enum.tag index 18ee66f9..532bdaa8 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/tags/enum.tag +++ b/saos-webapp/src/main/webapp/WEB-INF/tags/enum.tag @@ -5,6 +5,5 @@ - - + diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysis.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysis.jsp index 47149cce..1400f7cd 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysis.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysis.jsp @@ -2,6 +2,21 @@ <%@ include file="/WEB-INF/view/common/taglibs.jsp" %> +
    diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisContent.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisContent.jsp index ea2b9356..bab7de65 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisContent.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisContent.jsp @@ -2,25 +2,9 @@ <%@ include file="/WEB-INF/view/common/taglibs.jsp" %> - -
    -

    +

    diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp index 52e8c1f1..5b48b7b9 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp @@ -8,9 +8,9 @@ <%-- Open graph ogp.me --%> <%@ include file="../common/openGraphMeta.jsp" %> - - "> + - "> -<spring:message code="pageTitle.analysis" /> - <spring:message code="saos.fullname"/> +<spring:message code="pageTitle.analysis" /> - <spring:message code="saos.fullnameAndShortcut"/> diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/common/openGraphMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/common/openGraphMeta.jsp index a2e51e49..fa04d445 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/common/openGraphMeta.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/common/openGraphMeta.jsp @@ -1,12 +1,16 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/WEB-INF/view/common/taglibs.jsp" %> + +${pageContextRequest.requestURL} + -<%-- Open graph ogp.me --%> - +<%--Base url --%> + +<%-- Open graph ogp.me --%> - - + + diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/common/saosLogo.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/common/saosLogo.jsp index 536c212f..b10fc541 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/common/saosLogo.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/common/saosLogo.jsp @@ -2,12 +2,11 @@ <%@ include file="/WEB-INF/view/common/taglibs.jsp" %> -

    - - - " /> - - - - <spring:message code= - " /> - -

    + + - " /> + + + + <spring:message code= - " /> + + diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsContent.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsContent.jsp index e261bff4..3e7ff494 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsContent.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsContent.jsp @@ -3,7 +3,7 @@ <%-- Judgment content --%> -

    +

    diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp index 50ed9c76..93a5403b 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp @@ -6,141 +6,106 @@ <%-- JudgmentType --%> - - - - - + <%-- CaseNumbers --%> - - - - + <%-- CourtType --%> - - - - + - + <%-- CommonCourtJudgment properties --%> <%-- CommonCourt --%> - - - - - - - - - <%-- CommonCourtDivision --%> - - - - - - + + + + <%-- CommonCourtDivision --%> + + + + <%-- SupremeCourtJudgment properties --%> - - - - - + - + - - - - - + <%-- Judges --%> - - - - - + - + - + <%-- Keywords --%> - - - - + - + - + - + <%-- LegalBases --%> - - - - + - + - + - + @@ -152,13 +117,13 @@ - + - + - + @@ -169,23 +134,23 @@ - + - + - + - + @@ -193,7 +158,7 @@ - + @@ -202,10 +167,10 @@ <%-- Open graph ogp.me --%> <%@ include file="../common/openGraphMeta.jsp" %> - - "> + - "> <%-- title --%> -<c:out value="${metaCaseNumbers}" /> <spring:message code='pageTitle.judgmentDetails' /> - <spring:message code="saos.fullname"/> +<c:out value="${metaCaseNumbers}" /> <spring:message code='pageTitle.judgmentDetails' /> - <spring:message code="saos.fullnameAndShortcut"/> diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/home/homeContent.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/home/homeContent.jsp index 1e4a8613..531c1dcb 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/home/homeContent.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/home/homeContent.jsp @@ -9,9 +9,9 @@
    <spring:message code="home.navigation.search.imageAlt" /> -

    +

    -

    +

    @@ -30,9 +30,9 @@

    <spring:message code="home.navigation.analysis.imageAlt" /> -

    +

    -

    +

    @@ -49,9 +49,9 @@

    <spring:message code="home.navigation.api.imageAlt" /> -

    +

    -

    +

    diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/home/homeMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/home/homeMeta.jsp index 9fe4bf7a..bd333e86 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/home/homeMeta.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/home/homeMeta.jsp @@ -7,8 +7,8 @@ <%-- Open graph ogp.me --%> <%@ include file="../common/openGraphMeta.jsp" %> - - "> + - "> -<spring:message code="pageTitle.home" /> - <spring:message code="saos.fullname"/> +<spring:message code="pageTitle.home" /> - <spring:message code="saos.fullnameAndShortcut"/> diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/home/homeNavigation.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/home/homeNavigation.jsp index 77703fe1..c8042857 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/home/homeNavigation.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/home/homeNavigation.jsp @@ -2,10 +2,19 @@ <%@ include file="/WEB-INF/view/common/taglibs.jsp" %> -<%@ include file="../common/saosLogo.jsp" %> + +

    + + - " /> + + + + <spring:message code= - " /> + +

    -

    +
    -

    +
    \ No newline at end of file diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchContent.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchContent.jsp index f97fa887..fff8afc0 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchContent.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchContent.jsp @@ -4,7 +4,7 @@ -

    +

    diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp index f0a8fb12..0d1b5bde 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp @@ -8,8 +8,8 @@ <%-- Open graph ogp.me --%> <%@ include file="../common/openGraphMeta.jsp" %> - - "> + - "> -<spring:message code="pageTitle.judgmentSearch" /> - <spring:message code="saos.fullname"/> +<spring:message code="pageTitle.judgmentSearch" /> - <spring:message code="saos.fullnameAndShortcut"/> From e1ef3c0de78c6dc3bbb3af35038a8c0ce03e7fbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pawe=C5=82czak?= Date: Tue, 6 Oct 2015 10:36:03 +0200 Subject: [PATCH 06/10] Fix #941. CR2 --- saos-webapp/src/main/resources/message/common.properties | 1 + saos-webapp/src/main/resources/message/common_pl.properties | 1 + saos-webapp/src/main/webapp/WEB-INF/view/common/saosLogo.jsp | 4 ++-- .../src/main/webapp/WEB-INF/view/home/homeNavigation.jsp | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/saos-webapp/src/main/resources/message/common.properties b/saos-webapp/src/main/resources/message/common.properties index c234a50a..f7d07e90 100644 --- a/saos-webapp/src/main/resources/message/common.properties +++ b/saos-webapp/src/main/resources/message/common.properties @@ -1,3 +1,4 @@ +saos.shortname = SAOS saos.fullname = System Analizy Orzeczeń Sądowych saos.fullnameAndShortcut = System Analizy Orzeczeń Sądowych - SAOS diff --git a/saos-webapp/src/main/resources/message/common_pl.properties b/saos-webapp/src/main/resources/message/common_pl.properties index 109c9872..d0ea1690 100644 --- a/saos-webapp/src/main/resources/message/common_pl.properties +++ b/saos-webapp/src/main/resources/message/common_pl.properties @@ -1,3 +1,4 @@ +saos.shortname = SAOS saos.fullname = System Analizy Orzeczeń Sądowych saos.fullnameAndShortcut = System Analizy Orzeczeń Sądowych - SAOS diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/common/saosLogo.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/common/saosLogo.jsp index b10fc541..4149f773 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/common/saosLogo.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/common/saosLogo.jsp @@ -3,10 +3,10 @@ - - " /> + - " /> - <spring:message code= - " /> + <spring:message code= - " /> diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/home/homeNavigation.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/home/homeNavigation.jsp index c8042857..8acca7cf 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/home/homeNavigation.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/home/homeNavigation.jsp @@ -5,11 +5,11 @@

    - - " /> + - " /> - <spring:message code= - " /> + <spring:message code= - " />

    From 98932b7452d280640143e4a3f9858718ecf3dd4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pawe=C5=82czak?= Date: Thu, 8 Oct 2015 09:36:31 +0200 Subject: [PATCH 07/10] #941. CR --- .../common/http/HttpServletRequestUtils.java | 73 ++++++++++++++++--- .../http/HttpServletRequestUtilsTest.java | 69 +++++++++++++++++- .../icm/saos/webapp/WebappConfiguration.java | 2 + .../webapp/common/RequestURLInterceptor.java | 27 +++++++ .../main/resources/message/common.properties | 3 +- .../resources/message/common_pl.properties | 3 +- .../WEB-INF/view/common/openGraphMeta.jsp | 14 ++-- .../view/details/judgmentDetailsMeta.jsp | 36 +++++++-- 8 files changed, 195 insertions(+), 32 deletions(-) create mode 100644 saos-webapp/src/main/java/pl/edu/icm/saos/webapp/common/RequestURLInterceptor.java diff --git a/saos-common/src/main/java/pl/edu/icm/saos/common/http/HttpServletRequestUtils.java b/saos-common/src/main/java/pl/edu/icm/saos/common/http/HttpServletRequestUtils.java index 23166d10..4967140a 100644 --- a/saos-common/src/main/java/pl/edu/icm/saos/common/http/HttpServletRequestUtils.java +++ b/saos-common/src/main/java/pl/edu/icm/saos/common/http/HttpServletRequestUtils.java @@ -80,6 +80,36 @@ public static int extractServerPort(HttpServletRequest request) { } return port; } + + + /** + * Returns base url sent by the client. + * The url consists of:
    + *
      + *
    • scheme - {@link #extractClientScheme(HttpServletRequest)}
      • + *
    • host - {@link #extractClientHost(HttpServletRequest)}
      • + *
    • port - {@link #extractServerPort(HttpServletRequest)}
      • + *
    + */ + public static String constructRequestBaseUrl(HttpServletRequest request) { + + StringBuilder path = new StringBuilder(); + + String scheme = extractScheme(request); + + int port = extractServerPort(request); + + path.append (scheme); + path.append ("://"); + path.append (extractHost(request)); + + if (!isDefaultPort(scheme, port)) { + path.append (':'); + path.append (port); + } + + return path.toString(); + } /** @@ -96,18 +126,7 @@ public static String constructRequestUrl(HttpServletRequest request) { StringBuilder url = new StringBuilder(); - String scheme = extractScheme(request); - - int port = extractServerPort(request); - - url.append (scheme); - url.append ("://"); - url.append (extractHost(request)); - - if (!isDefaultPort(scheme, port)) { - url.append (':'); - url.append (port); - } + url.append(constructRequestBaseUrl(request)); String urlPath = request.getRequestURI(); url.append(urlPath); @@ -115,6 +134,36 @@ public static String constructRequestUrl(HttpServletRequest request) { return url.toString(); } + + + /** + * Returns url sent by the client with parameters. + * The url consists of:
    + *
      + *
    • scheme - {@link #extractClientScheme(HttpServletRequest)}
      • + *
    • host - {@link #extractClientHost(HttpServletRequest)}
      • + *
    • port - {@link #extractServerPort(HttpServletRequest)}
      • + *
    • urlPath - {@link HttpServletRequest#getRequestURI()}
      • + *
    • queryString - {@link HttpServletRequest#getQueryString()}
      • + *
    + */ + public static String constructRequestUrlWithParameters(HttpServletRequest request) { + + StringBuilder path = new StringBuilder(); + + String url = constructRequestUrl(request); + + String queryString = request.getQueryString(); + + path.append(url); + + if (queryString != null) { + path.append("?").append(queryString); + } + + return path.toString(); + } + /** * Is the given port a default port for the given scheme diff --git a/saos-common/src/test/java/pl/edu/icm/saos/common/http/HttpServletRequestUtilsTest.java b/saos-common/src/test/java/pl/edu/icm/saos/common/http/HttpServletRequestUtilsTest.java index c54882b1..16b5aba5 100644 --- a/saos-common/src/test/java/pl/edu/icm/saos/common/http/HttpServletRequestUtilsTest.java +++ b/saos-common/src/test/java/pl/edu/icm/saos/common/http/HttpServletRequestUtilsTest.java @@ -147,6 +147,30 @@ public void extractServerPort_NO_X_FORWARDED_PORT() { assertEquals(123, HttpServletRequestUtils.extractServerPort(request)); } + + @Test + public void constructRequestBaseUrl_NON_STANDARD_PORT() { + + // given + when(request.getHeader("X-FORWARDED-PROTO")).thenReturn("https"); + when(request.getHeader("X-FORWARDED-HOST")).thenReturn("saos.org.pl"); + when(request.getIntHeader("X-FORWARDED-PORT")).thenReturn(773); + + // execute & assert + assertEquals("https://saos.org.pl:773", HttpServletRequestUtils.constructRequestBaseUrl(request)); + } + + @Test + public void constructRequestBaseUrl_STANDARD_PORT() { + + // given + when(request.getHeader("X-FORWARDED-PROTO")).thenReturn("https"); + when(request.getHeader("X-FORWARDED-HOST")).thenReturn("saos.org.pl"); + when(request.getIntHeader("X-FORWARDED-PORT")).thenReturn(443); + + // execute & assert + assertEquals("https://saos.org.pl", HttpServletRequestUtils.constructRequestBaseUrl(request)); + } @Test public void constructRequestUrl_NON_STANDARD_PORT() { @@ -173,8 +197,49 @@ public void constructRequestUrl_STANDARD_PORT() { // execute & assert assertEquals("https://saos.org.pl/search", HttpServletRequestUtils.constructRequestUrl(request)); } - - + + @Test + public void constructRequestUrlWithParameters_NON_STANDARD_PORT() { + + // given + when(request.getHeader("X-FORWARDED-PROTO")).thenReturn("https"); + when(request.getHeader("X-FORWARDED-HOST")).thenReturn("saos.org.pl"); + when(request.getIntHeader("X-FORWARDED-PORT")).thenReturn(773); + when(request.getRequestURI()).thenReturn("/search"); + when(request.getQueryString()).thenReturn("searchPhrase=orzeczenie&signatur=ii12"); + + // execute & assert + assertEquals("https://saos.org.pl:773/search?searchPhrase=orzeczenie&signatur=ii12", HttpServletRequestUtils.constructRequestUrlWithParameters(request)); + } + + @Test + public void constructRequestUrlWithParameters_STANDARD_PORT_NO_QUERY() { + + // given + when(request.getHeader("X-FORWARDED-PROTO")).thenReturn("https"); + when(request.getHeader("X-FORWARDED-HOST")).thenReturn("saos.org.pl"); + when(request.getIntHeader("X-FORWARDED-PORT")).thenReturn(443); + when(request.getRequestURI()).thenReturn("/search"); + when(request.getQueryString()).thenReturn("searchPhrase=orzeczenie&signatur=ii12"); + + // execute & assert + assertEquals("https://saos.org.pl/search?searchPhrase=orzeczenie&signatur=ii12", HttpServletRequestUtils.constructRequestUrlWithParameters(request)); + } + + @Test + public void constructRequestUrlWithParameters_STANDARD_PORT() { + + // given + when(request.getHeader("X-FORWARDED-PROTO")).thenReturn("https"); + when(request.getHeader("X-FORWARDED-HOST")).thenReturn("saos.org.pl"); + when(request.getIntHeader("X-FORWARDED-PORT")).thenReturn(443); + when(request.getRequestURI()).thenReturn("/search"); + when(request.getQueryString()).thenReturn(null); + + // execute & assert + assertEquals("https://saos.org.pl/search", HttpServletRequestUtils.constructRequestUrlWithParameters(request)); + } + @Test public void isDefaultPort() { diff --git a/saos-webapp/src/main/java/pl/edu/icm/saos/webapp/WebappConfiguration.java b/saos-webapp/src/main/java/pl/edu/icm/saos/webapp/WebappConfiguration.java index 93c87d38..e7509dfe 100644 --- a/saos-webapp/src/main/java/pl/edu/icm/saos/webapp/WebappConfiguration.java +++ b/saos-webapp/src/main/java/pl/edu/icm/saos/webapp/WebappConfiguration.java @@ -35,6 +35,7 @@ import pl.edu.icm.saos.api.services.interceptor.AccessControlHeaderHandlerInterceptor; import pl.edu.icm.saos.api.services.interceptor.RestrictParamsHandlerInterceptor; import pl.edu.icm.saos.persistence.service.LawJournalEntryCodeExtractor; +import pl.edu.icm.saos.webapp.common.RequestURLInterceptor; import pl.edu.icm.saos.webapp.format.MultiWordFormatterFactory; import pl.edu.icm.saos.webapp.format.StringTrimmingFormatter; @@ -103,6 +104,7 @@ public void addInterceptors(InterceptorRegistry registry) { .addPathPatterns("/search/lawJournalEntries*") .addPathPatterns("/keywords/**"); registry.addInterceptor(new RestrictParamsHandlerInterceptor()); + registry.addInterceptor(new RequestURLInterceptor()); } diff --git a/saos-webapp/src/main/java/pl/edu/icm/saos/webapp/common/RequestURLInterceptor.java b/saos-webapp/src/main/java/pl/edu/icm/saos/webapp/common/RequestURLInterceptor.java new file mode 100644 index 00000000..51d8c973 --- /dev/null +++ b/saos-webapp/src/main/java/pl/edu/icm/saos/webapp/common/RequestURLInterceptor.java @@ -0,0 +1,27 @@ +package pl.edu.icm.saos.webapp.common; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; + +import pl.edu.icm.saos.common.http.HttpServletRequestUtils; + +/** + * Interceptor adds to request full url with parameters + * + * @author Łukasz Pawełczak + */ +public class RequestURLInterceptor extends HandlerInterceptorAdapter { + + /** + * Adds clients request url (with parameters) to request. + */ + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + + request.setAttribute("requestUrlWithParameters", HttpServletRequestUtils.constructRequestUrlWithParameters(request)); + return true; + } + +} + diff --git a/saos-webapp/src/main/resources/message/common.properties b/saos-webapp/src/main/resources/message/common.properties index f7d07e90..a3f5ddf0 100644 --- a/saos-webapp/src/main/resources/message/common.properties +++ b/saos-webapp/src/main/resources/message/common.properties @@ -301,7 +301,8 @@ details.meta.releasedBy.neuter = wydane przez details.meta.releasedBy.feminine = wydana przez details.meta.releasedBy.masculine = wydany przez details.meta.withSignature = o sygnaturze -details.meta.containing = w składzie sędziowskim +details.meta.judges = w składzie sędziowskim: +details.meta.nationalAppealChamber = Krajową Izbę Odwoławczą judgmentDetails.meta.keywords = orzeczenie, portal orzeczeń judgmentDetails.button.fullText = Zobacz pełny tekst orzeczenia judgmentDetails.header = Orzeczenie diff --git a/saos-webapp/src/main/resources/message/common_pl.properties b/saos-webapp/src/main/resources/message/common_pl.properties index d0ea1690..1ec4836b 100644 --- a/saos-webapp/src/main/resources/message/common_pl.properties +++ b/saos-webapp/src/main/resources/message/common_pl.properties @@ -300,7 +300,8 @@ details.meta.releasedBy.neuter = wydane przez details.meta.releasedBy.feminine = wydana przez details.meta.releasedBy.masculine = wydany przez details.meta.withSignature = o sygnaturze -details.meta.containing = w składzie sędziowskim +details.meta.judges = w składzie sędziowskim: +details.meta.nationalAppealChamber = Krajową Izbę Odwoławczą judgmentDetails.meta.keywords = orzeczenie, portal orzeczeń judgmentDetails.button.fullText = Zobacz pełny tekst orzeczenia judgmentDetails.header = Orzeczenie diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/common/openGraphMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/common/openGraphMeta.jsp index fa04d445..1d24f0c9 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/common/openGraphMeta.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/common/openGraphMeta.jsp @@ -1,16 +1,12 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/WEB-INF/view/common/taglibs.jsp" %> - -${pageContextRequest.requestURL} - - -<%--Base url --%> - + <%-- Open graph ogp.me --%> - - - + + + + \ No newline at end of file diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp index 93a5403b..62fca351 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp @@ -6,10 +6,21 @@ <%-- JudgmentType --%> - - - - + + + + + + + + + + + + + + + <%-- CaseNumbers --%> @@ -48,8 +59,11 @@ - - + + + + + @@ -129,6 +143,10 @@ + + + + @@ -148,6 +166,10 @@ + + + + @@ -157,7 +179,7 @@ - + From 1633d22a6c64ebc294d1c8551de356f98b359f97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pawe=C5=82czak?= Date: Thu, 8 Oct 2015 09:53:38 +0200 Subject: [PATCH 08/10] #941. CR --- .../edu/icm/saos/common/http/HttpServletRequestUtilsTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/saos-common/src/test/java/pl/edu/icm/saos/common/http/HttpServletRequestUtilsTest.java b/saos-common/src/test/java/pl/edu/icm/saos/common/http/HttpServletRequestUtilsTest.java index 16b5aba5..41b89f54 100644 --- a/saos-common/src/test/java/pl/edu/icm/saos/common/http/HttpServletRequestUtilsTest.java +++ b/saos-common/src/test/java/pl/edu/icm/saos/common/http/HttpServletRequestUtilsTest.java @@ -213,7 +213,7 @@ public void constructRequestUrlWithParameters_NON_STANDARD_PORT() { } @Test - public void constructRequestUrlWithParameters_STANDARD_PORT_NO_QUERY() { + public void constructRequestUrlWithParameters_STANDARD_PORT() { // given when(request.getHeader("X-FORWARDED-PROTO")).thenReturn("https"); @@ -227,7 +227,7 @@ public void constructRequestUrlWithParameters_STANDARD_PORT_NO_QUERY() { } @Test - public void constructRequestUrlWithParameters_STANDARD_PORT() { + public void constructRequestUrlWithParameters_NO_QUERY() { // given when(request.getHeader("X-FORWARDED-PROTO")).thenReturn("https"); From 822e4c45b052e413ccecbce2e624ea631d9b1a2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pawe=C5=82czak?= Date: Fri, 9 Oct 2015 09:25:54 +0200 Subject: [PATCH 09/10] #941. CR5 --- .../saos/webapp/common/RequestURLInterceptor.java | 6 ++++-- .../src/main/webapp/WEB-INF/tags/caseNumber.tag | 7 +------ .../main/webapp/WEB-INF/tags/metaDescription.tag | 14 ++++++++++++++ .../webapp/WEB-INF/view/analysis/analysisMeta.jsp | 3 +-- .../WEB-INF/view/details/judgmentDetailsMeta.jsp | 2 +- .../WEB-INF/view/search/judgmentSearchMeta.jsp | 2 +- 6 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 saos-webapp/src/main/webapp/WEB-INF/tags/metaDescription.tag diff --git a/saos-webapp/src/main/java/pl/edu/icm/saos/webapp/common/RequestURLInterceptor.java b/saos-webapp/src/main/java/pl/edu/icm/saos/webapp/common/RequestURLInterceptor.java index 51d8c973..43af83c3 100644 --- a/saos-webapp/src/main/java/pl/edu/icm/saos/webapp/common/RequestURLInterceptor.java +++ b/saos-webapp/src/main/java/pl/edu/icm/saos/webapp/common/RequestURLInterceptor.java @@ -8,14 +8,16 @@ import pl.edu.icm.saos.common.http.HttpServletRequestUtils; /** - * Interceptor adds to request full url with parameters + * Interceptor adding the full request url (with parameters) to the intercepted request. + * The url is kept as a 'requestUrlWithParameters' request variable. * * @author Łukasz Pawełczak */ public class RequestURLInterceptor extends HandlerInterceptorAdapter { /** - * Adds clients request url (with parameters) to request. + * Adds a client request url string (with parameters) to the request + * as a variable named 'requestUrlWithParameters'. */ public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { diff --git a/saos-webapp/src/main/webapp/WEB-INF/tags/caseNumber.tag b/saos-webapp/src/main/webapp/WEB-INF/tags/caseNumber.tag index 9c884d0a..2d3b74f7 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/tags/caseNumber.tag +++ b/saos-webapp/src/main/webapp/WEB-INF/tags/caseNumber.tag @@ -3,9 +3,4 @@ <%@ attribute name="items" required="true" description="collection of case numbers to print" rtexprvalue="true" type="java.util.Collection" %> - - - - - - + diff --git a/saos-webapp/src/main/webapp/WEB-INF/tags/metaDescription.tag b/saos-webapp/src/main/webapp/WEB-INF/tags/metaDescription.tag new file mode 100644 index 00000000..2fd83403 --- /dev/null +++ b/saos-webapp/src/main/webapp/WEB-INF/tags/metaDescription.tag @@ -0,0 +1,14 @@ +<%@ include file="/WEB-INF/view/common/taglibs.jsp" %> +<%@ tag display-name="metaDescription" description="Prints meta description for page, when page has no request parameters." %> + +<%@ attribute name="code" required="true" description="Spring message code with description" rtexprvalue="true" %> + +<%-- Page description only for the root of the given page, for example for /search but not for /search?dateFrom... + Search engines usually omit page descriptions if they are the same for many pages +--%> + + + + + + \ No newline at end of file diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp index 5b48b7b9..bd7c50df 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp @@ -3,7 +3,7 @@ - + <%-- Open graph ogp.me --%> @@ -13,4 +13,3 @@ <spring:message code="pageTitle.analysis" /> - <spring:message code="saos.fullnameAndShortcut"/> - diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp index 62fca351..f67fff7b 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp @@ -163,7 +163,7 @@ - + diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp index 0d1b5bde..2c30fe99 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp @@ -3,7 +3,7 @@ - + <%-- Open graph ogp.me --%> From d4da9d00eca3d9483fc1bdd8191190f8aaf2eb45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pawe=C5=82czak?= Date: Mon, 12 Oct 2015 12:45:30 +0200 Subject: [PATCH 10/10] #941. CR --- .../main/webapp/WEB-INF/tags/metaDescription.tag | 14 -------------- .../src/main/webapp/WEB-INF/tags/metaTag.tag | 15 +++++++++++++++ .../webapp/WEB-INF/view/analysis/analysisMeta.jsp | 4 ++-- .../WEB-INF/view/search/judgmentSearchMeta.jsp | 4 ++-- 4 files changed, 19 insertions(+), 18 deletions(-) delete mode 100644 saos-webapp/src/main/webapp/WEB-INF/tags/metaDescription.tag create mode 100644 saos-webapp/src/main/webapp/WEB-INF/tags/metaTag.tag diff --git a/saos-webapp/src/main/webapp/WEB-INF/tags/metaDescription.tag b/saos-webapp/src/main/webapp/WEB-INF/tags/metaDescription.tag deleted file mode 100644 index 2fd83403..00000000 --- a/saos-webapp/src/main/webapp/WEB-INF/tags/metaDescription.tag +++ /dev/null @@ -1,14 +0,0 @@ -<%@ include file="/WEB-INF/view/common/taglibs.jsp" %> -<%@ tag display-name="metaDescription" description="Prints meta description for page, when page has no request parameters." %> - -<%@ attribute name="code" required="true" description="Spring message code with description" rtexprvalue="true" %> - -<%-- Page description only for the root of the given page, for example for /search but not for /search?dateFrom... - Search engines usually omit page descriptions if they are the same for many pages ---%> - - - - - - \ No newline at end of file diff --git a/saos-webapp/src/main/webapp/WEB-INF/tags/metaTag.tag b/saos-webapp/src/main/webapp/WEB-INF/tags/metaTag.tag new file mode 100644 index 00000000..7dd59f09 --- /dev/null +++ b/saos-webapp/src/main/webapp/WEB-INF/tags/metaTag.tag @@ -0,0 +1,15 @@ +<%@ include file="/WEB-INF/view/common/taglibs.jsp" %> +<%@ tag display-name="metaTag" description="Prints meta tag, when page has no request parameters." %> + +<%@ attribute name="name" required="true" description="Meta tag name, string." rtexprvalue="true" %> +<%@ attribute name="code" required="true" description="Meta tag content, spring message code." rtexprvalue="true" %> + +<%-- Page meta tag only for the root of the given page, for example for /search but not for /search?dateFrom... + Search engines usually omit page keywords, descriptions, etc. if they are the same for many pages +--%> + + + + + + \ No newline at end of file diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp index bd7c50df..72ff7c4e 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp @@ -2,8 +2,8 @@ <%@ include file="/WEB-INF/view/common/taglibs.jsp" %> - - + + <%-- Open graph ogp.me --%> diff --git a/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp index 2c30fe99..8f496436 100644 --- a/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp +++ b/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp @@ -2,8 +2,8 @@ <%@ include file="/WEB-INF/view/common/taglibs.jsp" %> - - + + <%-- Open graph ogp.me --%>