svn commit: r1599446 - in /openoffice/trunk/main/solenv/inc: _tg_app.mk tg_app.mk
Author: jsc Date: Tue Jun 3 08:25:22 2014 New Revision: 1599446 URL: http://svn.apache.org/r1599446 Log: #125003# change LIBRARY path for test run target to use local output dir Modified: openoffice/trunk/main/solenv/inc/_tg_app.mk openoffice/trunk/main/solenv/inc/tg_app.mk Modified: openoffice/trunk/main/solenv/inc/_tg_app.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/_tg_app.mk?rev=1599446&r1=1599445&r2=1599446&view=diff == --- openoffice/trunk/main/solenv/inc/_tg_app.mk (original) +++ openoffice/trunk/main/solenv/inc/_tg_app.mk Tue Jun 3 08:25:22 2014 @@ -283,7 +283,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) .IF "$(APP1TEST)" == "enabled" && "$(APP1TARGET)" != "" $(APP1TARGET)_run: $(APP1TARGETN) - $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH) $(APP1TARGETN) --gtest_output="xml:$(BIN)/$(APP1TARGET)_result.xml" + $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP1TARGETN) --gtest_output="xml:$(BIN)/$(APP1TARGET)_result.xml" .ENDIF Modified: openoffice/trunk/main/solenv/inc/tg_app.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/tg_app.mk?rev=1599446&r1=1599445&r2=1599446&view=diff == --- openoffice/trunk/main/solenv/inc/tg_app.mk (original) +++ openoffice/trunk/main/solenv/inc/tg_app.mk Tue Jun 3 08:25:22 2014 @@ -285,7 +285,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $( .IF "$(APP$(TNR)TEST)" == "enabled" && "$(APP$(TNR)TARGET)" != "" $(APP$(TNR)TARGET)_run: $(APP$(TNR)TARGETN) - $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH) $(APP$(TNR)TARGETN) --gtest_output="xml:$(BIN)/$(APP$(TNR)TARGET)_result.xml" + $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP$(TNR)TARGETN) --gtest_output="xml:$(BIN)/$(APP$(TNR)TARGET)_result.xml" .ENDIF
svn commit: r1599462 - /openoffice/trunk/ext_libraries/gtest/prj/build.lst
Author: hdu Date: Tue Jun 3 10:05:30 2014 New Revision: 1599462 URL: http://svn.apache.org/r1599462 Log: #i125003# add gtest dependency to soltools the dmake build environment needs to be functional before such an external module can be unpacked, built, delivered, checked, etc. Adding a dependency to the solenv module could suffice already but current and future build recipes might also expect stuff from the soltool module such as mkdepend or checkdll. Modified: openoffice/trunk/ext_libraries/gtest/prj/build.lst Modified: openoffice/trunk/ext_libraries/gtest/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/gtest/prj/build.lst?rev=1599462&r1=1599461&r2=1599462&view=diff == --- openoffice/trunk/ext_libraries/gtest/prj/build.lst (original) +++ openoffice/trunk/ext_libraries/gtest/prj/build.lst Tue Jun 3 10:05:30 2014 @@ -1,3 +1,3 @@ -gtestgtest : NULL +gtestgtest : soltools NULL gtestgtest usr1- all gtest_mkout NULL gtestgtest nmake - all gtest_gtest NULL
svn propchange: r1599462 - svn:log
Author: hdu Revision: 1599462 Modified property: svn:log Modified: svn:log at Tue Jun 3 11:08:42 2014 -- --- svn:log (original) +++ svn:log Tue Jun 3 11:08:42 2014 @@ -1,4 +1,4 @@ -#i125003# add gtest dependency to soltools +#i125003# mark gtest as being dependent on soltools the dmake build environment needs to be functional before such an external module can be unpacked, built, delivered, checked, etc. Adding a dependency to
svn commit: r1599480 - /openoffice/trunk/ext_libraries/gtest/win/Library_gtest.mk
Author: jsc Date: Tue Jun 3 11:34:02 2014 New Revision: 1599480 URL: http://svn.apache.org/r1599480 Log: #125003# remove uwinapi dependency, linked by default in g_STDLIB, no need here and introduced a circular dependency to sal Modified: openoffice/trunk/ext_libraries/gtest/win/Library_gtest.mk Modified: openoffice/trunk/ext_libraries/gtest/win/Library_gtest.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/gtest/win/Library_gtest.mk?rev=1599480&r1=1599479&r2=1599480&view=diff == --- openoffice/trunk/ext_libraries/gtest/win/Library_gtest.mk (original) +++ openoffice/trunk/ext_libraries/gtest/win/Library_gtest.mk Tue Jun 3 11:34:02 2014 @@ -41,7 +41,7 @@ $(eval $(call gb_Library_set_ldflags,gte )) $(eval $(call gb_Library_add_linked_libs,gtest,\ -$(gb_STDLIBS) \ +kernel32 msvcrt oldnames \ $(gb_Library_STLLIBS) \ ))
svn commit: r1599536 - in /openoffice/trunk/main/sal: prj/build.lst qa/osl/pipe/makefile.mk qa/osl/pipe/osl_Pipe.cxx
Author: jsc
Date: Tue Jun 3 13:33:59 2014
New Revision: 1599536
URL: http://svn.apache.org/r1599536
Log:
#125038# migrate sal/qa/osl/pipe tests to gtest
Modified:
openoffice/trunk/main/sal/prj/build.lst
openoffice/trunk/main/sal/qa/osl/pipe/makefile.mk
openoffice/trunk/main/sal/qa/osl/pipe/osl_Pipe.cxx
Modified: openoffice/trunk/main/sal/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/prj/build.lst?rev=1599536&r1=1599535&r2=1599536&view=diff
==
--- openoffice/trunk/main/sal/prj/build.lst (original)
+++ openoffice/trunk/main/sal/prj/build.lst Tue Jun 3 13:33:59 2014
@@ -16,6 +16,7 @@ sasal\osl\all
nmake - all sa_osl
sa sal\util
nmake - all sa_util sa_tc.u sa_oslall sa_uwinapi.n sa_kill.n
sa_onlineupdate.n sa_osln.n sa_oslp.p sa_oslu.u sa_rtl sa_textenc NULL
sa sal\qa\sal nmake - all sa_qa_sal sa_util NULL
sa sal\qa\osl\condition nmake - all sa_qa_osl_condition sa_util NULL
+sa sal\qa\osl\pipe nmake - all sa_qa_osl_pipe sa_util NULL
sa sal\cppunittester nmake - all sa_cppunittester sa_cpprt.u sa_util NULL
sa sal\qa\ByteSequence nmake - all sa_qa_ByteSequence sa_cppunittester sa_util
NULL
Modified: openoffice/trunk/main/sal/qa/osl/pipe/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/pipe/makefile.mk?rev=1599536&r1=1599535&r2=1599536&view=diff
==
--- openoffice/trunk/main/sal/qa/osl/pipe/makefile.mk (original)
+++ openoffice/trunk/main/sal/qa/osl/pipe/makefile.mk Tue Jun 3 13:33:59 2014
@@ -20,15 +20,10 @@
#**
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
PRJ=..$/..$/..
PRJNAME=sal
-TARGET=qa_osl_pipe
+TARGET=sal_ut_osl_pipe
ENABLE_EXCEPTIONS=TRUE
@@ -39,28 +34,20 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+ @echo unit tests are disabled. Nothing to do.
-# BEGIN
-# auto generated Target:Pipe by codegen.pl
-SHL1OBJS= \
- $(SLO)$/osl_Pipe.obj
-
-SHL1TARGET= osl_Pipe
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTLIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+.ELSE
-DEF1NAME=$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
-SHL1RPATH = NONE
-# auto generated Target:Pipe
-# END --
+APP1OBJS = $(OBJ)/osl_Pipe.obj
+APP1RPATH = NONE
+APP1STDLIBS = $(GTESTLIB) $(SALLIB)
+APP1TARGET = sal_ut_osl_pipe
+APP1TEST = enabled
+#APP1TEST = disabled
-# --- Targets --
+.INCLUDE: target.mk
-.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
+.ENDIF
-.END
Modified: openoffice/trunk/main/sal/qa/osl/pipe/osl_Pipe.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/pipe/osl_Pipe.cxx?rev=1599536&r1=1599535&r2=1599536&view=diff
==
--- openoffice/trunk/main/sal/qa/osl/pipe/osl_Pipe.cxx (original)
+++ openoffice/trunk/main/sal/qa/osl/pipe/osl_Pipe.cxx Tue Jun 3 13:33:59 2014
@@ -28,11 +28,6 @@
// include files
//
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-#include "cppunit/plugin/TestPlugIn.h"
-#include "test/uniquepipename.hxx"
#include
#include
@@ -48,12 +43,15 @@
#include
#endif
#include
+#include
#ifdef UNX
#include
#endif
#include
+#include "gtest/gtest.h"
+
using namespace osl;
using namespace rtl;
@@ -61,6 +59,16 @@ using namespace rtl;
// helper functions
//
+
+/** helper function for unique pipe names
+ */
+OUString uniquePipeName(OUString const & name) {
+oslProcessInfo info;
+info.Size = sizeof info;
+EXPECT_TRUE( osl_Process_E_None == osl_getProcessInfo(0,
osl_Process_IDENTIFIER, &info) );
+return name + OUString::valueOf((sal_Int32)info.Ident);
+}
+
/** print Boolean value.
*/
inline void printBool( sal_Bool bOk )
@@ -133,9 +141,9 @@ inline void printPipeError( ::osl::Pipe
//
const rtl::OUString aTestPipeName = rtl::OUString::createFromAscii(
"testpipe2" );
const rtl::OUString aTestPipe1 = rtl::OUString::createFromAscii( "testpipe1" );
-const rtl::OUString aTestString = rtl::OUString::createFromAscii( "Sun
Microsystems" );
+const rtl::OUString aTestString = rtl::OUSt
svn commit: r1599542 - /openoffice/trunk/ext_libraries/gtest/makefile.mk
Author: hdu Date: Tue Jun 3 13:41:05 2014 New Revision: 1599542 URL: http://svn.apache.org/r1599542 Log: #125003# use gtest tarball provided configure script on the RHEL5 baseline using autoconf for building gtest results in problems because the platform only provides autoconf 2.59 while the provided aclocal.m4 requires autoconf 2.68 or newer. Fortunately the gtest tarball also provides a perfectly fine configure script and the autoconf step is not needed. Modified: openoffice/trunk/ext_libraries/gtest/makefile.mk Modified: openoffice/trunk/ext_libraries/gtest/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/gtest/makefile.mk?rev=1599542&r1=1599541&r2=1599542&view=diff == --- openoffice/trunk/ext_libraries/gtest/makefile.mk (original) +++ openoffice/trunk/ext_libraries/gtest/makefile.mk Tue Jun 3 13:41:05 2014 @@ -67,7 +67,7 @@ BUILD_FLAGS+= -f ../../../../win/Makefil .ELSE CONFIGURE_DIR= -CONFIGURE_ACTION=autoconf && .$/configure +CONFIGURE_ACTION=.$/configure .IF "$(OS)"=="MACOSX" CONFIGURE_FLAGS='CXX=$(CXX)'
svn commit: r1599543 - /openoffice/trunk/main/sal/prj/build.lst
Author: jsc Date: Tue Jun 3 13:42:15 2014 New Revision: 1599543 URL: http://svn.apache.org/r1599543 Log: #125038# remove double entry for sal/qa/osl/pipe Modified: openoffice/trunk/main/sal/prj/build.lst Modified: openoffice/trunk/main/sal/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/prj/build.lst?rev=1599543&r1=1599542&r2=1599543&view=diff == --- openoffice/trunk/main/sal/prj/build.lst (original) +++ openoffice/trunk/main/sal/prj/build.lst Tue Jun 3 13:42:15 2014 @@ -22,7 +22,6 @@ sa sal\cppunittester nmake - all sa_cppu sa sal\qa\ByteSequence nmake - all sa_qa_ByteSequence sa_cppunittester sa_util NULL sa sal\qa\OStringBuffer nmake - all sa_qa_OStringBuffer sa_cppunittester sa_util NULL sa sal\qa\osl\mutex nmake - all sa_qa_osl_mutex sa_cppunittester sa_util NULL -sa sal\qa\osl\pipe nmake - all sa_qa_osl_pipe sa_cppunittester sa_util NULL sa sal\qa\osl\profile nmake - all sa_qa_osl_profile sa_cppunittester sa_util NULL sa sal\qa\osl\setthreadname nmake - all sa_qa_osl_setthreadname sa_cppunittester sa_util NULL sa sal\qa\rtl\math nmake - all sa_qa_rtl_math sa_cppunittester sa_util NULL
svn commit: r1599549 - /openoffice/trunk/main/sal/qa/osl/pipe/osl_Pipe.cxx
Author: jsc Date: Tue Jun 3 13:59:55 2014 New Revision: 1599549 URL: http://svn.apache.org/r1599549 Log: #125038# add header for Sleep under windows Modified: openoffice/trunk/main/sal/qa/osl/pipe/osl_Pipe.cxx Modified: openoffice/trunk/main/sal/qa/osl/pipe/osl_Pipe.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/pipe/osl_Pipe.cxx?rev=1599549&r1=1599548&r2=1599549&view=diff == --- openoffice/trunk/main/sal/qa/osl/pipe/osl_Pipe.cxx (original) +++ openoffice/trunk/main/sal/qa/osl/pipe/osl_Pipe.cxx Tue Jun 3 13:59:55 2014 @@ -28,6 +28,10 @@ // include files // +#ifdef WNT +#include +#endif + #include #include
svn commit: r1599586 - in /openoffice/trunk/ext_libraries/gtest: makefile.mk use-own-tuple.patch
Author: hdu Date: Tue Jun 3 14:39:51 2014 New Revision: 1599586 URL: http://svn.apache.org/r1599586 Log: #i125003# use gtest's internal tuple class for its own needs test scripts using gtest include that gtest.h header with its dependencies. Using the system tuple header results in slight problems on RHEL5 that can be easily avoided by enabling gtest's internal tuple functionality. Other platforms also benefit from the reduced header dependencies. Added: openoffice/trunk/ext_libraries/gtest/use-own-tuple.patch Modified: openoffice/trunk/ext_libraries/gtest/makefile.mk Modified: openoffice/trunk/ext_libraries/gtest/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/gtest/makefile.mk?rev=1599586&r1=1599585&r2=1599586&view=diff == --- openoffice/trunk/ext_libraries/gtest/makefile.mk (original) +++ openoffice/trunk/ext_libraries/gtest/makefile.mk Tue Jun 3 14:39:51 2014 @@ -46,7 +46,7 @@ TARFILE_NAME=$(PRJNAME)-$(LIBGTESTVERSIO # thankfully, does not care. TARFILE_MD5=2d6ec8ccdf5c46b05ba54a9fd1d130d7 -PATCH_FILES= +PATCH_FILES= use-own-tuple.patch .IF "$(OS)"=="WNT" Added: openoffice/trunk/ext_libraries/gtest/use-own-tuple.patch URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/gtest/use-own-tuple.patch?rev=1599586&view=auto == --- openoffice/trunk/ext_libraries/gtest/use-own-tuple.patch (added) +++ openoffice/trunk/ext_libraries/gtest/use-own-tuple.patch Tue Jun 3 14:39:51 2014 @@ -0,0 +1,12 @@ +--- misc/gtest-1.7.0/include/gtest/internal/gtest-port.h 2013-09-18 19:48:30.0 +0200 misc/build/gtest-1.7.0/include/gtest/internal/gtest-port.h 2014-06-03 15:14:03.0 +0200 +@@ -76,6 +76,9 @@ + // Test's own tr1 tuple implementation should be + // used. Unused when the user sets + // GTEST_HAS_TR1_TUPLE to 0. ++ ++#define GTEST_USE_OWN_TR1_TUPLE 1 ++ + // GTEST_LANG_CXX11 - Define it to 1/0 to indicate that Google Test + // is building in C++11/C++98 mode. + // GTEST_LINKED_AS_SHARED_LIBRARY
svn commit: r1599676 - /openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx
Author: alg
Date: Tue Jun 3 16:43:56 2014
New Revision: 1599676
URL: http://svn.apache.org/r1599676
Log:
i124638 Corrected paints of Writer Frames with DrawingLayer FillAttributes for
all systems and AA/nonAA
Modified:
openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx
Modified: openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx?rev=1599676&r1=1599675&r2=1599676&view=diff
==
--- openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx Tue Jun 3
16:43:56 2014
@@ -1649,12 +1649,9 @@ bool MA_FASTCALL DrawFillAttributes(
if(bUseNew && rFillAttributes.get() && rFillAttributes->isUsed())
{
-// Need to substract a half logical pixel unit from TopLeft to get
the correct
-// layering for AAed paints
-const basegfx::B2DVector
aHalfSingleUnit(rOut.GetInverseViewTransformation() * basegfx::B2DVector(0.5,
0.5));
-const basegfx::B2DRange aPaintRange(
-rPaintRect.Left() - aHalfSingleUnit.getX(),
-rPaintRect.Top() - aHalfSingleUnit.getY(),
+basegfx::B2DRange aPaintRange(
+rPaintRect.Left(),
+rPaintRect.Top(),
rPaintRect.Right(),
rPaintRect.Bottom());
@@ -1662,6 +1659,14 @@ bool MA_FASTCALL DrawFillAttributes(
!basegfx::fTools::equalZero(aPaintRange.getWidth()) &&
!basegfx::fTools::equalZero(aPaintRange.getHeight()))
{
+// need to expand for correct AAed and non-AAed visualization
as primitive; move
+// bounds to half-(logical)pixel bounds and add a width/height of
one pixel that is missing
+// from SwRect/Rectangle integer handling
+const basegfx::B2DVector
aSingleUnit(rOut.GetInverseViewTransformation() * basegfx::B2DVector(0.5, 0.5));
+
+aPaintRange.expand(aPaintRange.getMinimum() - (aSingleUnit * 0.5));
+aPaintRange.expand(aPaintRange.getMaximum() + (aSingleUnit * 1.5));
+
const basegfx::B2DRange aDefineRange(
rOriginalLayoutRect.Left(),
rOriginalLayoutRect.Top(),
svn commit: r1599740 - /openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
Author: marcus Date: Tue Jun 3 18:37:53 2014 New Revision: 1599740 URL: http://svn.apache.org/r1599740 Log: Open the download link in a new browser tab Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html?rev=1599740&r1=1599739&r2=1599740&view=diff == --- openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Tue Jun 3 18:37:53 2014 @@ -93,8 +93,8 @@ // Both download text buttons. + "" + "" -+ "" -+ "" ++ "" ++ "" + "" + "" + ""
svn commit: r911134 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/analyze_droplist.html
Author: buildbot Date: Tue Jun 3 18:39:47 2014 New Revision: 911134 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/download/test/analyze_droplist.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Jun 3 18:39:47 2014 @@ -1 +1 @@ -1599389 +1599740 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Jun 3 18:39:47 2014 @@ -1 +1 @@ -1599389 +1599740 Modified: websites/staging/ooo-site/trunk/content/download/test/analyze_droplist.html == --- websites/staging/ooo-site/trunk/content/download/test/analyze_droplist.html (original) +++ websites/staging/ooo-site/trunk/content/download/test/analyze_droplist.html Tue Jun 3 18:39:47 2014 @@ -109,8 +109,8 @@ // Both download text buttons. + "" + "" -+ "" -+ "" ++ "" ++ "" + "" + "" + ""
svn commit: r1599741 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus
Date: Tue Jun 3 18:41:14 2014
New Revision: 1599741
URL: http://svn.apache.org/r1599741
Log:
Fixed error: Show the download link when 'other' or 'older' was selected
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1599741&r1=1599740&r2=1599741&view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Tue
Jun 3 18:41:14 2014
@@ -1252,10 +1252,12 @@ function getLinkSel() {
LINK_FULL = "http://www.openoffice.org/porting/";;
// Set the values for only one download text button.
- document.getElementById( "dl_f_link" ).href =
LINK_FULL;
- document.getElementById( "dl_f_link" ).innerHTML =
"Porting: Download from other 3rd party vendors";
- document.getElementById( "dl_f_link" ).title = "Click
to browse to the porting webpage and download from other 3rd party vendors";
- document.getElementById( "dl_lp_link" ).style.display = "none";
+ document.getElementById( "dl_f_link" ).href =
LINK_FULL;
+ document.getElementById( "dl_f_link" ).innerHTML =
"Porting: Download from other 3rd party vendors";
+ document.getElementById( "dl_f_link" ).title =
"Click to browse to the porting webpage and download from other 3rd party
vendors";
+ document.getElementById( "dl_f_link" ).style.display =
"inline";
+ document.getElementById( "dl_lp_link").style.display =
"none";
+ document.getElementById( "sub_green_box" ).style.display =
"none";
return LINK_FULL;
}
@@ -1269,11 +1271,11 @@ function getLinkSel() {
LINK_FULL = "http://www.openoffice.org/download/archive.html";;
// Set the values for only one download text button.
- document.getElementById( "dl_f_link" ).href =
LINK_FULL;
- document.getElementById( "dl_f_link" ).innerHTML =
"Archive: Download from older releases";
- document.getElementById( "dl_f_link" ).title = "Click
to browse to the archive and download older releases";
- document.getElementById( "dl_f_link" ).style.display =
"inline";
- document.getElementById( "dl_lp_link" ).style.display = "none";
+ document.getElementById( "dl_f_link" ).href =
LINK_FULL;
+ document.getElementById( "dl_f_link" ).innerHTML =
"Archive: Download from older releases";
+ document.getElementById( "dl_f_link" ).title =
"Click to browse to the archive and download older releases";
+ document.getElementById( "dl_f_link" ).style.display =
"inline";
+ document.getElementById( "dl_lp_link").style.display =
"none";
document.getElementById( "sub_green_box" ).style.display =
"none";
return LINK_FULL;
svn commit: r911135 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download_droplist.js
Author: buildbot
Date: Tue Jun 3 18:41:48 2014
New Revision: 911135
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/download/test/download_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 18:41:48 2014
@@ -1 +1 @@
-1599740
+1599741
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 18:41:48 2014
@@ -1 +1 @@
-1599740
+1599741
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Tue Jun 3 18:41:48 2014
@@ -1252,10 +1252,12 @@ function getLinkSel() {
LINK_FULL = "http://www.openoffice.org/porting/";;
// Set the values for only one download text button.
- document.getElementById( "dl_f_link" ).href =
LINK_FULL;
- document.getElementById( "dl_f_link" ).innerHTML =
"Porting: Download from other 3rd party vendors";
- document.getElementById( "dl_f_link" ).title = "Click
to browse to the porting webpage and download from other 3rd party vendors";
- document.getElementById( "dl_lp_link" ).style.display = "none";
+ document.getElementById( "dl_f_link" ).href =
LINK_FULL;
+ document.getElementById( "dl_f_link" ).innerHTML =
"Porting: Download from other 3rd party vendors";
+ document.getElementById( "dl_f_link" ).title =
"Click to browse to the porting webpage and download from other 3rd party
vendors";
+ document.getElementById( "dl_f_link" ).style.display =
"inline";
+ document.getElementById( "dl_lp_link").style.display =
"none";
+ document.getElementById( "sub_green_box" ).style.display =
"none";
return LINK_FULL;
}
@@ -1269,11 +1271,11 @@ function getLinkSel() {
LINK_FULL = "http://www.openoffice.org/download/archive.html";;
// Set the values for only one download text button.
- document.getElementById( "dl_f_link" ).href =
LINK_FULL;
- document.getElementById( "dl_f_link" ).innerHTML =
"Archive: Download from older releases";
- document.getElementById( "dl_f_link" ).title = "Click
to browse to the archive and download older releases";
- document.getElementById( "dl_f_link" ).style.display =
"inline";
- document.getElementById( "dl_lp_link" ).style.display = "none";
+ document.getElementById( "dl_f_link" ).href =
LINK_FULL;
+ document.getElementById( "dl_f_link" ).innerHTML =
"Archive: Download from older releases";
+ document.getElementById( "dl_f_link" ).title =
"Click to browse to the archive and download older releases";
+ document.getElementById( "dl_f_link" ).style.display =
"inline";
+ document.getElementById( "dl_lp_link").style.display =
"none";
document.getElementById( "sub_green_box" ).style.display =
"none";
return LINK_FULL;
svn commit: r1599745 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus
Date: Tue Jun 3 18:45:16 2014
New Revision: 1599745
URL: http://svn.apache.org/r1599745
Log:
Updated text
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1599745&r1=1599744&r2=1599745&view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Tue
Jun 3 18:45:16 2014
@@ -1253,8 +1253,8 @@ function getLinkSel() {
// Set the values for only one download text button.
document.getElementById( "dl_f_link" ).href =
LINK_FULL;
- document.getElementById( "dl_f_link" ).innerHTML =
"Porting: Download from other 3rd party vendors";
- document.getElementById( "dl_f_link" ).title =
"Click to browse to the porting webpage and download from other 3rd party
vendors";
+ document.getElementById( "dl_f_link" ).innerHTML =
"Porting: Click to choose from 3rd party vendors";
+ document.getElementById( "dl_f_link" ).title =
"Click to browse to the porting webpage and download from 3rd party vendors";
document.getElementById( "dl_f_link" ).style.display =
"inline";
document.getElementById( "dl_lp_link").style.display =
"none";
document.getElementById( "sub_green_box" ).style.display =
"none";
@@ -1272,8 +1272,8 @@ function getLinkSel() {
// Set the values for only one download text button.
document.getElementById( "dl_f_link" ).href =
LINK_FULL;
- document.getElementById( "dl_f_link" ).innerHTML =
"Archive: Download from older releases";
- document.getElementById( "dl_f_link" ).title =
"Click to browse to the archive and download older releases";
+ document.getElementById( "dl_f_link" ).innerHTML =
"Archive: Click to choose from legacy releases";
+ document.getElementById( "dl_f_link" ).title =
"Click to browse to the archive and download legacy releases";
document.getElementById( "dl_f_link" ).style.display =
"inline";
document.getElementById( "dl_lp_link").style.display =
"none";
document.getElementById( "sub_green_box" ).style.display =
"none";
svn commit: r1599746 - /openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
Author: marcus Date: Tue Jun 3 18:45:32 2014 New Revision: 1599746 URL: http://svn.apache.org/r1599746 Log: Updated text Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html?rev=1599746&r1=1599745&r2=1599746&view=diff == --- openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Tue Jun 3 18:45:32 2014 @@ -165,7 +165,7 @@ - Click here to update the table + Update the table @@ -240,8 +240,8 @@ + "isLangSupported() ? "/* isLangSupported() */ + "Old platform ? "/* OLD_PLATFORM */ + "Contains link to Sourgeforge ? "/* SF */ - + "Contains link to 'other.html' ? "/* OTHER */ - + "Contains link to archived build ? "/* ARCHIVE */ + + "Contains link to porting webpage ? "/* OTHER */ + + "Contains link to the archive ? "/* ARCHIVE */ + "General error ? "/* ERROR */ + "" + ""
svn commit: r911137 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download_droplist.js
Author: buildbot
Date: Tue Jun 3 18:45:48 2014
New Revision: 911137
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/download/test/download_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 18:45:48 2014
@@ -1 +1 @@
-1599741
+1599745
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 18:45:48 2014
@@ -1 +1 @@
-1599741
+1599745
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Tue Jun 3 18:45:48 2014
@@ -1253,8 +1253,8 @@ function getLinkSel() {
// Set the values for only one download text button.
document.getElementById( "dl_f_link" ).href =
LINK_FULL;
- document.getElementById( "dl_f_link" ).innerHTML =
"Porting: Download from other 3rd party vendors";
- document.getElementById( "dl_f_link" ).title =
"Click to browse to the porting webpage and download from other 3rd party
vendors";
+ document.getElementById( "dl_f_link" ).innerHTML =
"Porting: Click to choose from 3rd party vendors";
+ document.getElementById( "dl_f_link" ).title =
"Click to browse to the porting webpage and download from 3rd party vendors";
document.getElementById( "dl_f_link" ).style.display =
"inline";
document.getElementById( "dl_lp_link").style.display =
"none";
document.getElementById( "sub_green_box" ).style.display =
"none";
@@ -1272,8 +1272,8 @@ function getLinkSel() {
// Set the values for only one download text button.
document.getElementById( "dl_f_link" ).href =
LINK_FULL;
- document.getElementById( "dl_f_link" ).innerHTML =
"Archive: Download from older releases";
- document.getElementById( "dl_f_link" ).title =
"Click to browse to the archive and download older releases";
+ document.getElementById( "dl_f_link" ).innerHTML =
"Archive: Click to choose from legacy releases";
+ document.getElementById( "dl_f_link" ).title =
"Click to browse to the archive and download legacy releases";
document.getElementById( "dl_f_link" ).style.display =
"inline";
document.getElementById( "dl_lp_link").style.display =
"none";
document.getElementById( "sub_green_box" ).style.display =
"none";
svn commit: r911139 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/analyze_droplist.html
Author: buildbot Date: Tue Jun 3 18:46:36 2014 New Revision: 911139 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/download/test/analyze_droplist.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Jun 3 18:46:36 2014 @@ -1 +1 @@ -1599745 +1599746 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Jun 3 18:46:36 2014 @@ -1 +1 @@ -1599745 +1599746 Modified: websites/staging/ooo-site/trunk/content/download/test/analyze_droplist.html == --- websites/staging/ooo-site/trunk/content/download/test/analyze_droplist.html (original) +++ websites/staging/ooo-site/trunk/content/download/test/analyze_droplist.html Tue Jun 3 18:46:36 2014 @@ -181,7 +181,7 @@ - Click here to update the table + Update the table @@ -256,8 +256,8 @@ + "isLangSupported() ? "/* isLangSupported() */ + "Old platform ? "/* OLD_PLATFORM */ + "Contains link to Sourgeforge ? "/* SF */ - + "Contains link to 'other.html' ? "/* OTHER */ - + "Contains link to archived build ? "/* ARCHIVE */ + + "Contains link to porting webpage ? "/* OTHER */ + + "Contains link to the archive ? "/* ARCHIVE */ + "General error ? "/* ERROR */ + "" + ""
svn commit: r1599756 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus
Date: Tue Jun 3 18:56:02 2014
New Revision: 1599756
URL: http://svn.apache.org/r1599756
Log:
Inverted error flag, assume an error by default until the assembled download
link is valid
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1599756&r1=1599755&r2=1599756&view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Tue
Jun 3 18:56:02 2014
@@ -121,7 +121,7 @@ function initVars() {
SF = false; // Does the download
URL points to Soureforge?
OTHER = false; // Does the download
URL points to 'other.html'?
ARCHIVE = false; // Does the download
URL points to the ASF archive?
- ERROR = false; // Is the download URL
in general correct (false) or not (true)?
+ ERROR = true; // Is the download URL
in general correct (false) or not (true)?
}
/*
@@ -967,9 +967,6 @@ function showErrorMessage( error_text )
UI_PLATFORM_NO_SUP = "";
// Set some error flags.
- SF = false;
- OTHER = false;
- ARCHIVE = false;
ERROR = true;
return ERROR;
@@ -1066,8 +1063,6 @@ function getLink( rel_mode ) {
LINK_CHK_MD5_FULL=
ASF_ARC_PREV_URL+"/binaries/"+LANG_ISO+"/"+FILENAME_FULL+".md5";
LINK_CHK_SHA256_FULL =
ASF_ARC_PREV_URL+"/binaries/"+LANG_ISO+"/"+FILENAME_FULL+".sha256";
- SF = false;
- OTHER= false;
ARCHIVE = true;
ERROR= true;
return LINK_FULL;
@@ -1078,9 +1073,7 @@ function getLink( rel_mode ) {
LINK_FULL =
"http://www.openoffice.org/porting/index.html";;
- SF= false;
OTHER = true;
- ARCHIVE = false;
ERROR = true;
return LINK_FULL;
@@ -1094,9 +1087,7 @@ function getLink( rel_mode ) {
LINK_CHECKSUM_MD5_FULL=
"http://archive.apache.org/dist/openoffice/";;
LINK_CHECKSUM_SHA256_FULL =
"http://archive.apache.org/dist/openoffice/";;
- SF= false;
OTHER = true;
- ARCHIVE = false;
ERROR = true;
return LINK_FULL;
}
@@ -1110,9 +1101,7 @@ function getLink( rel_mode ) {
}
LINK_FULL =
"http://www.openoffice.org/download/other.html";;
- SF= false;
OTHER = true;
- ARCHIVE = false;
ERROR = true;
return LINK_FULL;
@@ -1141,8 +1130,6 @@ function getLink( rel_mode ) {
LINK_CHECKSUM_SHA256_FULL = ASF_ARC_BASE_URL + "/binaries/" +
LANG_ISO + "/" + FILENAME_FULL + ".sha256";
SF= true;
- OTHER = false;
- ARCHIVE = false;
ERROR = false;
return LINK_FULL;
@@ -1158,9 +1145,7 @@ function getLink( rel_mode ) {
// Provide the "all_beta.html" as download link.
LINK_FULL =
"http://www.openoffice.org/download/all_beta.html";;
}
- SF = false;
OTHER = true;
- ARCHIVE = false;
ERROR = true;
}
@@ -1178,7 +1163,7 @@ function getLinkSel() {
SF = false;
OTHER = false;
ARCHIVE = false;
- ERROR = false;
+ ERROR = true;
// If no mode was given, assume it is the release mode (stable release).
if( R_MODE === undefined )
@@ -1215,6 +1200,7 @@ function getLinkSel() {
+ "Solution: Please select a download
for Windows, Linux or OS X.";
showErrorMessage( error_text );
+ ERROR = true;
return ERROR;
}
@@ -122
svn commit: r911140 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download_droplist.js
Author: buildbot
Date: Tue Jun 3 18:56:34 2014
New Revision: 911140
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/download/test/download_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 18:56:34 2014
@@ -1 +1 @@
-1599746
+1599756
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 18:56:34 2014
@@ -1 +1 @@
-1599746
+1599756
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Tue Jun 3 18:56:34 2014
@@ -121,7 +121,7 @@ function initVars() {
SF = false; // Does the download
URL points to Soureforge?
OTHER = false; // Does the download
URL points to 'other.html'?
ARCHIVE = false; // Does the download
URL points to the ASF archive?
- ERROR = false; // Is the download URL
in general correct (false) or not (true)?
+ ERROR = true; // Is the download URL
in general correct (false) or not (true)?
}
/*
@@ -967,9 +967,6 @@ function showErrorMessage( error_text )
UI_PLATFORM_NO_SUP = "";
// Set some error flags.
- SF = false;
- OTHER = false;
- ARCHIVE = false;
ERROR = true;
return ERROR;
@@ -1066,8 +1063,6 @@ function getLink( rel_mode ) {
LINK_CHK_MD5_FULL=
ASF_ARC_PREV_URL+"/binaries/"+LANG_ISO+"/"+FILENAME_FULL+".md5";
LINK_CHK_SHA256_FULL =
ASF_ARC_PREV_URL+"/binaries/"+LANG_ISO+"/"+FILENAME_FULL+".sha256";
- SF = false;
- OTHER= false;
ARCHIVE = true;
ERROR= true;
return LINK_FULL;
@@ -1078,9 +1073,7 @@ function getLink( rel_mode ) {
LINK_FULL =
"http://www.openoffice.org/porting/index.html";;
- SF= false;
OTHER = true;
- ARCHIVE = false;
ERROR = true;
return LINK_FULL;
@@ -1094,9 +1087,7 @@ function getLink( rel_mode ) {
LINK_CHECKSUM_MD5_FULL=
"http://archive.apache.org/dist/openoffice/";;
LINK_CHECKSUM_SHA256_FULL =
"http://archive.apache.org/dist/openoffice/";;
- SF= false;
OTHER = true;
- ARCHIVE = false;
ERROR = true;
return LINK_FULL;
}
@@ -1110,9 +1101,7 @@ function getLink( rel_mode ) {
}
LINK_FULL =
"http://www.openoffice.org/download/other.html";;
- SF= false;
OTHER = true;
- ARCHIVE = false;
ERROR = true;
return LINK_FULL;
@@ -1141,8 +1130,6 @@ function getLink( rel_mode ) {
LINK_CHECKSUM_SHA256_FULL = ASF_ARC_BASE_URL + "/binaries/" +
LANG_ISO + "/" + FILENAME_FULL + ".sha256";
SF= true;
- OTHER = false;
- ARCHIVE = false;
ERROR = false;
return LINK_FULL;
@@ -1158,9 +1145,7 @@ function getLink( rel_mode ) {
// Provide the "all_beta.html" as download link.
LINK_FULL =
"http://www.openoffice.org/download/all_beta.html";;
}
- SF = false;
OTHER = true;
- ARCHIVE = false;
ERROR = true;
}
@@ -1178,7 +1163,7 @@ function getLinkSel() {
SF = false;
OTHER = false;
ARCHIVE = false;
- ERROR = false;
+
svn commit: r1599761 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus
Date: Tue Jun 3 19:00:49 2014
New Revision: 1599761
URL: http://svn.apache.org/r1599761
Log:
Inverted error flag, assume an error by default until the assembled download
link is valid
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1599761&r1=1599760&r2=1599761&view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Tue
Jun 3 19:00:49 2014
@@ -967,7 +967,7 @@ function showErrorMessage( error_text )
UI_PLATFORM_NO_SUP = "";
// Set some error flags.
- ERROR = true;
+ ERROR = true;
return ERROR;
}
@@ -998,7 +998,7 @@ function isLangSupported() {
break;
default:
RELEASE_LANG = "";
- ERROR = true;
+ ERROR = true;
}
// if( LANG_ARRAY[ 3 ] === 'y' ) {
@@ -1006,7 +1006,7 @@ function isLangSupported() {
return true;
} else {
NOT_AVAILABLE = RELEASE_LANG[ 1 ] + " is not available";
- ERROR = true;
+ ERROR = true;
return false;
}
}
@@ -1270,7 +1270,7 @@ function getLinkSel() {
document.getElementById( "sub_green_box" ).style.display =
"none";
ARCHIVE = true;
- ERROR = false;
+ ERROR = false;
return LINK_FULL;
}
@@ -1541,6 +1541,7 @@ function getPlatform() {
// If $UI_PLATFORM_NO_SUP is already filled, something was
recognized and no more work is needed.
if( UI_PLATFORM_NO_SUP !== "" )
+ ERROR = true;
return PLATFORM;
// Recognized and *supported* platforms/OS, set $UI_PLATFORM to
show it to the user.
svn commit: r911141 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download_droplist.js
Author: buildbot
Date: Tue Jun 3 19:01:33 2014
New Revision: 911141
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/download/test/download_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 19:01:33 2014
@@ -1 +1 @@
-1599756
+1599761
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 19:01:33 2014
@@ -1 +1 @@
-1599756
+1599761
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Tue Jun 3 19:01:33 2014
@@ -967,7 +967,7 @@ function showErrorMessage( error_text )
UI_PLATFORM_NO_SUP = "";
// Set some error flags.
- ERROR = true;
+ ERROR = true;
return ERROR;
}
@@ -998,7 +998,7 @@ function isLangSupported() {
break;
default:
RELEASE_LANG = "";
- ERROR = true;
+ ERROR = true;
}
// if( LANG_ARRAY[ 3 ] === 'y' ) {
@@ -1006,7 +1006,7 @@ function isLangSupported() {
return true;
} else {
NOT_AVAILABLE = RELEASE_LANG[ 1 ] + " is not available";
- ERROR = true;
+ ERROR = true;
return false;
}
}
@@ -1270,7 +1270,7 @@ function getLinkSel() {
document.getElementById( "sub_green_box" ).style.display =
"none";
ARCHIVE = true;
- ERROR = false;
+ ERROR = false;
return LINK_FULL;
}
@@ -1541,6 +1541,7 @@ function getPlatform() {
// If $UI_PLATFORM_NO_SUP is already filled, something was
recognized and no more work is needed.
if( UI_PLATFORM_NO_SUP !== "" )
+ ERROR = true;
return PLATFORM;
// Recognized and *supported* platforms/OS, set $UI_PLATFORM to
show it to the user.
svn commit: r1599774 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus Date: Tue Jun 3 19:43:21 2014 New Revision: 1599774 URL: http://svn.apache.org/r1599774 Log: Set the 'autofocus' attribute to the OS select box Modified: openoffice/ooo-site/trunk/content/download/test/index_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/index_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/index_droplist.html?rev=1599774&r1=1599773&r2=1599774&view=diff == --- openoffice/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/index_droplist.html Tue Jun 3 19:43:21 2014 @@ -223,12 +223,12 @@ // Select boxes. + "" - + "" - + "" - + "" - + "" - + "" - + "" + + "" + + "" + + "" + "" // Both download text buttons.
svn commit: r911158 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/index_droplist.html
Author: buildbot Date: Tue Jun 3 19:44:34 2014 New Revision: 911158 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/download/test/index_droplist.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Jun 3 19:44:34 2014 @@ -1 +1 @@ -1599761 +1599774 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Jun 3 19:44:34 2014 @@ -1 +1 @@ -1599761 +1599774 Modified: websites/staging/ooo-site/trunk/content/download/test/index_droplist.html == --- websites/staging/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ websites/staging/ooo-site/trunk/content/download/test/index_droplist.html Tue Jun 3 19:44:34 2014 @@ -239,12 +239,12 @@ // Select boxes. + "" - + "" - + "" - + "" - + "" - + "" - + "" + + "" + + "" + + "" + "" // Both download text buttons.
svn commit: r1599778 - /openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
Author: marcus
Date: Tue Jun 3 20:07:15 2014
New Revision: 1599778
URL: http://svn.apache.org/r1599778
Log:
Changed the link 'Update the table' into a button
Modified:
openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html?rev=1599778&r1=1599777&r2=1599778&view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
(original)
+++ openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Tue
Jun 3 20:07:15 2014
@@ -82,12 +82,12 @@
// Select boxes.
+ ""
- + ""
- + ""
- + ""
- + ""
- + ""
- + ""
+ + ""
+ + ""
+ + ""
+ ""
// Both download text buttons.
@@ -162,12 +162,25 @@
-
-
- Update the table
-
-
+
+
+
+
+
+
+
+
@@ -263,6 +276,15 @@
return;
}
+/*
+function copyTable() {
+ // Copy all table data into the clipboard.
+
+ alert( "TODO: Implement" );
+
+ return;
+}
+*/
svn commit: r1599779 - /openoffice/ooo-site/trunk/content/download/test/exceptions.css
Author: marcus
Date: Tue Jun 3 20:07:55 2014
New Revision: 1599779
URL: http://svn.apache.org/r1599779
Log:
Added new styles
Modified:
openoffice/ooo-site/trunk/content/download/test/exceptions.css
Modified: openoffice/ooo-site/trunk/content/download/test/exceptions.css
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/exceptions.css?rev=1599779&r1=1599778&r2=1599779&view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/exceptions.css (original)
+++ openoffice/ooo-site/trunk/content/download/test/exceptions.css Tue Jun 3
20:07:55 2014
@@ -24,6 +24,8 @@ h1 { padding-left: 0.5em; }
#navcol { display: none; }
.warning { border: solid 3px #F00; background: #FDD; padding: 1em; }
+.btn_analyze { background-color: LightGrey; border-radius: 5px; padding: 0px
15px 0px 15px; font-size: 1.2em; cursor: pointer; }
+
#content h2 { margin-top: 0; }
.overall_optionset { min-width: 880px; max-width: 1400px; overflow: auto; }
@@ -79,6 +81,8 @@ h1 { padding-left: 0.5em; }
.green-sel .dl-txt-btn:hover h3 a { background: #546828; border: 5px solid
#E9FEBE; border-radius: 15px; color: #E9FEBE; margin: 5px 0 0 3%;}
.sub-green-sel { height: 83px; background: #E9FEBE; border-top: 1px solid
#C3E480; border-bottom: 1px solid #C3E480; border-radius: 15px; font-size:
.8em; padding: 5px 5px 5px 0px; }
.sub-green-sel p { padding: .1em 3%; width: 100%; }
+.sub-green-sel_ok { background: #E9FEBE; border-top: 1px solid #C3E480;
border-bottom: 1px solid #C3E480; }
+.sub-green-sel_error { background: #FECBCB; border-top: 1px solid #C0;
border-bottom: 1px solid #C0; }
.grey { background: #C0C0C0 right top no-repeat; cursor: default; }
.grey:hover { background: #A0A0A0 right -200px no-repeat; cursor: default; }
svn commit: r911159 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/analyze_droplist.html
Author: buildbot
Date: Tue Jun 3 20:08:29 2014
New Revision: 911159
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/download/test/analyze_droplist.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 20:08:29 2014
@@ -1 +1 @@
-1599774
+1599778
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 20:08:29 2014
@@ -1 +1 @@
-1599774
+1599778
Modified:
websites/staging/ooo-site/trunk/content/download/test/analyze_droplist.html
==
--- websites/staging/ooo-site/trunk/content/download/test/analyze_droplist.html
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/analyze_droplist.html
Tue Jun 3 20:08:29 2014
@@ -98,12 +98,12 @@
// Select boxes.
+ ""
- + ""
- + ""
- + ""
- + ""
- + ""
- + ""
+ + ""
+ + ""
+ + ""
+ ""
// Both download text buttons.
@@ -178,12 +178,25 @@
-
-
- Update the table
-
-
+
+
+
+
+
+
+
+
@@ -279,6 +292,15 @@
return;
}
+/*
+function copyTable() {
+ // Copy all table data into the clipboard.
+
+ alert( "TODO: Implement" );
+
+ return;
+}
+*/
svn commit: r911160 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/exceptions.css
Author: buildbot
Date: Tue Jun 3 20:10:04 2014
New Revision: 911160
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/download/test/exceptions.css
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 20:10:04 2014
@@ -1 +1 @@
-1599778
+1599779
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 20:10:04 2014
@@ -1 +1 @@
-1599778
+1599779
Modified: websites/staging/ooo-site/trunk/content/download/test/exceptions.css
==
--- websites/staging/ooo-site/trunk/content/download/test/exceptions.css
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/exceptions.css Tue
Jun 3 20:10:04 2014
@@ -24,6 +24,8 @@ h1 { padding-left: 0.5em; }
#navcol { display: none; }
.warning { border: solid 3px #F00; background: #FDD; padding: 1em; }
+.btn_analyze { background-color: LightGrey; border-radius: 5px; padding: 0px
15px 0px 15px; font-size: 1.2em; cursor: pointer; }
+
#content h2 { margin-top: 0; }
.overall_optionset { min-width: 880px; max-width: 1400px; overflow: auto; }
@@ -79,6 +81,8 @@ h1 { padding-left: 0.5em; }
.green-sel .dl-txt-btn:hover h3 a { background: #546828; border: 5px solid
#E9FEBE; border-radius: 15px; color: #E9FEBE; margin: 5px 0 0 3%;}
.sub-green-sel { height: 83px; background: #E9FEBE; border-top: 1px solid
#C3E480; border-bottom: 1px solid #C3E480; border-radius: 15px; font-size:
.8em; padding: 5px 5px 5px 0px; }
.sub-green-sel p { padding: .1em 3%; width: 100%; }
+.sub-green-sel_ok { background: #E9FEBE; border-top: 1px solid #C3E480;
border-bottom: 1px solid #C3E480; }
+.sub-green-sel_error { background: #FECBCB; border-top: 1px solid #C0;
border-bottom: 1px solid #C0; }
.grey { background: #C0C0C0 right top no-repeat; cursor: default; }
.grey:hover { background: #A0A0A0 right -200px no-repeat; cursor: default; }
svn commit: r1599784 - /openoffice/ooo-site/trunk/content/download/test/exceptions.css
Author: marcus
Date: Tue Jun 3 20:19:58 2014
New Revision: 1599784
URL: http://svn.apache.org/r1599784
Log:
Added new styles
Modified:
openoffice/ooo-site/trunk/content/download/test/exceptions.css
Modified: openoffice/ooo-site/trunk/content/download/test/exceptions.css
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/exceptions.css?rev=1599784&r1=1599783&r2=1599784&view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/exceptions.css (original)
+++ openoffice/ooo-site/trunk/content/download/test/exceptions.css Tue Jun 3
20:19:58 2014
@@ -81,8 +81,7 @@ h1 { padding-left: 0.5em; }
.green-sel .dl-txt-btn:hover h3 a { background: #546828; border: 5px solid
#E9FEBE; border-radius: 15px; color: #E9FEBE; margin: 5px 0 0 3%;}
.sub-green-sel { height: 83px; background: #E9FEBE; border-top: 1px solid
#C3E480; border-bottom: 1px solid #C3E480; border-radius: 15px; font-size:
.8em; padding: 5px 5px 5px 0px; }
.sub-green-sel p { padding: .1em 3%; width: 100%; }
-.sub-green-sel_ok { background: #E9FEBE; border-top: 1px solid #C3E480;
border-bottom: 1px solid #C3E480; }
-.sub-green-sel_error { background: #FECBCB; border-top: 1px solid #C0;
border-bottom: 1px solid #C0; }
+.sub-green-sel_error { height: 83px; background: #FECBCB; border-top: 1px
solid #C0; border-bottom: 1px solid #C0; border-radius: 15px;
font-size: .8em; padding: 5px 5px 5px 0px; }
.grey { background: #C0C0C0 right top no-repeat; cursor: default; }
.grey:hover { background: #A0A0A0 right -200px no-repeat; cursor: default; }
svn commit: r1599785 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus
Date: Tue Jun 3 20:20:35 2014
New Revision: 1599785
URL: http://svn.apache.org/r1599785
Log:
Updated styles
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1599785&r1=1599784&r2=1599785&view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Tue
Jun 3 20:20:35 2014
@@ -948,9 +948,7 @@ function showErrorMessage( error_text )
document.getElementById( "dl_lp_link").innerHTML= "No
language pack available";
document.getElementById( "dl_lp_link").title=
"Please select another language, platform or version.";
- document.getElementById( "sub_green_box" ).style.background =
"#FECBCB";// LightRed
- document.getElementById( "sub_green_box" ).style.borderTop = "1px
solid #C0"; // Darker red
- document.getElementById( "sub_green_box" ).style.borderBottom = "1px
solid #C0"; // Darker red
+ document.getElementById( "sub_green_box" ).className=
"sub-green-sel_error";
document.getElementById( "dl_err_img").src =
"../cachedimages/exclamation-icon.png";
document.getElementById( "dl_err_img").title= "The
selected download file is not available";
@@ -1401,10 +1399,7 @@ function getLinkSel() {
document.getElementById( "dl_rpt" ).title =
"Broken download link? Click here to report.";
// Reset the CSS styles for the elements in the sub-green
colored boxes.
- document.getElementById( "sub_green_box").style.background
= "#E9FEBE"; // LightGreen
- document.getElementById( "sub_green_box").style.borderTop
= "1px solid #C3E480"; // Darker green
- document.getElementById( "sub_green_box"
).style.borderBottom = "1px solid #C3E480"; // Darker green
- document.getElementById( "sub_green_box").style.fontSize
= "0.8em";
+ document.getElementById( "sub_green_box").className
= "sub-green-sel";
document.getElementById( "dl_err_img" ).style.display
= "none";
document.getElementById( "dl_err" ).style.display
= "none";
svn commit: r911162 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/exceptions.css
Author: buildbot
Date: Tue Jun 3 20:20:50 2014
New Revision: 911162
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/download/test/exceptions.css
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 20:20:50 2014
@@ -1 +1 @@
-1599779
+1599784
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 20:20:50 2014
@@ -1 +1 @@
-1599779
+1599784
Modified: websites/staging/ooo-site/trunk/content/download/test/exceptions.css
==
--- websites/staging/ooo-site/trunk/content/download/test/exceptions.css
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/exceptions.css Tue
Jun 3 20:20:50 2014
@@ -81,8 +81,7 @@ h1 { padding-left: 0.5em; }
.green-sel .dl-txt-btn:hover h3 a { background: #546828; border: 5px solid
#E9FEBE; border-radius: 15px; color: #E9FEBE; margin: 5px 0 0 3%;}
.sub-green-sel { height: 83px; background: #E9FEBE; border-top: 1px solid
#C3E480; border-bottom: 1px solid #C3E480; border-radius: 15px; font-size:
.8em; padding: 5px 5px 5px 0px; }
.sub-green-sel p { padding: .1em 3%; width: 100%; }
-.sub-green-sel_ok { background: #E9FEBE; border-top: 1px solid #C3E480;
border-bottom: 1px solid #C3E480; }
-.sub-green-sel_error { background: #FECBCB; border-top: 1px solid #C0;
border-bottom: 1px solid #C0; }
+.sub-green-sel_error { height: 83px; background: #FECBCB; border-top: 1px
solid #C0; border-bottom: 1px solid #C0; border-radius: 15px;
font-size: .8em; padding: 5px 5px 5px 0px; }
.grey { background: #C0C0C0 right top no-repeat; cursor: default; }
.grey:hover { background: #A0A0A0 right -200px no-repeat; cursor: default; }
svn commit: r911164 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download_droplist.js
Author: buildbot
Date: Tue Jun 3 20:22:41 2014
New Revision: 911164
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/download/test/download_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 20:22:41 2014
@@ -1 +1 @@
-1599784
+1599785
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 20:22:41 2014
@@ -1 +1 @@
-1599784
+1599785
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Tue Jun 3 20:22:41 2014
@@ -948,9 +948,7 @@ function showErrorMessage( error_text )
document.getElementById( "dl_lp_link").innerHTML= "No
language pack available";
document.getElementById( "dl_lp_link").title=
"Please select another language, platform or version.";
- document.getElementById( "sub_green_box" ).style.background =
"#FECBCB";// LightRed
- document.getElementById( "sub_green_box" ).style.borderTop = "1px
solid #C0"; // Darker red
- document.getElementById( "sub_green_box" ).style.borderBottom = "1px
solid #C0"; // Darker red
+ document.getElementById( "sub_green_box" ).className=
"sub-green-sel_error";
document.getElementById( "dl_err_img").src =
"../cachedimages/exclamation-icon.png";
document.getElementById( "dl_err_img").title= "The
selected download file is not available";
@@ -1401,10 +1399,7 @@ function getLinkSel() {
document.getElementById( "dl_rpt" ).title =
"Broken download link? Click here to report.";
// Reset the CSS styles for the elements in the sub-green
colored boxes.
- document.getElementById( "sub_green_box").style.background
= "#E9FEBE"; // LightGreen
- document.getElementById( "sub_green_box").style.borderTop
= "1px solid #C3E480"; // Darker green
- document.getElementById( "sub_green_box"
).style.borderBottom = "1px solid #C3E480"; // Darker green
- document.getElementById( "sub_green_box").style.fontSize
= "0.8em";
+ document.getElementById( "sub_green_box").className
= "sub-green-sel";
document.getElementById( "dl_err_img" ).style.display
= "none";
document.getElementById( "dl_err" ).style.display
= "none";
svn commit: r1599816 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus
Date: Tue Jun 3 22:23:18 2014
New Revision: 1599816
URL: http://svn.apache.org/r1599816
Log:
Fixed error while recognizing the browser's platform, brackets missing for 'if'
query
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1599816&r1=1599815&r2=1599816&view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Tue
Jun 3 22:23:18 2014
@@ -1467,15 +1467,17 @@ function getPlatform() {
};
}
+ alert( os );
+
if( os ) {
// Recognized but *not supported* platforms/OS, set
$UI_PLATFORM_NO_SUP to show it to the user.
// Mobile devices.
+
if( ua.indexOf( "android" ) !== -1 )
if( ua.indexOf( "nexus" ) !== -1 &&
ve.indexOf( "google") !== -1 )
UI_PLATFORM_NO_SUP = "Google Nexus";
else if( ua.indexOf( "moble") !== -1 )
UI_PLATFORM_NO_SUP = "mobile devices (Android)";
-
if( os.indexOf( "arm" ) !== -1 )
UI_PLATFORM_NO_SUP = "mobile devices (ARM processor)";
if( ua.indexOf( "blackberry") !== -1 )
UI_PLATFORM_NO_SUP = "Blackberry smartphones";
if( ua.indexOf( "brew" ) !== -1 )
UI_PLATFORM_NO_SUP = "smartphones (BREW)";
@@ -1535,9 +1537,10 @@ function getPlatform() {
}
// If $UI_PLATFORM_NO_SUP is already filled, something was
recognized and no more work is needed.
- if( UI_PLATFORM_NO_SUP !== "" )
+ if( UI_PLATFORM_NO_SUP !== "" ) {
ERROR = true;
return PLATFORM;
+ }
// Recognized and *supported* platforms/OS, set $UI_PLATFORM to
show it to the user.
svn commit: r911186 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download_droplist.js
Author: buildbot
Date: Tue Jun 3 22:24:39 2014
New Revision: 911186
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/download/test/download_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 22:24:39 2014
@@ -1 +1 @@
-1599785
+1599816
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 22:24:39 2014
@@ -1 +1 @@
-1599785
+1599816
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Tue Jun 3 22:24:39 2014
@@ -1467,15 +1467,17 @@ function getPlatform() {
};
}
+ alert( os );
+
if( os ) {
// Recognized but *not supported* platforms/OS, set
$UI_PLATFORM_NO_SUP to show it to the user.
// Mobile devices.
+
if( ua.indexOf( "android" ) !== -1 )
if( ua.indexOf( "nexus" ) !== -1 &&
ve.indexOf( "google") !== -1 )
UI_PLATFORM_NO_SUP = "Google Nexus";
else if( ua.indexOf( "moble") !== -1 )
UI_PLATFORM_NO_SUP = "mobile devices (Android)";
-
if( os.indexOf( "arm" ) !== -1 )
UI_PLATFORM_NO_SUP = "mobile devices (ARM processor)";
if( ua.indexOf( "blackberry") !== -1 )
UI_PLATFORM_NO_SUP = "Blackberry smartphones";
if( ua.indexOf( "brew" ) !== -1 )
UI_PLATFORM_NO_SUP = "smartphones (BREW)";
@@ -1535,9 +1537,10 @@ function getPlatform() {
}
// If $UI_PLATFORM_NO_SUP is already filled, something was
recognized and no more work is needed.
- if( UI_PLATFORM_NO_SUP !== "" )
+ if( UI_PLATFORM_NO_SUP !== "" ) {
ERROR = true;
return PLATFORM;
+ }
// Recognized and *supported* platforms/OS, set $UI_PLATFORM to
show it to the user.
svn commit: r911188 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download_droplist.js
Author: buildbot
Date: Tue Jun 3 22:28:43 2014
New Revision: 911188
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/download/test/download_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 22:28:43 2014
@@ -1 +1 @@
-1599816
+1599820
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 22:28:43 2014
@@ -1 +1 @@
-1599816
+1599820
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Tue Jun 3 22:28:43 2014
@@ -1467,8 +1467,6 @@ function getPlatform() {
};
}
- alert( os );
-
if( os ) {
// Recognized but *not supported* platforms/OS, set
$UI_PLATFORM_NO_SUP to show it to the user.
svn commit: r1599820 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus
Date: Tue Jun 3 22:28:09 2014
New Revision: 1599820
URL: http://svn.apache.org/r1599820
Log:
Removed not needed 'alert()'
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1599820&r1=1599819&r2=1599820&view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Tue
Jun 3 22:28:09 2014
@@ -1467,8 +1467,6 @@ function getPlatform() {
};
}
- alert( os );
-
if( os ) {
// Recognized but *not supported* platforms/OS, set
$UI_PLATFORM_NO_SUP to show it to the user.
svn commit: r1599826 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus Date: Tue Jun 3 22:41:51 2014 New Revision: 1599826 URL: http://svn.apache.org/r1599826 Log: Removed the 'autofocus' attribute from the OS select box Modified: openoffice/ooo-site/trunk/content/download/test/index_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/index_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/index_droplist.html?rev=1599826&r1=1599825&r2=1599826&view=diff == --- openoffice/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/index_droplist.html Tue Jun 3 22:41:51 2014 @@ -223,12 +223,12 @@ // Select boxes. + "" - + "" - + "" - + "" + + "" + + "" + + "" + + "" + + "" + + "" + "" // Both download text buttons. @@ -237,6 +237,7 @@ + "" + "" + "" + + "" + "" + "" );
svn commit: r911194 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/index_droplist.html
Author: buildbot Date: Tue Jun 3 22:42:26 2014 New Revision: 911194 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/download/test/index_droplist.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Jun 3 22:42:26 2014 @@ -1 +1 @@ -1599820 +1599826 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Jun 3 22:42:26 2014 @@ -1 +1 @@ -1599820 +1599826 Modified: websites/staging/ooo-site/trunk/content/download/test/index_droplist.html == --- websites/staging/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ websites/staging/ooo-site/trunk/content/download/test/index_droplist.html Tue Jun 3 22:42:26 2014 @@ -239,12 +239,12 @@ // Select boxes. + "" - + "" - + "" - + "" + + "" + + "" + + "" + + "" + + "" + + "" + "" // Both download text buttons. @@ -253,6 +253,7 @@ + "" + "" + "" + + "" + "" + "" );
svn commit: r1599829 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus
Date: Tue Jun 3 22:44:16 2014
New Revision: 1599829
URL: http://svn.apache.org/r1599829
Log:
Set the 'autofocus' attribute to the 'full install' download text button
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1599829&r1=1599828&r2=1599829&view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Tue
Jun 3 22:44:16 2014
@@ -1335,10 +1335,11 @@ function getLinkSel() {
SF = true;
ERROR= false;
- // Set the values for both download text buttons.
+ // Set the values for both download text buttons and set the
focus to the "full install".
document.getElementById( "dl_f_link").href =
LINK_FULL;
document.getElementById( "dl_f_link").innerHTML =
"Download full installation";
document.getElementById( "dl_f_link").title =
"Click to download: " + FILENAME_FULL;
+ document.getElementById( "dl_f_link").focus()
document.getElementById( "dl_lp_link" ).href =
LINK_LP;
document.getElementById( "dl_lp_link" ).innerHTML =
"Download language pack";
document.getElementById( "dl_lp_link" ).title =
"Click to download: " + FILENAME_LP;
svn commit: r911198 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download_droplist.js
Author: buildbot
Date: Tue Jun 3 22:45:18 2014
New Revision: 911198
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/download/test/download_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 22:45:18 2014
@@ -1 +1 @@
-1599826
+1599829
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 22:45:18 2014
@@ -1 +1 @@
-1599826
+1599829
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Tue Jun 3 22:45:18 2014
@@ -1335,10 +1335,11 @@ function getLinkSel() {
SF = true;
ERROR= false;
- // Set the values for both download text buttons.
+ // Set the values for both download text buttons and set the
focus to the "full install".
document.getElementById( "dl_f_link").href =
LINK_FULL;
document.getElementById( "dl_f_link").innerHTML =
"Download full installation";
document.getElementById( "dl_f_link").title =
"Click to download: " + FILENAME_FULL;
+ document.getElementById( "dl_f_link").focus()
document.getElementById( "dl_lp_link" ).href =
LINK_LP;
document.getElementById( "dl_lp_link" ).innerHTML =
"Download language pack";
document.getElementById( "dl_lp_link" ).title =
"Click to download: " + FILENAME_LP;
svn commit: r911199 - in /websites/production/ooo-site: cgi-bin/ content/
Author: marcus Date: Tue Jun 3 22:51:32 2014 New Revision: 911199 Log: Publishing svnmucc operation to ooo-site site by marcus Added: websites/production/ooo-site/cgi-bin/ - copied from r911198, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r911198, websites/staging/ooo-site/trunk/content/
buildbot failure in ASF Buildbot on openoffice-linux32-nightly
The Buildbot has detected a failed build on builder openoffice-linux32-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux32-nightly/builds/42 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm2_ubuntu_32bit Build Reason: The Nightly scheduler named 'openoffice-linux32-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: BUILD FAILED: failed build --all sincerely, -The Buildbot
buildbot failure in ASF Buildbot on openoffice-linux64-nightly
The Buildbot has detected a failed build on builder openoffice-linux64-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-nightly/builds/38 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: BUILD FAILED: failed build --all sincerely, -The Buildbot
buildbot failure in ASF Buildbot on openoffice-fbsd-nightly
The Buildbot has detected a failed build on builder openoffice-fbsd-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-fbsd-nightly/builds/36 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-fbsd2_64bit Build Reason: The Nightly scheduler named 'openoffice-fbsd-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: BUILD FAILED: failed sincerely, -The Buildbot
