[Libreoffice-commits] .: 5 commits - autodoc/source odk/docs odk/index.html odk/util

Andras Timar timar at kemper.freedesktop.org
Tue Sep 6 15:25:46 PDT 2011


 autodoc/source/display/html/cfrstd.cxx |   18 
 odk/docs/common/ref/idl.css            |   27 -
 odk/docs/cpp/ref/cpp.css               |   40 -
 odk/docs/images/nav_up.png             |binary
 odk/docs/install.html                  |   90 +--
 odk/docs/notsupported.html             |   58 +-
 odk/docs/sdk_styles.css                |  838 ++++++++++++++++++++++++++++++++-
 odk/docs/tools.html                    |   72 +-
 odk/index.html                         |  106 +---
 odk/util/makefile.pmk                  |    2 
 10 files changed, 1045 insertions(+), 206 deletions(-)

New commits:
commit 6a59f572a4d76ee8e0e2cd82f3a4e06077e4ac38
Author: Andras Timar <atimar at suse.com>
Date:   Wed Sep 7 00:26:11 2011 +0200

    don't use fixed version number

diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index 2fd708a..583f33a 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -26,7 +26,7 @@
 #*************************************************************************
 
 # used for sdk common files
-PRODUCT_RELEASE=3.4
+PRODUCT_RELEASE=$(PRODUCTVERSION)
 OFFICENAME=LibreOffice
 SDKDIRNAME=libreoffice$(PRODUCT_RELEASE)_sdk
 OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE)
commit e1d42d404099fb83e9bb9d3434cce6807ee459d4
Author: Andras Timar <atimar at suse.com>
Date:   Wed Sep 7 00:19:15 2011 +0200

    css tweaks and LibreOffice branding

