Author: buildbot
Date: Sun Sep 14 21:21:23 2014
New Revision: 922199

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.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Sep 14 21:21:23 2014
@@ -1 +1 @@
-1624904
+1624905

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Sep 14 21:21:23 2014
@@ -1 +1 @@
-1624904
+1624905

Modified: websites/staging/ooo-site/trunk/content/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/index.html (original)
+++ websites/staging/ooo-site/trunk/content/index.html Sun Sep 14 21:21:23 2014
@@ -37,23 +37,48 @@
         }
       }
 
+      function showEventBox() {
+       // The text is defined in "/msg_prop_l10n.js".
+
+       // Show the event box or not?
+       if( l10n.index_event_box_show ) {
+               // Show the banner logo and text with link and cursor as poiner.
+               document.write( "<div id='event_box' onclick='window.open( \"" 
+ l10n.index_event_box_text_href
+                       + "\", \"_blank\" ); return false;'>"
+                       + "<ul>"
+                         + "<li>"
+                           // Event banner logo on the left hand side.
+                           + "<p style='float: left;'>"
+                             + "<a href='" + l10n.index_event_box_graphic_href
+                               + "' title='" + 
l10n.index_event_box_graphic_title + "' target='_blank'>"
+                                 + "<img src='" + 
l10n.index_event_box_graphic_src
+                                 + "' alt='" + 
l10n.index_event_box_graphic_alt + "' />"
+                             + "</a>"
+                           + "</p>"
+
+                           // Event text on the right hand side.
+                           + "<p>"
+                             + "<a style='color: black; text-decoration: 
none;'"
+                               + "' title='" + l10n.index_event_box_text_title 
+ "' target='_blank'>"
+                               + l10n.index_event_box_text_text
+                             + "</a>"
+                           + "</p>"
+                         + "</li>"
+                       + "</ul>"
+               + "</div>" );
+       }
+      }
+
       function showAlertBox() {
        // The text is defined in "/msg_prop_l10n.js".
 
-       // Show alert box or not?
+       // Show the 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";
-
-               // 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 +91,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 +103,7 @@
                                + l10n.index_alert_box_text_text + "</p>" );
                        }
                }
-               document.write( "</div>" ); // Alert box
+               document.write( "</li></ul></div>" ); // Alert box.
        }
       }
 
@@ -145,21 +169,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;
@@ -183,41 +211,49 @@
     
     
 
-<!-- The text in the H1 tag is intentionally shown as not displayable, just to 
please accessibility tools like a screen reader. -->
+<!-- The text in the H1 tag is intentionally shown as "display: none" (do not 
display). -->
+<!-- This is to please accessibility tools like a screen reader. -->
 <h1 style="display: none;">Apache OpenOffice</h1>
 
 <div id="actionstatements">
 
   <script type="text/javascript">
   <!--
+  // Show event box.
+  // Show a banner logo and message of the event.
+  // In "/msg_prop_l10n.js": Change to 'true' to show the box that is defined 
in the variables.
+  showEventBox();
+
   // Show alert box.
-  // Show important messages and announcements.
-  // Change to 'true' if you want to show the text that is defined in the 
variables above.
+  // Show an important message or announcement.
+  // In "/msg_prop_l10n.js": Change to 'true' to show the box that is defined 
in the variables.
   showAlertBox();
 
-  // Check if and how a redirect to the respective NL webpage should be done.
+  // 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>
 
-  <ul>
-    <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>
+    <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>
-    <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">
@@ -343,7 +379,7 @@
   </div>
 </div>
 
-<div id="news" style="margin: 2% 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>


Reply via email to