buildbot success in ASF Buildbot on aoo-win7
The Buildbot has detected a passing build on builder aoo-win7 while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/aoo-win7/builds/54 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-win7 Build Reason: The Nightly scheduler named 'aoo-win7-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! sincerely, -The Buildbot
buildbot success in ASF Buildbot on openoffice-linux32-nightly
The Buildbot has detected a passing build on builder openoffice-linux32-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux32-nightly/builds/56 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 succeeded! sincerely, -The Buildbot
svn commit: r1602821 - /openoffice/branches/AOO410/main/apache-commons/patches/httpclient.patch
Author: jsc
Date: Mon Jun 16 08:22:43 2014
New Revision: 1602821
URL: http://svn.apache.org/r1602821
Log:
#124442# adapt patch to make it buildable
Modified:
openoffice/branches/AOO410/main/apache-commons/patches/httpclient.patch
Modified:
openoffice/branches/AOO410/main/apache-commons/patches/httpclient.patch
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/apache-commons/patches/httpclient.patch?rev=1602821r1=1602820r2=1602821view=diff
==
--- openoffice/branches/AOO410/main/apache-commons/patches/httpclient.patch
(original)
+++ openoffice/branches/AOO410/main/apache-commons/patches/httpclient.patch Mon
Jun 16 08:22:43 2014
@@ -1,120 +1,31 @@
-diff -ru
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/ConnectMethod.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/ConnectMethod.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/ConnectMethod.java
2012-05-07 12:34:01.0 -0500
-+++
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/ConnectMethod.java
2012-05-07 12:37:50.0 -0500
-@@ -38,7 +38,7 @@
- /**
- * Establishes a tunneled HTTP connection via the CONNECT method.
- *
-- * @author Ortwin Gl???ck
-+ * @author Ortwin Glueck
- * @author dIon Gillard
- * @author a href=mailto:mbow...@gargoylesoftware.com;Mike Bowler/a
- * @author a href=mailto:o...@ural.ru;Oleg Kalnichevski/a
-diff -ru
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpClient.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClient.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpClient.java
2012-05-07 12:34:01.0 -0500
-+++
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClient.java
2012-05-07 12:37:50.0 -0500
-@@ -48,7 +48,7 @@
- * @author a href=mailto:rwaldh...@apache.org;Rodney Waldhoff/a
- * @author Sean C. Sullivan
- * @author a href=mailto:d...@apache.org;dIon Gillard/a
-- * @author Ortwin Gl?ck
-+ * @author Ortwin Glueck
- * @author a href=mailto:be...@u.washington.edu;Michael Becke/a
- * @author a href=mailto:mbow...@gargoylesoftware.com;Mike Bowler/a
- * @author Sam Maloney
-diff -ru
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpClientError.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClientError.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpClientError.java
2012-05-07 12:34:01.0 -0500
-+++
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClientError.java
2012-05-07 12:37:50.0 -0500
-@@ -33,7 +33,7 @@
- /**
- * Signals that an error has occurred.
- *
-- * @author Ortwin Gl?ck
-+ * @author Ortwin Glueck
- * @version $Revision: 480424 $ $Date: 2006-11-29 06:56:49 +0100 (Wed, 29 Nov
2006) $
- * @since 3.0
- */
-diff -ru
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpContentTooLargeException.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpContentTooLargeException.java
2012-05-07 12:34:01.0 -0500
-+++
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java
2012-05-07 12:37:50.0 -0500
-@@ -3,7 +3,7 @@
- /**
- * Signals that the response content was larger than anticipated.
- *
-- * @author Ortwin Glück
-+ * @author Ortwin Glueck
- */
- public class HttpContentTooLargeException extends HttpException {
- private int maxlen;
-diff -ru
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/WireLogInputStream.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/WireLogInputStream.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/WireLogInputStream.java
2012-05-07 12:34:01.0 -0500
-+++
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/WireLogInputStream.java
2012-05-07 12:37:50.0 -0500
-@@ -37,7 +37,7 @@
- /**
- * Logs all data read to the wire LOG.
- *
-- * @author Ortwin Gl�ck
-+ * @author Ortwin Glueck
- * @author a href=mailto:mbow...@gargoylesoftware.com;Mike Bowler/a
- * @author a href=mailto:o...@ural.ru;Oleg Kalnichevski/a
- *
-diff -ru
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/BasicScheme.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/BasicScheme.java
svn commit: r1602823 - /openoffice/trunk/main/sw/source/core/txtnode/ndtxt.cxx
Author: orw
Date: Mon Jun 16 08:40:28 2014
New Revision: 1602823
URL: http://svn.apache.org/r1602823
Log:
125055: follow-up of fix for issue 124338 - adjust condition to trigger sort of
bookmarks in order to avoid serious performance decrease
Kudos to Ariel for his analysis
Modified:
openoffice/trunk/main/sw/source/core/txtnode/ndtxt.cxx
Modified: openoffice/trunk/main/sw/source/core/txtnode/ndtxt.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/txtnode/ndtxt.cxx?rev=1602823r1=1602822r2=1602823view=diff
==
--- openoffice/trunk/main/sw/source/core/txtnode/ndtxt.cxx (original)
+++ openoffice/trunk/main/sw/source/core/txtnode/ndtxt.cxx Mon Jun 16 08:40:28
2014
@@ -1080,6 +1080,8 @@ void SwTxtNode::Update(
// Bookmarks must never grow to either side, when editing (directly)
to the left or right (#i29942#)!
// And a bookmark with same start and end must remain to the left of
the inserted text (used in XML import).
{
+bool bAtLeastOneBookmarkMoved = false;
+bool bAtLeastOneExpandedBookmarkAtInsertionPosition = false;
const IDocumentMarkAccess* const pMarkAccess =
getIDocumentMarkAccess();
for ( IDocumentMarkAccess::const_iterator_t ppMark =
pMarkAccess-getAllMarksBegin();
ppMark != pMarkAccess-getAllMarksEnd();
@@ -1087,14 +1089,28 @@ void SwTxtNode::Update(
{
const ::sw::mark::IMark* const pMark = ppMark-get();
const SwPosition* pEnd = pMark-GetMarkEnd();
-SwIndex rIdx = const_castSwIndex(pEnd-nContent);
+SwIndex rEndIdx = const_castSwIndex(pEnd-nContent);
if( this == pEnd-nNode.GetNode()
-rPos.GetIndex() == rIdx.GetIndex() )
+rPos.GetIndex() == rEndIdx.GetIndex() )
{
-rIdx.Assign( aTmpIdxReg, rIdx.GetIndex() );
-bSortMarks = true;
+rEndIdx.Assign( aTmpIdxReg, rEndIdx.GetIndex() );
+bAtLeastOneBookmarkMoved = true;
+}
+else if ( !bAtLeastOneExpandedBookmarkAtInsertionPosition )
+{
+if ( pMark-IsExpanded() )
+{
+const SwPosition* pStart = pMark-GetMarkStart();
+if ( this == pStart-nNode.GetNode()
+ rPos.GetIndex() == pStart-nContent.GetIndex()
)
+{
+bAtLeastOneExpandedBookmarkAtInsertionPosition =
true;
+}
+}
}
}
+
+bSortMarks = bAtLeastOneBookmarkMoved
bAtLeastOneExpandedBookmarkAtInsertionPosition;
}
}
buildbot success in ASF Buildbot on openoffice-linux64-nightly
The Buildbot has detected a passing build on builder openoffice-linux64-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-nightly/builds/51 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 succeeded! sincerely, -The Buildbot
svn commit: r1602833 - in /openoffice/branches/AOO410: ./ main/ main/sw/source/core/txtnode/ndtxt.cxx
Author: orw
Date: Mon Jun 16 09:58:58 2014
New Revision: 1602833
URL: http://svn.apache.org/r1602833
Log:
125055: follow-up of fix for issue 124338 - adjust condition to trigger sort of
bookmarks in order to avoid serious performance decrease
Kudos to Ariel for his analysis
cherry-picked from trunk
Modified:
openoffice/branches/AOO410/ (props changed)
openoffice/branches/AOO410/main/ (props changed)
openoffice/branches/AOO410/main/sw/source/core/txtnode/ndtxt.cxx
Propchange: openoffice/branches/AOO410/
--
Merged /openoffice/trunk:r1602823
Propchange: openoffice/branches/AOO410/main/
--
Merged /openoffice/trunk/main:r1602823
Modified: openoffice/branches/AOO410/main/sw/source/core/txtnode/ndtxt.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/txtnode/ndtxt.cxx?rev=1602833r1=1602832r2=1602833view=diff
==
--- openoffice/branches/AOO410/main/sw/source/core/txtnode/ndtxt.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/core/txtnode/ndtxt.cxx Mon Jun 16
09:58:58 2014
@@ -1075,6 +1075,8 @@ void SwTxtNode::Update(
// Bookmarks must never grow to either side, when editing (directly)
to the left or right (#i29942#)!
// And a bookmark with same start and end must remain to the left of
the inserted text (used in XML import).
{
+bool bAtLeastOneBookmarkMoved = false;
+bool bAtLeastOneExpandedBookmarkAtInsertionPosition = false;
const IDocumentMarkAccess* const pMarkAccess =
getIDocumentMarkAccess();
for ( IDocumentMarkAccess::const_iterator_t ppMark =
pMarkAccess-getAllMarksBegin();
ppMark != pMarkAccess-getAllMarksEnd();
@@ -1082,14 +1084,28 @@ void SwTxtNode::Update(
{
const ::sw::mark::IMark* const pMark = ppMark-get();
const SwPosition* pEnd = pMark-GetMarkEnd();
-SwIndex rIdx = const_castSwIndex(pEnd-nContent);
+SwIndex rEndIdx = const_castSwIndex(pEnd-nContent);
if( this == pEnd-nNode.GetNode()
-rPos.GetIndex() == rIdx.GetIndex() )
+rPos.GetIndex() == rEndIdx.GetIndex() )
{
-rIdx.Assign( aTmpIdxReg, rIdx.GetIndex() );
-bSortMarks = true;
+rEndIdx.Assign( aTmpIdxReg, rEndIdx.GetIndex() );
+bAtLeastOneBookmarkMoved = true;
+}
+else if ( !bAtLeastOneExpandedBookmarkAtInsertionPosition )
+{
+if ( pMark-IsExpanded() )
+{
+const SwPosition* pStart = pMark-GetMarkStart();
+if ( this == pStart-nNode.GetNode()
+ rPos.GetIndex() == pStart-nContent.GetIndex()
)
+{
+bAtLeastOneExpandedBookmarkAtInsertionPosition =
true;
+}
+}
}
}
+
+bSortMarks = bAtLeastOneBookmarkMoved
bAtLeastOneExpandedBookmarkAtInsertionPosition;
}
}
svn commit: r1602850 - in /openoffice/trunk/main/sw: inc/txtfld.hxx source/core/txtnode/atrfld.cxx source/core/unocore/unofield.cxx
Author: orw
Date: Mon Jun 16 12:01:46 2014
New Revision: 1602850
URL: http://svn.apache.org/r1602850
Log:
125086: correct UNO-API implementation for com::sun::star::text::XTextField
in Writer to reflect changes made for the in-place editing of Input Fields
Modified:
openoffice/trunk/main/sw/inc/txtfld.hxx
openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx
openoffice/trunk/main/sw/source/core/unocore/unofield.cxx
Modified: openoffice/trunk/main/sw/inc/txtfld.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/txtfld.hxx?rev=1602850r1=1602849r2=1602850view=diff
==
--- openoffice/trunk/main/sw/inc/txtfld.hxx (original)
+++ openoffice/trunk/main/sw/inc/txtfld.hxx Mon Jun 16 12:01:46 2014
@@ -27,6 +27,8 @@
#include tools/string.hxx
#include pam.hxx
+#include boost/shared_ptr.hpp
+
class SwTxtNode;
// ATT_FLD ***
@@ -68,6 +70,13 @@ public:
// enable notification that field content has changed and needs
reformatting
virtual void NotifyContentChange( SwFmtFld rFmtFld );
+// deletes the given field via removing the corresponding text selection
from the document's content
+static void DeleteTxtFld( const SwTxtFld rTxtFld );
+
+// return text selection for the given field
+static void GetPamForTxtFld( const SwTxtFld rTxtFld,
+ boost::shared_ptr SwPaM rPamForTxtFld );
+
};
class SwTxtInputFld : public SwTxtFld
Modified: openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx?rev=1602850r1=1602849r2=1602850view=diff
==
--- openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx (original)
+++ openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx Mon Jun 16 12:01:46
2014
@@ -456,6 +456,43 @@ void SwTxtFld::NotifyContentChange(SwFmt
}
+/*static*/
+void SwTxtFld::GetPamForTxtFld(
+const SwTxtFld rTxtFld,
+boost::shared_ptr SwPaM rPamForTxtFld )
+{
+if ( rTxtFld.GetpTxtNode() == NULL )
+{
+ASSERT( false, SwTxtFld::GetPamForField - missing SwTxtNode );
+return;
+}
+
+const SwTxtNode rTxtNode = rTxtFld.GetTxtNode();
+
+rPamForTxtFld.reset( new SwPaM( rTxtNode,
+( (rTxtFld.End() != NULL) ?
*(rTxtFld.End()) : ( *(rTxtFld.GetStart()) + 1 ) ),
+rTxtNode,
+*(rTxtFld.GetStart()) ) );
+
+}
+
+
+/*static*/
+void SwTxtFld::DeleteTxtFld( const SwTxtFld rTxtFld )
+{
+if ( rTxtFld.GetpTxtNode() != NULL )
+{
+boost::shared_ptr SwPaM pPamForTxtFld;
+GetPamForTxtFld( rTxtFld, pPamForTxtFld );
+if ( pPamForTxtFld.get() != NULL )
+{
+rTxtFld.GetTxtNode().GetDoc()-DeleteAndJoin( *pPamForTxtFld );
+}
+}
+}
+
+
+
// input field in-place editing
SwTxtInputFld::SwTxtInputFld(
SwFmtFld rAttr,
Modified: openoffice/trunk/main/sw/source/core/unocore/unofield.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/unocore/unofield.cxx?rev=1602850r1=1602849r2=1602850view=diff
==
--- openoffice/trunk/main/sw/source/core/unocore/unofield.cxx (original)
+++ openoffice/trunk/main/sw/source/core/unocore/unofield.cxx Mon Jun 16
12:01:46 2014
@@ -910,40 +910,37 @@ void SwXFieldMaster::removeVetoableChang
void SwXFieldMaster::dispose(void) throw(
uno::RuntimeException )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
-SwFieldType* pFldType = GetFldType(sal_True);
- if(pFldType)
- {
- sal_uInt16 nTypeIdx = USHRT_MAX;
- const SwFldTypes* pTypes = GetDoc()-GetFldTypes();
- for( sal_uInt16 i = 0; i pTypes-Count(); i++ )
- {
- if((*pTypes)[i] == pFldType)
- nTypeIdx = i;
- }
+vos::OGuard aGuard( Application::GetSolarMutex() );
- // zuerst alle Felder loeschen
- SwIteratorSwFmtFld,SwFieldType aIter( *pFldType );
- SwFmtFld* pFld = aIter.First();
- while(pFld)
- {
- // Feld im Undo?
- SwTxtFld *pTxtFld = pFld-GetTxtFld();
- if(pTxtFld
pTxtFld-GetTxtNode().GetNodes().IsDocNodes() )
- {
- SwTxtNode rTxtNode =
(SwTxtNode)*pTxtFld-GetpTxtNode();
- SwPaM aPam(rTxtNode, *pTxtFld-GetStart());
- aPam.SetMark();
- aPam.Move();
- GetDoc()-DeleteAndJoin(aPam);
-
svn commit: r1602856 - in /openoffice/branches/AOO410: ./ main/ main/sw/inc/txtfld.hxx main/sw/source/core/txtnode/atrfld.cxx main/sw/source/core/unocore/unofield.cxx
Author: orw
Date: Mon Jun 16 12:24:00 2014
New Revision: 1602856
URL: http://svn.apache.org/r1602856
Log:
125086: correct UNO-API implementation for com::sun::star::text::XTextField
in Writer to reflect changes made for the in-place editing of Input Fields
cherry-picked from trunk
Modified:
openoffice/branches/AOO410/ (props changed)
openoffice/branches/AOO410/main/ (props changed)
openoffice/branches/AOO410/main/sw/inc/txtfld.hxx
openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx
openoffice/branches/AOO410/main/sw/source/core/unocore/unofield.cxx
Propchange: openoffice/branches/AOO410/
--
Merged /openoffice/trunk:r1602850
Propchange: openoffice/branches/AOO410/main/
--
Merged /openoffice/trunk/main:r1602850
Modified: openoffice/branches/AOO410/main/sw/inc/txtfld.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/inc/txtfld.hxx?rev=1602856r1=1602855r2=1602856view=diff
==
--- openoffice/branches/AOO410/main/sw/inc/txtfld.hxx (original)
+++ openoffice/branches/AOO410/main/sw/inc/txtfld.hxx Mon Jun 16 12:24:00 2014
@@ -27,6 +27,8 @@
#include tools/string.hxx
#include pam.hxx
+#include boost/shared_ptr.hpp
+
class SwTxtNode;
// ATT_FLD ***
@@ -72,6 +74,13 @@ public:
// enable notification that field content has changed and needs
reformatting
virtual void NotifyContentChange( SwFmtFld rFmtFld );
+// deletes the given field via removing the corresponding text selection
from the document's content
+static void DeleteTxtFld( const SwTxtFld rTxtFld );
+
+// return text selection for the given field
+static void GetPamForTxtFld( const SwTxtFld rTxtFld,
+ boost::shared_ptr SwPaM rPamForTxtFld );
+
};
class SwTxtInputFld : public SwTxtFld
Modified: openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx?rev=1602856r1=1602855r2=1602856view=diff
==
--- openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx Mon Jun
16 12:24:00 2014
@@ -449,6 +449,43 @@ void SwTxtFld::NotifyContentChange(SwFmt
}
+/*static*/
+void SwTxtFld::GetPamForTxtFld(
+const SwTxtFld rTxtFld,
+boost::shared_ptr SwPaM rPamForTxtFld )
+{
+if ( rTxtFld.GetpTxtNode() == NULL )
+{
+ASSERT( false, SwTxtFld::GetPamForField - missing SwTxtNode );
+return;
+}
+
+const SwTxtNode rTxtNode = rTxtFld.GetTxtNode();
+
+rPamForTxtFld.reset( new SwPaM( rTxtNode,
+( (rTxtFld.End() != NULL) ?
*(rTxtFld.End()) : ( *(rTxtFld.GetStart()) + 1 ) ),
+rTxtNode,
+*(rTxtFld.GetStart()) ) );
+
+}
+
+
+/*static*/
+void SwTxtFld::DeleteTxtFld( const SwTxtFld rTxtFld )
+{
+if ( rTxtFld.GetpTxtNode() != NULL )
+{
+boost::shared_ptr SwPaM pPamForTxtFld;
+GetPamForTxtFld( rTxtFld, pPamForTxtFld );
+if ( pPamForTxtFld.get() != NULL )
+{
+rTxtFld.GetTxtNode().GetDoc()-DeleteAndJoin( *pPamForTxtFld );
+}
+}
+}
+
+
+
// input field in-place editing
SwTxtInputFld::SwTxtInputFld(
SwFmtFld rAttr,
Modified: openoffice/branches/AOO410/main/sw/source/core/unocore/unofield.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/unocore/unofield.cxx?rev=1602856r1=1602855r2=1602856view=diff
==
--- openoffice/branches/AOO410/main/sw/source/core/unocore/unofield.cxx
(original)
+++ openoffice/branches/AOO410/main/sw/source/core/unocore/unofield.cxx Mon Jun
16 12:24:00 2014
@@ -910,40 +910,37 @@ void SwXFieldMaster::removeVetoableChang
void SwXFieldMaster::dispose(void) throw(
uno::RuntimeException )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
-SwFieldType* pFldType = GetFldType(sal_True);
- if(pFldType)
- {
- sal_uInt16 nTypeIdx = USHRT_MAX;
- const SwFldTypes* pTypes = GetDoc()-GetFldTypes();
- for( sal_uInt16 i = 0; i pTypes-Count(); i++ )
- {
- if((*pTypes)[i] == pFldType)
- nTypeIdx = i;
- }
+vos::OGuard aGuard( Application::GetSolarMutex() );
- // zuerst alle Felder loeschen
- SwIteratorSwFmtFld,SwFieldType aIter( *pFldType );
- SwFmtFld* pFld =
svn commit: r1602869 - /openoffice/trunk/main/svx/inc/svx/fillctrl.hxx
Author: alg Date: Mon Jun 16 14:05:03 2014 New Revision: 1602869 URL: http://svn.apache.org/r1602869 Log: added missing include Modified: openoffice/trunk/main/svx/inc/svx/fillctrl.hxx Modified: openoffice/trunk/main/svx/inc/svx/fillctrl.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/inc/svx/fillctrl.hxx?rev=1602869r1=1602868r2=1602869view=diff == --- openoffice/trunk/main/svx/inc/svx/fillctrl.hxx (original) +++ openoffice/trunk/main/svx/inc/svx/fillctrl.hxx Mon Jun 16 14:05:03 2014 @@ -25,6 +25,7 @@ #include svl/lstner.hxx #include sfx2/tbxctrl.hxx #include svx/svxdllapi.h +#include svx/xenum.hxx class XFillStyleItem; class XFillColorItem;
buildbot exception in ASF Buildbot on openoffice-linux32-snapshot
The Buildbot has detected a build exception on builder openoffice-linux32-snapshot while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux32-snapshot/builds/2 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm3_ubuntu_32bit Build Reason: The Nightly scheduler named 'openoffice-linux32-snapshot' triggered this build Build Source Stamp: [branch openoffice/tags/SNAPSHOT] HEAD Blamelist: BUILD FAILED: exception upload the install3 bits sincerely, -The Buildbot
buildbot success in ASF Buildbot on aoo-w7snap
The Buildbot has detected a passing build on builder aoo-w7snap while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/aoo-w7snap/builds/7 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-win7 Build Reason: The Nightly scheduler named 'aoo-win7-snapshot' triggered this build Build Source Stamp: [branch openoffice/tags/SNAPSHOT] HEAD Blamelist: Build succeeded! sincerely, -The Buildbot
svn commit: r1602972 - /openoffice/ooo-site/trunk/content/download/all_beta.html
Author: marcus Date: Mon Jun 16 19:39:30 2014 New Revision: 1602972 URL: http://svn.apache.org/r1602972 Log: Updates Modified: openoffice/ooo-site/trunk/content/download/all_beta.html Modified: openoffice/ooo-site/trunk/content/download/all_beta.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/all_beta.html?rev=1602972r1=1602971r2=1602972view=diff == --- openoffice/ooo-site/trunk/content/download/all_beta.html (original) +++ openoffice/ooo-site/trunk/content/download/all_beta.html Mon Jun 16 19:39:30 2014 @@ -3,12 +3,17 @@ head meta http-equiv=Content-Type content=text/html; charset=utf-8 / meta http-equiv=refresh content=1; URL=index.html / - titleApache OpenOffice/title + titleApache OpenOffice Downloads - Beta Release/title /head body -If your browser do not support redirection please click yourself to go to the a href=index.htmlmain download website/a. +p + Currently there is no Beta Release for Apache OpenOffice available. + + If your browser do not support redirection please click yourself to go to the + a href=index.html title=Apache OpenOffice - Download webpagemain download website/a. +p /body /html
svn commit: r1602973 - /openoffice/ooo-site/trunk/content/download/globalvars.js
Author: marcus Date: Mon Jun 16 19:40:57 2014 New Revision: 1602973 URL: http://svn.apache.org/r1602973 Log: Updated variables Modified: openoffice/ooo-site/trunk/content/download/globalvars.js Modified: openoffice/ooo-site/trunk/content/download/globalvars.js URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/globalvars.js?rev=1602973r1=1602972r2=1602973view=diff == --- openoffice/ooo-site/trunk/content/download/globalvars.js (original) +++ openoffice/ooo-site/trunk/content/download/globalvars.js Mon Jun 16 19:40:57 2014 @@ -81,23 +81,28 @@ SEL_VER = [ 4.1.0, 4.1.0, 4.0.0, 4.0.0, older, Older releases ]; +// Only used on the other.html webpage. +REL_PLATFORM = [ Win_x86, Linux_x86_rpm, Linux_x86_deb, Linux_x86-64_rpm, Linux_x86-64_deb, + MacOS_x86-64 ]; +REL_FULL_LANG = [ ast, bg, cs, da, de, el, en-GB, en-US, es, eu, fi, fr, gd, + gl, he, hi, hu, it, ja, km, ko, lt, nb, nl, pl, pt, pt-BR, + ru, sk, sl, sr, sv, ta, th, tr, vi, zh-CN, zh-TW ]; +REL_LP_LANG= [ ast, bg, cs, da, de, el, en-GB, en-US, es, eu, fi, fr, gd, + gl, he, hi, hu, it, ja, km, ko, lt, nb, nl, pl, pt, pt-BR, + ru, sk, sl, sr, sv, ta, th, tr, vi, zh-CN, zh-TW ]; +REL_SDK_LANG = [ en-US ] + // Base URLs to the Sourceforge and Apache mirror server. SOURCEFORGE= http://sourceforge.net/projects/openofficeorg.mirror/files/;; ASF= http://www.apache.org/dyn/aoo-closer.cgi/openoffice/;; ASF_DIST = http://www.apache.org/dist/openoffice/;; ASF_ARC= http://archive.apache.org/dist/openoffice/;; -ASF_WIKI = http://cwiki.apache.org/confluence/display/OOOUSERS/;; // File names and images used in download.js. FILE_FULL_LP_IMG = http://www.openoffice.org/download/cachedimages/help-information-icon.png;; FILE_CHECKSUMS_IMG = http://www.openoffice.org/download/cachedimages/help-information-icon.png;; FILE_ANALYZE_IMG = http://www.openoffice.org/download/cachedimages/help-report-broken-link-icon.png;; FILE_ERROR_IMG = http://www.openoffice.org/download/cachedimages/exclamation-icon.png;; -// FILE_FULL_LP= http://www.openoffice.org/download/full_vs_lp.html;; -// FILE_CHECKSUMS = http://www.openoffice.org/download/checksums.html;; -// FILE_ANALYZE= http://www.openoffice.org/download/analyze.html;; -// FILE_PORTING= http://www.openoffice.org/porting/index.html;; -// FILE_ARCHIVE= http://www.openoffice.org/download/archive.html;; // Beta Release: General variables. BETA_VERSION = 4.1.0-beta; @@ -120,16 +125,14 @@ BETA_LP_LANG = [ ast, bg, cs, d BETA_SDK_LANG = [ en-US ]; // Base URLs to the Sourceforge and Apache mirror server. -BETA_SOURCEFORGE_BASE_URL = http://sourceforge.net/projects/openofficeorg.mirror/files/milestones/; + BETA_VERSION; -BETA_SOURCEFORGE_BASE_URL = BETA_SOURCEFORGE_BASE_URL + /binaries/; -BETA_ASF_BASE_URL = http://www.apache.org/dyn/aoo-closer.cgi/openoffice/; + BETA_VERSION; -BETA_ASF_DIST_BASE_URL = http://www.apache.org/dist/openoffice/; + BETA_VERSION; -BETA_ASF_ARC_BASE_URL = http://archive.apache.org/dist/openoffice/; + BETA_VERSION; +BETA_SOURCEFORGE = http://sourceforge.net/projects/openofficeorg.mirror/files/milestones/; + BETA_VERSION; +BETA_SOURCEFORGE = BETA_SOURCEFORGE + /binaries/; +BETA_ASF = http://www.apache.org/dyn/aoo-closer.cgi/openoffice/; + BETA_VERSION; +BETA_ASF_DIST = http://www.apache.org/dist/openoffice/; + BETA_VERSION; +BETA_ASF_ARC = http://archive.apache.org/dist/openoffice/; + BETA_VERSION; // Debug: Uncomment to use different base URLs. // PEOPLE_BASE_URL = http://people.apache.org/~marcus/aoo/; + VERSION; -// ASF_BASE_URL= http://www.apache.org/dyn/aoo-closer.cgi/aoo/; + VERSION; -// ASF_DIST_BASE_URL = http://www.apache.org/dist/aoo/; + VERSION; // The maximal number of available languages in download_other.js. LANG_MAX
svn commit: r912746 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/all_beta.html
Author: buildbot Date: Mon Jun 16 19:41:00 2014 New Revision: 912746 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/all_beta.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 16 19:41:00 2014 @@ -1 +1 @@ -1602581 +1602972 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 16 19:41:00 2014 @@ -1 +1 @@ -1602581 +1602972 Modified: websites/staging/ooo-site/trunk/content/download/all_beta.html == --- websites/staging/ooo-site/trunk/content/download/all_beta.html (original) +++ websites/staging/ooo-site/trunk/content/download/all_beta.html Mon Jun 16 19:41:00 2014 @@ -5,7 +5,7 @@ meta http-equiv=Content-Type content=text/html; charset=utf-8 / meta http-equiv=refresh content=1; URL=index.html / - titleApache OpenOffice/title + titleApache OpenOffice Downloads - Beta Release/title !--#include virtual=/google-analytics.js -- !--#include virtual=/scripts/entourage.js -- @@ -24,7 +24,12 @@ -If your browser do not support redirection please click yourself to go to the a href=index.htmlmain download website/a. +p + Currently there is no Beta Release for Apache OpenOffice available. + + If your browser do not support redirection please click yourself to go to the + a href=index.html title=Apache OpenOffice - Download webpagemain download website/a. +p /div
svn commit: r912747 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/globalvars.js
Author: buildbot Date: Mon Jun 16 19:41:33 2014 New Revision: 912747 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/globalvars.js Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 16 19:41:33 2014 @@ -1 +1 @@ -1602972 +1602973 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 16 19:41:33 2014 @@ -1 +1 @@ -1602972 +1602973 Modified: websites/staging/ooo-site/trunk/content/download/globalvars.js == --- websites/staging/ooo-site/trunk/content/download/globalvars.js (original) +++ websites/staging/ooo-site/trunk/content/download/globalvars.js Mon Jun 16 19:41:33 2014 @@ -81,23 +81,28 @@ SEL_VER = [ 4.1.0, 4.1.0, 4.0.0, 4.0.0, older, Older releases ]; +// Only used on the other.html webpage. +REL_PLATFORM = [ Win_x86, Linux_x86_rpm, Linux_x86_deb, Linux_x86-64_rpm, Linux_x86-64_deb, + MacOS_x86-64 ]; +REL_FULL_LANG = [ ast, bg, cs, da, de, el, en-GB, en-US, es, eu, fi, fr, gd, + gl, he, hi, hu, it, ja, km, ko, lt, nb, nl, pl, pt, pt-BR, + ru, sk, sl, sr, sv, ta, th, tr, vi, zh-CN, zh-TW ]; +REL_LP_LANG= [ ast, bg, cs, da, de, el, en-GB, en-US, es, eu, fi, fr, gd, + gl, he, hi, hu, it, ja, km, ko, lt, nb, nl, pl, pt, pt-BR, + ru, sk, sl, sr, sv, ta, th, tr, vi, zh-CN, zh-TW ]; +REL_SDK_LANG = [ en-US ] + // Base URLs to the Sourceforge and Apache mirror server. SOURCEFORGE= http://sourceforge.net/projects/openofficeorg.mirror/files/;; ASF= http://www.apache.org/dyn/aoo-closer.cgi/openoffice/;; ASF_DIST = http://www.apache.org/dist/openoffice/;; ASF_ARC= http://archive.apache.org/dist/openoffice/;; -ASF_WIKI = http://cwiki.apache.org/confluence/display/OOOUSERS/;; // File names and images used in download.js. FILE_FULL_LP_IMG = http://www.openoffice.org/download/cachedimages/help-information-icon.png;; FILE_CHECKSUMS_IMG = http://www.openoffice.org/download/cachedimages/help-information-icon.png;; FILE_ANALYZE_IMG = http://www.openoffice.org/download/cachedimages/help-report-broken-link-icon.png;; FILE_ERROR_IMG = http://www.openoffice.org/download/cachedimages/exclamation-icon.png;; -// FILE_FULL_LP= http://www.openoffice.org/download/full_vs_lp.html;; -// FILE_CHECKSUMS = http://www.openoffice.org/download/checksums.html;; -// FILE_ANALYZE= http://www.openoffice.org/download/analyze.html;; -// FILE_PORTING= http://www.openoffice.org/porting/index.html;; -// FILE_ARCHIVE= http://www.openoffice.org/download/archive.html;; // Beta Release: General variables. BETA_VERSION = 4.1.0-beta; @@ -120,16 +125,14 @@ BETA_LP_LANG = [ ast, bg, cs, d BETA_SDK_LANG = [ en-US ]; // Base URLs to the Sourceforge and Apache mirror server. -BETA_SOURCEFORGE_BASE_URL = http://sourceforge.net/projects/openofficeorg.mirror/files/milestones/; + BETA_VERSION; -BETA_SOURCEFORGE_BASE_URL = BETA_SOURCEFORGE_BASE_URL + /binaries/; -BETA_ASF_BASE_URL = http://www.apache.org/dyn/aoo-closer.cgi/openoffice/; + BETA_VERSION; -BETA_ASF_DIST_BASE_URL = http://www.apache.org/dist/openoffice/; + BETA_VERSION; -BETA_ASF_ARC_BASE_URL = http://archive.apache.org/dist/openoffice/; + BETA_VERSION; +BETA_SOURCEFORGE = http://sourceforge.net/projects/openofficeorg.mirror/files/milestones/; + BETA_VERSION; +BETA_SOURCEFORGE = BETA_SOURCEFORGE + /binaries/; +BETA_ASF = http://www.apache.org/dyn/aoo-closer.cgi/openoffice/; + BETA_VERSION; +BETA_ASF_DIST = http://www.apache.org/dist/openoffice/; + BETA_VERSION; +BETA_ASF_ARC = http://archive.apache.org/dist/openoffice/; + BETA_VERSION; // Debug:
svn commit: r1602974 - /openoffice/ooo-site/trunk/content/download/download_other.js
Author: marcus
Date: Mon Jun 16 19:42:23 2014
New Revision: 1602974
URL: http://svn.apache.org/r1602974
Log:
Fixed errors as the scripting was no longer working
Modified:
openoffice/ooo-site/trunk/content/download/download_other.js
Modified: openoffice/ooo-site/trunk/content/download/download_other.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/download_other.js?rev=1602974r1=1602973r2=1602974view=diff
==
--- openoffice/ooo-site/trunk/content/download/download_other.js (original)
+++ openoffice/ooo-site/trunk/content/download/download_other.js Mon Jun 16
19:42:23 2014
@@ -16,7 +16,6 @@ var COLSPAN = 9;// Defines the default
var ROW_COUNT = 1;// Counts the number of rows (start = 1)
var FULL_LANG_COUNT= 1;// Counts the max number of languages for full
install sets (start = 1)
var LP_LANG_COUNT = 1;// Counts the max number of languages for
language packs (start = 1)
-var LANG_MAX = 133; // The maximal available number of languages
(see the bottom)
/*
* Define base variables
@@ -28,10 +27,10 @@ function write_table( rel_mode ) {
var AOO = Apache_OpenOffice_;
var AOO_SDK = Apache_OpenOffice-SDK_;
var AOO_SRC = /source/apache-openoffice- + VERSION + -
+ SVN_REV + -src;
- var URL_AOO = SOURCEFORGE_BASE_URL;
- var URL_SDK = SOURCEFORGE_BASE_URL + SDK/ + AOO_SDK +
VERSION;
- var URL_SRC = APACHE_DIST_BASE_URL + AOO_SRC;
- var URL_HASH= APACHE_DIST_BASE_URL;
+ var URL_AOO = SOURCEFORGE;
+ var URL_SDK = SOURCEFORGE + SDK/ + AOO_SDK + VERSION;
+ var URL_SRC = ASF_DIST + AOO_SRC;
+ var URL_HASH= ASF_DIST;
// Debug: Uncomment to use different base URLs
/*
@@ -53,8 +52,8 @@ function write_table( rel_mode ) {
var AOO_SRC = /source/apache-openoffice- + BETA_VERSION +
-beta- + SVN_REV + -src;
var URL_AOO = BETA_SOURCEFORGE_BASE_URL;
var URL_SDK = BETA_SOURCEFORGE_BASE_URL + SDK/ + AOO_SDK
+ BETA_VERSION;
- var URL_SRC = BETA_APACHE_DIST_BASE_URL + AOO_SRC;
- var URL_HASH= BETA_APACHE_DIST_BASE_URL;
+ var URL_SRC = BETA_ASF_DIST_BASE_URL + AOO_SRC;
+ var URL_HASH= BETA_ASF_DIST_BASE_URL;
// Debug: Uncomment to use different base URLs
/*
@@ -68,8 +67,8 @@ function write_table( rel_mode ) {
write_header( rel_mode, 1 );
document.write( tbody );
- write_lang( rel_mode, URL_AOO, URL_HASH,
PLATFORM, FULL_LANG, LP_LANG, VERSION, AOO );
- write_sdk( rel_mode, URL_SDK, URL_SRC, URL_HASH, AOO_SRC,
PLATFORM, SDK_LANG, VERSION, AOO_SDK );
+ write_lang( rel_mode, URL_AOO, URL_HASH,
REL_PLATFORM, REL_FULL_LANG, REL_LP_LANG, VERSION, AOO );
+ write_sdk( rel_mode, URL_SDK, URL_SRC, URL_HASH, AOO_SRC,
REL_PLATFORM, REL_SDK_LANG, VERSION, AOO_SDK );
write_top();
document.write( /tbody );
@@ -137,24 +136,24 @@ function write_header( rel_mode, FIRST_H
document.write( theadtr );
document.write( th colspan='2' style='text-align: center'
+ SMALL1 + Languagebr /The names do not refer to countries.br
/nbsp; + SMALL2 + /th );
document.write( thspan style='text-align: center' class='builds'
+ SMALL1 + Typebr /nbsp;br /nbsp; + SMALL2 + /span/th
);
- if ( PLATFORM.indexOf( Win_x86 ) -1 )
+ if ( REL_PLATFORM.indexOf( Win_x86 ) -1 )
document.write( thspan style='text-align: center'
class='builds' + SMALL1 + Windowsbr /Intel br /EXE + SMALL2 +
/span/th );
- if ( PLATFORM.indexOf( Linux_x86_rpm ) -1 )
+ if ( REL_PLATFORM.indexOf( Linux_x86_rpm ) -1 )
document.write( thspan style='text-align: center'
class='builds' + SMALL1 + Linux br /Intel br /RPM + SMALL2 +
/span/th );
- if ( PLATFORM.indexOf( Linux_x86_deb ) -1 )
+ if ( REL_PLATFORM.indexOf( Linux_x86_deb ) -1 )
document.write( thspan style='text-align: center'
class='builds' + SMALL1 + Linux br /Intel br /DEB + SMALL2 +
/span/th );
- if ( PLATFORM.indexOf( Linux_x86-64_rpm ) -1 )
+ if ( REL_PLATFORM.indexOf( Linux_x86-64_rpm ) -1 )
document.write( thspan style='text-align: center'
class='builds' + SMALL1 + Linux br /x86-64br /RPM + SMALL2 +
/span/th );
- if ( PLATFORM.indexOf( Linux_x86-64_deb ) -1 )
+ if ( REL_PLATFORM.indexOf( Linux_x86-64_deb ) -1 )
document.write( thspan style='text-align: center'
class='builds' + SMALL1 + Linux br /x86-64br /DEB + SMALL2 +
/span/th );
svn commit: r1602975 - /openoffice/ooo-site/trunk/content/download/test/globalvars.js
Author: marcus Date: Mon Jun 16 19:43:11 2014 New Revision: 1602975 URL: http://svn.apache.org/r1602975 Log: Updated variables Modified: openoffice/ooo-site/trunk/content/download/test/globalvars.js Modified: openoffice/ooo-site/trunk/content/download/test/globalvars.js URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/globalvars.js?rev=1602975r1=1602974r2=1602975view=diff == --- openoffice/ooo-site/trunk/content/download/test/globalvars.js (original) +++ openoffice/ooo-site/trunk/content/download/test/globalvars.js Mon Jun 16 19:43:11 2014 @@ -82,15 +82,15 @@ SEL_VER = [ 4.1.0, 4.1.0, older, Older releases ]; // Only used on the other.html webpage. -var REL_PLATFORM = [ Win_x86, Linux_x86_rpm, Linux_x86_deb, Linux_x86-64_rpm, Linux_x86-64_deb, +REL_PLATFORM = [ Win_x86, Linux_x86_rpm, Linux_x86_deb, Linux_x86-64_rpm, Linux_x86-64_deb, MacOS_x86-64 ]; -var REL_FULL_LANG = [ ast, bg, cs, da, de, el, en-GB, en-US, es, eu, fi, fr, gd, +REL_FULL_LANG = [ ast, bg, cs, da, de, el, en-GB, en-US, es, eu, fi, fr, gd, gl, he, hi, hu, it, ja, km, ko, lt, nb, nl, pl, pt, pt-BR, ru, sk, sl, sr, sv, ta, th, tr, vi, zh-CN, zh-TW ]; -var REL_LP_LANG= [ ast, bg, cs, da, de, el, en-GB, en-US, es, eu, fi, fr, gd, +REL_LP_LANG= [ ast, bg, cs, da, de, el, en-GB, en-US, es, eu, fi, fr, gd, gl, he, hi, hu, it, ja, km, ko, lt, nb, nl, pl, pt, pt-BR, ru, sk, sl, sr, sv, ta, th, tr, vi, zh-CN, zh-TW ]; -var REL_SDK_LANG = [ en-US ] +REL_SDK_LANG = [ en-US ] // Base URLs to the Sourceforge and Apache mirror server. SOURCEFORGE= http://sourceforge.net/projects/openofficeorg.mirror/files/;;
svn commit: r912748 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/download_other.js
Author: buildbot
Date: Mon Jun 16 19:43:16 2014
New Revision: 912748
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/download_other.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 16 19:43:16 2014
@@ -1 +1 @@
-1602973
+1602974
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 16 19:43:16 2014
@@ -1 +1 @@
-1602973
+1602974
Modified: websites/staging/ooo-site/trunk/content/download/download_other.js
==
--- websites/staging/ooo-site/trunk/content/download/download_other.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/download_other.js Mon Jun
16 19:43:16 2014
@@ -16,7 +16,6 @@ var COLSPAN = 9;// Defines the default
var ROW_COUNT = 1;// Counts the number of rows (start = 1)
var FULL_LANG_COUNT= 1;// Counts the max number of languages for full
install sets (start = 1)
var LP_LANG_COUNT = 1;// Counts the max number of languages for
language packs (start = 1)
-var LANG_MAX = 133; // The maximal available number of languages
(see the bottom)
/*
* Define base variables
@@ -28,10 +27,10 @@ function write_table( rel_mode ) {
var AOO = Apache_OpenOffice_;
var AOO_SDK = Apache_OpenOffice-SDK_;
var AOO_SRC = /source/apache-openoffice- + VERSION + -
+ SVN_REV + -src;
- var URL_AOO = SOURCEFORGE_BASE_URL;
- var URL_SDK = SOURCEFORGE_BASE_URL + SDK/ + AOO_SDK +
VERSION;
- var URL_SRC = APACHE_DIST_BASE_URL + AOO_SRC;
- var URL_HASH= APACHE_DIST_BASE_URL;
+ var URL_AOO = SOURCEFORGE;
+ var URL_SDK = SOURCEFORGE + SDK/ + AOO_SDK + VERSION;
+ var URL_SRC = ASF_DIST + AOO_SRC;
+ var URL_HASH= ASF_DIST;
// Debug: Uncomment to use different base URLs
/*
@@ -53,8 +52,8 @@ function write_table( rel_mode ) {
var AOO_SRC = /source/apache-openoffice- + BETA_VERSION +
-beta- + SVN_REV + -src;
var URL_AOO = BETA_SOURCEFORGE_BASE_URL;
var URL_SDK = BETA_SOURCEFORGE_BASE_URL + SDK/ + AOO_SDK
+ BETA_VERSION;
- var URL_SRC = BETA_APACHE_DIST_BASE_URL + AOO_SRC;
- var URL_HASH= BETA_APACHE_DIST_BASE_URL;
+ var URL_SRC = BETA_ASF_DIST_BASE_URL + AOO_SRC;
+ var URL_HASH= BETA_ASF_DIST_BASE_URL;
// Debug: Uncomment to use different base URLs
/*
@@ -68,8 +67,8 @@ function write_table( rel_mode ) {
write_header( rel_mode, 1 );
document.write( tbody );
- write_lang( rel_mode, URL_AOO, URL_HASH,
PLATFORM, FULL_LANG, LP_LANG, VERSION, AOO );
- write_sdk( rel_mode, URL_SDK, URL_SRC, URL_HASH, AOO_SRC,
PLATFORM, SDK_LANG, VERSION, AOO_SDK );
+ write_lang( rel_mode, URL_AOO, URL_HASH,
REL_PLATFORM, REL_FULL_LANG, REL_LP_LANG, VERSION, AOO );
+ write_sdk( rel_mode, URL_SDK, URL_SRC, URL_HASH, AOO_SRC,
REL_PLATFORM, REL_SDK_LANG, VERSION, AOO_SDK );
write_top();
document.write( /tbody );
@@ -137,24 +136,24 @@ function write_header( rel_mode, FIRST_H
document.write( theadtr );
document.write( th colspan='2' style='text-align: center'
+ SMALL1 + Languagebr /The names do not refer to countries.br
/nbsp; + SMALL2 + /th );
document.write( thspan style='text-align: center' class='builds'
+ SMALL1 + Typebr /nbsp;br /nbsp; + SMALL2 + /span/th
);
- if ( PLATFORM.indexOf( Win_x86 ) -1 )
+ if ( REL_PLATFORM.indexOf( Win_x86 ) -1 )
document.write( thspan style='text-align: center'
class='builds' + SMALL1 + Windowsbr /Intel br /EXE + SMALL2 +
/span/th );
- if ( PLATFORM.indexOf( Linux_x86_rpm ) -1 )
+ if ( REL_PLATFORM.indexOf( Linux_x86_rpm ) -1 )
document.write( thspan style='text-align: center'
class='builds' + SMALL1 + Linux br /Intel br /RPM + SMALL2 +
/span/th );
- if ( PLATFORM.indexOf( Linux_x86_deb ) -1 )
+ if ( REL_PLATFORM.indexOf( Linux_x86_deb ) -1 )
document.write( thspan style='text-align: center'
class='builds' + SMALL1 + Linux br /Intel br /DEB + SMALL2 +
/span/th );
- if ( PLATFORM.indexOf( Linux_x86-64_rpm ) -1 )
+
svn commit: r912749 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/globalvars.js
Author: buildbot Date: Mon Jun 16 19:43:49 2014 New Revision: 912749 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/globalvars.js Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 16 19:43:49 2014 @@ -1 +1 @@ -1602974 +1602975 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 16 19:43:49 2014 @@ -1 +1 @@ -1602974 +1602975 Modified: websites/staging/ooo-site/trunk/content/download/test/globalvars.js == --- websites/staging/ooo-site/trunk/content/download/test/globalvars.js (original) +++ websites/staging/ooo-site/trunk/content/download/test/globalvars.js Mon Jun 16 19:43:49 2014 @@ -82,15 +82,15 @@ SEL_VER = [ 4.1.0, 4.1.0, older, Older releases ]; // Only used on the other.html webpage. -var REL_PLATFORM = [ Win_x86, Linux_x86_rpm, Linux_x86_deb, Linux_x86-64_rpm, Linux_x86-64_deb, +REL_PLATFORM = [ Win_x86, Linux_x86_rpm, Linux_x86_deb, Linux_x86-64_rpm, Linux_x86-64_deb, MacOS_x86-64 ]; -var REL_FULL_LANG = [ ast, bg, cs, da, de, el, en-GB, en-US, es, eu, fi, fr, gd, +REL_FULL_LANG = [ ast, bg, cs, da, de, el, en-GB, en-US, es, eu, fi, fr, gd, gl, he, hi, hu, it, ja, km, ko, lt, nb, nl, pl, pt, pt-BR, ru, sk, sl, sr, sv, ta, th, tr, vi, zh-CN, zh-TW ]; -var REL_LP_LANG= [ ast, bg, cs, da, de, el, en-GB, en-US, es, eu, fi, fr, gd, +REL_LP_LANG= [ ast, bg, cs, da, de, el, en-GB, en-US, es, eu, fi, fr, gd, gl, he, hi, hu, it, ja, km, ko, lt, nb, nl, pl, pt, pt-BR, ru, sk, sl, sr, sv, ta, th, tr, vi, zh-CN, zh-TW ]; -var REL_SDK_LANG = [ en-US ] +REL_SDK_LANG = [ en-US ] // Base URLs to the Sourceforge and Apache mirror server. SOURCEFORGE= http://sourceforge.net/projects/openofficeorg.mirror/files/;;
svn commit: r1602976 - /openoffice/ooo-site/trunk/content/download/all_beta.html
Author: marcus Date: Mon Jun 16 19:46:20 2014 New Revision: 1602976 URL: http://svn.apache.org/r1602976 Log: Updates Modified: openoffice/ooo-site/trunk/content/download/all_beta.html Modified: openoffice/ooo-site/trunk/content/download/all_beta.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/all_beta.html?rev=1602976r1=1602975r2=1602976view=diff == --- openoffice/ooo-site/trunk/content/download/all_beta.html (original) +++ openoffice/ooo-site/trunk/content/download/all_beta.html Mon Jun 16 19:46:20 2014 @@ -13,7 +13,7 @@ If your browser do not support redirection please click yourself to go to the a href=index.html title=Apache OpenOffice - Download webpagemain download website/a. -p +/p /body /html
svn commit: r1602977 - /openoffice/ooo-site/trunk/content/download/all_rc.html
Author: marcus Date: Mon Jun 16 19:46:35 2014 New Revision: 1602977 URL: http://svn.apache.org/r1602977 Log: Updates Modified: openoffice/ooo-site/trunk/content/download/all_rc.html Modified: openoffice/ooo-site/trunk/content/download/all_rc.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/all_rc.html?rev=1602977r1=1602976r2=1602977view=diff == --- openoffice/ooo-site/trunk/content/download/all_rc.html (original) +++ openoffice/ooo-site/trunk/content/download/all_rc.html Mon Jun 16 19:46:35 2014 @@ -3,12 +3,18 @@ head meta http-equiv=Content-Type content=text/html; charset=utf-8 / meta http-equiv=refresh content=1; URL=index.html / - titleApache OpenOffice/title + titleApache OpenOffice Downloads - Release Candidate/title /head body -If your browser do not support redirection please click yourself to go to the a href=index.htmlmain download website/a. +p + Currently there is no Release Candidate for Apache OpenOffice available. + + If your browser do not support redirection please click yourself to go to the + a href=index.html title=Apache OpenOffice - Download webpagemain download website/a. +/p /body /html +
svn commit: r912750 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/all_beta.html
Author: buildbot Date: Mon Jun 16 19:47:31 2014 New Revision: 912750 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/all_beta.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 16 19:47:31 2014 @@ -1 +1 @@ -1602975 +1602976 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 16 19:47:31 2014 @@ -1 +1 @@ -1602975 +1602976 Modified: websites/staging/ooo-site/trunk/content/download/all_beta.html == --- websites/staging/ooo-site/trunk/content/download/all_beta.html (original) +++ websites/staging/ooo-site/trunk/content/download/all_beta.html Mon Jun 16 19:47:31 2014 @@ -29,7 +29,7 @@ If your browser do not support redirection please click yourself to go to the a href=index.html title=Apache OpenOffice - Download webpagemain download website/a. -p +/p /div
svn commit: r912751 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/all_rc.html
Author: buildbot Date: Mon Jun 16 19:48:52 2014 New Revision: 912751 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/all_rc.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 16 19:48:52 2014 @@ -1 +1 @@ -1602976 +1602977 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 16 19:48:52 2014 @@ -1 +1 @@ -1602976 +1602977 Modified: websites/staging/ooo-site/trunk/content/download/all_rc.html == --- websites/staging/ooo-site/trunk/content/download/all_rc.html (original) +++ websites/staging/ooo-site/trunk/content/download/all_rc.html Mon Jun 16 19:48:52 2014 @@ -5,7 +5,7 @@ meta http-equiv=Content-Type content=text/html; charset=utf-8 / meta http-equiv=refresh content=1; URL=index.html / - titleApache OpenOffice/title + titleApache OpenOffice Downloads - Release Candidate/title !--#include virtual=/google-analytics.js -- !--#include virtual=/scripts/entourage.js -- @@ -24,7 +24,12 @@ -If your browser do not support redirection please click yourself to go to the a href=index.htmlmain download website/a. +p + Currently there is no Release Candidate for Apache OpenOffice available. + + If your browser do not support redirection please click yourself to go to the + a href=index.html title=Apache OpenOffice - Download webpagemain download website/a. +/p /div
svn commit: r1602980 - /openoffice/ooo-site/trunk/content/download/msg_prop_l10n_en.js
Author: marcus Date: Mon Jun 16 19:52:45 2014 New Revision: 1602980 URL: http://svn.apache.org/r1602980 Log: Added more strings, mostly for 'analyze.html' Modified: openoffice/ooo-site/trunk/content/download/msg_prop_l10n_en.js Modified: openoffice/ooo-site/trunk/content/download/msg_prop_l10n_en.js URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/msg_prop_l10n_en.js?rev=1602980r1=1602979r2=1602980view=diff == --- openoffice/ooo-site/trunk/content/download/msg_prop_l10n_en.js (original) +++ openoffice/ooo-site/trunk/content/download/msg_prop_l10n_en.js Mon Jun 16 19:52:45 2014 @@ -15,7 +15,7 @@ NL_LANG= ; // General: -var l10n_download_headline = Apache OpenOffice Download; +var l10n_download_headline_text= Apache OpenOffice Download; // Download: Strings in the green box (used in index.html). var l10n_download_green_box_headline_text = Download Apache OpenOffice; @@ -139,9 +139,6 @@ var l10n_download_rel_info_svn_text = var l10n_download_rel_info_rel_date_text = Released ; var l10n_download_rel_notes_text = Release Notes; var l10n_download_rel_notes_title = Release Notes for Apache OpenOffice ; -var l10n_download_rel_notes_aoo410_link= http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes;; -var l10n_download_rel_notes_aoo401_link= http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0.1+Release+Notes;; -var l10n_download_rel_notes_aoo400_link= http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes;; var l10n_download_headline_full_text = Full installation: ; var l10n_download_headline_langpack_text = Language pack: ; @@ -189,7 +186,52 @@ var l10n_download_error_please_select_4_ var l10n_download_unknown_platform_text= unknown operating system / platform; -// Links to webpage files that could be localized. + + +// The following variables are used in the analyze.html file: + +// Analyze: Strings for the instruction text (used in analyze.html). +var l10n_analyze_headline_text = How to report a broken download link?; +var l10n_analyze_instruction_select_text = bSelect your favorites/b: Operating system, language and version in the green below.; +var l10n_analyze_instruction_verify_text = Verify that these options bstill do not/b lead to valid download links.; +var l10n_analyze_instruction_click_text= Click on the button below the green box:; +var l10n_analyze_instruction_copy_text = Copy the selected table data into the clipboard:; +var l10n_analyze_instruction_new_mail_text = Create a new mail.; +var l10n_analyze_instruction_problem_text = bWrite a problem description/b (what does not work and what do you expect).; +var l10n_analyze_instruction_details_text = Please also add bdetails about the used operating system/b.; +var l10n_analyze_instruction_paste_text= Paste the copied data at the end of the mail.; +var l10n_analyze_instruction_only_download_text= Please bsend the mail only in case of download problems/b and not if you cannot install.; +var l10n_analyze_instruction_no_install_text = This webpage cannot help at all with installation problems.; +var l10n_analyze_instruction_send_mail_text= Finally, bsend the mail/b to the: ; +var l10n_analyze_instruction_mailing_list_text = Apache OpenOffice Development Mailing List; +var l10n_analyze_instruction_mailing_list_title= Send the report to the Apache OpenOffice developers mailing list; +var l10n_analyze_instruction_learn_more_text = Click here to learn more about what a mailing list is; +var l10n_analyze_instruction_learn_more_title = Learn more about what a mailing list is; +var l10n_analyze_instruction_answer_text = We will try to answer as soon as we get the mail and the problem analyzed.; +var l10n_analyze_instruction_thanks_text = Thank you for your report.; + +// Analyze: Strings for the 3 buttons (used in analyze.html). +var l10n_analyze_update_button_text= Click to update the table; +var l10n_analyze_update_button_title = Put the selected options as values into the table below; +var l10n_analyze_select_button_text= Click to select the table; +var l10n_analyze_select_button_title = Select all data in the table below; +var l10n_analyze_copy_button_text = Copy with
svn commit: r912752 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/msg_prop_l10n_en.js
Author: buildbot Date: Mon Jun 16 19:53:19 2014 New Revision: 912752 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/msg_prop_l10n_en.js Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 16 19:53:19 2014 @@ -1 +1 @@ -1602977 +1602980 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 16 19:53:19 2014 @@ -1 +1 @@ -1602977 +1602980 Modified: websites/staging/ooo-site/trunk/content/download/msg_prop_l10n_en.js == --- websites/staging/ooo-site/trunk/content/download/msg_prop_l10n_en.js (original) +++ websites/staging/ooo-site/trunk/content/download/msg_prop_l10n_en.js Mon Jun 16 19:53:19 2014 @@ -15,7 +15,7 @@ NL_LANG= ; // General: -var l10n_download_headline = Apache OpenOffice Download; +var l10n_download_headline_text= Apache OpenOffice Download; // Download: Strings in the green box (used in index.html). var l10n_download_green_box_headline_text = Download Apache OpenOffice; @@ -139,9 +139,6 @@ var l10n_download_rel_info_svn_text = var l10n_download_rel_info_rel_date_text = Released ; var l10n_download_rel_notes_text = Release Notes; var l10n_download_rel_notes_title = Release Notes for Apache OpenOffice ; -var l10n_download_rel_notes_aoo410_link= http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes;; -var l10n_download_rel_notes_aoo401_link= http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0.1+Release+Notes;; -var l10n_download_rel_notes_aoo400_link= http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes;; var l10n_download_headline_full_text = Full installation: ; var l10n_download_headline_langpack_text = Language pack: ; @@ -189,7 +186,52 @@ var l10n_download_error_please_select_4_ var l10n_download_unknown_platform_text= unknown operating system / platform; -// Links to webpage files that could be localized. + + +// The following variables are used in the analyze.html file: + +// Analyze: Strings for the instruction text (used in analyze.html). +var l10n_analyze_headline_text = How to report a broken download link?; +var l10n_analyze_instruction_select_text = bSelect your favorites/b: Operating system, language and version in the green below.; +var l10n_analyze_instruction_verify_text = Verify that these options bstill do not/b lead to valid download links.; +var l10n_analyze_instruction_click_text= Click on the button below the green box:; +var l10n_analyze_instruction_copy_text = Copy the selected table data into the clipboard:; +var l10n_analyze_instruction_new_mail_text = Create a new mail.; +var l10n_analyze_instruction_problem_text = bWrite a problem description/b (what does not work and what do you expect).; +var l10n_analyze_instruction_details_text = Please also add bdetails about the used operating system/b.; +var l10n_analyze_instruction_paste_text= Paste the copied data at the end of the mail.; +var l10n_analyze_instruction_only_download_text= Please bsend the mail only in case of download problems/b and not if you cannot install.; +var l10n_analyze_instruction_no_install_text = This webpage cannot help at all with installation problems.; +var l10n_analyze_instruction_send_mail_text= Finally, bsend the mail/b to the: ; +var l10n_analyze_instruction_mailing_list_text = Apache OpenOffice Development Mailing List; +var l10n_analyze_instruction_mailing_list_title= Send the report to the Apache OpenOffice developers mailing list; +var l10n_analyze_instruction_learn_more_text = Click here to learn more about what a mailing list is; +var l10n_analyze_instruction_learn_more_title = Learn more about what a mailing list is; +var l10n_analyze_instruction_answer_text = We will try to answer as soon as we get the mail and the problem analyzed.; +var l10n_analyze_instruction_thanks_text = Thank you for your report.; + +// Analyze: Strings for the 3 buttons (used in
svn commit: r1602981 - /openoffice/ooo-site/trunk/content/download/download.js
Author: marcus
Date: Mon Jun 16 19:56:19 2014
New Revision: 1602981
URL: http://svn.apache.org/r1602981
Log:
Re-worked the error variables, created new function to check first on problems
for download links
Modified:
openoffice/ooo-site/trunk/content/download/download.js
Modified: openoffice/ooo-site/trunk/content/download/download.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/download.js?rev=1602981r1=1602980r2=1602981view=diff
==
--- openoffice/ooo-site/trunk/content/download/download.js (original)
+++ openoffice/ooo-site/trunk/content/download/download.js Mon Jun 16 19:56:19
2014
@@ -17,7 +17,7 @@
* function showWindow ( target_url )
* function showErrorMessage ( error_text )
* function isLangSupported()
- * function getLink( rel_mode )
+ * function checkLinkExceptions ()
* function getLinkSel ()
* function getPlatform()
* function getReleaseMatrixPos()
@@ -29,7 +29,7 @@
/*
* Init function
*/
-function init( a ) {
+function init( mode ) {
// Set global variables.
initVars( 1 );
@@ -48,8 +48,10 @@ function init( a ) {
setVerSel();
- // Get release mode and analyze mode from index.html respective
analyze.html.
- R_MODE = a;
+ // When release mode = 2, it is a beta release. Otherwise assume
stable release as default.
+ if( mode === 2 )
+ R_MODE = mode;
+
getLinkSel();
return;
@@ -61,22 +63,26 @@ function init( a ) {
function initVars( init_all ) {
// Define variables without var to make them globally available.
- // The following are used in download.js only.
+ // The following are used in download.js. and index.html.
+
+ // All elements with ID in the sub-green box.
element_ids_sub_green = [ dl_rel_info, dl_rel_notes, dl_f_info,
dl_f_chk_keys, space1, dl_f_chk_asc,
space2, dl_f_chk_md5, space3, dl_f_chk_sha256, dl_lp_info,
dl_lp_chk_keys, space4, dl_lp_chk_asc,
space5, dl_lp_chk_md5, space6, dl_lp_chk_sha256, dl_hlp_img,
dl_hlp, dl_chk_img, dl_chk,
dl_rpt_img, dl_rpt ];
+ // All elements with ID in the green and sub-green box that have a link.
element_ids_links = [ dl_f_link, dl_lp_link, dl_f_chk_keys,
dl_f_chk_asc, dl_f_chk_md5, dl_f_chk_sha256,
dl_lp_chk_keys, dl_lp_chk_asc, dl_lp_chk_md5, dl_lp_chk_sha256,
dl_hlp, dl_chk, dl_rpt ];
- // The following are used in download.js. and index.html.
+ // The following are used in download.js only.
+
+ // All global variables.
if( init_all === 1 ) {
- R_MODE = ;// The release mode (1
= stable release (default), 2 = beta release, etc.).
+ R_MODE = 1; // The release mode (1
= stable release (default), 2 = beta release, etc.).
LANG_ISO= ;// The language as ISO
code.
LANG_SEL= ;// The selected
language as ISO code from select box.
UI_PLATFORM_NO_SUP = ;// The platform as
readable string, if not supported.
- OLD_PLATFORM= false; // Is the browser
platform old (true) or not (false)?
PLATFORM_SEL= ;// The selected
platform from select box.
VERSION_SEL = ;// The selected
version from select box.
}
@@ -90,7 +96,7 @@ function initVars( init_all ) {
RELEASE_PLATFORM= ;// The platform in the
release matrix array.
RELEASE_LANG= ;// The language
specific data depending on LANG_ISO.
REL_TEXT= ;// The release data
(milestone, build ID, svn rev, release date).
- REL_NOTES = ;// The complete URL
for the release notes.
+ REL_NOTES = ;// The complete URL
for the release notes (depends on version).
FILENAME_FULL = ;// The complete
filename of the download URL (full install).
FILENAME_LP = ;// The complete
filename of the download URL (langpack).
FILESIZE_FULL = -1;// The filesize of the
download file (full install).
@@ -110,10 +116,8 @@ function initVars( init_all ) {
LINK_CHK_ASC_LP = ;// The ASC file as
download URL (langpack).
LINK_CHK_MD5_LP = ;// The MD5 file as
download URL (langpack).
LINK_CHK_SHA256_LP = ;// The SHA256 file as
download URL (langpack).
- SF = false; // Does the
svn commit: r1602982 - /openoffice/ooo-site/trunk/content/download/index.html
Author: marcus Date: Mon Jun 16 19:56:57 2014 New Revision: 1602982 URL: http://svn.apache.org/r1602982 Log: Separated more strings from code Modified: openoffice/ooo-site/trunk/content/download/index.html Modified: openoffice/ooo-site/trunk/content/download/index.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/index.html?rev=1602982r1=1602981r2=1602982view=diff == --- openoffice/ooo-site/trunk/content/download/index.html (original) +++ openoffice/ooo-site/trunk/content/download/index.html Mon Jun 16 19:56:57 2014 @@ -14,6 +14,7 @@ script type=text/javascript src=msg_prop_l10n_en.js/script script type=text/javascript src=languages.js/script script type=text/javascript src=release_matrix.js/script + script type=text/javascript src=boxed_download.js/script script type=text/javascript src=download.js/script style type=text/css /* ![CDATA[ */ @@ -52,7 +53,7 @@ !-- // 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. - document.write( h1 style='display: none;'Apache OpenOffice Download/h1 ); + document.write( h1 style='display: none;' + l10n_download_headline_text + /h1 ); //-- /script @@ -62,113 +63,16 @@ !-- // Set a specific language ISO code to force to assemble a certain localized build as download link. - // The variable can be found in the msg_prop_l10n_ISO_code.js. + // Changed: The variable can now be found in the msg_prop_l10n_ISO_code.js. - // Green colored box. - // Show select boxes and both download text buttons. - document.write( div class='first button green-sel' id='optionitem2' -// Headline. -+ h2 - + a title='Download Apache OpenOffice for your favorite operating system, language and version' -+ Download Apache OpenOffice - + /a -+ /h2 - -// Select text. -+ p style='padding-bottom: 0px;' - + a title='Apache OpenOffice binary files are hosted by Sourceforge.net - A trusted website' -+ (Hosted by Sourceforge.net - A trusted website) - + /a - + a title='Select your favorite operating system, language and version' -+ bSelect your favorite operating system, language and version:/b - + /a -+ /p - -// Select boxes. -+ form name='download' - + select class='sel-os' id='os' name='os' title='Select your favorite operating system' onchange='getLinkSel()' - + /select - + select class='sel-lang' id='lang' name='lang' title='Select your favorite language' onchange='getLinkSel()' - + /select - + select class='sel-ver' id='ver' name='ver' title='Select your favorite release version' onchange='getLinkSel()' - + /select -+ /form - -// Both download text buttons: First for full install, then for langpack. -+ a style='padding: 0px 0px 0px 3%; cursor: default;'/a - -+ div class='btn_dl' style='display: inline-block;' - + h3 -+ a id='dl_f_link' href='' title='' target='_blank'/a - + /h3 -+ /div - -+ a style='padding: 0px 0px 0px 3%; cursor: default;'/a - -+ div class='btn_dl' style='display: inline-block;' - + h3 -+ a id='dl_lp_link' href='' title='' target='_blank'/a - + /h3 -+ /div -+ br /br / - - + /div ); - - // Sub-green colored box. - // Show release info, filesizes, checksum links and help links. - document.write( div id='sub_green_box' class='sub-green-sel' -+ p - // Error text with hint. - + img id='dl_err_img'style='margin: 5px 5px 15px 0px;' src='' title='' height='16' width='16' alt='' / - + a id='dl_err' style='text-decoration: none;' title=''/a - - // Release info and notes. - + a id='dl_rel_info' style='text-decoration: none;'/a - + a id='dl_rel_notes'style='text-decoration: underline;' href='' title='' target='_blank'/a - + br / - - // Full installation: Filesize and checksums. - + a id='dl_f_info' style='text-decoration: none;'/a - + a id='dl_f_chk_keys' style='text-decoration: underline;' href='' title='' target='_blank'/a - + a id='space1' style='text-decoration: none;'/a - + a id='dl_f_chk_asc'style='text-decoration: underline;' href='' title='' target='_blank'/a - + a id='space2' style='text-decoration: none;'/a - + a id='dl_f_chk_md5'style='text-decoration: underline;' href='' title='' target='_blank'/a - + a id='space3' style='text-decoration: none;'/a - + a id='dl_f_chk_sha256' style='text-decoration: underline;' href='' title='' target='_blank'/a - + br / - - // Langpack: Filesize and checksums. - + a id='dl_lp_info' style='text-decoration: none;'/a - + a id='dl_lp_chk_keys' style='text-decoration: underline;'
svn commit: r912753 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/download.js
Author: buildbot
Date: Mon Jun 16 19:57:00 2014
New Revision: 912753
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/download.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 16 19:57:00 2014
@@ -1 +1 @@
-1602980
+1602981
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 16 19:57:00 2014
@@ -1 +1 @@
-1602980
+1602981
Modified: websites/staging/ooo-site/trunk/content/download/download.js
==
--- websites/staging/ooo-site/trunk/content/download/download.js (original)
+++ websites/staging/ooo-site/trunk/content/download/download.js Mon Jun 16
19:57:00 2014
@@ -17,7 +17,7 @@
* function showWindow ( target_url )
* function showErrorMessage ( error_text )
* function isLangSupported()
- * function getLink( rel_mode )
+ * function checkLinkExceptions ()
* function getLinkSel ()
* function getPlatform()
* function getReleaseMatrixPos()
@@ -29,7 +29,7 @@
/*
* Init function
*/
-function init( a ) {
+function init( mode ) {
// Set global variables.
initVars( 1 );
@@ -48,8 +48,10 @@ function init( a ) {
setVerSel();
- // Get release mode and analyze mode from index.html respective
analyze.html.
- R_MODE = a;
+ // When release mode = 2, it is a beta release. Otherwise assume
stable release as default.
+ if( mode === 2 )
+ R_MODE = mode;
+
getLinkSel();
return;
@@ -61,22 +63,26 @@ function init( a ) {
function initVars( init_all ) {
// Define variables without var to make them globally available.
- // The following are used in download.js only.
+ // The following are used in download.js. and index.html.
+
+ // All elements with ID in the sub-green box.
element_ids_sub_green = [ dl_rel_info, dl_rel_notes, dl_f_info,
dl_f_chk_keys, space1, dl_f_chk_asc,
space2, dl_f_chk_md5, space3, dl_f_chk_sha256, dl_lp_info,
dl_lp_chk_keys, space4, dl_lp_chk_asc,
space5, dl_lp_chk_md5, space6, dl_lp_chk_sha256, dl_hlp_img,
dl_hlp, dl_chk_img, dl_chk,
dl_rpt_img, dl_rpt ];
+ // All elements with ID in the green and sub-green box that have a link.
element_ids_links = [ dl_f_link, dl_lp_link, dl_f_chk_keys,
dl_f_chk_asc, dl_f_chk_md5, dl_f_chk_sha256,
dl_lp_chk_keys, dl_lp_chk_asc, dl_lp_chk_md5, dl_lp_chk_sha256,
dl_hlp, dl_chk, dl_rpt ];
- // The following are used in download.js. and index.html.
+ // The following are used in download.js only.
+
+ // All global variables.
if( init_all === 1 ) {
- R_MODE = ;// The release mode (1
= stable release (default), 2 = beta release, etc.).
+ R_MODE = 1; // The release mode (1
= stable release (default), 2 = beta release, etc.).
LANG_ISO= ;// The language as ISO
code.
LANG_SEL= ;// The selected
language as ISO code from select box.
UI_PLATFORM_NO_SUP = ;// The platform as
readable string, if not supported.
- OLD_PLATFORM= false; // Is the browser
platform old (true) or not (false)?
PLATFORM_SEL= ;// The selected
platform from select box.
VERSION_SEL = ;// The selected
version from select box.
}
@@ -90,7 +96,7 @@ function initVars( init_all ) {
RELEASE_PLATFORM= ;// The platform in the
release matrix array.
RELEASE_LANG= ;// The language
specific data depending on LANG_ISO.
REL_TEXT= ;// The release data
(milestone, build ID, svn rev, release date).
- REL_NOTES = ;// The complete URL
for the release notes.
+ REL_NOTES = ;// The complete URL
for the release notes (depends on version).
FILENAME_FULL = ;// The complete
filename of the download URL (full install).
FILENAME_LP = ;// The complete
filename of the download URL (langpack).
FILESIZE_FULL = -1;// The filesize of the
download file (full install).
@@
svn commit: r912754 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/index.html
Author: buildbot Date: Mon Jun 16 19:57:48 2014 New Revision: 912754 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/index.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 16 19:57:48 2014 @@ -1 +1 @@ -1602981 +1602982 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 16 19:57:48 2014 @@ -1 +1 @@ -1602981 +1602982 Modified: websites/staging/ooo-site/trunk/content/download/index.html == --- websites/staging/ooo-site/trunk/content/download/index.html (original) +++ websites/staging/ooo-site/trunk/content/download/index.html Mon Jun 16 19:57:48 2014 @@ -16,6 +16,7 @@ script type=text/javascript src=msg_prop_l10n_en.js/script script type=text/javascript src=languages.js/script script type=text/javascript src=release_matrix.js/script + script type=text/javascript src=boxed_download.js/script script type=text/javascript src=download.js/script style type=text/css /* ![CDATA[ */ @@ -68,7 +69,7 @@ !-- // 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. - document.write( h1 style='display: none;'Apache OpenOffice Download/h1 ); + document.write( h1 style='display: none;' + l10n_download_headline_text + /h1 ); //-- /script @@ -78,113 +79,16 @@ !-- // Set a specific language ISO code to force to assemble a certain localized build as download link. - // The variable can be found in the msg_prop_l10n_ISO_code.js. + // Changed: The variable can now be found in the msg_prop_l10n_ISO_code.js. - // Green colored box. - // Show select boxes and both download text buttons. - document.write( div class='first button green-sel' id='optionitem2' -// Headline. -+ h2 - + a title='Download Apache OpenOffice for your favorite operating system, language and version' -+ Download Apache OpenOffice - + /a -+ /h2 - -// Select text. -+ p style='padding-bottom: 0px;' - + a title='Apache OpenOffice binary files are hosted by Sourceforge.net - A trusted website' -+ (Hosted by Sourceforge.net - A trusted website) - + /a - + a title='Select your favorite operating system, language and version' -+ bSelect your favorite operating system, language and version:/b - + /a -+ /p - -// Select boxes. -+ form name='download' - + select class='sel-os' id='os' name='os' title='Select your favorite operating system' onchange='getLinkSel()' - + /select - + select class='sel-lang' id='lang' name='lang' title='Select your favorite language' onchange='getLinkSel()' - + /select - + select class='sel-ver' id='ver' name='ver' title='Select your favorite release version' onchange='getLinkSel()' - + /select -+ /form - -// Both download text buttons: First for full install, then for langpack. -+ a style='padding: 0px 0px 0px 3%; cursor: default;'/a - -+ div class='btn_dl' style='display: inline-block;' - + h3 -+ a id='dl_f_link' href='' title='' target='_blank'/a - + /h3 -+ /div - -+ a style='padding: 0px 0px 0px 3%; cursor: default;'/a - -+ div class='btn_dl' style='display: inline-block;' - + h3 -+ a id='dl_lp_link' href='' title='' target='_blank'/a - + /h3 -+ /div -+ br /br / - - + /div ); - - // Sub-green colored box. - // Show release info, filesizes, checksum links and help links. - document.write( div id='sub_green_box' class='sub-green-sel' -+ p - // Error text with hint. - + img id='dl_err_img'style='margin: 5px 5px 15px 0px;' src='' title='' height='16' width='16' alt='' / - + a id='dl_err' style='text-decoration: none;' title=''/a - - // Release info and notes. - + a id='dl_rel_info' style='text-decoration: none;'/a - + a id='dl_rel_notes'style='text-decoration: underline;' href='' title='' target='_blank'/a - + br / - - // Full installation: Filesize and checksums. - + a id='dl_f_info' style='text-decoration: none;'/a - + a id='dl_f_chk_keys' style='text-decoration: underline;' href='' title='' target='_blank'/a - + a id='space1' style='text-decoration: none;'/a - + a id='dl_f_chk_asc'style='text-decoration: underline;' href='' title='' target='_blank'/a - + a id='space2' style='text-decoration:
svn commit: r1602985 - /openoffice/ooo-site/trunk/content/download/boxed_download.js
Author: marcus
Date: Mon Jun 16 19:59:07 2014
New Revision: 1602985
URL: http://svn.apache.org/r1602985
Log:
Separated the scripting for creating the download box into an own file
Added:
openoffice/ooo-site/trunk/content/download/boxed_download.js (with props)
Added: openoffice/ooo-site/trunk/content/download/boxed_download.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/boxed_download.js?rev=1602985view=auto
==
--- openoffice/ooo-site/trunk/content/download/boxed_download.js (added)
+++ openoffice/ooo-site/trunk/content/download/boxed_download.js Mon Jun 16
19:59:07 2014
@@ -0,0 +1,100 @@
+function createDownloadBox() {
+ // Green colored box.
+ // Show select boxes and both download text buttons.
+ document.write( div class='first button green-sel' id='optionitem2'
+// Headline.
++ h2
+ + a title=' + l10n_download_green_box_headline_title + '+
l10n_download_green_box_headline_text + /a
++ /h2
+
+// Select text.
++ p style='padding-bottom: 0px;'
+ + a title=' + l10n_download_green_box_subtext1_title + '( +
l10n_download_green_box_subtext1_text + )/a
+ + a title=' + l10n_download_green_box_subtext2_title + 'b +
l10n_download_green_box_subtext2_text + :/b/a
++ /p
+
+// Select boxes.
++ form name='download'
+ + select class='sel-os' id='os' name='os' ' onchange='getLinkSel()'
++ title=' + l10n_download_green_box_selectbox_os_title + '
+ + /select
+ + select class='sel-lang' id='lang' name='lang'
onchange='getLinkSel()'
++ title=' + l10n_download_green_box_selectbox_lang_title + '
+ + /select
+ + select class='sel-ver' id='ver' name='ver' onchange='getLinkSel()'
++ title=' + l10n_download_green_box_selectbox_ver_title + '
+ + /select
++ /form
+
+// Both download text buttons: First for full install, then for
langpack.
++ a style='padding: 0px 0px 0px 3%; cursor: default;'/a
+
++ div class='btn_dl' style='display: inline-block;'
+ + h3
++ a id='dl_f_link' href='' title='' target='_blank'/a
+ + /h3
++ /div
+
++ a style='padding: 0px 0px 0px 3%; cursor: default;'/a
+
++ div class='btn_dl' style='display: inline-block;'
+ + h3
++ a id='dl_lp_link' href='' title='' target='_blank'/a
+ + /h3
++ /div
++ br /br /
+
+ + /div
+
+ // Sub-green colored box.
+ // Show release info, filesizes, checksum links and help links.
+ + div id='sub_green_box' class='sub-green-sel'
++ p
+ // Error text with hint.
+ + img id='dl_err_img'style='margin: 5px 5px 15px 0px;' src=''
title='' height='16' width='16' alt='' /
+ + a id='dl_err' style='text-decoration: none;'
title=''/a
+
+ // Release info and notes.
+ + a id='dl_rel_info' style='text-decoration: none;'/a
+ + a id='dl_rel_notes'style='text-decoration: underline;' href=''
title='' target='_blank'/a
+ + br /
+
+ // Full installation: Filesize and checksums.
+ + a id='dl_f_info' style='text-decoration: none;'/a
+ + a id='dl_f_chk_keys' style='text-decoration: underline;' href=''
title='' target='_blank'/a
+ + a id='space1' style='text-decoration: none;'/a
+ + a id='dl_f_chk_asc'style='text-decoration: underline;' href=''
title='' target='_blank'/a
+ + a id='space2' style='text-decoration: none;'/a
+ + a id='dl_f_chk_md5'style='text-decoration: underline;' href=''
title='' target='_blank'/a
+ + a id='space3' style='text-decoration: none;'/a
+ + a id='dl_f_chk_sha256' style='text-decoration: underline;' href=''
title='' target='_blank'/a
+ + br /
+
+ // Langpack: Filesize and checksums.
+ + a id='dl_lp_info' style='text-decoration: none;'/a
+ + a id='dl_lp_chk_keys' style='text-decoration: underline;'
href='' title='' target='_blank'/a
+ + a id='space4' style='text-decoration: none;'/a
+ + a id='dl_lp_chk_asc' style='text-decoration: underline;' href=''
title='' target='_blank'/a
+ + a id='space5' style='text-decoration: none;'/a
+ + a id='dl_lp_chk_md5' style='text-decoration: underline;' href=''
title='' target='_blank'/a
+ + a id='space6' style='text-decoration: none;'/a
+ + a id='dl_lp_chk_sha256' style='text-decoration: underline;' href=''
title='' target='_blank'/a
+ + br /
+
+ // Help: What is a language pack?
+ + img id='dl_hlp_img'style='padding: 5px 5px 0px 0px;' src=''
title='' height='16' width='16' alt='' /
+ + a id='dl_hlp' href='' title='' target='_blank'
onclick='showWindow( this.href ); return false;'/a
+ + a style='padding: 0px 0px 0px 30px;'/a
+
+ // Help: How to verify the download?
+
svn commit: r912755 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/boxed_download.js
Author: buildbot
Date: Mon Jun 16 19:59:41 2014
New Revision: 912755
Log:
Staging update by buildbot for ooo-site
Added:
websites/staging/ooo-site/trunk/content/download/boxed_download.js
Modified:
websites/staging/ooo-site/trunk/cgi-bin/ (props changed)
websites/staging/ooo-site/trunk/content/ (props changed)
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 16 19:59:41 2014
@@ -1 +1 @@
-1602982
+1602985
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 16 19:59:41 2014
@@ -1 +1 @@
-1602982
+1602985
Added: websites/staging/ooo-site/trunk/content/download/boxed_download.js
==
--- websites/staging/ooo-site/trunk/content/download/boxed_download.js (added)
+++ websites/staging/ooo-site/trunk/content/download/boxed_download.js Mon Jun
16 19:59:41 2014
@@ -0,0 +1,100 @@
+function createDownloadBox() {
+ // Green colored box.
+ // Show select boxes and both download text buttons.
+ document.write( div class='first button green-sel' id='optionitem2'
+// Headline.
++ h2
+ + a title=' + l10n_download_green_box_headline_title + '+
l10n_download_green_box_headline_text + /a
++ /h2
+
+// Select text.
++ p style='padding-bottom: 0px;'
+ + a title=' + l10n_download_green_box_subtext1_title + '( +
l10n_download_green_box_subtext1_text + )/a
+ + a title=' + l10n_download_green_box_subtext2_title + 'b +
l10n_download_green_box_subtext2_text + :/b/a
++ /p
+
+// Select boxes.
++ form name='download'
+ + select class='sel-os' id='os' name='os' ' onchange='getLinkSel()'
++ title=' + l10n_download_green_box_selectbox_os_title + '
+ + /select
+ + select class='sel-lang' id='lang' name='lang'
onchange='getLinkSel()'
++ title=' + l10n_download_green_box_selectbox_lang_title + '
+ + /select
+ + select class='sel-ver' id='ver' name='ver' onchange='getLinkSel()'
++ title=' + l10n_download_green_box_selectbox_ver_title + '
+ + /select
++ /form
+
+// Both download text buttons: First for full install, then for
langpack.
++ a style='padding: 0px 0px 0px 3%; cursor: default;'/a
+
++ div class='btn_dl' style='display: inline-block;'
+ + h3
++ a id='dl_f_link' href='' title='' target='_blank'/a
+ + /h3
++ /div
+
++ a style='padding: 0px 0px 0px 3%; cursor: default;'/a
+
++ div class='btn_dl' style='display: inline-block;'
+ + h3
++ a id='dl_lp_link' href='' title='' target='_blank'/a
+ + /h3
++ /div
++ br /br /
+
+ + /div
+
+ // Sub-green colored box.
+ // Show release info, filesizes, checksum links and help links.
+ + div id='sub_green_box' class='sub-green-sel'
++ p
+ // Error text with hint.
+ + img id='dl_err_img'style='margin: 5px 5px 15px 0px;' src=''
title='' height='16' width='16' alt='' /
+ + a id='dl_err' style='text-decoration: none;'
title=''/a
+
+ // Release info and notes.
+ + a id='dl_rel_info' style='text-decoration: none;'/a
+ + a id='dl_rel_notes'style='text-decoration: underline;' href=''
title='' target='_blank'/a
+ + br /
+
+ // Full installation: Filesize and checksums.
+ + a id='dl_f_info' style='text-decoration: none;'/a
+ + a id='dl_f_chk_keys' style='text-decoration: underline;' href=''
title='' target='_blank'/a
+ + a id='space1' style='text-decoration: none;'/a
+ + a id='dl_f_chk_asc'style='text-decoration: underline;' href=''
title='' target='_blank'/a
+ + a id='space2' style='text-decoration: none;'/a
+ + a id='dl_f_chk_md5'style='text-decoration: underline;' href=''
title='' target='_blank'/a
+ + a id='space3' style='text-decoration: none;'/a
+ + a id='dl_f_chk_sha256' style='text-decoration: underline;' href=''
title='' target='_blank'/a
+ + br /
+
+ // Langpack: Filesize and checksums.
+ + a id='dl_lp_info' style='text-decoration: none;'/a
+ + a id='dl_lp_chk_keys' style='text-decoration: underline;'
href='' title='' target='_blank'/a
+ + a id='space4' style='text-decoration: none;'/a
+ + a id='dl_lp_chk_asc' style='text-decoration: underline;' href=''
title='' target='_blank'/a
+ + a id='space5' style='text-decoration: none;'/a
+ + a id='dl_lp_chk_md5' style='text-decoration: underline;' href=''
title='' target='_blank'/a
+ + a id='space6' style='text-decoration: none;'/a
+ + a id='dl_lp_chk_sha256'
svn commit: r1602992 - /openoffice/ooo-site/trunk/content/de/downloads/msg_prop_l10n_de.js
Author: marcus Date: Mon Jun 16 20:30:46 2014 New Revision: 1602992 URL: http://svn.apache.org/r1602992 Log: Updated strings Modified: openoffice/ooo-site/trunk/content/de/downloads/msg_prop_l10n_de.js Modified: openoffice/ooo-site/trunk/content/de/downloads/msg_prop_l10n_de.js URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/de/downloads/msg_prop_l10n_de.js?rev=1602992r1=1602991r2=1602992view=diff == --- openoffice/ooo-site/trunk/content/de/downloads/msg_prop_l10n_de.js (original) +++ openoffice/ooo-site/trunk/content/de/downloads/msg_prop_l10n_de.js Mon Jun 16 20:30:46 2014 @@ -20,7 +20,7 @@ var l10n_download_headline_text = Ap // Download: Strings in the green box (used in index.html). var l10n_download_green_box_headline_text = Apache OpenOffice herunterladen; var l10n_download_green_box_headline_title = Herunterladen von Apache OpenOffice für das gewünschte Betriebssystem, Sprache und Version; -var l10n_download_green_box_subtext1_text = (Hosted von Sourceforge.net - Eine vertrauenswürdige Webseite); +var l10n_download_green_box_subtext1_text = Hosted von Sourceforge.net - Eine vertrauenswürdige Webseite; var l10n_download_green_box_subtext1_title = Apache OpenOffice Installationsdateien sind von Sourceforge.net gehostet - Eine vertrauenswürdige Webseite; var l10n_download_green_box_subtext2_text = Wähle das gewünschte Betriebssystem, Sprache und Version; var l10n_download_green_box_subtext2_title = Wähle das gewünschte Betriebssystem, Sprache und Version; @@ -234,7 +234,7 @@ var l10n_download_rel_notes_aoo401_link var l10n_download_rel_notes_aoo400_link= http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes+%28Deutsch%29;; var l10n_download_help_link= http://www.openoffice.org/download/full_vs_lp.html;; var l10n_download_checksum_link= http://www.openoffice.org/download/checksums.html;; -var l10n_download_report_link = http://www.openoffice.org/download/analyze.html;; +var l10n_download_report_link = http://www.openoffice.org/de/downloads/analyze.html;; var l10n_download_porting_link = http://www.openoffice.org/porting/index.html;; var l10n_download_archive_link = http://www.openoffice.org/download/archive.html;;
svn commit: r912758 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/de/downloads/msg_prop_l10n_de.js
Author: buildbot Date: Mon Jun 16 20:31:50 2014 New Revision: 912758 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/de/downloads/msg_prop_l10n_de.js Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 16 20:31:50 2014 @@ -1 +1 @@ -1602985 +1602992 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 16 20:31:50 2014 @@ -1 +1 @@ -1602985 +1602992 Modified: websites/staging/ooo-site/trunk/content/de/downloads/msg_prop_l10n_de.js == --- websites/staging/ooo-site/trunk/content/de/downloads/msg_prop_l10n_de.js (original) +++ websites/staging/ooo-site/trunk/content/de/downloads/msg_prop_l10n_de.js Mon Jun 16 20:31:50 2014 @@ -20,7 +20,7 @@ var l10n_download_headline_text = Ap // Download: Strings in the green box (used in index.html). var l10n_download_green_box_headline_text = Apache OpenOffice herunterladen; var l10n_download_green_box_headline_title = Herunterladen von Apache OpenOffice für das gewünschte Betriebssystem, Sprache und Version; -var l10n_download_green_box_subtext1_text = (Hosted von Sourceforge.net - Eine vertrauenswürdige Webseite); +var l10n_download_green_box_subtext1_text = Hosted von Sourceforge.net - Eine vertrauenswürdige Webseite; var l10n_download_green_box_subtext1_title = Apache OpenOffice Installationsdateien sind von Sourceforge.net gehostet - Eine vertrauenswürdige Webseite; var l10n_download_green_box_subtext2_text = Wähle das gewünschte Betriebssystem, Sprache und Version; var l10n_download_green_box_subtext2_title = Wähle das gewünschte Betriebssystem, Sprache und Version; @@ -234,7 +234,7 @@ var l10n_download_rel_notes_aoo401_link var l10n_download_rel_notes_aoo400_link= http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes+%28Deutsch%29;; var l10n_download_help_link= http://www.openoffice.org/download/full_vs_lp.html;; var l10n_download_checksum_link= http://www.openoffice.org/download/checksums.html;; -var l10n_download_report_link = http://www.openoffice.org/download/analyze.html;; +var l10n_download_report_link = http://www.openoffice.org/de/downloads/analyze.html;; var l10n_download_porting_link = http://www.openoffice.org/porting/index.html;; var l10n_download_archive_link = http://www.openoffice.org/download/archive.html;;
svn commit: r1602993 - /openoffice/ooo-site/trunk/content/de/downloads/analyze.html
Author: marcus Date: Mon Jun 16 20:31:56 2014 New Revision: 1602993 URL: http://svn.apache.org/r1602993 Log: Created an 'analyze.html' webpage to be able to show it in German language Added: openoffice/ooo-site/trunk/content/de/downloads/analyze.html (with props) Added: openoffice/ooo-site/trunk/content/de/downloads/analyze.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/de/downloads/analyze.html?rev=1602993view=auto == --- openoffice/ooo-site/trunk/content/de/downloads/analyze.html (added) +++ openoffice/ooo-site/trunk/content/de/downloads/analyze.html Mon Jun 16 20:31:56 2014 @@ -0,0 +1,369 @@ +!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd; +html xmlns=http://www.w3.org/1999/xhtml; / +head + meta http-equiv=Content-Type content=text/html; charset=utf-8 / + titleApache OpenOffice Downloads - Analyze errors of stable release/title + script type=text/javascript src=../../download/globalvars.js/script + script type=text/javascript src=msg_prop_l10n_de.js/script + script type=text/javascript src=../../download/languages.js/script + script type=text/javascript src=../../download/release_matrix.js/script + script type=text/javascript src=../../download/download.js/script + style type=text/css + /* ![CDATA[ */ + /* Exceptions on standard css ---*/ + @import ../../download/styles.css; + @import ../../download/exceptions.css; + /* ]] */ + /style +/head + +body + +!-- No JavaScript enabled -- +noscript + h1Apache OpenOffice Downloads - Analyze errors/h1 + br / + + div class=notice +h2JavaScript not enabled?/h2 + +pJavaScript needs to be enabled to show the analysis data on this webpage./p + /div +/noscript + +div !-- introduction text -- + + !-- What to do to report a broken link -- + script type=text/javascript + !-- + document.write( ++ h1 + l10n_analyze_headline_text + /h1 + ++ p + + ol style='padding: 0px 0px 0px 15px; list-style: disc outside none;' + + li + l10n_analyze_instruction_select_text + /li + + li + l10n_analyze_instruction_verify_text + /li + + li + l10n_analyze_instruction_click_text + b[ + l10n_analyze_update_button_text + ]/b/li + + li + l10n_analyze_instruction_click_text + b[ + l10n_analyze_select_button_text + ]/b/li + + li + l10n_analyze_instruction_copy_text + b[ + l10n_analyze_copy_button_text + ]/b/li + + br / + + lib + l10n_analyze_instruction_new_mail_text + /b/li + + li + l10n_analyze_instruction_problem_text + /li + + li + l10n_analyze_instruction_details_text + /li + + lib + l10n_analyze_instruction_paste_text + /b/li + + li + l10n_analyze_instruction_only_download_text + /li + + lib + l10n_analyze_instruction_no_install_text + /b/li + + li + l10n_analyze_instruction_send_mail_text + + a href='mailto:d...@openoffice.apache.org#63;subject=Reporting%20broken%20download%20link' + + title=' + l10n_analyze_instruction_mailing_list_title + ' + + b + l10n_analyze_instruction_mailing_list_text + /b + + /a. *) + + /li + + /ol + + br / + + + *) + + a href='http://openoffice.apache.org/mailing-lists.html' + + title=' + l10n_analyze_instruction_learn_more_title + ' + + target='_blank'b + l10n_analyze_instruction_learn_more_text + /b + + /a. + + + h3 + l10n_analyze_instruction_answer_text + + br / + l10n_analyze_instruction_thanks_text + /h3 + + + pnbsp;/p ++ /p ); + //-- + /script +/div !-- introduction text -- + +div class=optionset style=float: left; + + !-- Text above the first colored box -- + script type=text/javascript + !-- + // 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. + document.write( h1 style='display: none;' + l10n_download_headline_text + /h1 ); + //-- + /script + + !-- Green: Stable release -- + !-- Download via select boxes -- + script type=text/javascript + !-- + + // Set a specific language ISO code to force to assemble a certain localized build as download link. + // Changed: The variable can now be found in the msg_prop_l10n_ISO_code.js. + + // Green colored box. + // Show select boxes and both download text buttons. + document.write( div class='first button green-sel' id='optionitem2' +// Headline. ++ h2 + + a title=' + l10n_download_green_box_headline_title + '+ l10n_download_green_box_headline_text + /a ++ /h2 + +// Select text. ++ p style='padding-bottom: 0px;' + + a title=' + l10n_download_green_box_subtext1_title + '( + l10n_download_green_box_subtext1_text + )/a + + a title=' + l10n_download_green_box_subtext2_title + 'b + l10n_download_green_box_subtext2_text +
svn commit: r912759 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/de/downloads/analyze.html
Author: buildbot Date: Mon Jun 16 20:32:33 2014 New Revision: 912759 Log: Staging update by buildbot for ooo-site Added: websites/staging/ooo-site/trunk/content/de/downloads/analyze.html Modified: websites/staging/ooo-site/trunk/cgi-bin/ (props changed) websites/staging/ooo-site/trunk/content/ (props changed) Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 16 20:32:33 2014 @@ -1 +1 @@ -1602992 +1602993 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 16 20:32:33 2014 @@ -1 +1 @@ -1602992 +1602993 Added: websites/staging/ooo-site/trunk/content/de/downloads/analyze.html == --- websites/staging/ooo-site/trunk/content/de/downloads/analyze.html (added) +++ websites/staging/ooo-site/trunk/content/de/downloads/analyze.html Mon Jun 16 20:32:33 2014 @@ -0,0 +1,387 @@ +!--#include virtual=/doctype.html -- +html +head +link href=/css/ooo.css rel=stylesheet type=text/css + + meta http-equiv=Content-Type content=text/html; charset=utf-8 / + titleApache OpenOffice Downloads - Analyze errors of stable release/title + script type=text/javascript src=../../download/globalvars.js/script + script type=text/javascript src=msg_prop_l10n_de.js/script + script type=text/javascript src=../../download/languages.js/script + script type=text/javascript src=../../download/release_matrix.js/script + script type=text/javascript src=../../download/download.js/script + style type=text/css + /* ![CDATA[ */ + /* Exceptions on standard css ---*/ + @import ../../download/styles.css; + @import ../../download/exceptions.css; + /* ]] */ + /style + +!--#include virtual=/google-analytics.js -- +!--#include virtual=/scripts/entourage.js -- +/head +body +!--#include virtual=/de/brand.html -- + div id=topbara +!--#include virtual=/de/topnav.html -- +div id=breadcrumbsaa href=/home/anbsp;raquo;nbsp;a href=/de/de/anbsp;raquo;nbsp;a href=/de/downloads/downloads/a/div + /div + div id=clear/div + + + div id=content + + + + +!-- No JavaScript enabled -- +noscript + h1Apache OpenOffice Downloads - Analyze errors/h1 + br / + + div class=notice +h2JavaScript not enabled?/h2 + +pJavaScript needs to be enabled to show the analysis data on this webpage./p + /div +/noscript + +div !-- introduction text -- + + !-- What to do to report a broken link -- + script type=text/javascript + !-- + document.write( ++ h1 + l10n_analyze_headline_text + /h1 + ++ p + + ol style='padding: 0px 0px 0px 15px; list-style: disc outside none;' + + li + l10n_analyze_instruction_select_text + /li + + li + l10n_analyze_instruction_verify_text + /li + + li + l10n_analyze_instruction_click_text + b[ + l10n_analyze_update_button_text + ]/b/li + + li + l10n_analyze_instruction_click_text + b[ + l10n_analyze_select_button_text + ]/b/li + + li + l10n_analyze_instruction_copy_text + b[ + l10n_analyze_copy_button_text + ]/b/li + + br / + + lib + l10n_analyze_instruction_new_mail_text + /b/li + + li + l10n_analyze_instruction_problem_text + /li + + li + l10n_analyze_instruction_details_text + /li + + lib + l10n_analyze_instruction_paste_text + /b/li + + li + l10n_analyze_instruction_only_download_text + /li + + lib + l10n_analyze_instruction_no_install_text + /b/li + + li + l10n_analyze_instruction_send_mail_text + + a href='mailto:d...@openoffice.apache.org#63;subject=Reporting%20broken%20download%20link' + + title=' + l10n_analyze_instruction_mailing_list_title + ' + + b + l10n_analyze_instruction_mailing_list_text + /b + + /a. *) + + /li + + /ol + + br / + + + *) + + a href='http://openoffice.apache.org/mailing-lists.html' + + title=' + l10n_analyze_instruction_learn_more_title + ' + + target='_blank'b + l10n_analyze_instruction_learn_more_text + /b + + /a. + + + h3 + l10n_analyze_instruction_answer_text + + br / + l10n_analyze_instruction_thanks_text + /h3 + + + pnbsp;/p ++ /p ); + //-- + /script +/div !-- introduction text -- + +div class=optionset style=float: left; + + !-- Text above the first colored box -- + script type=text/javascript + !-- + // 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. + document.write( h1 style='display: none;' + l10n_download_headline_text + /h1 ); + //-- + /script + + !-- Green: Stable release -- + !-- Download via select boxes -- + script
svn commit: r1603001 - /openoffice/ooo-site/trunk/content/download/test/analyze.html
Author: marcus
Date: Mon Jun 16 20:37:46 2014
New Revision: 1603001
URL: http://svn.apache.org/r1603001
Log:
Separated more strings from code, updated variables
Modified:
openoffice/ooo-site/trunk/content/download/test/analyze.html
Modified: openoffice/ooo-site/trunk/content/download/test/analyze.html
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze.html?rev=1603001r1=1603000r2=1603001view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/analyze.html (original)
+++ openoffice/ooo-site/trunk/content/download/test/analyze.html Mon Jun 16
20:37:46 2014
@@ -303,9 +303,7 @@ document.write( div style='clear: both
+ trtdBase URL to Apache Archive
/tdtd/td/tr/* ASF_ARC_BASE_URL */
+ trtdgetLinkSel()
/tdtd/td/tr/* getLinkSel() */
+ trtdisLangSupported() ?
/tdtd/td/tr/* isLangSupported() */
- + trtdContains link to Sourgeforge ?
/tdtd/td/tr/* SF */
- + trtdContains link to porting webpage ?
/tdtd/td/tr/* OTHER */
- + trtdContains link to the archive ?
/tdtd/td/tr/* ARCHIVE */
+ + trtdDownload link is supported and OK ?
/tdtd/td/tr/* SUPPORTED */
+ trtdGeneral error ?
/tdtd/td/tr/* ERROR */
+ /tbody
+ /table
@@ -319,7 +317,7 @@ function updateTable() {
UI_PLATFORM, UI_PLATFORM_NO_SUP, PLATFORM, PLATFORM_FULL,
PLATFORM_LP, PLATFORM_SEL, VERSION_SEL,
FILENAME_FULL, FILENAME_LP, EXTENSION, FILESIZE_FULL,
FILESIZE_LP, REL_TEXT, LINK_FULL, LINK_LP,
LINK_CHK_MD5_FULL, LINK_CHK_MD5_LP, SOURCEFORGE_BASE_URL,
ASF_ARC_BASE_URL, getLinkSel(), isLangSupported(),
- SF, OTHER, ARCHIVE, ERROR ];
+ SUPPORTED, ERROR ];
// Assign the respective table cell with the variable or function.
// Start with the 20th row (i = 19) in the 2nd cell (1), count through the
elements array (j):
svn commit: r912760 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/analyze.html
Author: buildbot
Date: Mon Jun 16 20:38:17 2014
New Revision: 912760
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.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 16 20:38:17 2014
@@ -1 +1 @@
-1602993
+1603001
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 16 20:38:17 2014
@@ -1 +1 @@
-1602993
+1603001
Modified: websites/staging/ooo-site/trunk/content/download/test/analyze.html
==
--- websites/staging/ooo-site/trunk/content/download/test/analyze.html
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/analyze.html Mon Jun
16 20:38:17 2014
@@ -319,9 +319,7 @@ document.write( div style='clear: both
+ trtdBase URL to Apache Archive
/tdtd/td/tr/* ASF_ARC_BASE_URL */
+ trtdgetLinkSel()
/tdtd/td/tr/* getLinkSel() */
+ trtdisLangSupported() ?
/tdtd/td/tr/* isLangSupported() */
- + trtdContains link to Sourgeforge ?
/tdtd/td/tr/* SF */
- + trtdContains link to porting webpage ?
/tdtd/td/tr/* OTHER */
- + trtdContains link to the archive ?
/tdtd/td/tr/* ARCHIVE */
+ + trtdDownload link is supported and OK ?
/tdtd/td/tr/* SUPPORTED */
+ trtdGeneral error ?
/tdtd/td/tr/* ERROR */
+ /tbody
+ /table
@@ -335,7 +333,7 @@ function updateTable() {
UI_PLATFORM, UI_PLATFORM_NO_SUP, PLATFORM, PLATFORM_FULL,
PLATFORM_LP, PLATFORM_SEL, VERSION_SEL,
FILENAME_FULL, FILENAME_LP, EXTENSION, FILESIZE_FULL,
FILESIZE_LP, REL_TEXT, LINK_FULL, LINK_LP,
LINK_CHK_MD5_FULL, LINK_CHK_MD5_LP, SOURCEFORGE_BASE_URL,
ASF_ARC_BASE_URL, getLinkSel(), isLangSupported(),
- SF, OTHER, ARCHIVE, ERROR ];
+ SUPPORTED, ERROR ];
// Assign the respective table cell with the variable or function.
// Start with the 20th row (i = 19) in the 2nd cell (1), count through the
elements array (j):
svn commit: r1603002 - /openoffice/ooo-site/trunk/content/download/analyze.html
Author: marcus Date: Mon Jun 16 20:38:14 2014 New Revision: 1603002 URL: http://svn.apache.org/r1603002 Log: Separated more strings from code, updated variables Modified: openoffice/ooo-site/trunk/content/download/analyze.html Modified: openoffice/ooo-site/trunk/content/download/analyze.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/analyze.html?rev=1603002r1=1603001r2=1603002view=diff == --- openoffice/ooo-site/trunk/content/download/analyze.html (original) +++ openoffice/ooo-site/trunk/content/download/analyze.html Mon Jun 16 20:38:14 2014 @@ -19,55 +19,72 @@ body -div +!-- No JavaScript enabled -- +noscript + h1Apache OpenOffice Downloads - Analyze errors/h1 + br / + + div class=notice +h2JavaScript not enabled?/h2 + +pJavaScript needs to be enabled to show the analysis data on this webpage./p + /div +/noscript + +div !-- introduction text -- + !-- What to do to report a broken link -- script type=text/javascript !-- document.write( -+ h1How to report a broken download link?/h1 ++ h1 + l10n_analyze_headline_text + /h1 + p + ol style='padding: 0px 0px 0px 15px; list-style: disc outside none;' - + libSelect your favorites/b: Operating system, language and version in the green below./li - + liVerify that these options bstill do not/b lead to valid download links./li - + liClick on the button b[Update the table]/b below the green box./li - + liClick on the button b[Select the table]/b below the green box./li - + libCopy via [Ctrl] + [C]/b the selected table data into the clipboard./li + + li + l10n_analyze_instruction_select_text + /li + + li + l10n_analyze_instruction_verify_text + /li + + li + l10n_analyze_instruction_click_text + b[ + l10n_analyze_update_button_text + ]/b/li + + li + l10n_analyze_instruction_click_text + b[ + l10n_analyze_select_button_text + ]/b/li + + li + l10n_analyze_instruction_copy_text + b[ + l10n_analyze_copy_button_text + ]/b/li + br / - + libCreate a new mail/b./li - + libWrite a problem description/b (what does not work and what do you expect)./li - + liAlso add bdetails about the operating system/b you are using./li - + libPaste the copied data/b at the end./li - + liFinally, bsend the mail/b to the: + + lib + l10n_analyze_instruction_new_mail_text + /b/li + + li + l10n_analyze_instruction_problem_text + /li + + li + l10n_analyze_instruction_details_text + /li + + lib + l10n_analyze_instruction_paste_text + /b/li + + li + l10n_analyze_instruction_only_download_text + /li + + lib + l10n_analyze_instruction_no_install_text + /b/li + + li + l10n_analyze_instruction_send_mail_text + a href='mailto:d...@openoffice.apache.org#63;subject=Reporting%20broken%20download%20link' - + title='Send the broken link report to the Apache OpenOffice developers mailing list' - + bApache OpenOffice Development Mailing List/b + + title=' + l10n_analyze_instruction_mailing_list_title + ' + + b + l10n_analyze_instruction_mailing_list_text + /b + /a. *) + /li + /ol + br / + *) - + a href='http://openoffice.apache.org/mailing-lists.html' title='Learn more about what a mailing list is' - + target='_blank'bClick here to learn more about what a mailing list is/b + + a href='http://openoffice.apache.org/mailing-lists.html' + + title=' + l10n_analyze_instruction_learn_more_title + ' + + target='_blank'b + l10n_analyze_instruction_learn_more_text + /b + /a. - + h3We will try to respond as soon as we get the mail and the problem analyzed. - + br /Thank you for your report./h3 + + h3 + l10n_analyze_instruction_answer_text + + br / + l10n_analyze_instruction_thanks_text + /h3 + pnbsp;/p + /p ); //-- /script -/div +/div !-- introduction text -- div class=optionset style=float: left; + !-- Text above the first colored box -- script type=text/javascript !-- // 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. - document.write( h1 style='display: none;'Apache OpenOffice Download/h1 ); + document.write( h1 style='display: none;' + l10n_download_headline_text + /h1 ); //-- /script @@ -77,35 +94,32 @@ !-- // Set a specific language ISO code to force to assemble a certain localized build as download link. - // The variable can be found in the msg_prop_l10n_ISO_code.js. + // Changed: The variable can now be found in the msg_prop_l10n_ISO_code.js. // Green colored box. // Show select boxes and both download text buttons. document.write( div class='first button green-sel'
svn commit: r912761 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/analyze.html
Author: buildbot Date: Mon Jun 16 20:38:56 2014 New Revision: 912761 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/analyze.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 16 20:38:56 2014 @@ -1 +1 @@ -1603001 +1603002 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 16 20:38:56 2014 @@ -1 +1 @@ -1603001 +1603002 Modified: websites/staging/ooo-site/trunk/content/download/analyze.html == --- websites/staging/ooo-site/trunk/content/download/analyze.html (original) +++ websites/staging/ooo-site/trunk/content/download/analyze.html Mon Jun 16 20:38:56 2014 @@ -35,55 +35,72 @@ -div +!-- No JavaScript enabled -- +noscript + h1Apache OpenOffice Downloads - Analyze errors/h1 + br / + + div class=notice +h2JavaScript not enabled?/h2 + +pJavaScript needs to be enabled to show the analysis data on this webpage./p + /div +/noscript + +div !-- introduction text -- + !-- What to do to report a broken link -- script type=text/javascript !-- document.write( -+ h1How to report a broken download link?/h1 ++ h1 + l10n_analyze_headline_text + /h1 + p + ol style='padding: 0px 0px 0px 15px; list-style: disc outside none;' - + libSelect your favorites/b: Operating system, language and version in the green below./li - + liVerify that these options bstill do not/b lead to valid download links./li - + liClick on the button b[Update the table]/b below the green box./li - + liClick on the button b[Select the table]/b below the green box./li - + libCopy via [Ctrl] + [C]/b the selected table data into the clipboard./li + + li + l10n_analyze_instruction_select_text + /li + + li + l10n_analyze_instruction_verify_text + /li + + li + l10n_analyze_instruction_click_text + b[ + l10n_analyze_update_button_text + ]/b/li + + li + l10n_analyze_instruction_click_text + b[ + l10n_analyze_select_button_text + ]/b/li + + li + l10n_analyze_instruction_copy_text + b[ + l10n_analyze_copy_button_text + ]/b/li + br / - + libCreate a new mail/b./li - + libWrite a problem description/b (what does not work and what do you expect)./li - + liAlso add bdetails about the operating system/b you are using./li - + libPaste the copied data/b at the end./li - + liFinally, bsend the mail/b to the: + + lib + l10n_analyze_instruction_new_mail_text + /b/li + + li + l10n_analyze_instruction_problem_text + /li + + li + l10n_analyze_instruction_details_text + /li + + lib + l10n_analyze_instruction_paste_text + /b/li + + li + l10n_analyze_instruction_only_download_text + /li + + lib + l10n_analyze_instruction_no_install_text + /b/li + + li + l10n_analyze_instruction_send_mail_text + a href='mailto:d...@openoffice.apache.org#63;subject=Reporting%20broken%20download%20link' - + title='Send the broken link report to the Apache OpenOffice developers mailing list' - + bApache OpenOffice Development Mailing List/b + + title=' + l10n_analyze_instruction_mailing_list_title + ' + + b + l10n_analyze_instruction_mailing_list_text + /b + /a. *) + /li + /ol + br / + *) - + a href='http://openoffice.apache.org/mailing-lists.html' title='Learn more about what a mailing list is' - + target='_blank'bClick here to learn more about what a mailing list is/b + + a href='http://openoffice.apache.org/mailing-lists.html' + + title=' + l10n_analyze_instruction_learn_more_title + ' + + target='_blank'b + l10n_analyze_instruction_learn_more_text + /b + /a. - + h3We will try to respond as soon as we get the mail and the problem analyzed. - + br /Thank you for your report./h3 + + h3 + l10n_analyze_instruction_answer_text + + br / + l10n_analyze_instruction_thanks_text + /h3 + pnbsp;/p + /p ); //-- /script -/div +/div !-- introduction text -- div class=optionset style=float: left; + !-- Text above the first colored box -- script type=text/javascript !-- // 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. - document.write( h1 style='display: none;'Apache OpenOffice Download/h1 ); + document.write( h1 style='display: none;' +
svn commit: r912763 - in /websites/production/ooo-site: cgi-bin/ content/
Author: marcus Date: Mon Jun 16 20:49:09 2014 New Revision: 912763 Log: Publishing svnmucc operation to ooo-site site by marcus Added: websites/production/ooo-site/cgi-bin/ - copied from r912762, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r912762, websites/staging/ooo-site/trunk/content/
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/49 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
