svn commit: r1414639 - in /ofbiz/site: documentation.html index.html

[jacopoc]

Author: jacopoc
Date: Wed Nov 28 11:28:24 2012
New Revision: 1414639

URL: http://svn.apache.org/viewvc?rev=1414639&view=rev
Log:
Moved the right bar links pointing to resources external to the site (most of them related to the Wikis) from the index.html to the documentation.html page.

Modified:
    ofbiz/site/documentation.html
    ofbiz/site/index.html

Modified: ofbiz/site/documentation.html
URL: http://svn.apache.org/viewvc/ofbiz/site/documentation.html?rev=1414639&r1=1414638&r2=1414639&view=diff
==============================================================================
--- ofbiz/site/documentation.html (original)
+++ ofbiz/site/documentation.html Wed Nov 28 11:28:24 2012
@@ -80,6 +80,14 @@ The following is a selection of Wiki pag
     <li><a href="https://cwiki.apache.org/confluence/display/OFBTECH/Framework+Introduction+Videos+and+Diagrams" target="ofbiz-wiki">Framework Introduction Videos and Diagrams</a></li>
     <li><a href="https://cwiki.apache.org/confluence/display/OFBIZ/OFBiz+Tutorial+-+A+Beginners+Development+Guide" target="ofbiz-wiki">OFBiz Development Guide For Beginners</a></li>
     <li><a href="https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Contributors+Best+Practices" target="ofbiz-wiki">OFBiz Contributors Best Practices</a></li>
+    <li><a href="https://cwiki.apache.org/confluence/display/OFBIZ/FAQ+-+Tips+-+Tricks+-+Cookbook+-+HowTo" target="ofbiz-wiki">FAQ - Tips - Tricks - HowTo</a></li>
+    <li><a href="https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Related+Books" target="ofbiz-wiki">Recommended Books</a></li>
+    <li><a href="https://cwiki.apache.org/confluence/display/OFBIZ/Screenshots" target="ofbiz-wiki">Screenshots</a></li>
+    <li><a href="https://cwiki.apache.org/confluence/display/OFBIZ/Open+Source+Projects+and+Standards" target="ofbiz-wiki">Open Source Projects, Standards</a></li>
+    <li><a href="https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+Service+Providers" target="ofbiz-wiki">Apache OFBiz Service Providers</a></li>
+    <li><a href="https://cwiki.apache.org/confluence/display/OFBIZ/In+The+News" target="ofbiz-wiki">In The News</a></li>
+    <li><a href="https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+User+List" target="ofbiz-wiki">Users of Apache OFBiz</a></li>
+    <li><a href="http://www.youtube.com/user/ofbiz" target="ofbiz-wiki">Watch OFBiz on YouTube</a></li>
   </ul>
 </p>
           

Modified: ofbiz/site/index.html
URL: http://svn.apache.org/viewvc/ofbiz/site/index.html?rev=1414639&r1=1414638&r2=1414639&view=diff
==============================================================================
--- ofbiz/site/index.html (original)
+++ ofbiz/site/index.html Wed Nov 28 11:28:24 2012
@@ -177,7 +177,7 @@
 
         <h3>Who is Using Apache OFBiz?</h3>
             <p>It's hard to say who and how many organizations are using Apache OFBiz because you don't have to tell us when you use it, but there are lots of public sites.</p>
-            <p>For a list of sites and products based on OFBiz see the <a href="https://cwiki.apache.org/OFBIZ/apache-ofbiz-user-list.html">Apache OFBiz User List</a> page.</p>
+            <p>In the <a href="documentation.html">documentation</a> page you'll find link to a Wiki page with the list of sites and products based on OFBiz we know about (&quot;Users of Apache OFBiz&quot;).</p>
     </div>
         <!-- main ends -->
 
@@ -188,40 +188,26 @@
             <div class="downloadNow"><a href="download.html"><img src="images/download.jpg" /></a></div>
             <h3>Resources &amp; Tools</h3>
             <ul class="sidemenu">
