Author: penyaskito
Date: 2008-10-02 13:15:26-0700
New Revision: 15867

Removed:
   trunk/www/test.html
Modified:
   trunk/www/images/download.png
   trunk/www/images/download.svg
   trunk/www/index.html

Log:
Issue 5426: The website must provide a prominent way of downloading the last 
stable release. Changed the table based layout to a div based one.

Modified: trunk/www/images/download.png
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/www/images/download.png?view=diff&rev=15867&p1=trunk/www/images/download.png&p2=trunk/www/images/download.png&r1=15866&r2=15867
==============================================================================
Binary files. No diff available.

Modified: trunk/www/images/download.svg
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/www/images/download.svg?view=diff&rev=15867&p1=trunk/www/images/download.svg&p2=trunk/www/images/download.svg&r1=15866&r2=15867
==============================================================================
--- trunk/www/images/download.svg       (original)
+++ trunk/www/images/download.svg       2008-10-02 13:15:26-0700
@@ -14,7 +14,7 @@
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
-   sodipodi:docbase="C:\Documents and Settings\penyaskito\Desktop"
+   sodipodi:docbase="D:\workspaces\Argo\argouml-www\images"
    sodipodi:docname="download.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    inkscape:export-filename="C:\Documents and 
Settings\penyaskito\Desktop\download.png"
@@ -279,9 +279,12 @@
        height="128.21011"
        x="157.72353"
        y="492.14285"
-       ry="16.210476" />
+       ry="16.210476"
+       
inkscape:export-filename="D:\workspaces\Argo\argouml-www\images\download.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
-       transform="matrix(1.926672,0,0,0.9446557,187.175,550.51657)"
+       transform="matrix(1.842252,0,0,0.9032642,203.59248,542.95818)"
        d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  
9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
        sodipodi:ry="8.3968935"
        sodipodi:rx="15.644737"
@@ -289,11 +292,17 @@
        sodipodi:cx="24.837126"
        id="path8660"
        
style="opacity:0.20454544;color:#000000;fill:url(#radialGradient5990);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
+       sodipodi:type="arc"
+       
inkscape:export-filename="D:\workspaces\Argo\argouml-www\images\download.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <g
        inkscape:label="Layer 1"
        id="g4877"
-       transform="matrix(2.1422229,0,0,2.2579291,147.73312,485.27199)">
+       transform="matrix(2.0483582,0,0,2.1589945,165.87881,480.57239)"
+       
inkscape:export-filename="D:\workspaces\Argo\argouml-www\images\download.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
       <g
          id="g6707"
          transform="matrix(2.29904e-2,0,0,2.345443e-2,45.3408,39.64914)">
@@ -336,7 +345,10 @@
     </g>
     <g
        id="g1464"
-       transform="matrix(-1.5864356,0,0,-1.5864354,271.56133,594.43935)">
+       transform="matrix(-1.5169235,0,0,-1.5169233,284.2813,584.95642)"
+       
inkscape:export-filename="D:\workspaces\Argo\argouml-www\images\download.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
       <path
          
style="opacity:1;color:#000000;fill:url(#radialGradient5986);fill-opacity:1;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
          d="M 14.519136,38.5 L 32.524165,38.496094 L 32.524165,25.504468 L 
40.519531,25.496656 L 23.374809,5.4992135 L 6.5285585,25.497284 L 
14.52444,25.501074 L 14.519136,38.5 z "

Modified: trunk/www/index.html
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/www/index.html?view=diff&rev=15867&p1=trunk/www/index.html&p2=trunk/www/index.html&r1=15866&r2=15867
==============================================================================
--- trunk/www/index.html        (original)
+++ trunk/www/index.html        2008-10-02 13:15:26-0700
@@ -1,41 +1,76 @@
 <html>
 <head>
-
 <meta name="keywords"
 content="ArgoUML, Argo, UML, Unified Modeling Language, modeling, modelling, 
