Author: simonetripodi
Date: Tue Jul 10 08:23:57 2012
New Revision: 1359516

URL: http://svn.apache.org/viewvc?rev=1359516&view=rev
Log:
updated latest fluido-skin release

Removed:
    maven/site/trunk/src/site/resources/css/
Modified:
    maven/site/trunk/src/site/apt/skins/index.apt
    maven/site/trunk/src/site/site.xml
    maven/site/trunk/src/site/xdoc/index.xml.vm

Modified: maven/site/trunk/src/site/apt/skins/index.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/skins/index.apt?rev=1359516&r1=1359515&r2=1359516&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/skins/index.apt (original)
+++ maven/site/trunk/src/site/apt/skins/index.apt Tue Jul 10 08:23:57 2012
@@ -22,7 +22,7 @@ Skins
 
*-------------------------------------------------------------------+--------------+------------------+
 | {{{/skins/maven-stylus-skin/} <<<Maven Stylus Skin>>>}}           | 1.4      
    | The skin used for the website of Maven itself.
 
*-------------------------------------------------------------------+--------------+------------------+
-| {{{/skins/maven-fluido-skin/} <<<Maven Fluido Skin>>>}}           | 1.2.1    
    | Skin based on bootstrap css
+| {{{/skins/maven-fluido-skin/} <<<Maven Fluido Skin>>>}}           | 1.2.2    
    | Skin based on bootstrap css
 
*-------------------------------------------------------------------+--------------+------------------+
 
   To use one of these skins in your project, you use the <<<skin>>> element of 
the

Modified: maven/site/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/site.xml?rev=1359516&r1=1359515&r2=1359516&view=diff
==============================================================================
--- maven/site/trunk/src/site/site.xml (original)
+++ maven/site/trunk/src/site/site.xml Tue Jul 10 08:23:57 2012
@@ -20,12 +20,24 @@ under the License.
 -->
 
 
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 
http://maven.apache.org/xsd/decoration-1.0.0.xsd";
+<project xmlns="http://maven.apache.org/DECORATION/1.1.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 
http://maven.apache.org/xsd/decoration-1.1.0.xsd";
   name="Maven">
   <version position="none" />
 
+  <skin>
+    <groupId>org.apache.maven.skins</groupId>
+    <artifactId>maven-fluido-skin</artifactId>
+    <version>1.0</version>
+  </skin>
+
+  <custom>
+    <fluidoSkin>
+      <topBarEnabled>true</topBarEnabled>
+      <sideBarEnabled>false</sideBarEnabled>
+    </fluidoSkin>
+  </custom>
+
   <body>
     <breadcrumbs>
       <item name="Maven"  href="http://maven.apache.org/index.html"; />
@@ -47,14 +59,6 @@ under the License.
       <item name="NetBeans" href="/netbeans-module.html"/>
     </menu>
 
-    <menu name="About Maven">
-      <item name="What is Maven?" href="/what-is-maven.html"/>
-      <item name="Features" href="/maven-features.html"/>
-      <item name="FAQ (official)" href="/general.html"/> <!-- TODO: check this 
is for non-users, not a technical FAQ -->
-      <item name="FAQ (unofficial)" 
href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1"/>
-      <item name="Powered By" href="/powered-by-m2.html"/>
-    </menu>
-
     <menu name="Documentation">
       <item name="Maven Plugins" href="/plugins/index.html" />
       <item name="Index (category)" href="/guides/index.html" />
@@ -90,5 +94,10 @@ under the License.
       <item name="Source Repository" href="/source-repository.html" />
       <item name="The Maven Team" href="/team-list.html" />
     </menu>
+
+    <footer>
+      <div class="row span16">Apache Maven, Apache, the Apache feather logo, 
and the Apache Maven project logos are trademarks of The Apache Software 
Foundation.
+      All other marks mentioned may be trademarks or registered trademarks of 
their respective owners.</div>
+    </footer>
   </body>
 </project>

