incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robw...@apache.org
Subject svn commit: r1331531 - /incubator/ooo/ooo-site/trunk/content/index.html
Date Fri, 27 Apr 2012 18:28:18 GMT
Author: robweir
Date: Fri Apr 27 18:28:18 2012
New Revision: 1331531

URL: http://svn.apache.org/viewvc?rev=1331531&view=rev
Log:
resolve conflict

Modified:
    incubator/ooo/ooo-site/trunk/content/index.html

Modified: incubator/ooo/ooo-site/trunk/content/index.html
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/index.html?rev=1331531&r1=1331530&r2=1331531&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/index.html (original)
+++ incubator/ooo/ooo-site/trunk/content/index.html Fri Apr 27 18:28:18 2012
@@ -1,131 +1,111 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-  <meta name="verify-v1" content="7/WnCcvax+gnJU1u0eXYQOYtS6zlmE13fsCzq+qnlUs="/>
-  <meta name="google-site-verification" content="x1jl2cGum4kCvj0PgxjTy_pasCsLY_fBT7my88fpKD4"/>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <link href="https://plus.google.com/114598373874764163668" rel="publisher" />
-  <title>OpenOffice.org - The Free and Open Productivity Suite</title>
-  <script type="text/javascript" src="download/globalvars.js"></script>
-  <script type="text/javascript" src="download/languages.js"></script>
-  <script type="text/javascript" src="download/download.js"></script>
-  <script type="text/javascript" src="download/download_bouncer.js"></script>
-  <script type="text/javascript" src="download/download_mirrorbrain.js"></script>
-  <script type="text/javascript">
-  <!--
-  var SHOWDOWNLOAD = false;
-
-  function toggleDownload() {
-  if (!SHOWDOWNLOAD) {
-    SHOWDOWNLOAD = true;
-    showDownload();
-  } else {
-    SHOWDOWNLOAD = false;
-    hideDownload();
-  }
-  }
-
-  function showDownload() {
-  var LINK         = getLink( VERSION, MIRROR, SCHEMA );
-  var downloadCont = document.getElementById("action-download-extra");
-  var newHTML      = "<div id=\"buttonwrap\"><div id=\"downloadbutton\" onclick=\"openItem('optionitem1','"
+ LINK + "'); return false;\">";
-
-  if ( hasMirrorLink() ) {
-    newHTML += "<h3><a href=\"" + LINK + "\" title=\"" + LINK + "\">Download
now!</a></h3>"
-    + "<p>Start downloading OpenOffice.org " + VERSION + " for " + getPlatform() +
" in "
-    + getLanguage() + "<br/>(Java Runtime Environment (JRE) included for all OS versions
except Linux 32/64-bit Debian and Mac OS)</p>";
-  } else {
-    newHTML += "<h3><a href=\""+ LINK + "\" title=\"" + LINK + "\">Download now!</a></h3><p>Get
OpenOffice.org from your "
-    + getLanguage() + " Native Language community</p>";
-
-  }
-
-  newHTML += "</div><p class=\"options\"><a href=\"/download/other.html\""
-  + "title=\"Get all platforms and languages, non-JRE versions, language packs to download\"
onclick=\"document.location = this.href; return false;\">"
-  + "Get all platforms and languages</a> | "
-  + "<br><a href=\"/download/index.html\" title=\"More information\" onclick=\"document.location
= this.href; return false;\">Installation information and more ways to get OpenOffice.org</a></p></div>";
-  downloadCont.innerHTML = newHTML;
-  }
-
-  function hideDownload() {
-  var downloadCont       = document.getElementById("action-download-extra");
-  var newHTML            = "";
-  downloadCont.innerHTML = newHTML;
-  }
-  //-->
-  </script>
-  <style type="text/css">
-  /* <![CDATA[ */
-  /*-------------------- Exceptions on standard css -----------------------*/
-  @import "home.css";
-  @import "styles.css";
-  @import "exceptions.css";
-  /* ]]> */
-  </style>
-  <link rel="stylesheet" type="text/css" href="/product/product.css" media="screen"/>
-	
-	
-<script src="scripts/entourage.js"></script>
-	
-<script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-30193653-1']);
-  _gaq.push(['_setDomainName', 'openoffice.org']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    <meta name="description" content="The offical home page of the Apache OpenOffice open
source project, home of OpenOffice Writer, Calc, Presents, Draw and Base." />
+    <meta name="keywords" content="OpenOffice, Open Office, Apache OpenOffice, OpenOffice.org,
Calc, Presents, Draw, Base, ODF, Open Document Format, free office editors" />
+    <meta name="google-site-verification" content="x1jl2cGum4kCvj0PgxjTy_pasCsLY_fBT7my88fpKD4"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    
+	<link href="https://plus.google.com/114598373874764163668" rel="PUBLISHER" />
+    
+	<title>OpenOffice.org - The Free and Open Productivity Suite</title>
+    <style type="text/css">
+    
+	/* <![CDATA[ */
+    /*-------------------- Exceptions on standard css -----------------------*/
+    @import "home.css";
+    @import "styles.css";
+    @import "exceptions.css";
+    /* ]]> */
+    </style>
+    
+	<link rel="STYLESHEET" type="text/css" href="/product/product.css" media="screen"/>
+    
+	<script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', 'UA-30193653-1']);
+    _gaq.push(['_setDomainName', 'openoffice.org']);
+    _gaq.push(['_trackPageview']);
+    (function(){
+     var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
     ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-
-</script>		
-	
-	
+    })();
+    </script>
 </head>
 
-<body>
-
-  <!-- commment added in the online CMS -->
+	<body>
+<!-- commment added in the online CMS -->
 <div id="actionstatements">
-  <ul>
-  <li><div class="action-info"><div class="action-text action-link">
-  <h2><a name="content" href="/why/">I want to learn more about OpenOffice.org</a></h2>
-  <p><a href="/why/">What is OpenOffice.org? And why should I use it?</a></p>
-  </div></div></li>
-  <li><hr/></li>
-
-  <li><div class="action-download"><div class="action-text action-expand"
-  onclick="if ( SHOWDOWNLOAD ) { this.className='action-text action-contract' } else { this.className='action-text
action-expand' }">
-  <h2><a href="/download" onclick="toggleDownload(); return false;">I want to
download OpenOffice.org</a></h2>
-  <p><a href="/download" onclick="toggleDownload(); return false;">
-  Download OpenOffice.org for free, or find out about other ways of getting it.</a></p>
-  </div>
-  <div id="action-download-extra"></div></div></li>
-  <li><hr/></li>
-
-  <li><div class="action-help"><div class="action-text action-link">
-  <h2><a href="/support/">I need help with my OpenOffice.org</a></h2>
-  <p><a href="/support/">Help is at hand whenever you need it.</a></p>
-  </div></div></li>
-  <li><hr/></li>
-
-  <li><div class="action-extend"><div class="action-text action-link">
-  <h2><a href="/extensions/">I want to do more with my OpenOffice.org</a></h2>
-  <p><a href="/extensions/">Extend OpenOffice.org with additional functionality,
templates and clipart.</a></p>
-  </div></div></li>
-  <li><hr/></li>
-
-  <li><div class="action-participate"><div class="action-text action-link">
-  <h2><a href="http://incubator.apache.org/openofficeorg/get-involved.html">I
want to participate in OpenOffice.org</a></h2>
-  <p><a href="http://incubator.apache.org/openofficeorg/get-involved.html"> 
OpenOffice.org is made with help from people all over the world. Feel free to contribute!</a></p>
-  </div></div></li>
-  <li><hr/></li>
-
-  </ul>
+    <ul>
+        <li>
+            <div class="action-info">
+                <div class="action-text action-link">
+                    <h2><a name="content" href="/why/">I want to learn more about
OpenOffice.org</a></h2>
+                    <p>
+                    <a href="/why/">What is OpenOffice.org? And why should I use it?</a>
+                    </p>
+                </div>
+            </div>
+        </li>
+        <li>
+            <hr/>
+        </li>
+        <li>
+            <div class="action-download">
+                <div class="action-text action-link">
+                    <h2><a href="/download">I want to download 
+                        OpenOffice.org</a></h2>
+                        <p>
+                        <a href="/download">Download OpenOffice.org for free, or find
out about other ways of getting it.</a>
+                        </p>
+                    </div>
+            </div>
+        </li>
+        <li>
+            <hr/>
+        </li>
+        <li>
+            <div class="action-help">
+                <div class="action-text action-link">
+                    <h2><a href="/support/">I need help with my OpenOffice.org</a></h2>
+                    <p>
+                    <a href="/support/">Help is at hand whenever you need it.</a>
+                    </p>
+                </div>
+            </div>
+        </li>
+        <li>
+            <hr/>
+        </li>
+        <li>
+            <div class="action-extend">
+                <div class="action-text action-link">
+                    <h2><a href="/extensions/">I want to do more with my OpenOffice.org</a></h2>
+                    <p>
+                    <a href="/extensions/">Extend OpenOffice.org with additional functionality,
templates and clipart.</a>
+                    </p>
+                </div>
+            </div>
+        </li>
+        <li>
+            <hr/>
+        </li>
+        <li>
+            <div class="action-participate">
+                <div class="action-text action-link">
+                    <h2><a href="http://incubator.apache.org/openofficeorg/get-involved.html">I
want to participate in OpenOffice.org</a></h2>
+                    <p>
+                    <a href="http://incubator.apache.org/openofficeorg/get-involved.html">OpenOffice.org
is made with help from people all over the world. Feel free to contribute!</a>
+                    </p>
+                </div>
+            </div>
+        </li>
+        <li>
+            <hr/>
+        </li>
+    </ul>
 </div>
-
 <div id="news">
 <div class="campaign">
   <h2>Follow Apache OpenOffice on Twitter, Google+ and Facebook</h2>
@@ -153,7 +133,5 @@
 
 
 </div>
-  
-
 </body>
 </html>



Mime
View raw message