Gentleware, Poseidon, MDA, model-driven, software architecture, software 
methods, software engineering, CASE, consulting, seminar, seminars, coaching, 
Java, XML, OCL, object, technology">
 
 <title>ArgoUML homepage</title>
+<style>
+#projecthome .axial { display: none; }
+#apphead h1 { display: none; }
+#longdescription { border: none; }
+#longdescription h2 { display: none; }
+#customcontent h2 { display: block; }
+
+#intro {
+    background: url(images/argologo100x100.gif) no-repeat;
+    padding: 5px 5px 5px 110px;
+    width: 60%;
+    float:left;
+}
+    #intro p {
+        margin: 10px;
+    }
+#downloads {
+    background: url(images/download.png) no-repeat;
+    width:150px;
+    float:left;
+    height:150px;
+    margin-left:15px;
+    style:block;
+}
+    #downloads a{
+        background: none;
+        display:block;
+        width:150px;
+        height:30px;
+        font-size: 16px !important;
+        font-weight:bold;
+        color: #000;
+        text-decoration:none;        
+        text-align:center;
+        padding: 100px 5px 2px 2px;
+        margin:0 0;
+    }
+#tour {
+    width:90%;
+}
+    #tour img {
+        float:left;
+        margin:5px;
+        border:0px;
+    }
+.block {
+    background: #eed;
+    width:45%;
+    float:left;
+    margin: 15px;
+}
+    .block h1 {
+        font-size: 20px;
+        background: #ccc;
+        margin:0 !important;
+        padding: 5px 10px 5px 10px;
+    }
+    .block p {
+        margin: 10px;
+    }
+</style>
 </head>
 
 <body>
 
-<div class="h2">
-<!--
-<h2>Summer of Code</h2>
-<p>
-ArgoUML will once again take part in the
-<a href="http://code.google.com/soc/2008";>Google Summer of Code</a>, edition 
2008.
-</p>
-
-<p>
-If you are an interested student we have a special page with
-a list of project suggestions and
-some general tips on what we look for in a student such as
-<a href="googlessoc2008.html#look_for_students">what we look for in a 
student</a>,
-<a href="googlessoc2008.html#choose_project">what projects we want to see</a>,
-<a href="googlessoc2008.html#application">how you should fill in your 
applications</a>,
-and
-<a href="googlessoc2008.html#project_intro_references">some quick references 
on the projects</a>.
-</p>
- -->
-</div>
-
-<table>
-<tr>
-<td width="50%" rowspan="2">
-
-<h1 style="color: #036;">Welcome to ArgoUML</h1>
-<a href="http://www.ddj.com/184414991?pgno=10";><img 
src="images/jolt02_productivity.gif" width="150" height="89" align="right" 
border="0"/></a>
+<div id="intro">
+<h1>Welcome to ArgoUML</h1>
 
 <p>ArgoUML is the leading open source UML modeling tool and includes support
 for all standard UML 1.4 diagrams.  It runs on any Java platform and
@@ -47,18 +82,98 @@
 180 thousand times and is in use all over the world.
 See the <a href="downloadcount.html">download statistics</a>.
 </p>