Modified: maven/site/trunk/src/site/xdoc/index.xml.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/xdoc/index.xml.vm?rev=1359516&r1=1359515&r2=1359516&view=diff
==============================================================================
--- maven/site/trunk/src/site/xdoc/index.xml.vm (original)
+++ maven/site/trunk/src/site/xdoc/index.xml.vm Tue Jul 10 08:23:57 2012
@@ -24,11 +24,101 @@ under the License.
     <author email="ja...@sonatype.com">Jason van Zyl</author>
   </properties>
   <body>
+    <div class="hero-unit">
+      <!-- TODO: I reckon it's time for a new description -->
+      <p>
+        Apache Maven is a software project management and comprehension tool. 
Based on the concept of a project object model
+        (POM), Maven can manage a project's build, reporting and documentation 
from a central piece of information.
+      </p>
+      <p>
+        If you think that Maven could help your project, you can find out more 
information about in the "About Maven"
+        section of the navigation. This includes an in-depth description of <a 
href="what-is-maven.html">what Maven is</a>,
+        a <a href="maven-features.html">list of some of its main features</a>, 
and a set of <a href="general.html">frequently
+        asked questions about what Maven is</a>.
+      </p>
+      <p><a class="btn primary large" href="/what-is-maven.html">Read 
more</a></p>
+    </div>
 
-    <!-- TODO: news? -->
-    <section name=""> <!-- valid xdoc needs at least a section -->
-    <div id="downloadbox">
-    <h5>Search Maven Sites</h5>
+    <section class="row">
+      <subsection class="span-one-third">
+        <div>
+          <h3>Run Maven</h3>
+          <p>Information for those needing to build a project that uses 
Maven</p>
+          <a class="btn info small" href="run-maven/index.html">View 
details</a>
+        </div>
+        <div>
+          <h3>Use Maven</h3>
+          <p>Information for those wanting to use Maven to build their 
project, including a "10 minute test" that gives a
+            practical overview of Maven's main features in just 10 minutes</p>
+          <a class="btn info small" href="users/index.html">View details</a>
+        </div>
+        <div>
+          <h3>Develop Maven</h3>
+          <p>Information for those who are currently developers, or who are 
interested
+            in contributing to the Maven project itself</p>
+          <a class="btn info small" href="developers/index.html">View 
details</a>
+        </div>
+        <div>
+          <h3>Write Maven Plugins</h3>
+          <p>Information for those who may or may not be using Maven, but want 
to provide a plugin for shared
+            functionality or to accompany their own product or toolset</p>
+          <a class="btn info small" href="plugin-developers/index.html">View 
details</a>
+        </div>
+        <div>
+          <h3>Improve the Maven Repository</h3>
+          <p>Information for those who may or may not use, but are interested 
in getting project metadata into the
+            repository</p>
+          <a class="btn info small" href="repository/index.html">View 
details</a>
+        </div>
+        <div>
+          <item name="FAQ (official)" href="/general.html"/>
+          <item name="FAQ (unofficial)" 
href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1"/>
+          <item name="Powered By" href="/powered-by-m2.html"/>
+        </div>
+      </subsection>
+
+      <subsection class="span-one-third">
+        <div>
+          <h3>Documentation Index</h3>
+          <p>If you are looking for a quick reference, you can use the <a 
href="guides/index.html">documentation index.</a></p>
+        </div>
+        <div>
+          <h3>Plugins</h3>
+          <p>For detailed information on just some of the plugins available 
for Maven, see the
+        <a href="plugins/index.html">plugin list</a>.</p>
+        </div>
+        <div>
+          <h3>Documentation Index</h3>
+          <p>If you are looking for a quick reference, you can use the <a 
href="guides/index.html">documentation index.</a></p>
+        </div>
+        <div>
+          <h3>How to Get Support</h3>
+          <p>
+        Support for Maven is available in a variety of different forms.
+      </p>
+      <p>
+        To get started, search the documentation, the <a 
href="http://docs.codehaus.org/display/MAVENUSER";>wiki</a>,
+        <a href="issue-tracking.html">issue tracker</a>, or the <a 
href="mail-lists.html">mailing list archives</a> to
+        see if the problem has been solved or reported before.
+      </p>
+      <p>
+        If the problem has not been reported before, the recommended way to 
get help is to
+        subscribe to the <a href="mail-lists.html">Maven Users Mailing 
list</a>. Many other users and Maven developers
+        will answer your questions there, and the answer will be archived for 
others in the future.
+      </p>
+      <p>
+        You can also reach the Maven developers on <a 
href="community.html">IRC</a>.
+      </p>
+        </div>
+        <div>
+          <h3>How can I help?</h3>
+          <p>Maven is an open source community and welcomes contributions. If 
you'd like to get involved, see the
+        <a href="guides/development/guide-helping.html">Guide to helping with 
Maven</a>.</p>
+        </div>
+      </subsection>
+
+      <subsection class="span-one-third">
+            <h5>Search Maven Sites</h5>
 <!-- Google CSE Search Box Begins  -->
 <form action="http://www.google.com/cse"; 