diff --git a/odk/docs/common/ref/idl.css b/odk/docs/common/ref/idl.css
index 7d4a305..ab94520 100644
--- a/odk/docs/common/ref/idl.css
+++ b/odk/docs/common/ref/idl.css
@@ -5,10 +5,10 @@
 
 body { background-color:#ffffff; }
 
-#adc-idlref a { text-decoration: none; }
-#adc-idlref a:link { color: #18a303; }
-#adc-idlref a:visited { color: #84f671; }
-#adc-idlref a:active { color: #2cee0e; }
+#adc-idlref a { color: #000000;	text-decoration: none; }
+#adc-idlref a:link { color: #18A303;	text-decoration: none; }
+#adc-idlref a:hover { text-decoration: underline; }
+#adc-idlref a:visited { color: #106802; }
 
 #adc-idlref h3
 	    { font-size:13pt; font-weight:bold;
@@ -45,10 +45,10 @@ body { background-color:#ffffff; }
 #adc-idlref td.imsum_left  { width:30%;  }
 #adc-idlref td.imsum_right { width:70%;  }
 
-#adc-idlref table.navimain { background-color:#c2f6ba; }
+#adc-idlref table.navimain { background-color:#18a303; }
 
 #adc-idlref td.navimain
-	    { background-color:#c2f6ba;
+	    { background-color:#18a303;
 	      text-align:center;
 	      font-family: Arial; font-size:12pt; font-weight:bold;
 	      padding-left:7pt; padding-right:7pt; }
@@ -56,11 +56,12 @@ body { background-color:#ffffff; }
 #adc-idlref td.navimainself
 	    { text-align:center;
 	      font-family: Arial; font-size:12pt; font-weight:bold;
-	      color:#ffffff; }
+	      color:#ffffff; background-color:#106802;}
 
 #adc-idlref td.navimainnone
 	    { text-align:center;
-	      font-family: Arial; font-size:12pt; }
+	      font-family: Arial; font-size:12pt;
+	      color:#ffffff; }
 
 #adc-idlref td.navisub
 	    { text-align:center;
@@ -79,9 +80,13 @@ body { background-color:#ffffff; }
 
 #adc-idlref a.membertitle  { font-size:12pt; font-weight:bold; line-height:18pt; }
 
-#adc-idlref a:link.navimain, #adc-idlref a:link.navisub  { color:#18a303; }
-#adc-idlref a:visited.navimain, #adc-idlref a:visited.navisub { color: #84f671; }
-#adc-idlref a:active.navimain, #adc-idlref a:active.navisub { color: #2cee0e; }
+#adc-idlref a:link.navisub  { color:#18a303; }
+#adc-idlref a:visited.navisub { color: #106802; }
+#adc-idlref a:hover.navisub { color: #106802; text-decoration: underline; }
+
+#adc-idlref a:link.navimain  { color:#ffffff; }
+#adc-idlref a:visited.navimain { color: #ffffff; }
+#adc-idlref a:hover.navimain { color: #ffffff; text-decoration: underline; }
 
 #adc-idlref .dt            { font-weight:bold; }
 #adc-idlref .namechain     { font-size:13pt; font-weight:bold; margin-top:3pt; margin-bottom:6pt; }
diff --git a/odk/docs/cpp/ref/cpp.css b/odk/docs/cpp/ref/cpp.css
index cf1226b..0d279b9 100644
--- a/odk/docs/cpp/ref/cpp.css
+++ b/odk/docs/cpp/ref/cpp.css
@@ -3,10 +3,10 @@
 
 body   { background-color:#ffffff; }
 
-#adc-cppref a { text-decoration: none; }
-#adc-cppref a:link { color: #18a303; }
-#adc-cppref a:visited { color: #84f671; }
-#adc-cppref a:active { color: #2cee0e; }
+#adc-cppref a { color: #000000;	text-decoration: none; }
+#adc-cppref a:link { color: #18A303;	text-decoration: none; }
+#adc-cppref a:hover { text-decoration: underline; }
+#adc-cppref a:visited { color: #106802; }
 
 #adc-cppref h1     { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }
 #adc-cppref h2     { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }
@@ -37,17 +37,17 @@ body   { background-color:#ffffff; }
 #adc-cppref td.flagno      { font-family:Arial; font-size:8pt; }
 #adc-cppref td.flagtext    { font-family:Arial; font-size:8pt; font-weight:bold; }
 
-#adc-cppref td.navimain, td.navimain a
+#adc-cppref td.navimain
                { background-color:#c2f6ba;
                  font-family:Arial; font-size:12pt; font-weight:bold; }
-
+                 
 /* background-color:#eeeeff; color:#000000; */
 
 #adc-cppref td.navimainself
-               { background-color:#18a303; color:#ffffff;
+               { background-color:#106802; color:#ffffff;
                  font-family:Arial; font-size:12pt; font-weight:bold; }
 #adc-cppref td.navimainnone
-               {background-color:#c2f6ba;
+               {background-color:#c2f6ba; 
                  font-family:Arial; font-size:12pt; }
 
 #adc-cppref div.define     { font-family:Arial; background-color:#c2f6ba; }
diff --git a/odk/docs/images/nav_up.png b/odk/docs/images/nav_up.png
index 8267ada..d583b31 100644
Binary files a/odk/docs/images/nav_up.png and b/odk/docs/images/nav_up.png differ
diff --git a/odk/docs/install.html b/odk/docs/install.html
index 2dc4dab..38ff7ac 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -2,17 +2,26 @@
 <head>
   <title>LibreOffice %PRODUCT_RELEASE% SDK - Installation Guide</title>
   <link rel="stylesheet" type="text/css" href="sdk_styles.css">
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <meta name="author" content="J&uuml;rgen Schmidt">
   <meta name="created" content="2004-12-14">
 </head>
-<body class="sdkbody"><a name="install"/>
-<table class="table1" cellpadding=0>
-  <tr style="background-image:url(images/sdk_head-2.png)"> 
-      <td align="left" width="377"><a href="http://www.libreoffice.org/"><img src="images/sdk_head-1.png" width="377" height="120" border="0"></a></td>
-      <td valign="center" align="left" class="head1">Software Development Kit %PRODUCT_RELEASE%</td>
-  </tr>
-</table>
+    <body>
+        <div id="BgContainer">
+            <div id="Container">
+                <div id="TopHeader">
+                    <a id="Logo" href="http://www.libreoffice.org/" title="Go to the Home of LibreOffice and the LibreOffice Community page"></a>
+                    <p id="HeaderTagLine">
+                        Software Development Kit %PRODUCT_RELEASE%  
+                    </p>
+                </div> 
+                <div class="clear">
+                </div> 
+                <div id="Layout">
+                    <div class="typography">
+                        <h1>
+                            Installation Guide
+                        </h1>
 <table class="table1" cellpadding=0>
   <tr> 
     <td colspan="3"><img  class="nothing10" src="images/nada.gif"></td>
@@ -24,16 +33,6 @@
 	    <tr> 
 		  <td colspan="3"><img class="nothing1" src="images/nada.gif"></td>
         </tr>
-        <tr> 
-          <td> 
-          <table class="table3">
-		  <tr> 
-			<td colspan="2" class="head1">Installation Guide</td>
-			<td align="right"><a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a></td>
-		  </tr> 
-		  </table>
-          </td>
-        </tr>
 		<tr>
           <td> 
           <table class="table3">
@@ -75,7 +74,7 @@
 		  <table class="table4">
 		  <tr>
 		  <td class="cell15">Solaris</td>
-		  <td class="cell85">Sun Studion 8 (20070730)</td>
+		  <td class="cell85">Sun Studio 8 (20070730)</td>
 		  </tr>
 		  <tr>
 		  <td class="cell15">Linux</td>
@@ -120,12 +119,6 @@
 		  <tr valign="middle"> 
             <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td>
           </tr>
-		  <tr> 
-		    <td><img class="nothing10" src="images/nada.gif"></td>
-			<td align="right">
-			<a href="#install" title="link to the top of this page"><img class="navigate" src="images/nav_up.png"></a>
-			<a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a></td>
-		  </tr>
 		  <tr valign="middle"> 
           <td colspan="2">
 		  <p>The SDK provides an implicit configuration mechanism, which
@@ -242,12 +235,6 @@
 		  <tr valign="middle"> 
             <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td>
           </tr>
-		  <tr> 
-		    <td><img class="nothing10" src="images/nada.gif"></td>
-			<td align="right">
-			<a href="#install" title="link to the top of this page"><img class="navigate" src="images/nav_up.png"></a>
-			<a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a></td>
-		  </tr>
 		  <tr>
 		  <td colspan="2">
 		  <p class="head2">Manual Setting</p>
@@ -401,21 +388,28 @@
 	  </table>
 	</td>  	
   </tr>
-  <tr> 
-    <td colspan="3"><img class="nothing30" src="images/nada.gif"></td>
-  </tr>
-  <tr> 
-    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td>
-  </tr>
-  <tr> 
-    <td colspan="3"> 
-      <div class="centertext">
-	      <p>LibreOffice is copyright &copy; 2000, 2011 LibreOffice contributors and/or their affiliates. All rights reserved.</p>
-	      <p>LibreOffice is derived from OpenOffice.org. OpenOffice.org is copyright &copy; 2000, 2011 Oracle and/or its affiliates. All rights reserved.</p>
-	      <p>Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.</p>
-      </div>
-    </td>
-  </tr>
 </table>
-</body>
-</html>
+                </div> 
+                <div id="Footer">
+                    <div id="FooterText">
+                        <p>
+                            Copyright © 2000, 2010 LibreOffice contributors and/or their affiliates. All rights reserved.
+                            <br>
+                            LibreOffice was created by The Document Foundation, based on OpenOffice.org, which is Copyright 2000, 2010 Oracle and/or its affiliates.
+                            <br>
+                            The Document Foundation acknowledges all community members, please find more info <a href="http://www.libreoffice.org/about-us/credits/" target="_blank">at our website</a>.
+                        </p>
+                        <p>
+                            &nbsp;
+                        </p>
+                        <p>
+                            <a href="http://www.libreoffice.org/privacy" target="_blank">Privacy Policy</a> | <a href="http://www.libreoffice.org/imprint" target="_blank">Impressum (Legal Info)</a>
+                            | Copyright information: The source code of LibreOffice is licensed under the GNU Lesser General Public License (<a href="http://www.libreoffice.org/download/license/" target="_blank">LGPLv3</a>). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our <a href="http://wiki.documentfoundation.org/TradeMark_Policy" target="_blank">trademark policy</a>.
+                        </p>
+                    </div> 
+                </div> 
+            </div> 
+        </div> 
+    </body> 
+</html> 
+
diff --git a/odk/docs/notsupported.html b/odk/docs/notsupported.html
index c012f07..d9d6a13 100644
--- a/odk/docs/notsupported.html
+++ b/odk/docs/notsupported.html
@@ -1,23 +1,28 @@
 <html>
     <head>
-        <title>LibreOffice %PRODUCT_RELEASE% SDK - Not supported page</title> 
+        <title>LibreOffice 3.4 SDK - Not supported page</title> 
         <link rel="stylesheet" type="text/css" href="sdk_styles.css">
         <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
         <meta name="author" content="J&uuml;rgen Schmidt">
         <meta name="created" content="2004-12-14">
     </head> 
-    <body class="sdkbody">
+    <body>
+        <div id="BgContainer">
+            <div id="Container">
+                <div id="TopHeader">
+                    <a id="Logo" href="http://www.libreoffice.org/" title="Go to the Home of LibreOffice and the LibreOffice Community page"></a>
+                    <p id="HeaderTagLine">
+                        Software Development Kit 3.4  
+                    </p>
+                </div> 
+                <div class="clear">
+                </div> 
+                <div id="Layout">
+                    <div class="typography">
+                        <h1>
+                            Not supported
+                        </h1>
         <table class="table1" cellpadding="0">
-            <tr style="background-image:url(images/sdk_head-2.png); background-position: bottom; ">
-                <td colspan="2" align="left">
-                    <img src="images/sdk_head-1.png" width="377" height="120" border="0">
-                </td> 
-            </tr> 
-            <tr>
-                <td colspan="3">
-                    <img class="nothing10" src="images/nada.gif">
-                </td> 
-            </tr> 
             <tr>
                 <td colspan="3">
                     <table class="table2">
@@ -48,27 +53,28 @@
                     <img class="nothing30" src="images/nada.gif">
                 </td> 
             </tr> 
-            <tr>
-                <td colspan="3">
-                    <img class="line" src="images/sdk_line-1.gif">
-                </td> 
-            </tr> 
-            <tr>
-                <td colspan="3">
-                    <div class="centertext">
+        </table> 
+                </div> 
+                <div id="Footer">
+                    <div id="FooterText">
                         <p>
-                            LibreOffice is copyright &copy; 2000, 2011 LibreOffice contributors and/or their affiliates. All rights reserved. 
+                            Copyright © 2000, 2010 LibreOffice contributors and/or their affiliates. All rights reserved.
+                            <br>
+                            LibreOffice was created by The Document Foundation, based on OpenOffice.org, which is Copyright 2000, 2010 Oracle and/or its affiliates.
+                            <br>
+                            The Document Foundation acknowledges all community members, please find more info <a href="http://www.libreoffice.org/about-us/credits/" target="_blank">at our website</a>.
                         </p>
                         <p>
-                            LibreOffice is derived from OpenOffice.org. OpenOffice.org is copyright &copy; 2000, 2011 Oracle and/or its affiliates. All rights reserved. 
+                            &nbsp;
                         </p>
                         <p>
-                            Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners. 
+                            <a href="http://www.libreoffice.org/privacy" target="_blank">Privacy Policy</a> | <a href="http://www.libreoffice.org/imprint" target="_blank">Impressum (Legal Info)</a>
+                            | Copyright information: The source code of LibreOffice is licensed under the GNU Lesser General Public License (<a href="http://www.libreoffice.org/download/license/" target="_blank">LGPLv3</a>). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our <a href="http://wiki.documentfoundation.org/TradeMark_Policy" target="_blank">trademark policy</a>.
                         </p>
                     </div> 
-                </td> 
-            </tr> 
-        </table> 
+                </div> 
+            </div> 
+        </div> 
     </body> 
 </html> 
 
diff --git a/odk/docs/sdk_styles.css b/odk/docs/sdk_styles.css
index 745e211..d1cd940 100644
--- a/odk/docs/sdk_styles.css
+++ b/odk/docs/sdk_styles.css
@@ -1,6 +1,838 @@
-a { text-decoration: none; }
-a:link { color: #18a303; }
-a:visited { color: #84f671; }
+/* Core Styles */
+
+* {
+	margin: 0;
+	padding: 0;
+}
+
+body {
+	font: 87.5% sans-serif;
+	background: url(http://www.libreoffice.org/themes/libo/images/background-page.png) repeat-x #FFF;
+}
+
+/* Styles go from the top of the page to the bottom (generally) */
+
+#Container {
+	width: 900px;
+	margin: auto;
+}
+
+#Logo {
+	display: inline-block;
+	width: 218px;
+	height: 45px;
+	padding: 18px 20px;
+	background: url(http://www.libreoffice.org/themes/libo/images/logo.png) no-repeat 18px 20px;
+	*float:left;/* hack for IE7 that doesn't respect inline-block */
+}
+#TopHeader { height: 88px;/* needed for IE7 */}
+#TopHeader, #BottomHeader {
+	padding-left: 5px;
+	padding-right: 5px;
+	background-image: url(http://www.libreoffice.org/themes/libo/images/header.png);
+	background-repeat: no-repeat;
+}
+#Layout {
+	padding: 0 5px;
+}
+#HeaderTagLine {
+	float: right; 
+	padding-top: 30px;
+	padding-right: 20px;
+	color: #18A303;
+	font-size: 1.2em;
+}
+
+#BottomHeader {
+	background-position: 0 bottom;
+	margin-bottom: 1.25em;
+}
+
+#FirstNavigation, #SecondNavigation {
+	width: 100%;
+	display: block;
+	list-style: none;
+	white-space: nowrap;
+	word-spacing: -1em;
+	letter-spacing: -4px;
+}
+
+#FirstNavigation {
+	background: #18A303;
+	border-bottom: 6px solid #43C330;
+}
+#SecondNavigation {
+	margin-top: -6px;
+}
+
+.SingleMenu {
+	padding-bottom: 10px;
+}
+
+#FirstNavigation li, #SecondNavigation li {
+	display: inline-block;
+	zoom:1; *display:inline;/* for ie6/7 */
+	word-spacing: normal;
+	letter-spacing: normal;
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+#FirstNavigation li a, #SecondNavigation li a {
+	display: block;
+	text-decoration: none;
+	color: #FFF;
+}
+#FirstNavigation li a {
+	padding: 9px 18px;
+	margin-bottom: -6px;
+	background: #18A303;
+	border-bottom: 6px solid #43C330;
+}
+#SecondNavigation li a {
+	padding: 8px 16px;
+	margin-bottom: 10px;
+	font-size: .95em;
+	background: #43C330;
+}
+#FirstNavigation li a span, #SecondNavigation li a span {
+	opacity: .75;
+}
+#FirstNavigation li a:hover span, #SecondNavigation li a:hover span, #ThirdNavigation li a:hover {
+	opacity: 1;
+	text-decoration: none;
+}
+#FirstNavigation li.current a span, #SecondNavigation li.current a span, #SecondNavigation li.section a span {
+	opacity: 1;
+	font-weight: bold;
+}
+#FirstNavigation li.section > a span {
+	opacity: 1;
+}
+#FirstNavigation li.current a, #FirstNavigation li.section > a {
+	background-color: #43C330;
+}
+#SecondNavigation li.current, #SecondNavigation li.section {
+	background: url(http://www.libreoffice.org/themes/libo/images/navigation-second-current.png) center bottom no-repeat;
+}
+
+#Layout #ThirdNavigation {
+	float: left;
+	width: 17.5%;
+	margin: .6em 0 0 0;
+}
+#Layout[dir="rtl"] #ThirdNavigation {
+	float: right;
+}
+
+#Layout #ThirdNavigation > li {
+	margin-bottom: 0.25em;
+	display: block;
+	padding: 0;
+	background-image: none;
+	position: relative;
+}
+
+#ThirdNavigation >li>ul {
+	position: absolute;
+	z-index: 50;
+	top: 0;
+	left: 100%;
+	background-color: white;
+	display: none;
+	white-space: nowrap;
+}
+#ThirdNavigation >li:hover >ul {
+	display: block;
+}
+
+#Layout #ThirdNavigation li a {
+	margin: 0;
+	display: block;
+	padding: 3px 10px 3px 0;
+	border-bottom: 1px solid #92E285;
+}
+
+#Layout #ThirdNavigation li a:hover {
+	background: url(http://www.libreoffice.org/themes/libo/images/heading-green.png) repeat-x 0 bottom;
+}
+
+#Layout #ThirdNavigation li a.current {
+	color: #106802;
+	/*text-shadow: #18A303 0px 1px 1px;*/
+	font-weight: bold;
+	border-bottom: 1px solid #18A303;
+}
+
+#DownloadButton {
+	display: block;
+	padding: 20px 0 0 64px;
+	width: 360px;
+	height: 44px;
+	font-size: 1.5em;
+	color: #18A303;
+	background: url(http://www.libreoffice.org/themes/libo/images/download-button.png) no-repeat;
+}
+
+#DownloadButton:hover {
+	background-position: 0 -64px;
+	color: #106802;
+}
+
+#Footer {
+	margin: 0 5px;
+	clear: both;
+	border-top: 6px solid #43C330;
+	padding: 1.25em 0 2.2em 0;
+	font-size: 80%;
+}
+
+#FooterText {
+	display: inline-block;
+}
+
+#FooterText p {
+	line-height: 150%;
+	margin: 0;
+}
+
+#FooterText ul {
+	margin: 0 0 10px 0;
+	float: left;
+}
+
+#FooterText ul li {
+	display: inline-block;
+	margin: 0 0 0 18px;
+}
+
+#CreativeCommons {
+	float: right;
+	display: block;
+	margin: 3px 0 20px 18px;
+	width: 88px;
+	height: 30px;
+	background: url(http://www.libreoffice.org/themes/libo/images/creative-commons-license.png) no-repeat;
+}
+
+div.HalfBlockLeft, div.HalfBlockRight {
+	width: 440px; 
+	float: left;
+	display: block;
+}
+
+div.HalfBlockRight {
+	float: right;
+}
+
+.ThirdLevelPage {
+	width: 80%;
+	margin: 0 0 0 1%;
+}
+
+div#screenshot-slide, a#toTop {
+	background-repeat: no-repeat;
+}
+
+div#filtered {
+	margin-top: 0.8em;
+}
+
+div.faqsList {
+	margin-top: 1em;
+	margin-bottom: 1.2em;
+}
+
+a#toTop {
+	background-image: url(http://www.libreoffice.org/themes/libo/images/tango_totop.png);
+	text-indent: 48px;
+	white-space: nowrap;
+	width: 48px;
+	height: 48px;
+	position: fixed;
+	top: 5px;
+	right: 0px;
+}
+div#translations p, ul.translations, ul.translations li {
+	display: inline-block;
+}
+div#translations > ul.translations> li:first-letter {
+	text-transform: uppercase;
+}
+ul.translations li:not(:last-child):after {
+	content: ", ";
+}
+
+/**
+ * LibreOffice theme
+ * initially based on SilverStripe Black Candy Theme
+ *
+ * This typography file is included in the WYSIWYG editor and the front end. It provides
+ * a place to add link styles and font styles you would like in the CMS and the Front End.
+ */
+
+/* PARAGRAPHS & BLOCKQUOTES
+-------------------------------------------- */
+p, blockquote, .HalfBlockLeft, .HalfBlockRight {
+	margin-bottom: 1.2em;
+}
+
+.typography ul {
+	margin-bottom: 1.5em;
+}
+
+.typography ol {
+	margin-left: 3em;
+	line-height: 170%;
+}
+
+.typography p, .typography blockquote {
+	text-align: justify;
+	line-height: 175%;
+	color: #333;
+}
+
+.typography blockquote {
+	border-left: 10px solid #92E285;
+	margin: 0 0 1.5em 25px;
+	padding: 0 0 0 18px;
+	color: #333;
+}
+
+.typography blockquote p {
+	margin: 0;
+	padding: 5px 0;
+	color: #333;
+}
+
+/* LINKS
+-------------------------------------------- */
+a, .typography a {
+	color: #18A303;
+	text-decoration: none;
+}
+
+a:hover, .typography a:hover {
+	color: #106802;
+	text-decoration: underline;
+} 
+a:visited, .typography a:visited  {
+	color: #106802;
+}
+/* LINK ICONS - shows type of file
+------------------------------------ */
+.typography a[href$=".pdf"],
+.typography a[href$=".PDF"],
+.typography a.pdf {
+	padding: 2px;
+	padding-left: 20px;
+	background: url(http://www.libreoffice.org/themes/libo/images/icons/page_white_acrobat.png) no-repeat left center;
+}
+.typography a[href$=".doc"],
+.typography a[href$=".DOC"],
+.typography a.doc {
+	padding: 2px;
+	padding-left: 20px;
+	background: url(http://www.libreoffice.org/themes/libo/images/icons/page_word.png) no-repeat left center;
+}
+.typography a[href$=".xls"],
+.typography a[href$=".XLS"],
+.typography a.xls {
+	padding: 2px;
+	padding-left: 20px;
+	background: url(http://www.libreoffice.org/themes/libo/images/icons/page_excel.png) no-repeat left center;
+}
+.typography a[href$=".gz"],
+.typography a[href$=".GZ"],
+.typography a[href$=".gzip"],
+.typography a[href$=".GZIP"],
+.typography a[href$=".zip"],
+.typography a[href$=".ZIP"],
+.typography a.archive {
+	padding: 2px;
+	padding-left: 20px;
+	background: url(http://www.libreoffice.org/themes/libo/images/icons/page_white_zip.png) no-repeat left center;
+}
+.typography a[href$=".exe"],
+.typography a[href$=".EXE"],
+.typography a.application {
+	padding: 2px;
+	padding-left: 20px;
+	background: url(http://www.libreoffice.org/themes/libo/images/icons/application.png) no-repeat left center;
+}
+
+/* LIST STYLES
+-------------------------------------------- */
+ul, .typography ul {
+	list-style: none;
+}
+
+.typography ul li {
+	background: url(http://www.libreoffice.org/themes/libo/images/bullet-green.png) no-repeat 0 6px;
+	color: 333;
+	line-height: 170%;
+	padding: 0 0 8px 18px;
+}
+#Layout[dir="rtl"] ul li {
+	padding-left: 0;
+	padding-right: 18px; 
+	background-position: right 6px;
+}
+
+.typography ul ul {
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+
+.typography ul ul li {
+	background: url(http://www.libreoffice.org/themes/libo/images/bullet-blue.png) no-repeat 0 6px;
+}
+
+.typography .Widget a {
+	color: #106802;
+}
+
+.typography #Blog li h2 a, .typography .Widget a.TweetAuthor, .typography .Widget small a {
+	color: #1C99E0;
+}
+
+.typography #Twitter li {
+	background: url(http://www.libreoffice.org/themes/libo/images/tweet.png) no-repeat 0 12px !important;
+	padding: 6px 0 6px 40px !important;
+	direction: ltr;
+	font-size: .9em;
+	border-bottom: 1px solid #CCF4C6;
+}
+
+.typography #Blog li {
+	display: block;
+	background: url(http://www.libreoffice.org/themes/libo/images/bullet-large-blue.png) no-repeat 0 10px !important;
+	padding: 6px 0 6px 30px !important;
+	direction: ltr;
+	border-bottom: 1px solid #CCF4C6;
+}
+
+.typography #Blog li h2 {
+	background: none;
+	border: none;
+	font-size: 1.1em;
+	margin: 0;
+	padding: 0;
+}
+
+.typography #Blog li p {
+	line-height: 150%;
+	font-size: .9em;
+	text-align: left;
+	padding: 0;
+	margin: 0;
+}
+
+.typography .Widget li small {
+	display: block;
+	font-size: .85em;
+}
+
+/* used by FolderPage */
+.typography li.folder {
+	background: url(http://www.libreoffice.org/themes/libo/images/icons/folder_open.png) no-repeat left top;
+	margin-left: -12px;
+	padding-left: 22px;
+	list-style-type: none;
+}
+
+.typography .ButtonBar {
+	clear: both;
+	display: block;
+	width: 100%;
+}
+
+.typography .ButtonBar li {
+	display: block;
+	float: left;
+	width: 17%;
+	height: 50px;
+	margin: 0 2.5% 1.25em 0;
+	padding: 0 !important; /* important because of rtl rules */
+	background-image: none;
+}
+
+.typography .ButtonBar li a {
+	padding: 0 0 0 24px;
+	background-repeat: no-repeat;
+	display: block;
+	font-size: .95em;
+}
+
+.typography .ButtonBar li a.irc {
+	background-image: url(http://www.libreoffice.org/themes/libo/images/chat.png);
+}
+
+.typography .ButtonBar li a.facebook {
+	background-image: url(http://www.libreoffice.org/themes/libo/images/facebook.png);
+}
+
+.typography .ButtonBar li a.template {
+	background-image: url(http://www.libreoffice.org/themes/libo/images/template.png);
+}
+
+.typography .ButtonBar li a.extension {
+	background-image: url(http://www.libreoffice.org/themes/libo/images/extension.png);
+}
+
+
+/* HEADER STYLES
+-------------------------------------------- */
+.typography h1, .typography h2, .typography h3, .typography h4, .typography h5, .typography h6 {
+	margin-bottom: .5em;
+	font-weight: normal;
+}
+
+.typography h1 {
+	background: url(http://www.libreoffice.org/themes/libo/images/heading-green.png) 0 bottom repeat-x;
+	border-bottom: 1px solid #92E285;
+	padding: .2em 0 .1em 2px;
+	color: #18A303;
+	font-weight: bold;
+	font-size: 1.4em;
+	text-shadow: #FFF 0px 1px 1px;
+}
+
+.typography h2 {
+	border-bottom: 1px solid #CCF4C6;
+	color: #18A303;
+	font-size: 1.3em;
+}
+
+.typography h3 {
+	color: #18A303;
+	font-size: 1.2em;
+}
+
+.typography h4 {
+	color: #18A303;
+	font-size: 1.15em;
+}
+
+.typography h5 {
+	color: #18A303;
+	font-size: 1.1em;
+}
+
+.typography h6 {
+	color: #18A303;
+	font-size: 1.05em;
+}
+
+/* PRE STYLES
+-------------------------------------------- */
+.typography pre {
+	font-family:"Courier New",Courier;
+	display:block;
+	font-size:1.2em;
+	margin:2em 5em;
+	padding:0.5em;
+	border:1px #ccc solid;
+	background:#eee;;
+}
+
+/* TABLE STYLING
+-------------------------------------------- */
+.typography table {
+	margin: 0 0 18px 0;
+	border-collapse:collapse;
+}
+	.typography tr {}
+		.typography td {
+			padding:5px;
+		}
+
+/* WYSIWYG EDITOR ALIGNMENT CLASSES
+-------------------------------------------- */
+.typography .left {
+	text-align: left;
+}
+.typography .center {
+	text-align: center;
+}
+.typography .right {
+	text-align: right;
+}
+
+/* IMAGES
+-------------------------------------------- */
+.typography img {
+	border: none;
+}
+	.typography img.right {
+		float: right;
+		margin-left: 20px;
+	}
+	.typography img.left {
+		float: left;
+		margin-right: 20px;
+	}
+	.typography img.leftAlone {
+		float: left;
+		margin-right: 100%;
+	}
+	.typography img.center {
+		float: none;
+		margin-left: auto;
+		margin-right: auto;
+		display: block;
+	}
+
+ul.ul-libreoffice li {
+	position: relative;
+	list-style: none;
+	margin-left: 0px;
+	background: url(http://www.libreoffice.org/themes/libo/images/li-bullet-single-dark.png) no-repeat;
+	background-position: 4px 3px;
+	padding-left: 30px;
+	display: block;
+	color: #000;
+	margin-bottom: 20px;
+	margin-top: 10px;
+}
+.typography kbd {
+	color: #000;
+	font-family: monospace;
+	background: #ddd;
+}
+#supporters td {
+	border-width: 0px;
+	vertical-align:top;
+	padding-bottom: 50px;
+}
+.foundationtable th {
+	font-size: 140%;
+	padding: 6px;
+	vertical-align: middle;
+	background: #eee;
+}
+.foundationtable tbody tr:first-child td  {
+	padding-top: 20px;
+}
+.foundationtable tbody tr td:first-child  {
+	padding-left: 0px;
+	padding-right: 15px;
+}
+p.roles {
+	font-variant: small-caps;
+}
+
+/* STRONG
+-------------------------------------------- 
+.typography strong {
+	color: #18A303;
+}*/
+.highlight {
+	background: yellow;
+}
+
+/* for translation status sitemap */
+div.missing {
+	background-color: red;
+}
+div.live {
+	background-color: green;
+}
+div.unpublished {
+	background-color: orange;
+}
+div.changed {
+	background-color: yellow;
+}
+
+/* for horizontally aligned li-children */
+ul.table {
+	display: table;
+}
+ul.table > li {
+	display: table-row;
+	background: none;
+}
+ul.table > li > * {
+	display: table-cell;
+	padding-right: 1em;
+}
+.clear{
+	clear:both;
+}
+
+hr {
+	display: block;
+	clear: both;
+	height: .1em;
+	border: none;
+	width: 100%;
+}
+
+.FloatLeft {
+	float: left;
+}
+
+.FloatRight {
+	float: right;
+}
+
+.RightMargin {
+	margin-right: 10px;
+}
+
+.captionImage.FloatRight {
+	margin-left: 1em;
+}
+
+.captionImage.FloatLeft {
+	margin-right: 1em;
+}
+/* pending - not final */
+.typography p.greenbox {
+	border: 1px solid #43C330;
+	background-color: #CCF4C6;
+	padding: 10px;
+	margin: 10px 0;
+}
+
+.typography p.bluebox {
+	border: 1px solid #1C99E0;
+	background-color: #AADCF7;
+	padding: 10px;
+	margin: 10px 0;
+}
+
+.typography p.orangebox {
+	border: 1px solid #D36118;
+	background-color: #F9CFB5;
+	padding: 10px;
+	margin: 10px 0;
+}
+
+.typography p.purplebox {
+	border: 1px solid #C254D2;
+	background-color: #F2CBF8;
+	padding: 10px;
+	margin: 10px 0;
+}
+
+.typography p.yellowbox {
+	border: 1px solid #E9B913;
+	background-color: #FDE9A9;
+	padding: 10px;
+	margin: 10px 0;
+}
+
+.typography p.intro {
+	font-size: 1.1em;
+	border-bottom: 1px solid #CCC;
+	padding-bottom: .75em;
+}
+
+.typography p.excerpt {
+	width: 200px;
+	margin-bottom: 0;
+	padding: 0 0 0 40px;
+	display: block;
+	float: right;
+	color: #777;
+	font-style: italic;
+	text-align: left;
+}
+
+.typography p.tick {
+	padding-left: 50px;
+	background-image: url(http://www.libreoffice.org/themes/libo/images/tick.png);
+	background-position: 10px 5px;
+	background-repeat: no-repeat;
+}
+.typography ul.tick {
+	background: url(http://www.libreoffice.org/themes/libo/images/tick.png) no-repeat;
+	padding-left: 40px;
+}
+
+.typography p.information {
+	padding-left: 50px;
+	background-image: url(http://www.libreoffice.org/themes/libo/images/information.png);
+	background-position: 10px 5px;
+	background-repeat: no-repeat;
+}
+.typography ul.information {
+	background: url(http://www.libreoffice.org/themes/libo/images/information.png) no-repeat;
+	padding-left: 40px;
+}
+
+.typography p.warning {
+	padding-left: 50px;
+	background-image: url(http://www.libreoffice.org/themes/libo/images/warning.png);
+	background-position: 10px 5px;
+	background-repeat: no-repeat;
+}
+.typography ul.warning {
+	background: url(http://www.libreoffice.org/themes/libo/images/warning.png) no-repeat;
+	padding-left: 40px;
+}
+
+.typography p.error {
+	padding-left: 50px;
+	background-image: url(http://www.libreoffice.org/themes/libo/images/error.png);
+	background-position: 10px 5px;
+	background-repeat: no-repeat;
+}
+.typography ul.error {
+	background: url(http://www.libreoffice.org/themes/libo/images/error.png) no-repeat;
+	padding-left: 40px;
+}
+
+.typography p.excerpt:before {
+	content: '\201C';
+	color: #18A303;
+	font-size: 4em;
+	line-height: 0.1em;
+	margin-left: -25px;
+	margin-right: 8px;
+	position: relative;
+	top: .5em;
+	font-style: normal;
+}
+.typography p.excerpt:after {
+	content: '\201D ';
+	color: #18A303;
+	font-size: 4em;
+	line-height: 1px;
+	margin-left: 8px;
+	margin-bottom: 0;
+	position: relative;
+	top: .45em;
+	font-style: normal;
+}
+
+.typography div.box {
+	width: 150px;
+	margin: 10px;
+	display: block;
+	float: left;
+	box-shadow: 0 1px 2px #777;
+	-webkit-box-shadow: 0 1px 2px #777;
+	-moz-box-shadow: 0 1px 2px #777;
+	border-radius: 2px;
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+	text-align: center;
+}
+
+.typography div.box img {
+	height: 80px;
+	padding: 10px 10px 10px 10px;
+}
+
+.typography div.box p {
+	margin: 0;
+	padding: 10px;
+	background: #EEE;
+	text-align: left;
+}
 
 
 .sdkbody { background-color: #FFFFFF;
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index 73c3b5d..6a7b7ca 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -6,11 +6,25 @@
   <meta name="author" content="J&uuml;rgen Schmidt">
 </head>
 
-<body class="sdkbody"><a name="tools"/>
+</head>
+    <body>
+        <a name="tools"></a>
+        <div id="BgContainer">
+            <div id="Container">
+                <div id="TopHeader">
+                    <a id="Logo" href="http://www.libreoffice.org/" title="Go to the Home of LibreOffice and the LibreOffice Community page"></a>
+                    <p id="HeaderTagLine">
+                        Software Development Kit %PRODUCT_RELEASE%  
+                    </p>
+                </div> 
+                <div class="clear">
+                </div> 
+                <div id="Layout">
+                    <div class="typography">
+                        <h1>
+                            Development Tools
+                        </h1>
 <table class="table1" cellpadding=0>
-  <tr style="background-image:url(images/sdk_head-2.png)"> 
-    <td colspan="3" align="left"><img src="images/sdk_head-1.png" width="377" height="120" border="0"></td>
-  </tr>
   <tr> 
     <td colspan="3"><img  class="nothing10" src="images/nada.gif"></td>
   </tr>
@@ -24,16 +38,6 @@
         <tr> 
           <td> 
           <table class="table3">
-		  <tr> 
-			<td colspan="2" class="head1">Development Tools</td>
-			<td align="right"><a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a></td>
-		  </tr> 
-		  </table>
-          </td>
-        </tr> 
-        <tr> 
-          <td> 
-          <table class="table3">
             <tr valign="top">
               <td class="content3"><img src="images/arrow-1.gif"></td>
               <td><a href="#unopkg"  title="link to the unopkg tool description">unopkg</a></td>
@@ -145,7 +149,7 @@
 		  office installation. UNO packages are UNO components (single libraries or 
 		  Jar files or more complex zip files that contains one or more libraries|
 		  Jar files, type libraries and configuration items), scripts  and 
-		  OpenOffice.org %PRODUCT_RELEASE% Basic libraries as zip package. 'unopkg' is not part of the 
+		  LibreOffice %PRODUCT_RELEASE% Basic libraries as zip package. 'unopkg' is not part of the 
 		  SDK but comes with the office directly and is a development tool as well 
 		  as an end user tool to deploy extension into an office installation.</p>
 		  <p>More details concerning deployment and this tool can be find in the 
@@ -1075,18 +1079,28 @@ types the specified types depend on.</p>
     </td>
     <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
   </tr>
-  <tr> 
-    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td>
-  </tr>
-  <tr> 
-    <td colspan="3"> 
-      <div class="centertext">
-	      <p>LibreOffice is copyright &copy; 2000, 2011 LibreOffice contributors and/or their affiliates. All rights reserved.</p>
-	      <p>LibreOffice is derived from OpenOffice.org. OpenOffice.org is copyright &copy; 2000, 2011 Oracle and/or its affiliates. All rights reserved.</p>
-	      <p>Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.</p>
-      </div>
-    </td>
-  </tr>
 </table>
-</body>
-</html>
+                </div> 
+                <div id="Footer">
+                    <div id="FooterText">
+                        <p>
+                            Copyright © 2000, 2010 LibreOffice contributors and/or their affiliates. All rights reserved.
+                            <br>
+                            LibreOffice was created by The Document Foundation, based on OpenOffice.org, which is Copyright 2000, 2010 Oracle and/or its affiliates.
+                            <br>
+                            The Document Foundation acknowledges all community members, please find more info <a href="http://www.libreoffice.org/about-us/credits/" target="_blank">at our website</a>.
+                        </p>
+                        <p>
+                            &nbsp;
+                        </p>
+                        <p>
+                            <a href="http://www.libreoffice.org/privacy" target="_blank">Privacy Policy</a> | <a href="http://www.libreoffice.org/imprint" target="_blank">Impressum (Legal Info)</a>
+                            | Copyright information: The source code of LibreOffice is licensed under the GNU Lesser General Public License (<a href="http://www.libreoffice.org/download/license/" target="_blank">LGPLv3</a>). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our <a href="http://wiki.documentfoundation.org/TradeMark_Policy" target="_blank">trademark policy</a>.
+                        </p>
+                    </div> 
+                </div> 
+            </div> 
+        </div> 
+    </body> 
+</html> 
+
diff --git a/odk/index.html b/odk/index.html
index 6490e23..2a9c57e 100644
--- a/odk/index.html
+++ b/odk/index.html
@@ -1,17 +1,23 @@
 <html>
 <head>
-  <title>OpenOffice.org %PRODUCT_RELEASE% SDK - Overview</title>
+  <title>LibreOffice %PRODUCT_RELEASE% SDK - Overview</title>
   <link rel="stylesheet" type="text/css" href="docs/sdk_styles.css">
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   <meta name="author" content="J&uuml;rgen Schmidt">
   <meta name="created" content="2004-12-14">
 </head>
-<body class="sdkbody">
-
+<body>
+<div id="BgContainer">
+    <div id="Container">
+        <div id="TopHeader">
+            <a id="Logo" href="http://www.libreoffice.org/" title="Go to the Home of LibreOffice and the LibreOffice Community page"></a>
+            <p id="HeaderTagLine">LibreOffice API Documentation</p>
+         </div> 
+         <div class="clear"></div> 
+    <div id="Layout">
+    <div class="typography">
+        <h1>LibreOffice API Documentation</h1>
 <table class="table1" cellpadding=0>
-  <tr style="background-image:url(docs/images/sdk_head-2.png)"> 
-    <td colspan="3" align="left"><img src="docs/images/sdk_head-1.png" width="800" height="120" usemap="#Map" border="0"></td>
-  </tr>
   <tr> 
     <td colspan="3"><img  class="nothing30" src="docs/images/nada.gif"></td>
   </tr>
@@ -21,12 +27,12 @@
         <tr> 
           <td><img class="nothing8" src="docs/images/nada.gif"></td>
           <td> 
-            <p>OpenOffice.org %PRODUCT_RELEASE% software is a complete, feature-rich
+            <p>LibreOffice %PRODUCT_RELEASE% software is a complete, feature-rich
               office productivity suite that provides, in combination with this 
 			  SDK, all the essential tools for building and deploying custom 
-			  solutions that build on, or integrate with, the OpenOffice.org %PRODUCT_RELEASE% suite 
+			  solutions that build on, or integrate with, the LibreOffice %PRODUCT_RELEASE% suite 
 			  of products.</p>
-            <p>The SDK is a development kit for OpenOffice.org %PRODUCT_RELEASE%, which 
+            <p>The SDK is a development kit for LibreOffice %PRODUCT_RELEASE%, which 
 			  eases the development of office components. It provides a set of 
 			  libraries, binaries, header, and IDL files which have final API's 
 			  and can only be extended with new functionality. This set of libraries
@@ -41,14 +47,14 @@
 			  with new functions.</p>
             <p>The SDK provides the basic building blocks for external developers 
 			  to develop components in any language for which a binding exists. 
-			  Currently, there are language bindings for OpenOffice.org %PRODUCT_RELEASE% Basic, Java, 
-			  and different C++ compilers on different platforms, for OpenOffice.org %PRODUCT_RELEASE%,
+			  Currently, there are language bindings for LibreOffice %PRODUCT_RELEASE% Basic, Java, 
+			  and different C++ compilers on different platforms, for LibreOffice %PRODUCT_RELEASE%,
 			  thus covering the two most commonly used programming languages. There 
 			  will be no limit for office automation in heterogeneous environments.
 			  Currently supported platforms of the SDK are Linux, Solaris (sparc, 
 			  x86), and Windows.</p>
             <p>The SDK also contains <a href="docs/common/ref/com/sun/star/module-ix.html" title="link to the IDL reference documentation"> reference</a> documentation 
-              for the API and a complete <a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/OpenOffice.org_Developers_Guide" title="link to the Developer's Guide in the Wiki">Developer's Guide</a> is availbale online in the OpenOffice.org Wiki, with 
+              for the API and a complete <a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/OpenOffice.org_Developers_Guide" title="link to the Developer's Guide in the Wiki">Developer's Guide</a> is available online in the OpenOffice.org Wiki, with 
 			  lots of examples, which introduce the API, explain the concepts behind
 			  it, and make it possible for all users to quickly get started with 
 			  the Office API.</p>
@@ -83,7 +89,7 @@
               <tr valign="top"> 
                 <td class="content4"><img src="docs/images/arrow-1.gif"></td>
                 <td colspan="2"><a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/OpenOffice.org_Developers_Guide" title="link to the Developer's Guide in the Wiki">Developer's Guide</a></td>
-                <td class="content70">Detailed documentation, explaining the OpenOffice.org %PRODUCT_RELEASE% 
+                <td class="content70">Detailed documentation, explaining the LibreOffice %PRODUCT_RELEASE% 
 				API and the concepts behind it, with a rich set of examples, 
 				implemented mainly in Java. This documentation is online in the 
 				OpenOffice.org Wiki.</td>
@@ -91,7 +97,7 @@
               <tr valign="top"> 
                 <td class="content4"><img src="docs/images/arrow-1.gif"></td>
                 <td colspan="2"><a href="docs/common/ref/com/sun/star/module-ix.html" title="link to the IDL reference documentation">IDL Reference</a></td>
-                <td class="content70">Complete OpenOffice.org %PRODUCT_RELEASE% API reference.</td>
+                <td class="content70">Complete LibreOffice %PRODUCT_RELEASE% API reference.</td>
               </tr>
               <tr valign="top"> 
                 <td class="content4"><img src="docs/images/arrow-1.gif"></td>
@@ -132,7 +138,7 @@
 				Office Applications (OpenDocument) Technical Committee where you 
 				can find the latest information about the OASIS Open Document XML 
 				file format which is the default document format 
-				for OpenOffice.org %PRODUCT_RELEASE%.</td>
+				for LibreOffice %PRODUCT_RELEASE%.</td>
               </tr>
               <tr valign="top"> 
                 <td class="content4"><img src="docs/images/arrow-1.gif"></td>
@@ -147,32 +153,7 @@
               <tr valign="top"> 
                 <td class="content4"><img src="docs/images/arrow-1.gif"></td>
                 <td colspan="2"><a href="share/readme/LICENSE_en-US.html" title="link to the SDK license file">License</a></td>
-                <td class="content70">The license for the OpenOffice.org %PRODUCT_RELEASE% SDK.</td>
-              </tr>
-              <tr valign="middle"> 
-                <td><img class="nothing10" src="docs/images/nada.gif"></td>
-                <td colspan="3"><img class="line" src="docs/images/sdk_line-1.gif"></td>
-              </tr>
-              <tr valign="top"> 
-			    <td colspan="4"><img class="nothing8" src="docs/images/nada.gif"></td>
-              </tr>
-              <tr valign="top"> 
-                <td colspan="4" class="head1">Additional Resources</td>
-              </tr>
-              <tr valign="top"> 
-			    <td colspan="4"><img class="nothing8" src="docs/images/nada.gif"></td>
-              </tr>
-              <tr valign="middle"> 
-                <td class="content4"><img class="arrow" src="docs/images/arrow-1.gif"</td>
-                <td width="5%"><a target="_blank" href="http://www.oracle.com/us/products/applications/open-office" title="link to the Oracle Open Office homepage (online)"><img  class="appicon" src="docs/images/orc-main-app_32.png"></a></td>
-                <td width="21%"><a target="_blank" href="http://www.oracle.com/us/products/applications/open-office" title="link to the Oracle Open Office homepage (online)">Oracle Open Office&#153</a></td>
-                <td class="content70">Full-featured suite of office productivity tools.</td>
-              </tr>
-              <tr valign="middle"> 
-                <td class="content4"><img class="arrow" src="docs/images/arrow-1.gif"</td>
-                <td width="5%"><a target="_blank" href="http://www.openoffice.org/" title="link to the OpenOffice.org homepage (online)"><img class="appicon" src="docs/images/ooo-main-app_32.png"></a></td>
-                <td width="21%"><a target="_blank" href="http://www.openoffice.org/" title="link to the OpenOffice.org homepage (online)">OpenOffice.org&#153</a></td>
-                <td class="content70">Open Source community project of office-productivity software.</td>
+                <td class="content70">The license for the LibreOffice %PRODUCT_RELEASE% SDK.</td>
               </tr>
             </table>
           </td>
@@ -181,23 +162,28 @@
       </table>
     </td>
   </tr>
-  <tr> 
-    <td colspan="3"><img class="nothing30" src="docs/images/nada.gif"></td>
-  </tr>
-  <tr> 
-    <td colspan="3"><img class="line" src="docs/images/sdk_line-1.gif"></td>
-  </tr>
-  <tr> 
-    <td colspan="3"> 
-      <div class="centertext">
-	<p><img class="oraclelogo" src="docs/images/odk-footer-logo.gif" title="Sponsored by Oracle" alt="Oracle Logo" />
-            Copyright &copy; 2010, Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.<p>
-      </div>
-    </td>
-  </tr>
 </table>
-<map name="Map">
-  <area shape="rect" coords="10,68,93,105" href="http://www.oracle.com">
-</map>
-</body>
-</html>
+                </div> 
+                <div id="Footer">
+                    <div id="FooterText">
+                        <p>
+                            Copyright &copy; 2000, 2010 LibreOffice contributors and/or their affiliates. All rights reserved.
+                            <br>
+                            LibreOffice was created by The Document Foundation, based on OpenOffice.org, which is Copyright 2000, 2010 Oracle and/or its affiliates.
+                            <br>
+                            The Document Foundation acknowledges all community members, please find more info <a href="http://www.libreoffice.org/about-us/credits/" target="_blank">at our website</a>.
+                        </p>
+                        <p>
+                            &nbsp;
+                        </p>
+                        <p>
+                            <a href="http://www.libreoffice.org/privacy" target="_blank">Privacy Policy</a> | <a href="http://www.libreoffice.org/imprint" target="_blank">Impressum (Legal Info)</a>
+                            | Copyright information: The source code of LibreOffice is licensed under the GNU Lesser General Public License (<a href="http://www.libreoffice.org/download/license/" target="_blank">LGPLv3</a>). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our <a href="http://wiki.documentfoundation.org/TradeMark_Policy" target="_blank">trademark policy</a>.
+                        </p>
+                    </div> 
+                </div> 
+            </div> 
+        </div> 
+    </body> 
+</html> 
+
commit 16132fddb979278ea92f0aa0257b8f379bb2fe0e
Author: Andras Timar <atimar at suse.com>
Date:   Wed Sep 7 00:12:49 2011 +0200

    licence footer for API docs

diff --git a/autodoc/source/display/html/cfrstd.cxx b/autodoc/source/display/html/cfrstd.cxx
index 29a680b..669d29e 100644
--- a/autodoc/source/display/html/cfrstd.cxx
+++ b/autodoc/source/display/html/cfrstd.cxx
@@ -329,7 +329,7 @@ StdFrame::Set_SimpleLinks()
 String
 MakeCopyRight()
 {
-    StreamStr cr(700);
+    StreamStr cr(1400);
     time_t
         gt;
     time(&gt);
@@ -337,11 +337,13 @@ MakeCopyRight()
         plt = localtime(&gt);
     int year = 1900 + plt->tm_year;
 
-    cr  << "LibreOffice is copyright &copy; 2000, "
+    cr  << "Copyright &copy; 2000, "
 	<< year
-	<< ", LibreOffice contributors and/or their affiliates. All rights reserved.</p>"
-	<< "<p class=\"copyright\" align=\"center\">LibreOffice is derived from OpenOffice.org. OpenOffice.org is copyright &copy; 2000, 2011 Oracle and/or its affiliates. All rights reserved.</p>"
-	<< "<p class=\"copyright\" align=\"center\">Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.";
+	<< " LibreOffice contributors and/or their affiliates. All rights reserved.</p>"
+	<< "<p class=\"copyright\" align=\"center\">LibreOffice was created by The Document Foundation, based on OpenOffice.org, which is Copyright 2000, 2010 Oracle and/or its affiliates.</p>"
+	<< "<p class=\"copyright\" align=\"center\">The Document Foundation acknowledges all community members, please find more info <a href=\"http://www.libreoffice.org/about-us/credits/\" target=\"_blank\">at our website</a>."
+	<< "<p>&nbsp;</p>"
+	<< "<p class=\"copyright\" align=\"center\"><a href=\"http://www.libreoffice.org/privacy\" target=\"_blank\">Privacy Policy</a> | <a href=\"http://www.libreoffice.org/imprint\" target=\"_blank\">Impressum (Legal Info)</a> | Copyright information: The source code of LibreOffice is licensed under the GNU Lesser General Public License (<a href=\"http://www.libreoffice.org/download/license/\" target=\"_blank\">LGPLv3</a>). \"LibreOffice\" and \"The Document Foundation\" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our <a href=\"http://wiki.documentfoundation.org/TradeMark_Policy\" target=\"_blank\">trademark policy</a>.";
     return String(cr.c_str());
 
 }
commit a7a56615e7b05eb62ecb1d4f53053e1d40aa8487
Author: Andras Timar <atimar at suse.com>
Date:   Tue Sep 6 21:27:20 2011 +0200

    translated German comment

diff --git a/autodoc/source/display/html/cfrstd.cxx b/autodoc/source/display/html/cfrstd.cxx
index 9671bcf..29a680b 100644
--- a/autodoc/source/display/html/cfrstd.cxx
+++ b/autodoc/source/display/html/cfrstd.cxx
@@ -46,9 +46,9 @@ Colors:
 Fonts:
 -   page title              20, bold, Arial
 -   navibar main            12, bold, Arial
--   navibar sub              8, Arial, kapitälchen
--   attrtable title line     8, bold, Arial, kapitälchen
--   attrtable value line     8, Arial kapitälchen
+-   navibar sub              8, Arial, small caps
+-   attrtable title line     8, bold, Arial, small caps
+-   attrtable value line     8, Arial small caps
 
 -   namespace chain         13, bold
 -   table title             13, bold
commit 40ab4aebb7ee1e37537fc01bcbe3a75fc41f82ad
Author: Andras Timar <atimar at suse.com>
Date:   Sun Sep 4 07:39:25 2011 +0200

    add LibreOffice colors to SDK cpp doc css

diff --git a/odk/docs/cpp/ref/cpp.css b/odk/docs/cpp/ref/cpp.css
index b828699..cf1226b 100644
--- a/odk/docs/cpp/ref/cpp.css
+++ b/odk/docs/cpp/ref/cpp.css
@@ -4,9 +4,9 @@
 body   { background-color:#ffffff; }
 
 #adc-cppref a { text-decoration: none; }
-#adc-cppref a:link { color: #0e85cd; }
-#adc-cppref a:visited { color: #638093; }
-#adc-cppref a:active { color: #4dadea; }
+#adc-cppref a:link { color: #18a303; }
+#adc-cppref a:visited { color: #84f671; }
+#adc-cppref a:active { color: #2cee0e; }
 
 #adc-cppref h1     { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }
 #adc-cppref h2     { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }
@@ -14,7 +14,7 @@ body   { background-color:#ffffff; }
 #adc-cppref h4     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }
 #adc-cppref dl     { margin-top:1pt; margin-bottom:1pt; }
 #adc-cppref dl.member  { margin-top:1pt; margin-bottom:1pt; 
-	     background-image:url(../../images/bg_table3.png); }
+	     background-color:#c2f6ba; }
 #adc-cppref dt     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }
 #adc-cppref dt.member  { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }
 #adc-cppref dt.simple  { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }
@@ -28,40 +28,40 @@ body   { background-color:#ffffff; }
 #adc-cppref dt.attention   { color:#ff0000; }
 
 #adc-cppref div.title      { text-align:center;  line-height:26pt; 
-		 background-image:url(../../images/bg_table.png); }
-#adc-cppref .subtitle      { background-image:url(../../images/bg_table.png); }
+		 background-color:#18a303; }
+#adc-cppref .subtitle      {background-color:#18a303; }
 
-#adc-cppref td.flagname    { background-image:url(../../images/bg_table2.png);
+#adc-cppref td.flagname    { background-color:#c2f6ba;
 	         font-family:Arial; font-size:8pt; font-weight:bold; }
 #adc-cppref td.flagyes     { font-family:Arial; font-size:8pt; font-weight:bold; }
 #adc-cppref td.flagno      { font-family:Arial; font-size:8pt; }
 #adc-cppref td.flagtext    { font-family:Arial; font-size:8pt; font-weight:bold; }
 
 #adc-cppref td.navimain, td.navimain a
-               { background-image:url(../../images/bg_table2.png);
+               { background-color:#c2f6ba;
                  font-family:Arial; font-size:12pt; font-weight:bold; }
 
 /* background-color:#eeeeff; color:#000000; */
 
 #adc-cppref td.navimainself
-               { background-color:#226bb0; color:#ffffff;
+               { background-color:#18a303; color:#ffffff;
                  font-family:Arial; font-size:12pt; font-weight:bold; }
 #adc-cppref td.navimainnone
-               { background-image:url(../../images/bg_table2.png);
+               {background-color:#c2f6ba;
                  font-family:Arial; font-size:12pt; }
 
-#adc-cppref div.define     { font-family:Arial; background-color:#87c2e6; }
+#adc-cppref div.define     { font-family:Arial; background-color:#c2f6ba; }
 
 #adc-cppref .nqclass       { color:#008800; }
 
-#adc-cppref h3.help        { background-color:#cfe7f5; margin-top:12pt; }
+#adc-cppref h3.help        { background-color:#c2f6ba; margin-top:12pt; }
 
-#adc-cppref .btpubl        { color:#87c2e6; }
-#adc-cppref .btprot        { color:#226bb0; }
-#adc-cppref .btpriv        { color:#06348c; }
+#adc-cppref .btpubl        { color:#c2f6ba; }
+#adc-cppref .btprot        { color:#18a303; }
+#adc-cppref .btpriv        { color:#00ff00; }
 #adc-cppref .btvpubl       { color:#87c2e6; font-style:italic; }
-#adc-cppref .btvprot       { color:#226bb0; font-style:italic; }
-#adc-cppref .btvpriv       { color:#06348c; font-style:italic; }
+#adc-cppref .btvprot       { color:#18a303; font-style:italic; }
+#adc-cppref .btvpriv       { color:#00ff00; font-style:italic; }
 #adc-cppref .btself        { font-weight:bold; }
 
 #adc-cppref table { empty-cells:show; }


More information about the Libreoffice-commits mailing list