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:
+ * + */ + 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:
+ * + */ + 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..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 @@ -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() { + + // 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_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(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 f3586f02..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; @@ -78,6 +79,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); } @@ -102,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..43af83c3 --- /dev/null +++ b/saos-webapp/src/main/java/pl/edu/icm/saos/webapp/common/RequestURLInterceptor.java @@ -0,0 +1,29 @@ +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 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 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 { + + 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 4a113c19..a3f5ddf0 100644 --- a/saos-webapp/src/main/resources/message/common.properties +++ b/saos-webapp/src/main/resources/message/common.properties @@ -1,4 +1,6 @@ +saos.shortname = SAOS saos.fullname = System Analizy Orzeczeń Sądowych +saos.fullnameAndShortcut = System Analizy Orzeczeń Sądowych - SAOS choose = Wybierz more = Więcej @@ -30,6 +32,10 @@ button.resetForm = Czyść formularz button.close = Zamknij 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 */ @@ -153,7 +159,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 +171,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 @@ -187,6 +194,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 @@ -288,6 +296,14 @@ courtCriteriaFormSection.hint.administrativeCourt.content = Dane nie zostały na /* Judgment details view */ +details.meta.judgment = Orzeczenie +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.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 judgmentDetails.judgmentFullText = Pełny tekst orzeczenia @@ -355,6 +371,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, 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 a4b75675..1ec4836b 100644 --- a/saos-webapp/src/main/resources/message/common_pl.properties +++ b/saos-webapp/src/main/resources/message/common_pl.properties @@ -1,4 +1,6 @@ +saos.shortname = SAOS saos.fullname = System Analizy Orzeczeń Sądowych +saos.fullnameAndShortcut = System Analizy Orzeczeń Sądowych - SAOS choose = Wybierz more = Więcej @@ -30,6 +32,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 +159,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 +171,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 +193,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 +295,14 @@ courtCriteriaFormSection.hint.administrativeCourt.content = Dane nie zostały na /* Judgment details view */ +details.meta.judgment = Orzeczenie +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.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 judgmentDetails.judgmentFullText = Pełny tekst orzeczenia @@ -354,6 +370,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, 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..c4c25d9c 100644 --- a/saos-webapp/src/main/resources/saos.default.properties +++ b/saos-webapp/src/main/resources/saos.default.properties @@ -96,4 +96,6 @@ piwik.siteId = 0 # ehcache configuration file path -ehcache.configurationFilePath = classpath:ehcache.xml \ No newline at end of file +ehcache.configurationFilePath = classpath:ehcache.xml + + 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..cc08bbd2 --- /dev/null +++ b/saos-webapp/src/main/webapp/WEB-INF/sitemap.xml @@ -0,0 +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 + + 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..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 @@ -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/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/enum.tag b/saos-webapp/src/main/webapp/WEB-INF/tags/enum.tag index 6a7ba39b..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,5 +5,5 @@ - - \ 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/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/analysis.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysis.jsp index c8b8e3f6..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" %> +
@@ -10,8 +25,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..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 new file mode 100644 index 00000000..72ff7c4e --- /dev/null +++ b/saos-webapp/src/main/webapp/WEB-INF/view/analysis/analysisMeta.jsp @@ -0,0 +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.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 new file mode 100644 index 00000000..1d24f0c9 --- /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 --%> + + + + + + \ No newline at end of file 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/common/saosLogo.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/common/saosLogo.jsp new file mode 100644 index 00000000..4149f773 --- /dev/null +++ b/saos-webapp/src/main/webapp/WEB-INF/view/common/saosLogo.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" %> + + + + - " /> + + + + <spring:message code= - " /> + + 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..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,14 +1,12 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/WEB-INF/view/common/taglibs.jsp" %> - - + + +
@@ -28,7 +26,6 @@ $(document).ready(function() {
-
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..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 new file mode 100644 index 00000000..f67fff7b --- /dev/null +++ b/saos-webapp/src/main/webapp/WEB-INF/view/details/judgmentDetailsMeta.jsp @@ -0,0 +1,198 @@ +<%@ 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 --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- Open graph ogp.me --%> +<%@ include file="../common/openGraphMeta.jsp" %> + - "> + + + + +<%-- title --%> +<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/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 new file mode 100644 index 00000000..bd333e86 --- /dev/null +++ b/saos-webapp/src/main/webapp/WEB-INF/view/home/homeMeta.jsp @@ -0,0 +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.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 5748d6e0..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 @@ -2,16 +2,16 @@ <%@ 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/search/judgmentSearchContent.jsp b/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchContent.jsp index 6ff4b19d..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 new file mode 100644 index 00000000..8f496436 --- /dev/null +++ b/saos-webapp/src/main/webapp/WEB-INF/view/search/judgmentSearchMeta.jsp @@ -0,0 +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.fullnameAndShortcut"/> 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 12c6c92c..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,18 @@ - - - - <%@ include file="pageDescription.jsp" %> - - + + + + + <%-- bing verification --%> + + + + + - - <%@ 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