-                <li><a href="https://cwiki.apache.org/OFBADMIN/ofbiz-documentation-index.html">Main Documentation Page</a></li>
                 <li><a href="https://cwiki.apache.org/OFBADMIN/mailing-lists.html">Mailing Lists</a></li>
-                <li><a href="https://cwiki.apache.org/OFBIZ/ofbiz-tutorial-a-beginners-development-guide.html">Tutorial for beginners</a></li>
-                <hr>
                 <li><a href="https://issues.apache.org/jira/browse/OFBIZ">Issue Tracker (Jira)</a></li>
                 <li><a href="https://cwiki.apache.org/OFBADMIN/ofbiz-source-repository-and-access.html">Source Repository (SVN)</a></li>
-                <li><a href="http://fisheye6.atlassian.com/browse/ofbiz">Source Browse and Stats (Fisheye)</a></li>
                 <li><a href="http://ci.apache.org/projects/ofbiz/site/javadocs/">API Reference (Javadoc)</a></li>
-                <hr>
-                <li><a href="https://cwiki.apache.org/OFBIZ/main-new-features.html">What is New?</a></li>
-                <li><a href="https://cwiki.apache.org/OFBIZ/">Documentation Site: Wiki</a></li>
-                <li><a href="https://cwiki.apache.org/OFBIZ/faq-tips-tricks-cookbook-howto.html">FAQ - Tips - Tricks - HowTo</a></li>
-                <li><a href="https://cwiki.apache.org/OFBADMIN/ofbiz-related-books.html">Recommended Books</a></li>
+                <!-- TODO: the format of the page is very old and some of the videos are unavailable: move the page to the Wiki and add the link to it to the documentation.html page
                 <li><a href="VideosConf.html">Conference Videos</a></li>
-                <li><a href="http://www.youtube.com/user/ofbiz">Watch OFBiz on YouTube</a></li>
-                <li><a href="https://cwiki.apache.org/OFBIZ/screenshots.html">Screenshots</a></li>
-                <li><a href="https://cwiki.apache.org/OFBIZ/open-source-projects-and-standards.html">Open Source Projects, Standards</a></li>
-                <li><a href="https://cwiki.apache.org/OFBIZ/apache-ofbiz-service-providers.html" target="_blank">Apache OFBiz Service Providers</a></li>
-                <li><a href="https://cwiki.apache.org/OFBIZ/in-the-news.html" target="_blank">In The News</a></li>
-            </ul>
-            <h3>Demo Sites</h3>
-            <ul class="sidemenu">
-                <li>10.04 Release:
+                -->
+                <li>10.04 Release Branch Demo
                     <ul>
                         <li><a href="http://demo-stable.ofbiz.apache.org/ecommerce/control/main">Front-End Store</a></li>
                         <li><a href="https://demo-stable.ofbiz.apache.org/catalog/control/main?USERNAME=flexadmin&amp;PASSWORD=ofbiz&amp;JavaScriptEnabled=Y">Management Apps</a></li>
                     </ul>
                 </li>
-                <li>09.04 Release:
+                <li>09.04 Release Branch Demo
                     <ul>
                         <li><a href="http://demo-old.ofbiz.apache.org/ecommerce/control/main">Front-End Store</a></li>
                         <li><a href="https://demo-old.ofbiz.apache.org/catalog/control/main?USERNAME=flexadmin&amp;PASSWORD=ofbiz&amp;JavaScriptEnabled=Y">Management Apps</a></li>
                     </ul>
                 </li>
+            </ul>
             <h3>Apache Software Foundation</h3>
             <ul class="sidemenu">
                 <li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
@@ -229,10 +215,6 @@
                 <li><a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks</a></li>
                 <li><a href="download.html#vulnerabilities">Security</a></li>
             </ul>
-
-<!-- Removed for now - this has not been duplicated on apache infrastructure -->
-<!--                <li><a href="http://log.ofbiz.org/">Daily Log Files<br /><span>trunk and release demo log files.</span></a></li> -->
-            </ul>
         </div>
         <!-- sidebar -->
       </div>