Author: buildbot
Date: Thu Sep 11 22:27:33 2014
New Revision: 921907
Log:
Staging update by buildbot for ooo-site
Modified:
websites/staging/ooo-site/trunk/cgi-bin/ (props changed)
websites/staging/ooo-site/trunk/content/ (props changed)
websites/staging/ooo-site/trunk/content/index_asfcon.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Sep 11 22:27:33 2014
@@ -1 +1 @@
-1624410
+1624411
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Sep 11 22:27:33 2014
@@ -1 +1 @@
-1624410
+1624411
Modified: websites/staging/ooo-site/trunk/content/index_asfcon.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/index_asfcon.html (original)
+++ websites/staging/ooo-site/trunk/content/index_asfcon.html Thu Sep 11
22:27:33 2014
@@ -41,19 +41,13 @@
// The text is defined in "/msg_prop_l10n.js".
// Show alert box or not?
- if( l10n.index_alert_box_show ) {
- // If no background color value was set then use the default
value.
- if( ! l10n.index_alert_box_background_color ||
l10n.index_alert_box_background_color === "" )
- l10n.index_alert_box_background_color = "#FFD9A7";
-
+ if( ! l10n.index_alert_box_show ) {
// Show alert box with defined background color.
// Depending if link is available, make the whole DIV clickable
or not.
if( l10n.index_alert_box_href ) {
// Show the text with link and cursor as poiner.
- document.write( "<div id='alert_box' style='background:
"
- + l10n.index_alert_box_background_color
- + "; ' onclick='window.open( \"" +
l10n.index_alert_box_href
- + "\", \"_blank\" ); return false;'>" );
+ document.write( "<div id='alert_box'
onclick='window.open( \"" + l10n.index_alert_box_href
+ + "\", \"_blank\" ); return false;'><ul><li>" );
// Show headline.
document.write( "<h2 style='cursor: pointer;'>"
@@ -66,8 +60,7 @@
}
} else {
// Show the text without link and normal cursor.
- document.write( "<div id='alert_box' style='background:
"
- + l10n.index_alert_box_background_color + "'>" );
+ document.write( "<div id='alert_box'><ul><li>" );
// Show headline.
document.write( "<h2 style='cursor: default;'>"
@@ -79,7 +72,7 @@
+ l10n.index_alert_box_text_text + "</p>" );
}
}
- document.write( "</div>" ); // Alert box
+ document.write( "</li></ul></div>" ); // Alert box
}
}
@@ -145,21 +138,25 @@
}
switch( lang_mode ) {
- case "hard":
- // Do not show a message, just redirect.
- window.open( "http://www.openoffice.org/"; + lang_iso , "_self" );
- break;
- case "soft":
- // Show a message and redirect only on user's click.
- // Assign the message text (defined in "/msg_prop_l10n.js", array
"l10n.index_redirect_text", column 1).
- document.write( "<div id='redirect_box'"
- + " onclick='window.open( \"http://www.openoffice.org/"; +
lang_iso + "\", \"_self\" ); return false;'>"
- + "<p>" + lang_text + "</p>"
- + "</div>" ); // redirect box
- break;
- case "none":
- default:
- // Do nothing and show nothing.
+ case "hard":
+ // Do not show a message, just redirect.
+ window.open( "http://www.openoffice.org/"; + lang_iso ,
"_self" );
+ break;
+ case "soft":
+ // Show a message and redirect only on user's click.
+ // Assign the message text that is defined in:
+ // "/msg_prop_l10n.js", array
"l10n.index_redirect_text", column 1),
+ document.write( "<div id='redirect_box'"
+ + " onclick='window.open( \"http://www.openoffice.org/";
+ lang_iso + "\", \"_self\" );"
+ + "return false;'>"
+ + "<ul><li>"
+ + "<p>" + lang_text + "</p>"
+ + "</li></ul>"
+ + "</div>" ); // redirect box
+ break;
+ case "none":
+ default:
+ // Do nothing and show nothing.
}
return;
@@ -187,26 +184,24 @@
<!-- This is to please accessibility tools like a screen reader. -->
<h1 style="display: none;">Apache OpenOffice</h1>
-<div id="actionstatements" style="margin: 23px 0 50px 3%;">
-
- <ul>
- <li>
+<div id="actionstatements">
- <!-- Show event box. -->
- <!-- Show a banner logo for events and a text. -->
- <div id="event_box">
- <!-- Event banner logo on the left hand side. -->
- <p>
- <a href="http://apachecon.com/"; target="_blank">
- <img src="http://www.apache.org/ads/ApacheCon/2014-eu-234x60.png";
alt="Apache Software Foundation" />
- </a>
- </p>
+ <!-- Show event box. -->
+ <!-- Show a banner logo for events and a text. -->
+ <div id="event_box">
+ <ul>
+ <li>
+ <!-- Event banner logo on the left hand side. -->
+ <p style="float: left;">
+ <a href="http://apachecon.com/"; target="_blank">
+ <img src="http://www.apache.org/ads/ApacheCon/2014-eu-234x60.png";
alt="Apache Software Foundation" />
+ </a>
+ </p>
- <!-- Event text on the right hand side. -->
- <div id="event_box_text">
+ <!-- Event text on the right hand side. -->
<p>
- <a style="color: black; text-decoration: none;"
href="http://events.linuxfoundation.org/events/apachecon-europe";
- target="_blank">
+ <a style="color: black; text-decoration: none;"
+ href="http://events.linuxfoundation.org/events/apachecon-europe";
target="_blank">
ApacheCon Europe, 2014
<br />
Budapest, November 17th - 21st, 2014
@@ -214,44 +209,42 @@
Click to see conference site for details and registration.
</a>
</p>
- </div>
- </div>
+ </li>
+ </ul>
+ </div>
- </li>
- <li>
+ <script type="text/javascript">
+ <!--
+ // Show alert box.
+ // Show important messages and announcements.
+ // In "/msg_prop_l10n.js": Change to 'true' to show the text that is defined
in the variables.
+ showAlertBox();
+
+ // Show redirect box.
+ // Show a text how to redirect to the NL webpage.
+ // In "/msg_prop_l10n.js": Change the mode and text how a redirect to the
respective NL webpage should be done.
+ setRedirect();
+ //-->
+ </script>
- <script type="text/javascript">
- <!--
- // Show alert box.
- // Show important messages and announcements.
- // In "/msg_prop_l10n.js": Change to 'true' to show the text that is
defined in the variables.
- showAlertBox();
-
- // Show redirect box.
- // Show a text how to redirect to the NL webpage.
- // In "/msg_prop_l10n.js": Change the mode and text how a redirect to the
respective NL webpage should be done.
- setRedirect();
- //-->
- </script>
+ <li>
+ <hr />
+ </li>
- </li>
- <li>
- <hr />
- </li>
- <li>
- <div class="action-info">
- <div class="action-text action-link">
- <a href="why/index.html">
- <h2>I want to learn more about OpenOffice</h2>
- <p>What is Apache OpenOffice? And why should I use it?</p>
- </a>
- </div>
+ <li>
+ <div class="action-info">
+ <div class="action-text action-link">
+ <a href="why/index.html">
+ <h2>I want to learn more about OpenOffice</h2>
+ <p>What is Apache OpenOffice? And why should I use it?</p>
+ </a>
</div>
- </li>
- <li>
- <hr />
- </li>
- </ul>
+ </div>
+ </li>
+
+ <li>
+ <hr />
+ </li>
<!-- Show the download link with currently available version number, loaded
via JavaScript -->
<script type="text/javascript">
@@ -377,7 +370,7 @@
</div>
</div>
-<div id="news" style="margin: 1% 3% 0 0; height: 520px;">
+<div id="news">
<div class="campaign" style="height: 200px; float: right; overflow: auto;">
<h2 style="display: inline;">Recent Blog Posts</h2>
![http://www.apache.org/ads/ApacheCon/2014-eu-234x60.png"](http://www.apache.org/ads/ApacheCon/2014-eu-234x60.png"){kind=link}