id="searchbox_006660305041243700248:hyqtfwsewpm">
   <input type="hidden" name="cx" value="006660305041243700248:hyqtfwsewpm" />
@@ -88,144 +178,15 @@ under the License.
       <p><a href="http://maven.apache.org/continuous-integration.html";>Take a 
look</a> at the CI Servers available from the community.</p>
       <h5>Looking for Code Quality Management tools?</h5>
       <p><a href="http://maven.apache.org/code-quality-management.html";>Take a 
look</a> at the Code Quality Management platforms available from the 
community.</p>
+      </subsection>
+   </section>
 
-      <h5>Supporting Maven</h5>
-      <p>We'd like to <a 
href="http://www.apache.org/foundation/thanks.html";>thank the sponsors of the 
Apache Software Foundation</a> for their support and assistance. To support the 
ASF, see the <a 
href="http://www.apache.org/foundation/sponsorship.html";>sponsorship</a> 
page.</p>
-    </div>
-    </section>
-
-    <section name="Welcome to Apache Maven">
-
-      <!-- TODO: I reckon it's time for a new description -->
-      <p>
-        Apache Maven is a software project management and comprehension tool. 
Based on the concept of a project object model
-        (POM), Maven can manage a project's build, reporting and documentation 
from a central piece of information.
-      </p>
-      <p>
-        If you think that Maven could help your project, you can find out more 
information about in the "About Maven"
-        section of the navigation. This includes an in-depth description of <a 
href="what-is-maven.html">what Maven is</a>,
-        a <a href="maven-features.html">list of some of its main features</a>, 
and a set of <a href="general.html">frequently
-        asked questions about what Maven is</a>.
-      </p>
-      <h3>Learning about Maven</h3>
-      <p>
-        <!-- TODO: this could be the big button type thing instead of a list 
of links -->
-        This site is separated into the following sections, depending on how 
you'd like to use Maven:
-      </p>
-      <!-- TODO: use CSS -->
-      <ul>
-        <li>
-          <span style="white-space:nowrap; font-weight: bold; font-size: 
1.25em">
-            <a href="run-maven/index.html">Run Maven</a>
-          </span>
-          <span style="display: block; margin-bottom: 0.5em">
-            Information for those needing to build a project that uses Maven
-          </span>
-        </li>
-        <li>
-          <span style="white-space:nowrap; font-weight: bold; font-size: 
1.25em">
-            <a href="users/index.html">Use Maven</a>
-          </span>
-          <span style="display: block; margin-bottom: 0.5em">
-            Information for those wanting to use Maven to build their project, 
including a "10 minute test" that gives a
-            practical overview of Maven's main features in just 10 minutes
-          </span>
-        </li>
-        <li>
-          <span style="white-space:nowrap; font-weight: bold; font-size: 
1.25em">
-            <a href="plugin-developers/index.html">Write Maven Plugins</a>
-          </span>
-          <span style="display: block; margin-bottom: 0.5em">
-            Information for those who may or may not be using Maven, but want 
to provide a plugin for shared
-            functionality or to accompany their own product or toolset
-          </span>
-        </li>
-        <li>
-          <span style="white-space:nowrap; font-weight: bold; font-size: 
1.25em">
-            <a href="repository/index.html">Improve the Maven Repository</a>
-          </span>
-          <span style="display: block; margin-bottom: 0.5em">
-            Information for those who may or may not use, but are interested 
in getting project metadata into the
-            repository
-          </span>
-        </li>
-        <li>
-          <span style="white-space:nowrap; font-weight: bold; font-size: 
1.25em">
-            <a href="developers/index.html">Develop Maven</a>
-          </span>
-          <span style="display: block; margin-bottom: 0.5em">
-            Information for those who are currently developers, or who are 
interested
-            in contributing to the Maven project itself
-          </span>
-        </li>
-      </ul>
-      <p>
-        Each guide is divided into a number of trails to get you started on a 
particular topic, and includes a
-        reference area and a "cookbook" of common examples.
-      </p>
-      <p>
-        You can access the guides at any time from the left navigation.
-      </p>
-      <h3>Documentation Index</h3>
-      <p>
-        If you are looking for a quick reference, you can use the <a 
href="guides/index.html">documentation index.</a>
-<!-- TODO
-        If you are looking for a quick reference, you can use the 
documentation index. It is available in both
-        <a href="todo.html">alphabetical</a> and <a 
href="todo.html">categorical</a> listing formats.
--->
-      </p>
-      <h3>Plugins</h3>
-<!-- TODO
-      <p>
-        Maven functionality is provided by plugins. For an explanation of how 
plugins work, and basic information on how
-        to use a plugin, see the <a href="todo.html">introduction to 
plugins</a> in the Users Centre.
-      </p>
--->
-      <p>
-        For detailed information on just some of the plugins available for 
Maven, see the
-        <a href="plugins/index.html">plugin list</a>.
-      </p>
-<!-- TODO: Should these be here, or just in the user centre?
-      <h3>Converting from a different Build System</h3>
-      <p>
-        If you are currently using a different build system, there are options 
for converting from that to Maven 2
-        either partially or completely. These guides also give an overview of 
the differences between Maven and the
-        other build system. The following guides are available in the Users 
Centre:
-      </p>
-      <ul>
-        <li><a href="todo.html">Converting from Ant to Maven 2</a></li>
-        <li><a href="todo.html">Converting from Maven 1.x to Maven 2</a></li>
-        <li><a href="todo.html">Adding Maven 2 to an IDE based build</a></li>
-      </ul>
--->
-      <h3>How to Get Support</h3>
-      <p>
-        Support for Maven is available in a variety of different forms.
-      </p>
-      <p>
-        To get started, search the documentation, the <a 
href="http://docs.codehaus.org/display/MAVENUSER";>wiki</a>,
-        <a href="issue-tracking.html">issue tracker</a>, or the <a 
href="mail-lists.html">mailing list archives</a> to
-        see if the problem has been solved or reported before.
-      </p>
-      <p>
-        If the problem has not been reported before, the recommended way to 
get help is to
-        subscribe to the <a href="mail-lists.html">Maven Users Mailing 
list</a>. Many other users and Maven developers
-        will answer your questions there, and the answer will be archived for 
others in the future.
-      </p>
-      <p>
-        You can also reach the Maven developers on <a 
href="community.html">IRC</a>.
-      </p>
-
-      <h3>How can I help?</h3>
-      <p>
-        Maven is an open source community and welcomes contributions. If you'd 
like to get involved, see the
-        <a href="guides/development/guide-helping.html">Guide to helping with 
Maven</a>.
-      </p>
+    <div class="alert-message block-message warning">
       <p>
         Maven is a part of the Apache Software Foundation. We'd like to <a 
href="http://www.apache.org/foundation/thanks.html";>thank
         the sponsors</a> that provide financial assistance to the foundation. 
For more information on how you can support the
         foundation, see the <a 
href="http://www.apache.org/foundation/sponsorship.html";>sponsorship</a> page.
       </p>
-    </section>
+    </div>
   </body>
 </document>


Reply via email to