Author: arist Date: Fri Feb 3 04:36:53 2012 New Revision: 1240000 URL: http://svn.apache.org/viewvc?rev=1240000&view=rev Log: revert changes to page layout as functionality became broken Modified: incubator/ooo/trunk/main/solenv/bin/build.pl Modified: incubator/ooo/trunk/main/solenv/bin/build.pl URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/build.pl?rev=1240000&r1=1239999&r2=1240000&view=diff ============================================================================== --- incubator/ooo/trunk/main/solenv/bin/build.pl (original) +++ incubator/ooo/trunk/main/solenv/bin/build.pl Fri Feb 3 04:36:53 2012 @@ -22,7 +22,6 @@ # #************************************************************** - # # build - build entire project # @@ -2836,7 +2835,7 @@ sub generate_html_file { print HTML 'document.write(" ");' . "\n"; print HTML 'document.write(" ");' . "\n"; print HTML 'document.write(" ");' . "\n"; - print HTML 'document.write("
Jobs");' . "\n"; @@ -2951,7 +2957,13 @@ sub generate_html_file { print HTML ' return StatusInnerHtml;' . "\n"; print HTML '} ' . "\n"; print HTML 'function ShowLog(LogFilePath, ModuleJob) {' . "\n"; - print HTML ' top.innerFrame.frames[2].location = LogFilePath;' . "\n"; + print HTML ' top.innerFrame.frames[2].document.write("

Log for " + ModuleJob + "

");' . "\n"; + print HTML ' top.innerFrame.frames[2].document.write("");' . "\n"; + print HTML ' top.innerFrame.frames[2].document.close();' . "\n"; print HTML '};' . "\n"; print HTML 'function FillFrame_1(Module, Message1, Message2) {' . "\n"; print HTML ' var FullUpdate = 1;' . "\n"; @@ -3008,10 +3020,6 @@ sub generate_html_file { print HTML ' top.innerFrame.frames[1].document.close();' . "\n"; print HTML '};' . "\n"; print HTML 'function Error(Module, Message1, Message2) {' . "\n"; - print HTML ' if (top.innerFrame.frames[2].location) {' . "\n"; - print HTML ' var urlquery = location.href.split("?");' . "\n"; - print HTML ' top.innerFrame.frames[2].location = urlquery[0] + "?initFrame2";' . "\n"; - print HTML ' }' . "\n"; print HTML ' if (Module == \'\') {' . "\n"; print HTML ' if (Message1 != \'\') {' . "\n"; print HTML ' var erroneous_modules = Message1.split("
");' . "\n"; @@ -3027,6 +3035,19 @@ sub generate_html_file { print HTML ' };' . "\n"; print HTML ' top.innerFrame.frames[2].document.close();' . "\n"; print HTML ' };' . "\n"; + print HTML ' } else {' . "\n"; + print HTML ' var ModuleNameObj = top.innerFrame.frames[2].document.getElementById("ModuleErrors");' . "\n"; + print HTML ' var OldErrors = null;' . "\n"; + print HTML ' var ErrorNumber = Message1.split("
").length;' . "\n"; + print HTML ' if ((ModuleNameObj != null) && (Module == ModuleNameObj.getAttribute(\'name\')) ) {' . "\n"; + print HTML ' OldErrors = ModuleNameObj.getAttribute(\'errors\');' . "\n"; + print HTML ' }' . "\n"; + print HTML ' if ((OldErrors == null) || (OldErrors != ErrorNumber)) {' . "\n"; + print HTML ' top.innerFrame.frames[2].document.write("

Errors in module " + Module + ":

");' . "\n"; + print HTML ' top.innerFrame.frames[2].document.write(Message1);' . "\n"; + print HTML ' top.innerFrame.frames[2].document.close();' . "\n"; + print HTML ' }' . "\n"; + print HTML ' FillFrame_1(Module, Message1, Message2);' . "\n"; print HTML ' }' . "\n"; print HTML '}' . "\n"; print HTML 'function updateInnerFrame() {' . "\n"; @@ -3046,7 +3067,7 @@ sub generate_html_file { print HTML ' var urlquery = location.href.split("?");' . "\n"; print HTML ' if (urlquery.length == 1) {' . "\n"; print HTML ' document.write("' . $ENV{INPATH} .'");' . "\n"; - print HTML ' document.write(" ");' . "\n"; + print HTML ' document.write(" ");' . "\n"; print HTML ' document.write(" ");' . "\n"; print HTML ' document.write(" ");' . "\n"; print HTML ' document.write(" ");' . "\n"; @@ -3062,23 +3083,26 @@ sub generate_html_file { print HTML ' };' . "\n"; print HTML ' };' . "\n"; print HTML ' document.write("");' . "\n"; - print HTML ' document.write("");' . "\n"; - print HTML ' document.write("");' . "\n"; - print HTML ' document.write("

Build process progress status

");' . "\n"; + print HTML ' document.write("

Build process progress status

");' . "\n"; + print HTML ' document.write("
");' . "\n"; + print HTML ' document.write(" ");' . "\n"; + print HTML ' document.write("");' . "\n"; + print HTML ' document.write("
Refresh rate(sec):");' . "\n"; print HTML ' document.write("
");' . "\n"; print HTML ' document.write("");' . "\n"; print HTML ' document.write("");' . "\n"; - print HTML ' document.write("");' . "\n"; + print HTML ' document.write("");' . "\n"; print HTML ' document.write("
");' . "\n"; - print HTML ' document.write("
");' . "\n"; + print HTML ' document.write("
");' . "\n"; + print HTML ' document.write("");' . "\n"; print HTML ' document.write(" ");' . "\n"; print HTML ' document.write("");' . "\n"; print HTML ' top.frames[0].clearInterval(IntervalID);' . "\n"; print HTML ' IntervalID = top.frames[0].setInterval("updateInnerFrame()", UpdateRate * 1000);' . "\n"; print HTML ' } else if (urlquery[1] == "initInnerPage") {' . "\n"; print HTML ' document.write("");' . "\n"; - print HTML ' document.write(\' \');' . "\n"; - print HTML ' document.write(\' \');' . "\n"; + print HTML ' document.write(\' \');' . "\n"; + print HTML ' document.write(\' \');' . "\n"; print HTML ' document.write(\' \');' . "\n";