Author: veithen
Date: Thu Dec 29 12:33:49 2011
New Revision: 1225508
URL: http://svn.apache.org/viewvc?rev=1225508&view=rev
Log:
Also added the factoids Ohloh gadget and fixed a couple of styles so that the
placement of the gadgets is correct.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/src/main/java/org/apache/axiom/buildutils/OhlohMacro.java
webservices/commons/trunk/modules/axiom/src/site/apt/index.apt
webservices/commons/trunk/modules/axiom/src/site/resources/css/site.css
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/pom.xml?rev=1225508&r1=1225507&r2=1225508&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/pom.xml
(original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/pom.xml
Thu Dec 29 12:33:49 2011
@@ -56,6 +56,13 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
<version>1.5.5</version>
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/src/main/java/org/apache/axiom/buildutils/OhlohMacro.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/src/main/java/org/apache/axiom/buildutils/OhlohMacro.java?rev=1225508&r1=1225507&r2=1225508&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/src/main/java/org/apache/axiom/buildutils/OhlohMacro.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/src/main/java/org/apache/axiom/buildutils/OhlohMacro.java
Thu Dec 29 12:33:49 2011
@@ -34,11 +34,14 @@ public class OhlohMacro extends Abstract
if (project == null) {
throw new MacroExecutionException("'project' macro parameter is
required");
}
- String widget = (String)request.getParameter("widget");
- if (widget == null) {
- throw new MacroExecutionException("'widget' macro parameter is
required");
+ String widgets = (String)request.getParameter("widgets");
+ if (widgets == null) {
+ throw new MacroExecutionException("'widgets' macro parameter is
required");
}
- sink.rawText("<div style=\"float: left\"><script
type=\"text/javascript\" src=\"http://www.ohloh.net/p/";
- + project + "/widgets/project_" + widget +
".js\"></script></div><div style=\"clear: both\"/>");
+ for (String widget : widgets.split(",")) {
+ sink.rawText("<div class=\"gadgetContainer\" style=\"float:
left\"><script type=\"text/javascript\" src=\"http://www.ohloh.net/p/";
+ + project + "/widgets/project_" + widget +
".js\"></script></div>");
+ }
+ sink.rawText("<div style=\"clear: both\"/>");
}
}
Modified: webservices/commons/trunk/modules/axiom/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/site/apt/index.apt?rev=1225508&r1=1225507&r2=1225508&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/site/apt/index.apt (original)
+++ webservices/commons/trunk/modules/axiom/src/site/apt/index.apt Thu Dec 29
12:33:49 2011
@@ -35,7 +35,7 @@ Welcome to Apache Axiom
Apache Axiom, Axiom, Apache, the Apache feather logo, and the Apache Axiom
project logo are
trademarks of {{{http://apache.org/}The Apache Software Foundation}}.
-%{ohloh|project=6368|widget=basic_stats}
+%{ohloh|project=6368|widgets=basic_stats,factoids}
Key Features
Modified:
webservices/commons/trunk/modules/axiom/src/site/resources/css/site.css
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/site/resources/css/site.css?rev=1225508&r1=1225507&r2=1225508&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/site/resources/css/site.css
(original)
+++ webservices/commons/trunk/modules/axiom/src/site/resources/css/site.css Thu
Dec 29 12:33:49 2011
@@ -92,9 +92,13 @@ div#contentBox {
float: left;
}
-div#contentBox > div.section {
+div#contentBox > div.section > h2 {
border-top: 1px solid #999999;
- margin-top: 1.5em;
+ margin-left: -4pt;
+ margin-right: -4pt;
+ padding-left: 4pt;
+ padding-right: 4pt;
+ padding-top: 4pt
}
h2 {
@@ -104,7 +108,6 @@ h2 {
padding: 0;
color: black;
background-color: transparent;
- margin: 0;
}
div#contentBox > div.section > div.section {
@@ -133,6 +136,10 @@ a.externalLink, a.externalLink:link, a.e
/* Styles for Ohloh widgets */
+div.gadgetContainer {
+ margin-left: 10pt
+}
+
div.gadget {
background-color: white
}
\ No newline at end of file
