Author: grobmeier
Date: Sun Sep  8 13:01:47 2013
New Revision: 1520864

URL: http://svn.apache.org/r1520864
Log:
restructuring the main page

Modified:
    struts/site/branches/next/content/resources/css/site.css
    struts/site/branches/next/content/site.xml
    struts/site/branches/next/content/xdoc/index.xml

Modified: struts/site/branches/next/content/resources/css/site.css
URL: 
http://svn.apache.org/viewvc/struts/site/branches/next/content/resources/css/site.css?rev=1520864&r1=1520863&r2=1520864&view=diff
==============================================================================
--- struts/site/branches/next/content/resources/css/site.css (original)
+++ struts/site/branches/next/content/resources/css/site.css Sun Sep  8 
13:01:47 2013
@@ -31,6 +31,12 @@ img.poweredBy {
 .hero-unit h1 {
        font-size: 40px;
        margin-top: 20px;
+    margin-bottom: 20px;
+}
+
+.hero-unit p {
+    margin-top: 20px;
+    margin-bottom: 20px;
 }
 
 .hero-unit {
@@ -64,3 +70,13 @@ a.btn-primary:visited, a.btn-info:visite
 #bodyColumn .row {
        padding:20px;
 }
+
+table.showcase tr td h2 {
+    font-size: 20px;
+    line-height: 27px;
+}
+
+table.showcase tr td {
+    vertical-align: top;
+    padding: 5px;
+}
\ No newline at end of file

Modified: struts/site/branches/next/content/site.xml
URL: 
http://svn.apache.org/viewvc/struts/site/branches/next/content/site.xml?rev=1520864&r1=1520863&r2=1520864&view=diff
==============================================================================
--- struts/site/branches/next/content/site.xml (original)
+++ struts/site/branches/next/content/site.xml Sun Sep  8 13:01:47 2013
@@ -10,8 +10,8 @@
      </skin>
      <custom>
         <fluidoSkin>
-        <topBarEnabled>false</topBarEnabled>
-        <sideBarEnabled>true</sideBarEnabled>
+        <topBarEnabled>true</topBarEnabled>
+        <sideBarEnabled>false</sideBarEnabled>
         <searchEnabled>true</searchEnabled>
         <gitHub>
             <projectId>apache/struts2</projectId>
@@ -32,18 +32,6 @@
         <href>http://struts.apache.org/</href>
     </bannerRight>
     <body>
-        <links>
-            <item
-                    name="Apache"
-                    href="http://www.apache.org/"; />
-            <item
-                    name="Struts 2"
-                    href="http://struts.apache.org/release/2.3.x/index.html"; />
-            <item
-                    name="Struts 1 (EOL)"
-                    href="http://struts.apache.org/release/1.3.x/index.html"; />
-        </links>
-
         <menu name="Apache Struts">
             <item
                     name="Welcome"
@@ -62,14 +50,6 @@
                     href="http://www.apache.org/licenses/";
                     />
             <item
-                    name="Kickstart FAQ"
-                    href="kickstart.html"
-                    />
-            <item
-                    name="Website Stats"
-                    
href="http://people.apache.org/~vgritsenko/stats/projects/struts";
-                    />
-            <item
                     name="Thanks!"
                     href="http://apache.org/foundation/thanks.html";
                     />
@@ -79,19 +59,20 @@
                     />
         </menu>
 
-        <menu name="Documentation">
+        <menu name="Get started">
             <item
                     name="Key Technologies"
                     href="primer.html" />
             <item
-                    name="Struts 2.3.15.1 (GA)"
+                    name="Kickstart FAQ"
+                    href="kickstart.html"
+                    />
+            <item
+                    name="Struts 2.3.x"
                     href="http://struts.apache.org/release/2.3.x/index.html"; />
             <item
-                    name="Struts 1.3.10 (GA) - EOL"
+                    name="Struts 1.3.x"
                     href="http://struts.apache.org/release/1.3.x/index.html"; />
-            <item
-                    name="Prior Releases"
-                    href="downloads.html#PriorReleases" />
         </menu>
 
         <menu name="Support">
@@ -109,14 +90,11 @@
                     />
         </menu>
 
-        <menu name="Development">
+        <menu name="Contributing">
             <item
-                    name="Struts 2.x Draft Docs"
-                    
href="http://struts.apache.org/development/2.x/index.html"/>
-
-            <item
-                    name="Struts 1.x EOL Announcement"
-                    href="struts1eol-announcement.html"/>
+                    name="You at Struts"
+                    href="youatstruts.html"
+                    />
 
             <item
                     name="How to Help FAQ"

Modified: struts/site/branches/next/content/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/site/branches/next/content/xdoc/index.xml?rev=1520864&r1=1520863&r2=1520864&view=diff
==============================================================================
--- struts/site/branches/next/content/xdoc/index.xml (original)
+++ struts/site/branches/next/content/xdoc/index.xml Sun Sep  8 13:01:47 2013
@@ -18,9 +18,8 @@ limitations under the License.
 // ======================================================================== 78
 -->
 <document>
-
     <properties>
-        <title>Welcome</title>
+        <title>Welcome to the Apache Struts project</title>
     </properties>
 
     <head>
@@ -28,27 +27,43 @@ limitations under the License.
     </head>
 
     <body>
-
         <div class="hero-unit">
             <h1>Apache Struts 2.3.15.1 GA</h1>
             <p>
-                Released on 16 July 2013.
-                The <a 
href="http://struts.apache.org/release/2.3.x/docs/version-notes-23151.html";>version
 notes</a>
-                are available online. Scroll down for more about <a 
href="#Welcome">Apache Struts</a>,
-                the <a href="#Project">Apache Struts project</a>, and <a 
href="#Newbies">Struts for Newbies</a>
+                The Apache Struts web framework is a free open-source solution 
for creating
+                elegant and modern Java web applications. While the 
predecessor Struts 1
+                used a lot of XML in old times, Struts 2 applications can be 
configured
+                by "Convention". Struts 2 applications support the MVC 
pattern, allow a
+                REST-like approach and enables you to create full-featured 
AJAX applications.
             </p>
-            <a href="http://struts.apache.org/download.cgi#struts23151"; 
class="btn btn-primary">Download</a>
-            <a href="primer.html" class="btn btn-info">Read more</a>
-                
-            <h1>Apache Struts 1 End-Of-Life (EOL)</h1>
-            <p>
-                The Apache Struts Project Team would like to inform you that 
the Struts 1.x web framework
-                has reached its end of life and is no longer officially 
supported.
-            </p>
-            <a href="struts1eol-announcement.html" class="btn btn-info">Read 
more</a>
-            <a href="struts1eol-press.html" class="btn btn-info">Press 
release</a>
+            <a href="http://struts.apache.org/download.cgi#struts23151"; 
class="btn btn-primary btn-large">Download</a>
+            <a href="primer.html" class="btn btn-info btn-large">Technology 
Primer</a>
+
+            <p><small>Latest release: 16 July 2013. <a 
href="http://struts.apache.org/release/2.3.x/docs/version-notes-23151.html";>Version
 notes</a></small></p>
         </div>
 
+        <table class="showcase">
+            <tr>
+                <td width="33%">
+                    <h2>Key technologies</h2>
+                    Need a birds perspective on Struts 2 to decide if it is 
right for?
+                    Please read our <a href="primer.html">Technology Primer</a>
+                </td>
+                <td width="33%">
+                    <h2>Want to help?</h2>
+                    We welcome your help! If you want to more about how to 
build
+                    and patch the Struts 2 codebase, please read the <a 
href="#">Developer Docs</a>
+                </td>
+                <td width="33%">
+                    <h2>Apache Struts 1</h2>
+                    <strong>End-Of-Life (EOL)</strong><br/>
+                    The Struts 1.x web framework has reached its end of life 
and is no longer officially supported.
+                    <a href="struts1eol-announcement.html">Read the 
announcment</a> or the official <a href="struts1eol-press.html">Press 
release</a>
+                </td>
+            </tr>
+
+        </table>
+
         <div class="row">
             <div class="pull-left">
                <div>Official IRC channel: <a 
href="irc://irc.freenode.net/struts">#struts</a></div>
@@ -64,183 +79,5 @@ limitations under the License.
                 <a href="https://twitter.com/TheApacheStruts"; 
class="twitter-follow-button" data-show-count="false">Follow 
@TheApacheStruts</a>
             </div>
         </div>
-        
-        <div class="row">
-            <div class="span12">
-                <h2>The Apache Struts web framework</h2>
-                <a name="Welcome"/>
-                <p>
-                    The Apache Struts web framework is a free open-source 
solution for creating
-                    Java web applications.
-                </p>
-                
-                <p>
-                    Web applications differ from conventional websites in that
-                    web applications can create a dynamic response.
-                    Many websites deliver only static pages.
-                    A web application can interact with databases and
-                    business logic engines to customize a response.
-                </p>
-                
-                <p>
-                    Web applications based on JavaServer Pages sometimes
-                    commingle database code, page design code, and control
-                    flow code.
-                    In practice, we find that unless these concerns are
-                    separated,
-                    larger applications become difficult to maintain.
-                </p>
-                
-                <p>
-                    One way to separate concerns in a software application is 
to
-                    use a Model-View-Controller (MVC) architecture.
-                    The <em>Model</em> represents the business or database 
code,
-                    the <em>View</em> represents the page design code,
-                    and the <em>Controller</em> represents the navigational 
code.
-                    The Struts framework is designed to help developers create
-                    web applications that utilize a MVC architecture.
-                </p>
-                
-                <p>
-                    The framework provides three key components:
-                </p>
-                
-                <ul>
-                    <li>
-                        A "request" handler provided by the application 
developer
-                        that is mapped to a standard URI.
-                    </li>
-                    <li>
-                        A "response" handler that transfers control to another 
resource
-                        which completes the response.
-                    </li>
-                    <li>
-                        A tag library that helps developers create interactive
-                        form-based applications with server pages.
-                    </li>
-                </ul>
-                
-                <p>
-                    The framework's architecture and tags are buzzword 
compliant.
-                    Struts works well with conventional REST applications
-                    and with nouveau technologies like SOAP and AJAX.
-                </p>
-                
-                <hr/>
-        
-                <a name="Project"/>        
-                <h2>The Apache Struts Project</h2>
-                <p>
-                    The Apache Struts Project is the open source community
-                    that creates and maintains the Apache Struts framework.
-                    The project consists of a diverse group of volunteers who
-                    share common values regarding collaborative, 
community-based
-                    open source development.
-                    The Apache Struts Project is proud to share these values 
with
-                    our parent organization: The Apache Software Foundation.
-                </p>
-                
-                <p>
-                    The project is called "Struts" because the framework is 
meant to
-                    furnish the "invisible underpinnings" that support 
professional
-                    application development.
-                    Struts provides the glue that joins the various elements
-                    of the standard Java platform into a coherent whole.
-                    Our goal is to leverage existing standards by producing the
-                    missing pieces we need to create enterprise-grade 
applications
-                    that are easy to maintain over time.
-                </p>
-                
-                <p>
-                    The Apache Struts Project offers two major versions of the
-                    Struts framework.
-                    Struts 1 is recognized as
-                    <em>the</em> most popular web application framework for 
Java.
-                    The 1.x framework is mature, well-documented, and widely
-                    supported.
-                    Struts 1 is the best choice for teams who value proven
-                    solutions to common problems.
-                </p>
-                
-                <p>
-                    Struts 2 was originally known as
-                    <a href="http://www.opensymphony.com/webwork";>WebWork 
2</a>.
-                    After working independently for several years,
-                    the WebWork and Struts communities
-                    <a href="announce-2005.html#a20051214.3">joined forces</a>
-                    to create Struts 2.
-                    The 2.x framework is the best choice for teams who value
-                    elegant solutions to difficult problems.
-                </p>
-                
-                <hr/>
-
-                <a name="Newbies"/>
-                <h2>Struts for Newbies</h2>
-                <p>
-                    If you are new to development with Struts,
-                    here are some pointers on how to get started.
-                </p>
-                
-                <p>
-                    The framework "stands on the shoulders of giants".
-                    To use Struts well, it's important to have a good grasp of 
the
-                    fundamentals.
-                    Start by reviewing the
-                    <a href="http://struts.apache.org/primer.html";>Key 
Technologies primer</a>,
-                    and studying any unfamiliar topics.
-                </p>
-                
-                <p>
-                    Next, branch to either the
-                    <a href="http://struts.apache.org/2.x/index.html";>Struts 
2</a> or
-                    <a href="http://struts.apache.org/1.x/index.html";>Struts 
1</a>
-                    documentation
-                </p>
-                
-                <p>
-                    The Struts 2 documentation is maintained as a wiki, but 
don't let that
-                    stop you from scrolling through. We have organized the 
wiki so that
-                    it can be read like a book, cover to cover. Just keep 
following the
-                    Next links.
-                </p>
-                
-                <p>
-                    <a href="http://www.infoq.com/minibooks/starting-struts2";>
-                        <img 
src="http://www.infoq.com/resource/minibooks/starting-struts2/en/cover/StartingStruts2online250x355.JPG";
 alt="Starting Struts 2" hspace="16" align="left" style="height: 160px;"/></a>
-                    Better yet, turn first to the
-                    <a href="http://www.infoq.com/minibooks/starting-struts2";>
-                        Starting with Struts2</a> book.
-                    At 122 pages, it's a small book that doesn't try to 
replicate the
-                    online Struts 2 Documentation. Instead, the book is a 
perfect complement
-                    to the Struts 2 website. The "minibook" is available both 
as a free PDF
-                    and in conventional printed form.
-                </p>
-                
-                <p>
-                    For Struts 1, the most up-to-date book would be
-                    <a href="http://www.jamesholmes.com/StrutsTCR/";>Struts: 
The Complete Reference</a>.
-                    For newbies, <a 
href="http://www.dummies.com/store/product/Jakarta-Struts-For-Dummies.productCd-0764559575.html";>Struts
 for Dummies</a>
-                    is another good choice.
-                </p>
-                
-                <p>
-                    And don't hesitate to
-                    <a href="http://struts.apache.org/helping.html";>get 
involved</a>.
-                    The best way to help with any open source project is to 
improve the
-                    documentation!
-                    There are mountains of Struts know-how posted to the
-                    <a href="http://struts.apache.org/mail.html";>user mailing 
list</a>
-                    that could be sholved into the documentation.
-                    (How do you think this section started?)
-                </p>
-                
-                <p>
-                    <div class="right">
-                        <b>Next:</b> <a href="downloads.html" class="btn 
btn-primary">Download</a>
-                    </div>
-                </p>
-            </div>
-        </div>       
     </body>
 </document>


Reply via email to