true
-
+
**/*min.css
@@ -395,5 +393,14 @@
htmlcompressor
${htmlcompressor.version}
+
+
+
+ org.tuckey
+ urlrewritefilter
+ 4.0.4
+
diff --git a/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/IndexController.java b/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/IndexController.java
index 99511107..f350ef51 100644
--- a/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/IndexController.java
+++ b/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/IndexController.java
@@ -94,6 +94,18 @@ public class IndexController {
private String defaultAlgorithm;
+ /**
+ * Give crawlers instructions
+ * searchEngineInclude = "yes"
+ * searchEngineInclude = "no" (default)
+ * = disallow search engines from showing HTML pages in their results
+ *
+ * can be override in the following file:
+ * /etc/contrast-finder/contrast-finder.conf
+ */
+ @Value("${searchEngineInclude:no}")
+ private String searchEngineInclude;
+
/**
* environment
* env = debug
@@ -146,6 +158,7 @@ else if ("HSV".equals(defaultAlgorithm) || "Rgb".equals(defaultAlgorithm)) {
model.addAttribute("env", env);
model.addAttribute("piwikKey", piwikAnalyticsKey);
model.addAttribute("piwikServer", piwikAnalyticServer);
+ model.addAttribute("searchEngineInclude", searchEngineInclude);
model.addAttribute(commandName, colorModel);
return mainPageView;
}
@@ -169,6 +182,7 @@ public String getPageResultFromGet( final Model model,
model.addAttribute("env", env);
model.addAttribute("piwikKey", piwikAnalyticsKey); /* Analytics Keys*/
model.addAttribute("piwikServer", piwikAnalyticServer);
+ model.addAttribute("searchEngineInclude", searchEngineInclude);
model.addAttribute("defaultAlgorithm", defaultAlgorithm);
model.addAttribute("algo", colorModel.getAlgo());
if (result.hasErrors()) {
diff --git a/webapp/src/main/webapp/Images/logo/favicon/browserconfig.xml b/webapp/src/main/webapp/Images/logo/favicon/browserconfig.xml
deleted file mode 100644
index 0dc493e6..00000000
--- a/webapp/src/main/webapp/Images/logo/favicon/browserconfig.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
- #2d89ef
-
-
-
diff --git a/webapp/src/main/webapp/WEB-INF/pages/error/error_4xx.html b/webapp/src/main/webapp/WEB-INF/pages/error/error_4xx.html
new file mode 100644
index 00000000..9113eada
--- /dev/null
+++ b/webapp/src/main/webapp/WEB-INF/pages/error/error_4xx.html
@@ -0,0 +1,24 @@
+
+
+
+
+ Error: not found on this server / Contrast-Finder
+
+
+
+ Not Found
+ The requested URL was not found on this server.
+
+
diff --git a/webapp/src/main/webapp/WEB-INF/pages/error/error_5xx.html b/webapp/src/main/webapp/WEB-INF/pages/error/error_5xx.html
new file mode 100644
index 00000000..1f52fe87
--- /dev/null
+++ b/webapp/src/main/webapp/WEB-INF/pages/error/error_5xx.html
@@ -0,0 +1,24 @@
+
+
+
+
+ Error: the server failed to fulfil this request / Contrast-Finder
+
+
+
+ Server error
+ The server failed to fulfil this request.
+
+
diff --git a/webapp/src/main/webapp/WEB-INF/pages/form.jsp b/webapp/src/main/webapp/WEB-INF/pages/form.jsp
index befa7483..81168f3f 100644
--- a/webapp/src/main/webapp/WEB-INF/pages/form.jsp
+++ b/webapp/src/main/webapp/WEB-INF/pages/form.jsp
@@ -21,15 +21,9 @@
<%-- DEBUG contrast-finder.conf --%>
-
- env ${env}
- defaultAlgorithm ${defaultAlgorithm}
- cookie.algo ${cookie.algo.value}
- algo ${algo}
-
+ <%@include file='/WEB-INF/template/env_debug-info.jspf' %>
-
<%-- ===== FORM ========================================================================================= --%>
" alt="Correct contrast"/>
+ 