From 59f6cd01bb722a9802a18703c66c7d4d0a75d33e Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sat, 31 Dec 2016 00:32:12 +0100 Subject: [PATCH 01/18] set version to 0.4.1-dev --- CHANGELOG.md | 19 +++++++++++++++++++ contrast-finder-api/pom.xml | 4 ++-- contrast-finder-hsv/pom.xml | 4 ++-- contrast-finder-impl/pom.xml | 4 ++-- contrast-finder-resources/pom.xml | 4 ++-- contrast-finder-utils/pom.xml | 4 ++-- contrast-finder-webapp/pom.xml | 4 ++-- .../main/webapp/WEB-INF/template/footer.jspf | 2 +- docker/RELEASE/Dockerfile | 8 ++++---- docker/SNAPSHOT-local_from-Ubuntu/Dockerfile | 2 +- pom.xml | 2 +- 11 files changed, 38 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1277e9b2..683da3c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,23 @@ +Contrast-Finder 0.4.x, 2017-xx-xx +--------------------------------- + +Features: +None + +Security: +None + +Bugs: +None + +Configuration: +None + +Documentation: +None + + Contrast-Finder 0.4.0, 2016-12-30 --------------------------------- diff --git a/contrast-finder-api/pom.xml b/contrast-finder-api/pom.xml index a7972e98..07f3abb0 100644 --- a/contrast-finder-api/pom.xml +++ b/contrast-finder-api/pom.xml @@ -4,11 +4,11 @@ org.opens contrast-finder - 0.4.0 + 0.4.1-dev contrast-finder-api - 0.4.0 + 0.4.1-dev jar contrast-finder-api diff --git a/contrast-finder-hsv/pom.xml b/contrast-finder-hsv/pom.xml index fa43649e..ad1a7676 100644 --- a/contrast-finder-hsv/pom.xml +++ b/contrast-finder-hsv/pom.xml @@ -4,10 +4,10 @@ org.opens contrast-finder - 0.4.0 + 0.4.1-dev contrast-finder-hsv - 0.4.0 + 0.4.1-dev jar contrast-finder-hsv diff --git a/contrast-finder-impl/pom.xml b/contrast-finder-impl/pom.xml index a9831687..bd016424 100644 --- a/contrast-finder-impl/pom.xml +++ b/contrast-finder-impl/pom.xml @@ -4,10 +4,10 @@ org.opens contrast-finder - 0.4.0 + 0.4.1-dev contrast-finder-impl - 0.4.0 + 0.4.1-dev jar contrast-finder-impl diff --git a/contrast-finder-resources/pom.xml b/contrast-finder-resources/pom.xml index a735d0e9..e0491025 100644 --- a/contrast-finder-resources/pom.xml +++ b/contrast-finder-resources/pom.xml @@ -5,10 +5,10 @@ org.opens contrast-finder - 0.4.0 + 0.4.1-dev contrast-finder-resources - 0.4.0 + 0.4.1-dev contrast-finder-resources http://maven.apache.org diff --git a/contrast-finder-utils/pom.xml b/contrast-finder-utils/pom.xml index 0895a490..0fb42703 100644 --- a/contrast-finder-utils/pom.xml +++ b/contrast-finder-utils/pom.xml @@ -4,10 +4,10 @@ org.opens contrast-finder - 0.4.0 + 0.4.1-dev contrast-finder-utils - 0.4.0 + 0.4.1-dev jar contrast-finder-utils diff --git a/contrast-finder-webapp/pom.xml b/contrast-finder-webapp/pom.xml index 9f12f02e..d3c4f288 100644 --- a/contrast-finder-webapp/pom.xml +++ b/contrast-finder-webapp/pom.xml @@ -4,10 +4,10 @@ org.opens contrast-finder - 0.4.0 + 0.4.1-dev contrast-finder-webapp - 0.4.0 + 0.4.1-dev war contrast-finder-webapp diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf index f2436952..ae679f01 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf @@ -8,7 +8,7 @@
- +
@@ -64,7 +64,7 @@
- +
From 37dd987d664609c0c75a878668666a33a091e8a4 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Thu, 5 Jan 2017 23:24:43 +0100 Subject: [PATCH 09/18] typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 30837ab3..c263d678 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Just to **provide contrast solutions** ! All tools just tell you whether the contrast is good or not, which is fine... but insufficient. Webdesigners / webdevelopers need to easily have a good contrast. -That's the purpose of [Contrast-Finder](https://contrast-finder.org/) +That's the purpose of [Contrast-Finder.org](https://contrast-finder.org/) ## Documentation How to build, install and use ? From e61167b064d74a30b74f11be71e0714ac7693823 Mon Sep 17 00:00:00 2001 From: Matthieu FAURE Date: Sat, 7 Jan 2017 21:31:27 +0100 Subject: [PATCH 10/18] Fixed edge cases on tests --- docker/compile_and_build_docker_image.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/compile_and_build_docker_image.sh b/docker/compile_and_build_docker_image.sh index ecc91fbe..8f0bd953 100755 --- a/docker/compile_and_build_docker_image.sh +++ b/docker/compile_and_build_docker_image.sh @@ -135,10 +135,10 @@ function kill_previous_container() { RUNNING=$(${SUDO} docker inspect --format="{{ .State.Status }}" ${CONTAINER_NAME} 2>/dev/null) set -e - if [ ${RUNNING} == "running" ]; then + if [ "${RUNNING}" == "running" ]; then ${SUDO} docker stop ${CONTAINER_NAME} ${SUDO} docker rm ${CONTAINER_NAME} - elif [ ${RUNNING} == "exited" ]; then + elif [ "${RUNNING}" == "exited" ]; then ${SUDO} docker rm ${CONTAINER_NAME} fi } @@ -170,7 +170,7 @@ function do_docker_run() { set +e RESULT=$(curl -o /dev/null --silent --write-out '%{http_code}\n' ${URL}) set -e - if [ ${RESULT} == "000" ]; then + if [ "${RESULT}" == "000" ]; then DOCKER_RUN="${SUDO} docker run -p ${ADD_IP}${CONTAINER_EXPOSED_PORT}:8080 --name ${CONTAINER_NAME} -d ${IMAGE_NAME}:${TAG_NAME}" eval ${DOCKER_RUN} else @@ -186,7 +186,7 @@ function do_docker_run() { set +e RESULT=$(curl -o /dev/null --silent --write-out '%{http_code}\n' ${URL}) set -e - if [ ${RESULT} == "200" ]; then + if [ "${RESULT}" == "200" ]; then echo "... it's done ... ${RESULT}" else ((time+=1)) From 50c063d2941dd1946029224fdfe94403b8249dbd Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Wed, 21 Dec 2016 04:46:16 +0100 Subject: [PATCH 11/18] Dockerfile FROM tomcat:8.0-jre7 : not working (WIP) --- docker/SNAPSHOT-local_from-Tomcat/Dockerfile | 44 ++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 docker/SNAPSHOT-local_from-Tomcat/Dockerfile diff --git a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile new file mode 100644 index 00000000..6598f18f --- /dev/null +++ b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile @@ -0,0 +1,44 @@ +FROM tomcat:8.0-jre7 +MAINTAINER Fabrice Gangler + +# ########################################################## +# +# DISCLAIMER +# +# #### usage ###################################################### +# +# +# #### FROM ###################################################### +# tomcat:8.0-jre7 https://github.com/docker-library/tomcat/blob/master/8.0/jre7/Dockerfile +# |-- openjdk:7-jre https://github.com/docker-library/openjdk/blob/master/7-jre/Dockerfile +# |-- buildpack-deps:jessie-curl https://github.com/docker-library/buildpack-deps/blob/master/jessie/curl/Dockerfile +# |-- debian:jessie https://github.com/tianon/docker-brew-debian/blob/master/jessie/Dockerfile +################################################################### + +# build variables +ARG GIT_BRANCH=master + +# Add .war +# ADD contrast-finder-webapp-0.3.6-dev.war /var/lib/tomcat8/webapps/ +# ADD contrast-finder-webapp-0.3.6-dev.war /usr/local/tomcat/webapps + +ADD contrast-finder-webapp-0.3.6-dev.war /root + + +# build +RUN cd /root && mv -v contrast-*.war contrast-finder.war +RUN mv -v /root/contrast-finder.war /usr/local/tomcat/webapps +RUN mkdir -p /var/log/contrast-finder/ +RUN mkdir -p /etc/contrast-finder/ +RUN touch /var/log/contrast-finder/contrast-finder.log +RUN touch /etc/contrast-finder/contrast-finder.conf +RUN echo "piwik_analytics_key=\"\"" >> /etc/contrast-finder/contrast-finder.conf +RUN echo "google_analytics_key=\"\"" >> /etc/contrast-finder/contrast-finder.conf +# RUN chown -R tomcat /var/log/contrast-finder/ +# RUN chown -R tomcat /etc/contrast-finder/ + + + + + + From f0aeeb17cffe56d3818012f098141c7175f8cbda Mon Sep 17 00:00:00 2001 From: Matthieu FAURE Date: Sat, 7 Jan 2017 21:32:12 +0100 Subject: [PATCH 12/18] Enhanced docker image based on Tomcat7 (still WIP) --- docker/README.md | 3 -- docker/SNAPSHOT-local_from-Tomcat/Dockerfile | 37 ++++++++++---------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/docker/README.md b/docker/README.md index 0fc0eabd..1b56e9b1 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,8 +1,5 @@ - - # Docker - ## Builds and runs a container - builds Contrast-Finder from sources, diff --git a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile index 6598f18f..344fdc6d 100644 --- a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile +++ b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile @@ -1,4 +1,4 @@ -FROM tomcat:8.0-jre7 +FROM tomcat:7.0-jre7 MAINTAINER Fabrice Gangler # ########################################################## @@ -15,27 +15,28 @@ MAINTAINER Fabrice Gangler # |-- debian:jessie https://github.com/tianon/docker-brew-debian/blob/master/jessie/Dockerfile ################################################################### -# build variables -ARG GIT_BRANCH=master +# environment variables +ENV CONTRAST_FINDER_RELEASE="0.4.1-dev" +ENV TOMCAT_WEBAPP_DIR="/usr/local/tomcat/webapps" -# Add .war -# ADD contrast-finder-webapp-0.3.6-dev.war /var/lib/tomcat8/webapps/ -# ADD contrast-finder-webapp-0.3.6-dev.war /usr/local/tomcat/webapps +# Prepare Contrast-Finder +RUN mkdir -p /var/log/contrast-finder/ \ + && mkdir -p /etc/contrast-finder/ \ + && touch /var/log/contrast-finder/contrast-finder.log \ + && touch /etc/contrast-finder/contrast-finder.conf \ + && echo "piwik_analytics_key=\"\"" >> /etc/contrast-finder/contrast-finder.conf \ + && echo "google_analytics_key=\"\"" >> /etc/contrast-finder/contrast-finder.conf \ -ADD contrast-finder-webapp-0.3.6-dev.war /root +# TODO add Spring Instrument Tomcat for Tomcat 7 (as this image is based on Tomcat7) +# Add Contrast-Finder .war +ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz /root -# build -RUN cd /root && mv -v contrast-*.war contrast-finder.war -RUN mv -v /root/contrast-finder.war /usr/local/tomcat/webapps -RUN mkdir -p /var/log/contrast-finder/ -RUN mkdir -p /etc/contrast-finder/ -RUN touch /var/log/contrast-finder/contrast-finder.log -RUN touch /etc/contrast-finder/contrast-finder.conf -RUN echo "piwik_analytics_key=\"\"" >> /etc/contrast-finder/contrast-finder.conf -RUN echo "google_analytics_key=\"\"" >> /etc/contrast-finder/contrast-finder.conf -# RUN chown -R tomcat /var/log/contrast-finder/ -# RUN chown -R tomcat /etc/contrast-finder/ +# Install Contrast-Finder +RUN cd /root/contrast-*/install/ && \ + mv -v contrast-*.war contrast-finder.war && \ + mv -v contrast-*.war ${TOMCAT_WEBAPP_DIR} && \ + rm -rf /root/contrast-* From 5cc6900307bce4219f8a58278b4b3aec65dbc36e Mon Sep 17 00:00:00 2001 From: Matthieu FAURE Date: Sun, 8 Jan 2017 10:36:22 +0100 Subject: [PATCH 13/18] Docker image based on Tomcat7 image OK --- docker/SNAPSHOT-local_from-Tomcat/Dockerfile | 16 +++++++--------- .../spring3-instrument-tomcat-3.x.jar | Bin 0 -> 10427 bytes docker/compile_and_build_docker_image.sh | 3 --- 3 files changed, 7 insertions(+), 12 deletions(-) create mode 100644 docker/SNAPSHOT-local_from-Tomcat/spring3-instrument-tomcat-3.x.jar diff --git a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile index 344fdc6d..ee00382d 100644 --- a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile +++ b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile @@ -9,7 +9,7 @@ MAINTAINER Fabrice Gangler # # # #### FROM ###################################################### -# tomcat:8.0-jre7 https://github.com/docker-library/tomcat/blob/master/8.0/jre7/Dockerfile +# tomcat:7.0-jre7 https://github.com/docker-library/tomcat/blob/master/7.0/jre7/Dockerfile # |-- openjdk:7-jre https://github.com/docker-library/openjdk/blob/master/7-jre/Dockerfile # |-- buildpack-deps:jessie-curl https://github.com/docker-library/buildpack-deps/blob/master/jessie/curl/Dockerfile # |-- debian:jessie https://github.com/tianon/docker-brew-debian/blob/master/jessie/Dockerfile @@ -25,9 +25,13 @@ RUN mkdir -p /var/log/contrast-finder/ \ && touch /var/log/contrast-finder/contrast-finder.log \ && touch /etc/contrast-finder/contrast-finder.conf \ && echo "piwik_analytics_key=\"\"" >> /etc/contrast-finder/contrast-finder.conf \ - && echo "google_analytics_key=\"\"" >> /etc/contrast-finder/contrast-finder.conf \ + && echo "google_analytics_key=\"\"" >> /etc/contrast-finder/contrast-finder.conf -# TODO add Spring Instrument Tomcat for Tomcat 7 (as this image is based on Tomcat7) +# Add Spring Instrument Tomcat for Tomcat 7 (as this image is based on Tomcat7) +# +# Remark: **not** working for Tomcat 8, see +# http://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.html +ADD spring3-instrument-tomcat-3.x.jar /usr/local/tomcat/lib # Add Contrast-Finder .war ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz /root @@ -37,9 +41,3 @@ RUN cd /root/contrast-*/install/ && \ mv -v contrast-*.war contrast-finder.war && \ mv -v contrast-*.war ${TOMCAT_WEBAPP_DIR} && \ rm -rf /root/contrast-* - - - - - - diff --git a/docker/SNAPSHOT-local_from-Tomcat/spring3-instrument-tomcat-3.x.jar b/docker/SNAPSHOT-local_from-Tomcat/spring3-instrument-tomcat-3.x.jar new file mode 100644 index 0000000000000000000000000000000000000000..6e1095ca408dddc7782fa221f9397348e070aaaa GIT binary patch literal 10427 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 D#%ZzV literal 0 HcmV?d00001 diff --git a/docker/compile_and_build_docker_image.sh b/docker/compile_and_build_docker_image.sh index 8f0bd953..66fbb605 100755 --- a/docker/compile_and_build_docker_image.sh +++ b/docker/compile_and_build_docker_image.sh @@ -162,8 +162,6 @@ function do_docker_build() { fail "Error building container" } - - function do_docker_run() { kill_previous_container @@ -177,7 +175,6 @@ function do_docker_run() { fail "${CONTAINER_EXPOSED_PORT} port is already allocated" fi - # wait a bit to let container start # test if URL responds with 200 time=0 From 4b9dc7cdd6e1152d1d76e46a8970892c0976292b Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Mon, 9 Jan 2017 01:35:44 +0100 Subject: [PATCH 14/18] typo Tomcat/Dockerfile --- docker/SNAPSHOT-local_from-Tomcat/Dockerfile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile index ee00382d..358e66c3 100644 --- a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile +++ b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile @@ -1,15 +1,24 @@ FROM tomcat:7.0-jre7 -MAINTAINER Fabrice Gangler # ########################################################## # # DISCLAIMER # # #### usage ###################################################### -# +# +# --- Building this docker image +# docker build -t asqatasun/contrast-finder:SNAPSHOT_local_tomcat . +# +# --- Launch a container +# docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder:SNAPSHOT_local_tomcat +# +# --- Playing with this docker image +# docker exec -ti contrast.finder /bin/bash +# docker logs -f contrast.finder +# # # #### FROM ###################################################### -# tomcat:7.0-jre7 https://github.com/docker-library/tomcat/blob/master/7.0/jre7/Dockerfile +# tomcat:7.0-jre7 https://github.com/docker-library/tomcat/blob/master/7/jre7/Dockerfile # |-- openjdk:7-jre https://github.com/docker-library/openjdk/blob/master/7-jre/Dockerfile # |-- buildpack-deps:jessie-curl https://github.com/docker-library/buildpack-deps/blob/master/jessie/curl/Dockerfile # |-- debian:jessie https://github.com/tianon/docker-brew-debian/blob/master/jessie/Dockerfile From 15923edb0ba1fab223e640891adab2cac88e0245 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Thu, 12 Jan 2017 01:02:10 +0100 Subject: [PATCH 15/18] Added useHttpOnly flag for session ID (fixed #9) Should the HttpOnly flag be set on session cookies to prevent client side script from accessing the session ID fixed #9 "don't expose session ID in the URL" --- contrast-finder-webapp/src/main/webapp/META-INF/context.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrast-finder-webapp/src/main/webapp/META-INF/context.xml b/contrast-finder-webapp/src/main/webapp/META-INF/context.xml index b1cadc63..705a416e 100644 --- a/contrast-finder-webapp/src/main/webapp/META-INF/context.xml +++ b/contrast-finder-webapp/src/main/webapp/META-INF/context.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file From 7620e911864dcb2384101380c2d64d38cfa87209 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Thu, 12 Jan 2017 22:02:11 +0100 Subject: [PATCH 16/18] typo --- CHANGELOG.md | 2 +- .../resources/i18n/color-finder.properties | 34 ++++++++++++++++--- .../resources/i18n/color-finder_en.properties | 34 ++++++++++++++++--- .../resources/i18n/color-finder_fr.properties | 20 +++++++---- .../src/main/webapp/WEB-INF/pages/form.jsp | 5 +++ .../main/webapp/WEB-INF/template/footer.jspf | 2 +- 6 files changed, 79 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 683da3c1..7cafdb84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ Features: None Security: -None +- [#9 don't expose session ID in the URL](https://github.com/Asqatasun/Contrast-Finder/issues/9) Bugs: None diff --git a/contrast-finder-webapp/src/main/resources/i18n/color-finder.properties b/contrast-finder-webapp/src/main/resources/i18n/color-finder.properties index 1da35341..f3c10e29 100644 --- a/contrast-finder-webapp/src/main/resources/i18n/color-finder.properties +++ b/contrast-finder-webapp/src/main/resources/i18n/color-finder.properties @@ -1,15 +1,16 @@ NOT_A_VALID_COLOR=The color should be between #000000 and #FFFFFF +NOT_A_VALID_RATIO.colorModel.ratio=Wrong ratio home.titleTag=Contrast Finder, find correct color contrasts for web accessibility (WCAG) home.metaDescription=Contrast-Finder finds correct color contrasts for web accessibility (WCAG). This helps you in satisfying web accessibility (a11y) tests on contrasts. form.fillInFields=Please fill in the following fields : form.description=Contrast-Finder finds correct color contrasts for web accessibility form.help=The color should be between #000000 and #FFFFFF -form.foregroundColor=Foreground Color : -form.backgroundColor=Background Color : -form.component=Component to edit : +form.foregroundColor=Foreground Color +form.backgroundColor=Background Color +form.component=Component to edit form.componentForeground=Edit the foreground color form.componentBackground=Edit the background color -form.ratio=Minimum ratio : +form.ratio=Minimum ratio form.contrastOld=Old contrast form.contrastNew=New contrast form.validate=Check and find contrast @@ -33,7 +34,7 @@ form.sc-info=requires text to have a minimum contrast ratio of 4.5:1 (and 3:1 fo footer.LikedCf=Liked Contrast-Finder ?
Try Asqatasun, the opensource website analyser for accessibility form.contrastSolutionDistance=Distance form.contrastSolutionDistanceEx=Distance from initial color -form.objectifs=Gimme : +form.objectifs=Gimme form.algoHSV=a range of valid colors form.algoRGB=valid colors and very closed to initial color form.invalidColor=Invalid color @@ -51,3 +52,26 @@ footer.poweredBy=Powered by footer.availableUnder=available under footer.link-twitter=Follow Asqatasun on Twitter footer.link-git=Contributing to Contrast-Finder on GitHub +home.noResultTxt=

Help

\ +

Component to edit

\ +

It is either the foreground or the background. Default is foreground.

\ +

The component you choose will be modified until we find a valid color. The other color won't change.

\ +

The ratio

\ +

Three possible values 3, 4.5 and 7.

\ +

All details about the contrast ratio:

\ +\ +\ + +form.results=Results +form.usage=Usage : +form.ratioMedium=Small text (size < 18px, Level AA) +form.ratioShort=Big text (size ≥ 18px, Level AA) +form.ratioHigh=Strenghten contrast (Level AAA) + +form.description_v2=Find me the good constrasts, for web accessibility, between these two colors: +form.tryRgb_v2=Gimme valid colors and very close to initial color \ No newline at end of file diff --git a/contrast-finder-webapp/src/main/resources/i18n/color-finder_en.properties b/contrast-finder-webapp/src/main/resources/i18n/color-finder_en.properties index 1da35341..f3c10e29 100644 --- a/contrast-finder-webapp/src/main/resources/i18n/color-finder_en.properties +++ b/contrast-finder-webapp/src/main/resources/i18n/color-finder_en.properties @@ -1,15 +1,16 @@ NOT_A_VALID_COLOR=The color should be between #000000 and #FFFFFF +NOT_A_VALID_RATIO.colorModel.ratio=Wrong ratio home.titleTag=Contrast Finder, find correct color contrasts for web accessibility (WCAG) home.metaDescription=Contrast-Finder finds correct color contrasts for web accessibility (WCAG). This helps you in satisfying web accessibility (a11y) tests on contrasts. form.fillInFields=Please fill in the following fields : form.description=Contrast-Finder finds correct color contrasts for web accessibility form.help=The color should be between #000000 and #FFFFFF -form.foregroundColor=Foreground Color : -form.backgroundColor=Background Color : -form.component=Component to edit : +form.foregroundColor=Foreground Color +form.backgroundColor=Background Color +form.component=Component to edit form.componentForeground=Edit the foreground color form.componentBackground=Edit the background color -form.ratio=Minimum ratio : +form.ratio=Minimum ratio form.contrastOld=Old contrast form.contrastNew=New contrast form.validate=Check and find contrast @@ -33,7 +34,7 @@ form.sc-info=requires text to have a minimum contrast ratio of 4.5:1 (and 3:1 fo footer.LikedCf=Liked Contrast-Finder ?
Try Asqatasun, the opensource website analyser for accessibility form.contrastSolutionDistance=Distance form.contrastSolutionDistanceEx=Distance from initial color -form.objectifs=Gimme : +form.objectifs=Gimme form.algoHSV=a range of valid colors form.algoRGB=valid colors and very closed to initial color form.invalidColor=Invalid color @@ -51,3 +52,26 @@ footer.poweredBy=Powered by footer.availableUnder=available under footer.link-twitter=Follow Asqatasun on Twitter footer.link-git=Contributing to Contrast-Finder on GitHub +home.noResultTxt=

Help

\ +

Component to edit

\ +

It is either the foreground or the background. Default is foreground.

\ +

The component you choose will be modified until we find a valid color. The other color won't change.

\ +

The ratio

\ +

Three possible values 3, 4.5 and 7.

\ +

All details about the contrast ratio:

\ +\ +\ + +form.results=Results +form.usage=Usage : +form.ratioMedium=Small text (size < 18px, Level AA) +form.ratioShort=Big text (size ≥ 18px, Level AA) +form.ratioHigh=Strenghten contrast (Level AAA) + +form.description_v2=Find me the good constrasts, for web accessibility, between these two colors: +form.tryRgb_v2=Gimme valid colors and very close to initial color \ No newline at end of file diff --git a/contrast-finder-webapp/src/main/resources/i18n/color-finder_fr.properties b/contrast-finder-webapp/src/main/resources/i18n/color-finder_fr.properties index 1c270e70..884fb3d4 100644 --- a/contrast-finder-webapp/src/main/resources/i18n/color-finder_fr.properties +++ b/contrast-finder-webapp/src/main/resources/i18n/color-finder_fr.properties @@ -1,15 +1,16 @@ NOT_A_VALID_COLOR=La couleur doit \u00eatre entre #000000 \u00e0 #FFFFFF +NOT_A_VALID_RATIO.colorModel.ratio=Le ratio n'est pas valide home.titleTag=Contrast Finder, trouvez le bon contraste pour vos couleurs, accessibilit\u00e9 web (WCAG / RGAA) home.metaDescription=Outil en ligne pour v\u00e9rifier si le contrate de vos couleurs est accessible. Contrat-Finder propose des jeux de couleurs accessibles proches de celles que vous venez de tester. Accessibilit\u00e9 web (WCAG / RGAA) form.fillInFields=Renseignez les champs suivants : form.description=Contrast-Finder trouve les bons contrastes de couleurs pour l'accessibilit\u00e9 web form.help=La couleur doit \u00eatre comprise entre #000000 \u00e0 #FFFFFF -form.foregroundColor=Couleur du texte : -form.backgroundColor=Couleur du fond : -form.component=Composante \u00e0 modifier : +form.foregroundColor=Couleur du texte +form.backgroundColor=Couleur du fond +form.component=Composante \u00e0 modifier form.componentForeground=Modifier la couleur du texte form.componentBackground=Modifier la couleur du fond -form.ratio=Ratio minimum : +form.ratio=Ratio minimum form.contrastOld=Ancien contraste form.contrastNew=Nouveau contraste form.validate=Verifier et trouver le contraste @@ -33,7 +34,7 @@ form.sc-info=demande pour le texte un rapport de contraste minimum de 4.5:1 (et footer.LikedCf=Tu kiffes Contrast-Finder ?
Essaye Asqatasun, le logiciel libre de mesure de l'accessibilit\u00e9 form.contrastSolutionDistance=Distance form.contrastSolutionDistanceEx=Distance de la couleur d'origine -form.objectifs=Propose-moi : +form.objectifs=Propose-moi form.algoHSV=une palette de couleurs valides form.algoRGB=les couleurs valides et tr\u00e8s proches de la couleur initiale form.invalidColor=Couleur invalide @@ -46,8 +47,15 @@ form.notSatisfied=Pas satisfait ? form.anyResult= form.oppositeComponentForeground=couleur du fond form.oppositeComponentBackground=couleur du texte -message.addon=Hey ! Avez-vous test\u00e9 la nouvelle \nextension Firefox de Asqatasun Contrast-Finder ? +message.addon=Hey ! Avez-vous test\u00e9 la nouvelle \nextension Firefox de Contrast-Finder ? footer.poweredBy=Propulsé par footer.availableUnder=disponible sous licence footer.link-twitter = Suivez Asqatasun sur Twitter footer.link-git = Contribuer au logiciel Contrast-Finder sur GitHub +home.noResultTxt= + +form.results=Resultats +form.usage=Utilisation : +form.ratioMedium=Texte petit (Taille < 18px, Niveau AA) +form.ratioShort=Grand texte (Taille ≥ 18px, Niveau AA) +form.ratioHigh=Renforcer le contraste (Niveau AAA) \ No newline at end of file diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp b/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp index 439de388..b53f85f4 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp @@ -145,6 +145,11 @@
+ + + + + <%-- Good contrast: nothing to do --%> diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf index ae679f01..a4d4fd9d 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf @@ -13,7 +13,7 @@ GNU AGPL v3

© 2013- - - Contrast-Finder.org + - Contrast-Finder.org - Contact " href="https://twitter.com/Asqatasun">@Asqatasun

From 60eee24a85946d2e0f2a762512b4599c47194fa4 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Thu, 12 Jan 2017 22:41:39 +0100 Subject: [PATCH 17/18] Updated RELEASE/Dockerfile --- docker/RELEASE/Dockerfile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/docker/RELEASE/Dockerfile b/docker/RELEASE/Dockerfile index 540ccb68..f2d955a3 100644 --- a/docker/RELEASE/Dockerfile +++ b/docker/RELEASE/Dockerfile @@ -29,14 +29,16 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu # build variables ARG CONTRAST_FINDER_RELEASE="0.4.1-dev" ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}" -ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder-webapp-${CONTRAST_FINDER_RELEASE}.war" +ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz" # Install contrast-finder -RUN cd /root/ && \ - wget ${SRC_URL} && \ - mv -v /root/contrast-*.war /root/contrast-finder.war && \ - mv -v /root/contrast-finder.war /var/lib/tomcat7/webapps - +RUN cd /root/ && \ + wget ${SRC_URL} && \ + tar -xzvf contrast-*.tar.gz && \ + cd /root/contrast-*/install/ && \ + mv -v contrast-*.war contrast-finder.war && \ + mv -v contrast-*.war /var/lib/tomcat7/webapps && \ + rm -rf /root/contrast-* && echo "-- Install: Ok" # environment variables ENV CONTRAST_FINDER=${CONTRAST_FINDER_RELEASE} From fc235e57db0d5c43815189c5b5393e2d0759033f Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Thu, 12 Jan 2017 22:28:13 +0100 Subject: [PATCH 18/18] set version to 0.4.1 --- CHANGELOG.md | 11 ++++++++--- contrast-finder-api/pom.xml | 4 ++-- contrast-finder-hsv/pom.xml | 4 ++-- contrast-finder-impl/pom.xml | 4 ++-- contrast-finder-resources/pom.xml | 4 ++-- contrast-finder-utils/pom.xml | 4 ++-- contrast-finder-webapp/pom.xml | 4 ++-- .../src/main/webapp/WEB-INF/template/footer.jspf | 2 +- docker/RELEASE/Dockerfile | 8 ++++---- docker/SNAPSHOT-local_from-Tomcat/Dockerfile | 2 +- docker/SNAPSHOT-local_from-Ubuntu/Dockerfile | 2 +- pom.xml | 2 +- 12 files changed, 28 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cafdb84..f02c0352 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,14 @@ -Contrast-Finder 0.4.x, 2017-xx-xx +Contrast-Finder 0.4.1, 2017-01-12 --------------------------------- Features: -None +- [#2 Webapp - Used input tag type=color instead off type=text](https://github.com/Asqatasun/Contrast-Finder/issues/2) +- Added descriptor.xml (building tar.gz with maven) +- Added SNAPSHOT-local_from-Tomcat/Dockerfile Security: -- [#9 don't expose session ID in the URL](https://github.com/Asqatasun/Contrast-Finder/issues/9) +- [#9 Webapp - Don't expose session ID in the URL](https://github.com/Asqatasun/Contrast-Finder/issues/9) Bugs: None @@ -17,6 +19,9 @@ None Documentation: None +Upgrade-o-meter: +just replace the .war file and restart Tomcat + Contrast-Finder 0.4.0, 2016-12-30 --------------------------------- diff --git a/contrast-finder-api/pom.xml b/contrast-finder-api/pom.xml index 80f464e6..e36b2305 100644 --- a/contrast-finder-api/pom.xml +++ b/contrast-finder-api/pom.xml @@ -4,11 +4,11 @@ org.asqatasun contrast-finder - 0.4.1-dev + 0.4.1 contrast-finder-api - 0.4.1-dev + 0.4.1 jar contrast-finder-api diff --git a/contrast-finder-hsv/pom.xml b/contrast-finder-hsv/pom.xml index d3657173..c9797dd8 100644 --- a/contrast-finder-hsv/pom.xml +++ b/contrast-finder-hsv/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.4.1-dev + 0.4.1 contrast-finder-hsv - 0.4.1-dev + 0.4.1 jar contrast-finder-hsv diff --git a/contrast-finder-impl/pom.xml b/contrast-finder-impl/pom.xml index 34ad27e1..1622c5c3 100644 --- a/contrast-finder-impl/pom.xml +++ b/contrast-finder-impl/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.4.1-dev + 0.4.1 contrast-finder-impl - 0.4.1-dev + 0.4.1 jar contrast-finder-impl diff --git a/contrast-finder-resources/pom.xml b/contrast-finder-resources/pom.xml index 341ca265..8474cbea 100644 --- a/contrast-finder-resources/pom.xml +++ b/contrast-finder-resources/pom.xml @@ -5,10 +5,10 @@ org.asqatasun contrast-finder - 0.4.1-dev + 0.4.1 contrast-finder-resources - 0.4.1-dev + 0.4.1 contrast-finder-resources http://maven.apache.org diff --git a/contrast-finder-utils/pom.xml b/contrast-finder-utils/pom.xml index 519b7c65..3acf3b81 100644 --- a/contrast-finder-utils/pom.xml +++ b/contrast-finder-utils/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.4.1-dev + 0.4.1 contrast-finder-utils - 0.4.1-dev + 0.4.1 jar contrast-finder-utils diff --git a/contrast-finder-webapp/pom.xml b/contrast-finder-webapp/pom.xml index 0eb5fd55..6e16af93 100644 --- a/contrast-finder-webapp/pom.xml +++ b/contrast-finder-webapp/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.4.1-dev + 0.4.1 contrast-finder-webapp - 0.4.1-dev + 0.4.1 war contrast-finder-webapp diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf index a4d4fd9d..cb64d6c4 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf @@ -8,7 +8,7 @@