Skip to content

Commit

Permalink
Merge branch 'release-v0.3.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
lingua committed Mar 27, 2014
2 parents 09405c6 + 128f995 commit cbc7a2e
Show file tree
Hide file tree
Showing 15 changed files with 113 additions and 23 deletions.
13 changes: 10 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
Contrast-Finder
===============
# Contrast-Finder

Find good background / foreground color contrast for accessibility
Tool to provide color combination for a good (accessible, WCAG-compliant) contrast.

## Demo

http://contrast-finder.tanaguru.com/

## License

AGPL
11 changes: 9 additions & 2 deletions color-finder-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
<parent>
<groupId>org.opens</groupId>
<artifactId>color-finder</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.3.1</version>
</parent>

<groupId>org.opens</groupId>
<artifactId>color-finder-api</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.3.1</version>
<packaging>jar</packaging>
<name>color-finder-api</name>

Expand All @@ -21,5 +22,11 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<type>jar</type>
</dependency>
</dependencies>
</project>
6 changes: 3 additions & 3 deletions color-finder-factory-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.opens</groupId>
<artifactId>color-finder-factory-impl</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.3.1</version>
<packaging>jar</packaging>
<name>color-finder-factory-impl</name>
<dependencies>
Expand All @@ -16,12 +16,12 @@
<dependency>
<groupId>org.opens</groupId>
<artifactId>color-finder-api</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.3.1</version>
</dependency>
<dependency>
<groupId>org.opens</groupId>
<artifactId>color-finder-onebyone</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.3.1</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions color-finder-hsv/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<parent>
<groupId>org.opens</groupId>
<artifactId>color-finder</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.3.1</version>
</parent>
<groupId>org.opens</groupId>
<artifactId>color-finder-hsv</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.3.1</version>
<packaging>jar</packaging>
<name>color-finder-hsv</name>
<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public class ColorFinderRgb extends AbstractColorFinder {
private static final int MAX_POSSIBLE_VALUE = 255;
private static final int MIN_POSSIBLE_VALUE = 0;
private static final int DEFAUT_MAX_MOVE = 60;
private static final int INITL_CPT = 0;
private static final float DEFAUT_HUE_BOUNDER = 5.0f;
private static final float DEFAUT_MAX_COEFFICIENT = 0.001f;
private int maxMove = DEFAUT_MAX_MOVE;
Expand Down
4 changes: 2 additions & 2 deletions color-finder-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<parent>
<groupId>org.opens</groupId>
<artifactId>color-finder</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.3.1</version>
</parent>
<groupId>org.opens</groupId>
<artifactId>color-finder-impl</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.3.1</version>
<packaging>jar</packaging>
<name>color-finder-impl</name>
<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions color-finder-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<parent>
<groupId>org.opens</groupId>
<artifactId>color-finder</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.3.1</version>
</parent>
<groupId>org.opens</groupId>
<artifactId>color-finder-utils</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.3.1</version>
<packaging>jar</packaging>
<name>color-finder-utils</name>
<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions color-finder-webapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<parent>
<groupId>org.opens</groupId>
<artifactId>color-finder</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.3.1</version>
</parent>
<groupId>org.opens</groupId>
<artifactId>contrast-finder-webapp</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.3.1</version>
<packaging>war</packaging>

<name>contrast-finder-webapp</name>
Expand Down Expand Up @@ -97,7 +97,7 @@
<dependency>
<groupId>org.opens</groupId>
<artifactId>color-finder-hsv</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.3.1</version>
<type>jar</type>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ form.sampleTextBold=with some words in bold
form.sampleText2=\ to illustrate the contrast.
form.wcagLink=http://www.w3.org/TR/WCAG20/#visual-audio-contrast-contrast
form.sc=Success criteria
form.sc-info=requires text to have a minimum contrast ratio of 4.5:1 (and 3:1 for large text).
footer.paragraphe=Liked this tool ? Try our other opensource tools for accessibility !
footer.tanaguru=<a href="http://www.tanaguru.com/">automated accessibility assessment tool</a>, with heavy automation and high reliability (really !)
footer.kbaccess=<a href="http://www.kbaccess.org/">examples of accessibility on real webpages</a> (archived)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ form.sampleTextBold=with some words in bold
form.sampleText2=\ to illustrate the contrast.
form.wcagLink=http://www.w3.org/TR/WCAG20/#visual-audio-contrast-contrast
form.sc=Success criteria
form.sc-info=requires text to have a minimum contrast ratio of 4.5:1 (and 3:1 for large text).
footer.paragraphe=Liked this tool ? Try our other opensource tools for accessibility !
footer.tanaguru=<a href="http://www.tanaguru.com/">automated accessibility assessment tool</a>, with heavy automation and high reliability (really !)
footer.kbaccess=<a href="http://www.kbaccess.org/">examples of accessibility on real webpages</a> (archived)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ form.sampleTextBold=avec quelques mots en gras
form.sampleText2=\ pour illustrer le bon contraste.
form.wcagLink=http://www.w3.org/Translations/WCAG20-fr/#visual-audio-contrast-contrast
form.sc=Crit\u00e8re de succ\u00e8s
form.sc-info=demande pour le texte un rapport de contraste minimum de 4.5:1 (et 3:1 pour le texte agrandi).
footer.paragraphe=Vous aimez cet outil ? Essayez nos autres logiciels libres pour l'acc\u00e9ssibilit\u00e9 !
footer.tanaguru=Logiciel pour <a href="http://www.tanaguru.com/">\u00e9valuer l'accessibilit\u00e9 web</a>, avec une forte automatisation et grande fiabilit\u00e9 (vraiment !)
footer.kbaccess=<a href="http://www.kbaccess.org/">exemples de l'accesibilit\u00e9 sur de r\u00e9elles pages web</a> (archiv\u00e9es).
footer.kbaccess=<a href="http://www.kbaccess.org/">exemples d'accessibilit\u00e9 sur des pages web r\u00e9elles</a> (et archiv\u00e9es).
form.contrastSolutionDistance=Distance
form.usage=Utilisation :
form.ratioMedium=Texte petit (Taille &lt; 18px, Niveau AA)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
var _paq = _paq || [];
_paq.push(["trackPageView"]);
_paq.push(["enableLinkTracking"]);

(function() {
var u = (("https:" == document.location.protocol) ? "https" : "http") + "://stats.open-s.com/";
_paq.push(["setTrackerUrl", u + "piwik.php"]);
Expand All @@ -54,4 +53,4 @@
})();
</script>
<!-- End Piwik Code -->
</c:if>
</c:if>
74 changes: 74 additions & 0 deletions color-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf~
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@page pageEncoding="UTF-8"%>
<jsp:useBean id="now" class="java.util.Date" scope="page" />
<footer class="container">
<div id="footer-msg">
<p><fmt:message key="footer.paragraphe"/></p>
<ul>
<li><fmt:message key="footer.tanaguru"/></li>
<li><fmt:message key="footer.kbaccess"/></li>
</ul>
</div>
<p id="footer-copyright">© <fmt:formatDate value="${now}" pattern="yyyy" /> <a href="http://www.Open-S.com/">Open-S</a> - Version 0.3 - <a href="http://blog.tanaguru.com/">Blog Tanaguru</a></p>
</footer>
<c:set var="analytics" value=""/>
<c:if test="${not empty analytics}">
<script>
(function(i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r;
i[r] = i[r] || function() {
(i[r].q = i[r].q || []).push(arguments)
}, i[r].l = 1 * new Date();
a = s.createElement(o),
m = s.getElementsByTagName(o)[0];
a.async = 1;
a.src = g;
m.parentNode.insertBefore(a, m)
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');

ga('create', '${analytics}', 'tanaguru.com');
ga('send', 'pageview');

</script>
</c:if>

<c:set var="piwikSiteId" value=""/>
<c:if test="${not empty piwikSiteId}">
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
_paq.push(["trackPageView"]);
_paq.push(["enableLinkTracking"]);

<<<<<<< HEAD
(function() {
var u = (("https:" == document.location.protocol) ? "https" : "http") + "://stats.open-s.com/";
_paq.push(["setTrackerUrl", u + "piwik.php"]);
_paq.push(["setSiteId", "${piwikSiteId}"]);
var d = document, g = d.createElement("script"), s = d.getElementsByTagName("script")[0];
g.type = "text/javascript";
g.defer = true;
g.async = true;
g.src = u + "piwik.js";
s.parentNode.insertBefore(g, s);
})();
</script>
<!-- End Piwik Code -->
</c:if>
=======
(function() {
var u = (("https:" == document.location.protocol) ? "https" : "http") + "://stats.open-s.com/";
_paq.push(["setTrackerUrl", u + "piwik.php"]);
_paq.push(["setSiteId", "${piwikSiteId}"]);
var d = document, g = d.createElement("script"), s = d.getElementsByTagName("script")[0];
g.type = "text/javascript";
g.defer = true;
g.async = true;
g.src = u + "piwik.js";
s.parentNode.insertBefore(g, s);
})();
</script>
<!-- End Piwik Code -->
</c:if>
>>>>>>> release-0.3
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
<a href="<fmt:message key="form.wcagLink"/>">
<span lang="en"><abbr title="Web Content Accessibility Guidelines">WCAG</abbr></span> <fmt:message key="form.sc"/> 1.4.3
</a>
<fmt:message key="form.sc-info"/>
</p>

</div><!-- id="header' class="page-header"-->
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>org.opens</groupId>
<artifactId>color-finder</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<version>0.3.1</version>
<name>color-finder</name>
<modules>
<module>color-finder-api</module>
Expand Down Expand Up @@ -99,4 +99,4 @@
</dependency>
</dependencies>
</dependencyManagement>
</project>
</project>

0 comments on commit cbc7a2e

Please sign in to comment.