Author: mck Date: Wed Nov 6 22:55:26 2013 New Revision: 1539491 URL: http://svn.apache.org/r1539491 Log:
Inspired by http://struts.apache.org I applied the same skin and simplification to our site. A summary of changes involved: a) I've taken away a number of pages that i felt were presenting duplicate information. contributers.html and volunteers.html since the information, apart from the long entries about individuals, were already present on the "Project Team" page. Antonio Petrelli and David H. DeWolf, do you mind having the extra info about the two of you taken away? (it's easy to put it elsewhere and link to it from the teams page) b) a number of the links in the navigation have been removed. related projects, thanks, sponsorship, security. c) much of the text on the front page has been removed. "About Tiles as an Apache project", "Powered by Apache Tiles", and all links to Tiles-2.1. All this stuff on Apache can be found easily enough if people are searching for it. And we really want to encourage people to only be downloading tiles-3 or tiles-2.2. We don't have the manpower to be supporting extra versions. d) The security warning has been removed from the front page. It is old, and it still exists on the security bulletin pages. e) The "hero-unit" summary is extended, including the quote from Nick. f) on the faq page move the stuff about relationship to struts to the bottom of the page. this is old history now, the technical faq are likely more interesting to newcomers. Removed: tiles/site/src/site/xdoc/contributors.xml tiles/site/src/site/xdoc/volunteers.xml Modified: tiles/site/pom.xml tiles/site/src/site/fml/faq.fml tiles/site/src/site/resources/images/logo.png tiles/site/src/site/site.xml tiles/site/src/site/xdoc/index.xml Modified: tiles/site/pom.xml URL: http://svn.apache.org/viewvc/tiles/site/pom.xml?rev=1539491&r1=1539490&r2=1539491&view=diff ============================================================================== --- tiles/site/pom.xml (original) +++ tiles/site/pom.xml Wed Nov 6 22:55:26 2013 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- +<!-- /* * $Id$ * @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.tiles</groupId> <artifactId>tiles-master</artifactId> - <version>5</version> + <version>6</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: tiles/site/src/site/fml/faq.fml URL: http://svn.apache.org/viewvc/tiles/site/src/site/fml/faq.fml?rev=1539491&r1=1539490&r2=1539491&view=diff ============================================================================== --- tiles/site/src/site/fml/faq.fml (original) +++ tiles/site/src/site/fml/faq.fml Wed Nov 6 22:55:26 2013 @@ -35,12 +35,12 @@ </faq> <faq id="creator"> <question>Who is the creator of Tiles?</question> - <answer>Tiles has been created by Cédric Dumoulin, who had the idea + <answer>Tiles has been created by C�dric Dumoulin, who had the idea and integrated it into Struts.</answer> </faq> <faq id="name"> <question>Why Tiles has this name?</question> - <answer>We did not ask Cédric, but I think that he thought about tiling + <answer>We did not ask C�dric, but I think that he thought about tiling the pages. A tile here, a tile there, and you have your page complete! </answer> </faq> @@ -58,61 +58,17 @@ </faq> <faq id="team"> <question>Who is developing Tiles?</question> - <answer>See the <a href="volunteers.html">team page</a>. + <answer>See the <a href="contributors.html">team page</a>. </answer> </faq> <faq id="helping"> - <question>How can I help?</question> + <question>How can I contribute?</question> <answer> - Struts website contains a nice <a href="http://struts.apache.org/helping.html";> - how to help page</a>. + Contributions and patches are easiest done via github. + </answer> </faq> </part> - <part id="compatibility"> - <title>Struts-Tiles relationship</title> - <faq id="changes"> - <question>Is Tiles2 compatible with the version of tiles I've been using with Struts?</question> - <answer> - <p> - No. Struts-Tiles is an ancestor of Tiles 2 - which grew out of the Struts project. This version is a total redesign - which makes the framework easier to embed within frameworks such as - Struts and Shale. - </p> - <p> - If you're a casual user, you'll probably only notice the differences - in the tag libraries and in Tiles definition files. Many of them have - been renamed for clarity sake and you can upgrade to Tiles2 - by simple doing a global find and replace. - </p> - <p> - If you're integrating Tiles into a framework or using it for more advanced - features, then you'll probably notice a world of difference. Tiles now runs - as a container which encapsulates it's feature set and there is a much - cleaner API. If you find that this api doesn't suffice for you, please - hop on the developer list and help us flush out the next generation of - Tiles! - </p> - </answer> - </faq> - <faq id="migrate"> - <question>How can I migrate from Struts-Tiles?</question> - <answer>We have prepared a <a href="migration/index.html">Migration - guide</a>.</answer> - </faq> - <faq id="why-move"> - <question>Why should I move from Struts-Tiles to Tiles 2?</question> - <answer>Tiles 2 can be used outside of Struts: it has been integrated - into Struts 1, Struts 2 and Shale. And Tiles 2 is supported by a - passionate team.</answer> - </faq> - <faq id="why-change"> - <question>Why did you change everything in Tiles 2?</question> - <answer>To improve learning of Tiles. After the refactoring, the APIs, - the TLD and the DTD are clearer than before.</answer> - </faq> - </part> <part id="technical"> <title>Technical questions</title> <faq id="attribute-not-found"> @@ -159,4 +115,48 @@ the whole page.</answer> </faq> </part> + <part id="compatibility"> + <title>Struts-Tiles relationship</title> + <faq id="changes"> + <question>Is Tiles2 compatible with the version of tiles I've been using with Struts?</question> + <answer> + <p> + No. Struts-Tiles is an ancestor of Tiles 2 + which grew out of the Struts project. This version is a total redesign + which makes the framework easier to embed within frameworks such as + Struts and Shale. + </p> + <p> + If you're a casual user, you'll probably only notice the differences + in the tag libraries and in Tiles definition files. Many of them have + been renamed for clarity sake and you can upgrade to Tiles2 + by simple doing a global find and replace. + </p> + <p> + If you're integrating Tiles into a framework or using it for more advanced + features, then you'll probably notice a world of difference. Tiles now runs + as a container which encapsulates it's feature set and there is a much + cleaner API. If you find that this api doesn't suffice for you, please + hop on the developer list and help us flush out the next generation of + Tiles! + </p> + </answer> + </faq> + <faq id="migrate"> + <question>How can I migrate from Struts-Tiles?</question> + <answer>We have prepared a <a href="migration/index.html">Migration + guide</a>.</answer> + </faq> + <faq id="why-move"> + <question>Why should I move from Struts-Tiles to Tiles 2?</question> + <answer>Tiles 2 can be used outside of Struts: it has been integrated + into Struts 1, Struts 2 and Shale. And Tiles 2 is supported by a + passionate team.</answer> + </faq> + <faq id="why-change"> + <question>Why did you change everything in Tiles 2?</question> + <answer>To improve learning of Tiles. After the refactoring, the APIs, + the TLD and the DTD are clearer than before.</answer> + </faq> + </part> </faqs> Modified: tiles/site/src/site/resources/images/logo.png URL: http://svn.apache.org/viewvc/tiles/site/src/site/resources/images/logo.png?rev=1539491&r1=1539490&r2=1539491&view=diff ============================================================================== Binary files - no diff available. Modified: tiles/site/src/site/site.xml URL: http://svn.apache.org/viewvc/tiles/site/src/site/site.xml?rev=1539491&r1=1539490&r2=1539491&view=diff ============================================================================== --- tiles/site/src/site/site.xml (original) +++ tiles/site/src/site/site.xml Wed Nov 6 22:55:26 2013 @@ -25,24 +25,37 @@ 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";> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.0</version> + </skin> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <gitHub> + <projectId>apache/tiles</projectId> + <ribbonOrientation>right</ribbonOrientation> + <ribbonColor>darkblue</ribbonColor> + </gitHub> + </fluidoSkin> + </custom> <bannerLeft> - <name>Apache Software Foundation</name> - <src>http://www.apache.org/images/asf-logo.gif</src> - <href>http://www.apache.org</href> - </bannerLeft> - <bannerRight> <name>Apache Tiles™</name> <src>/images/logo.png</src> <href>http://tiles.apache.org</href> + </bannerLeft> + <bannerRight> + <name>Apache Software Foundation</name> + <src>http://struts.apache.org/images/asf-logo.gif</src> + <href>http://www.apache.org</href> </bannerRight> <version position="none" /> <body> - <links> - <item name="Apache" href="http://www.apache.org"; /> - <item name="Tiles" href="http://tiles.apache.org"; /> - </links> - <menu name="Apache Tiles™"> <item name="Welcome" @@ -51,23 +64,8 @@ name="FAQ" href="/faq.html"/> <item - name="Volunteers" - href="/volunteers.html"/> - <item - name="Contributors" - href="/contributors.html"/> - <item name="Download" href="/download.html"/> - <item - name="Thanks!" - href="http://apache.org/foundation/thanks.html"/> - <item - name="Sponsorship" - href="http://apache.org/foundation/sponsorship.html"/> - <item - name="Security" - href="/framework/security/index.html"/> </menu> <menu name="Documentation"> @@ -83,28 +81,19 @@ <item name="Tiles 2.2.x" href="/2.2/framework/index.html"/> - <item - name="Tiles 2.1.x" - href="/2.1/framework/index.html"/> - <item - name="Tiles 2.0.x" - href="/2.0/framework/index.html"/> - <item - name="Wiki" - href="http://cwiki.apache.org/TILES/"/> </menu> <menu name="Support"> <item name="Mailing List" href="mail.html"/> <item - name="Issue Tracker (JIRA)" + name="JIRA - Tiles" href="http://issues.apache.org/jira/browse/TILES"/> <item - name="Issue Tracker for Request (JIRA)" + name="JIRA - Tiles Request" href="http://issues.apache.org/jira/browse/TREQ"/> <item - name="Issue Tracker for Autotag (JIRA)" + name="JIRA - Tiles Autotag" href="http://issues.apache.org/jira/browse/AUTOTAG"/> </menu> Modified: tiles/site/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/tiles/site/src/site/xdoc/index.xml?rev=1539491&r1=1539490&r2=1539491&view=diff ============================================================================== --- tiles/site/src/site/xdoc/index.xml (original) +++ tiles/site/src/site/xdoc/index.xml Wed Nov 6 22:55:26 2013 @@ -21,102 +21,76 @@ </properties> <body> - - <section name="Apache Tiles™"> - + <div class="hero-unit"> + <p>A free open-sourced templating framework for modern Java applications.<br/> + Based upon the Composite pattern it is built to simplify the development of user interfaces.</p><br/> + <p>For complex web sites it remains <br/> + + the easiest and most elegant way to work alongside any MVC technology.</p> + </div> + <section> <div id="downloadbox"> - <strong>Get Tiles</strong> - <span style="display: block; text-align: right; font-size: smaller">Released: 28 June, 2010</span> + <strong>Get Tiles!</strong> <p> + <span style="display: block; text-align: right; font-size: smaller">Released: 28 May, 2012</span> <a href="download.html"> <img style="vertical-align: top;" src="images/folder-open.gif" border="0" alt="" title="download"></img> - Tiles 2.2.2 (GA) + Tiles 3.0.1 (BETA) </a> - <small>(5.6MB)</small> + <small>(7.0MB)</small> </p> <div style="font-size: smaller"> <ul> <li> - <a href="download.html">Download</a> - </li> - <li> - <a href="download.html#Tiles_2_as_a_Maven_dependency">Maven Repository</a> - </li> - <li> - <a href="/framework/2.2/index.html">Documentation</a> + <a href="download.html#Tiles_3_as_a_Maven_dependency">Maven Repository</a> </li> <li> <a - href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311046&version=12314702";>Release Notes</a> + href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311046&version=12314704";>Release Notes</a> </li> </ul> </div> - <span style="display: block; text-align: right; font-size: smaller">Released: 28 May, 2012</span> <p> + <span style="display: block; text-align: right; font-size: smaller">Released: 28 June, 2010</span> <a href="download.html"> <img style="vertical-align: top;" src="images/folder-open.gif" border="0" alt="" title="download"></img> - Tiles 3.0.1 (BETA) + Tiles 2.2.2 (GA) </a> - <small>(7.0MB)</small> + <small>(5.6MB)</small> </p> <div style="font-size: smaller"> <ul> <li> - <a href="download.html">Download</a> - </li> - <li> - <a href="download.html#Tiles_3_as_a_Maven_dependency">Maven Repository</a> - </li> - <li> - <a href="/framework/index.html">Documentation</a> + <a href="download.html#Tiles_2_as_a_Maven_dependency">Maven Repository</a> </li> <li> <a - href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311046&version=12314704";>Release Notes</a> + href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311046&version=12314702";>Release Notes</a> </li> </ul> </div> </div> <div> - <p> - <strong> - <a href="http://tiles.apache.org";>Apache Tiles™</a> - </strong> - is a templating framework built to simplify the development of - web - application user interfaces. - </p> <p>Tiles allows authors to define page fragments which can be - assembled - into a complete page at runtime. These fragments, or - tiles, can be used - as simple includes in order to reduce the - duplication of - common page - elements or embedded within other + assembled into a complete pages at runtime. These fragments, or + tiles, can be used as simple includes in order to reduce the + duplication of common page elements or embedded within other tiles to develop a series of reusable - templates. These - templates streamline the development of a - consistent - look and - feel across an entire application.</p> + templates. These templates streamline the development of a + consistent look and feel across an entire application.</p> <p> Tiles grew in popularity as a component of the popular <a href="http://struts.apache.org/";>Struts</a> - framework. It has since - been extracted from Struts and is now - integrated with various - frameworks, - such as - <a href="http://struts.apache.org/";>Struts 2</a> - and - <a href="http://shale.apache.org/";>Shale</a> - . + framework. It was extracted from Struts and is now + integrated with various frameworks, + such as <a href="http://projects.spring.io/spring-framework/";>Spring</a>, + <a href="http://struts.apache.org/";>Struts 2</a>, + and <a href="http://shale.apache.org/";>Shale</a>. </p> <ul> <li> @@ -131,42 +105,11 @@ <li> <a href="/2.2/framework/whats-new.html">What's new in Tiles 2.2</a> </li> - <li> - <a href="/2.1/framework/index.html">Tiles 2.1 Documentation</a> - </li> - <li> - <a href="/2.1/framework/whats-new.html">What's new in Tiles 2.1</a> - </li> </ul> - <p> - <strong>Warning!</strong> - Tiles users that use Tiles 2.1.1 or - 2.1.0 version should not - install it in a production environment, - due to a - discovered - <a href="framework/security/security-bulletin-1.html">security problem</a>. - <a href="download.html">Upgrade Tiles.</a> - </p> - <p>Tiles 2.0.x is not involved in this security bug.</p> - <!-- <a name="downloads" /> --> + <p><br/><br/></p> </div> </section> - <section name="About Tiles as an Apache project"> - - <p>Apache Tiles™ is an <a href="http://www.apache.org/";>Apache project</a>, - and is part of a larger community of developers and users. - </p> - <p>Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles project - logo are trademarks of The Apache Software Foundation</p> - </section> - <section name="Powered By Apache Tiles"> - <p> - If you use Tiles in your project, you can use the "powered by" logo in your website. - </p> - <img src="images/powered-by-tiles.png" alt="The 'powered by Tiles' logo"/> - </section> </body> </document>