+</div>
+
+<div id="downloads">
+<script type="text/javascript">
+document.write("<div style='display:none;'>");
+</script>
+<a href="http://argouml-downloads.tigris.org/argouml-0.26/"; >Download ArgoUML 
0.26</a>
+<script type="text/javascript">
+document.write("</div>");
+</script>
+
+<script type="text/javascript">
+    if (navigator.appVersion.indexOf("Win")!=-1) {
+        document.write("<a 
href='http://argouml-downloads.tigris.org/nonav/argouml-0.26/ArgoUML-0.26-setup.exe'
 
onClick=\"javascript:urchinTracker('DOWNLOAD/ArgoUML-0.26-setup.exe')\">Download
 ArgoUML 0.26 (Windows)</a>");
+    }
+    else if (navigator.appVersion.indexOf("Mac")!=-1) {
+        document.write("<a 
href='http://argouml-downloads.tigris.org/nonav/argouml-0.26/ArgoUML-0.26.app.tgz'
  
onClick=\"javascript:urchinTracker('DOWNLOAD/ArgoUML-0.26.app.tgz')\">Download 
ArgoUML 0.26 (Mac)</a>");
+    }
+    else if (window.navigator.userAgent.indexOf("X11")!=-1) {
+        document.write("<a 
href='http://argouml-downloads.tigris.org/nonav/argouml-0.26/ArgoUML-0.26.tar.gz'
  onClick=\"javascript:urchinTracker('DOWNLOAD/ArgoUML-0.26.tar.gz')\">Download 
ArgoUML 0.26 (Linux/BSD)</a>");
+    }
+    else if (window.navigator.userAgent.indexOf("Linux")!=-1) {
+        document.write("<a 
href='http://argouml-downloads.tigris.org/nonav/argouml-0.26/ArgoUML-0.26.tar.gz'
  onClick=\"javascript:urchinTracker('DOWNLOAD/ArgoUML-0.26.tar.gz')\">Download 
ArgoUML 0.26 (Linux/BSD)</a>");
+    }
+
+    else {
+        document.write("<a 
href='http://argouml-downloads.tigris.org/nonav/argouml-0.26/ArgoUML-0.26.zip'  
onClick=\"javascript:urchinTracker('DOWNLOAD/ArgoUML-0.26.zip')\">Download 
ArgoUML 0.26</a>");
+    }
+</script>
+</div>
+
+<div style="clear:both;" />
+
+<div id="news" class="block">
+<h1>Latest News</h1>
+<script type="text/javascript">
+document.write("<div style='display:none;'>");
+</script>
+<p>This news are provided by an external widget. You don't have javascript 
enabled, so we cannot show you our news.</p>
+<p>Please visit the <a 
href="http://argouml.tigris.org/servlets/ProjectNewsList";>ArgoUML news page</a> 
for knowing what is going on!</p>
+<script type="text/javascript">
+document.write("</div>");
+</script>
+<!-- RSS WIDGET -->
+<script 
src="http://www.gmodules.com/ig/ifr?url=http://customrss.googlepages.com/customrss.xml&amp;up_rssurl=http%3A%2F%2Fargouml.tigris.org%2Fservlets%2FProjectNewsRSS&amp;up_title=ArgoUML%20News&amp;up_titleurl=http%3A%2F%2Fargouml.tigris.org%2Fservlets%2FProjectNewsList&amp;up_num_entries=5&amp;up_linkaction=showdescription&amp;up_background=%23EEEEDD&amp;up_border=%23EEEEDD&amp;up_round=0&amp;up_fontfamily=Verdana&amp;up_fontsize=10pt&amp;up_openfontsize=9pt&amp;up_itempadding=3px&amp;up_bullet=icon&amp;up_custicon=Overrides%20favicon.ico&amp;up_boxicon=1&amp;up_opacity=20&amp;up_itemlinkcolor=%23003366&amp;up_itemlinkweight=Normal&amp;up_itemlinkdecoration=None&amp;up_vlinkcolor=C7CFA8&amp;up_vlinkweight=Normal&amp;up_vlinkdecoration=None&amp;up_showdate=1&amp;up_datecolor=9F9F9F&amp;up_tcolor=FFFFFF&amp;up_thighlight=%23666633&amp;up_desclinkcolor=1B5790&amp;up_color=000000&amp;up_dback=FFFFFF&amp;up_dborder=DFCE6F&amp;up_desclinkweight=Bold&amp;up_desclinkdecoration=None&amp;synd=open&amp;w=&amp;h=220&amp;title=&amp;border=%23ffffff%7C0px%2C0px+solid+%23004488%7C0px%2C1px+solid+%23005599%7C0px%2C0px+solid+%230077BB%7C0px%2C0px+solid+%230088CC&amp;output=js";></script>
 
-</td>
-<td valign="bottom">
-<div class="h2">
-<h2>User documentation</h2>
 </div>
-</td>
-</tr>
-<tr>
 
-<td style="background: #eed;">
-<img src="images/argologo100x100_on_eeeedd.gif" align="right" hspace="0" 
width="100" height="100" border="0">
+<div id="quickstart" class="block">
+<h1>Start ArgoUML Now (two methods)</h1>
+<ol>
+<li>
+
+<strong>Launch via Java Web Start:</strong></p>
+<p><a href="http://argouml-downloads.tigris.org/jws/argouml-latest-stable.jnlp";
+   onClick="javascript:urchinTracker('JWS/argouml-latest-stable.jnlp')"
+   >Click</a>
+to launch the latest stable release.</p>
+<p>Java Web Start is included with the latest Java runtimes.  If the
+link above doesn't work, you can
+update your Java version at <a href="http://java.com";>java.com</a> or get
+other Java Web Start versions and information from their
+<a href="http://java.sun.com/products/javawebstart/";>Java Web Start product 
page</a>.
+If you have problems, please
+see the <a href="faqs/users.html#jws">JWS part of the FAQ</a>.</p>
+</li>
+<li>
+<strong>Download files and run:</strong>
+<p>
+<ol>
+<li>Download latest stable release:
+<a 
href="http://argouml-downloads.tigris.org/nonav/argouml-0.26/ArgoUML-0.26.zip";
+   onClick="javascript:urchinTracker('DOWNLOAD/ArgoUML-0.26.zip')"
+   >0.26 zip</a>
+(<a href="http://argouml-downloads.tigris.org/argouml-0.26";>other formats & 
add-in modules</a>)<br>
+</li>
+<li>Unzip the archive.</li>
+<li>Run it:
+<ol style="list-style-type:lower-alpha;">
+<li>On Windows or Mac: Double-click on argouml.jar</li>
+<li>On Unix: Type the command 'java -jar argouml.jar'</li>
+</ol>
+</li>
+</ol>
+</p>
+</li>
+</div>
+
+<div style="clear:both;" />
+
+<div id="docs" class="block">
+<h1>User documentation</h1>
 <ul>
   <li>Quick Guide
    (<a 
href="http://argouml-stats.tigris.org/documentation/quick-guide-0.26/";>html</a> 
|
@@ -85,63 +200,46 @@
   <br>(You must be a logged in Tigris member to do this).
   </li>
 </ul>
-</td>
-</tr>
-<tr><td style="background: #eed;">
-<div class="h2" style="margin-top:0px;">
-<h2>Start ArgoUML Now (two methods)</h2>
 </div>
-<p><b>Launch via Java Web Start:</b><br>
-1. <a href="http://argouml-downloads.tigris.org/jws/argouml-latest-stable.jnlp";
-   onClick="javascript:urchinTracker('JWS/argouml-latest-stable.jnlp')"
-   >Click</a>
-to launch the latest stable release.</p>
 
-<p>Java Web Start is included with the latest Java runtimes.  If the
-link above doesn't work, you can
-update your Java version <a href="http://java.com";>here</a> or get
-other Java Web Start versions and information from their
-<a href="http://java.sun.com/products/javawebstart/";>product page</a>.
-If you have problems, please
-see the <a href="faqs/users.html#jws">JWS part of the FAQ</a>.</p>
-<p><b>Download files and run:</b><br>
-1. Download latest stable release:
-<a 
href="http://argouml-downloads.tigris.org/nonav/argouml-0.26/ArgoUML-0.26.zip";
-   onClick="javascript:urchinTracker('DOWNLOAD/ArgoUML-0.26.zip')"
-   >0.26 zip</a>
-(<a href="http://argouml-downloads.tigris.org/argouml-0.26";>other formats & 
add-in modules</a>)<br>
-2. Unzip the archive<br>
-3a. On Windows or Mac: Double-click on argouml.jar<br>
-3b. On Unix: Type the command 'java -jar argouml.jar'
+<div id="community" class="block">
+<h1>Joining the ArgoUML Community</h1>
+<p >
+Join the users' mailing list for your UML questions.
 </p>
-</td>
-<td>
-<!-- RSS WIDGET -->
-<script 
src="http://www.gmodules.com/ig/ifr?url=http://customrss.googlepages.com/customrss.xml&amp;up_rssurl=http%3A%2F%2Fargouml.tigris.org%2Fservlets%2FProjectNewsRSS&amp;up_title=ArgoUML%20News&amp;up_titleurl=http%3A%2F%2Fargouml.tigris.org%2Fservlets%2FProjectNewsList&amp;up_num_entries=5&amp;up_linkaction=showdescription&amp;up_background=%23EEEEDD&amp;up_border=%23EEEEDD&amp;up_round=0&amp;up_fontfamily=Verdana&amp;up_fontsize=12pt&amp;up_openfontsize=9pt&amp;up_itempadding=3px&amp;up_bullet=icon&amp;up_custicon=Overrides%20favicon.ico&amp;up_boxicon=1&amp;up_opacity=20&amp;up_itemlinkcolor=%23003366&amp;up_itemlinkweight=Normal&amp;up_itemlinkdecoration=None&amp;up_vlinkcolor=C7CFA8&amp;up_vlinkweight=Normal&amp;up_vlinkdecoration=None&amp;up_showdate=1&amp;up_datecolor=9F9F9F&amp;up_tcolor=FFFFFF&amp;up_thighlight=%23666633&amp;up_desclinkcolor=1B5790&amp;up_color=000000&amp;up_dback=FFFFFF&amp;up_dborder=DFCE6F&amp;up_desclinkweight=Bold&amp;up_desclinkdecoration=None&amp;synd=open&amp;w=520&amp;h=220&amp;title=ArgoUML+News&amp;border=%23ffffff%7C0px%2C1px+solid+%23004488%7C0px%2C1px+solid+%23005599%7C0px%2C1px+solid+%230077BB%7C0px%2C1px+solid+%230088CC&amp;output=js";></script>
-</td>
+<p>
+Join the <a href="irc://irc.freenode.net/argouml">#argouml</a> IRC channel at 
Freenode.
+</p>
+<p>
+Apply for a membership in the project to file bugs and issues and
+follow up on them.
+</p>
+
+<p>
+Why not check out the source code and build ArgoUML to see if you
+can fix your favorite problem yourself.
+Your help is most welcome!
+</p>
+</div>
 
-</tr>
+<div style="clear:both;" />
+
+<div id="tour" class="block">
+<h1>Screenshot (click for tour)</h1>
 
-<tr>
-<td colspan="2">
-<div class="h2">
-<h2>Screenshot (click for tour)</h2>
-<table border="0">
-<tr>
-<td>
 <a href="tours/">
-<img align="left" src="images/welcome_screenshot_0_26.png" alt="Go on the full 
tour" width="706" align="left" border="0" height="641">
+<img align="left" src="images/welcome_screenshot_0_26.png" alt="Go on the full 
tour" width="706" height="641">
 </a>
-</td>
-<td>
-<div>ArgoUML's user interface is divided into 4 panels:</div>
-<div><b>Top left</b>: a hierarchical view of the current project file.</div>
-<div><b>Top right</b>: editor for the selected part of the project, in this 
case a class diagram.</div>
-<div><b>Bottom left</b>: the designer's "to do" list.</div>
-<div><b>Bottom right</b>: details of the selected object in the diagram or the 
selected "to do" item.</div>
 
-<p><b>Supported diagrams</b>:</p>
-<ul>
+<p>ArgoUML's user interface is divided into 4 panels:</p>
+<ul style="list-style-position: inside;">
+<li><strong>Top left</strong>: a hierarchical view of the current project 
file.</li>
+<li><strong>Top right</strong>: editor for the selected part of the project, 
in this case a class diagram.</li>
+<li><strong>Bottom left</strong>: the designer's "to do" list.</li>
+<li><strong>Bottom right</strong>: details of the selected object in the 
diagram or the selected "to do" item.</li>
+</ul>
+<p><strong>Supported diagrams</strong>:</p>
+<ul style="list-style-position: inside;">
  <li>Class</li>
  <li>State</li>
  <li>Use case</li>
@@ -153,45 +251,26 @@
 
 <p>Learn more on the <a href="tours/">ArgoUML tour</a>.</p>
 
+</div><!-- end tour -->
 
-</td>
-</tr>
-</table>
-
-</div>
-</td>
-</tr>
-
-
-<tr>
-<td>
-<div class="h2">
-<h2>Commercial Extensions</h2>
-
-<p>
-ArgoUML is licensed under the BSD license which also allows extensions
-to be commercialized.
-</p>
+<div style="clear:both;" />
 
+<div id="developers" class="block">
+<h1>For Developers of ArgoUML</h1>
 <p>
-The company <a href="http://www.gentleware.com";>Gentleware</a>
-offers such an extension under the name
-<a href="http://www.gentleware.com/products/index.php3";>Poseidon for UML</a>.
-<br> A Community Edition is offered free of charge.
+ArgoUML is not only a free UML modelling tool, it is also an
+Open Source Development project where you are invited to contribute.
 </p>
 
 <p>
-The <a href="http://www.myeclipseide.com";>MyEclipse</a>
-UML modeling is also based on ArgoUML.
+Go to the <a href="dev.html">Developer Zone</a>
+to read about the project and to find the documentation of the internals
+of ArgoUML.
 </p>
-
 </div>
-</td>
-
 
-<td>
-<div class="h2">
-<h2>Donate to ArgoUML</h2>
+<div id="donate" class="block">
+<h1>Donate to ArgoUML</h1>
 
 <p>
 If you want to donate money to the ArgoUML project
@@ -203,65 +282,21 @@
   New York, NY 10023
 </pre>
 <p>
-or use PayPal and the address
-conservancy-argouml&#064;softwarefreedom.org.
-</p>
-</div>
-</td>
-</tr>
-
-
-<tr>
-<td>
-<div class="h2">
-<h2>Joining the ArgoUML Community</h2>
-<p>
-Join the users' mailing list for your UML questions.
-</p>
-<p>
-Join the <a href="irc://irc.freenode.net/argouml">#argouml</a> IRC channel at 
Freenode.
-</p>
-<p>
-Apply for a membership in the project to file bugs and issues and
-follow up on them.
-</p>
-
-<p>
-Why not check out the source code and build ArgoUML to see if you
-can fix your favorite problem yourself.
-Your help is most welcome!
+or use PayPal and the address 
+<pre>
+  conservancy-argouml&#064;softwarefreedom.org
+</pre>
 </p>
-
 </div>
-</td>
 
-<td>
-<div class="h2">
-<h2>For Developers of ArgoUML</h2>
-<p>
-ArgoUML is not only a free UML modelling tool, it is also an
-Open Source Development project where you are invited to contribute.
-</p>
-
-<p>
-Go to the <a href="dev.html">Developer Zone</a>
-to read about the project and to find the documentation of the internals
-of ArgoUML.
-</p>
-
-<p>
+<div id="membership">
+<a href="http://www.ddj.com/184414991?pgno=10";>
+    <img src="images/jolt02_productivity.gif" width="150" height="89" 
border="0"/>
+</a>
 <a href="http://www.java.net";>
-  <img src="images/java_dot_net_member.gif" width="170" heigth="47" border="0"
+    <img src="images/java_dot_net_member.gif" width="170" heigth="47" 
border="0"
        alt="java.net - The Source for Java Technology Collaboration"/>
 </a>
-</p>
-
-</td>
-</tr>
-</table>
-
-
-
 </div>
 
 </body>

Removed: trunk/www/test.html
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/www/test.html?view=auto&rev=15866

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to