incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject svn commit: r1225367 - /incubator/ooo/trunk/main/solenv/bin/build.pl
Date Wed, 28 Dec 2011 22:50:28 GMT
Author: arist
Date: Wed Dec 28 22:50:27 2011
New Revision: 1225367

URL: http://svn.apache.org/viewvc?rev=1225367&view=rev
Log:
needed to fix up html in log status page - now works on chrome, etc 

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=1225367&r1=1225366&r2=1225367&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/build.pl (original)
+++ incubator/ooo/trunk/main/solenv/bin/build.pl Wed Dec 28 22:50:27 2011
@@ -2823,7 +2823,7 @@ sub generate_html_file {
         print HTML 'document.write("        <td>");' . "\n";
         print HTML 'document.write("            <table width=100% valign=top cellpadding=0
hspace=0 vspace=0 cellspacing=0 border=0>");' . "\n";
         print HTML 'document.write("                <tr>");' . "\n";
-        print HTML 'document.write("                    <td height=15* width=';
+        print HTML 'document.write("                    <td height=15 width=';
                 
         print HTML $successes_percent + $errors_percent;
         if ($errors_number) {
@@ -2945,13 +2945,7 @@ 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].document.write("<h3 id=ModuleErrors name=\""
+ null + "\">Log for " + ModuleJob + "</h3>");' . "\n";
-    print HTML '    top.innerFrame.frames[2].document.write("<iframe id=LogFile name=Log
src="';
-	if (defined $html_path) {
-		print HTML 'file://';
-	}
-	print HTML '+ LogFilePath + " width=100%></iframe>");' . "\n"; 
-    print HTML '    top.innerFrame.frames[2].document.close();' . "\n";
+    print HTML '    top.innerFrame.frames[2].location = LogFilePath;' . "\n"; 
     print HTML '};' . "\n";
     print HTML 'function FillFrame_1(Module, Message1, Message2) {' . "\n";
     print HTML '    var FullUpdate = 1;' . "\n";
@@ -3055,7 +3049,7 @@ sub generate_html_file {
     print HTML '    var urlquery = location.href.split("?");' . "\n";
     print HTML '    if (urlquery.length == 1) {' . "\n";
     print HTML '        document.write("<html><head><TITLE id=MainTitle>'
. $ENV{INPATH} .'</TITLE>");' . "\n";
-    print HTML '        document.write("    <frameset rows=\"12%,88%\">");' . "\n";
+    print HTML '        document.write("    <frameset rows=\"36,*\">");' . "\n";
     print HTML '        document.write("        <frame name=\"topFrame\" src=\"" + urlquery
+ "?initTop\"/>");' . "\n";
     print HTML '        document.write("        <frame name=\"innerFrame\" src=\"" + urlquery
+ "?initInnerPage\"/>");' . "\n";
     print HTML '        document.write("    </frameset>");' . "\n";
@@ -3071,26 +3065,23 @@ sub generate_html_file {
     print HTML '            };' . "\n";
     print HTML '        };' . "\n";
     print HTML '        document.write("<html><body>");' . "\n";
-    print HTML '        document.write("<h3 align=center>Build process progress status</h3>");'
. "\n";
-    print HTML '        document.write("<div align=\"right\">");' . "\n";
-    print HTML '        document.write("    <table border=\"0\"> <tr>");' . "\n";
-    print HTML '        document.write("<td>Refresh rate(sec):</td>");' . "\n";
-    print HTML '        document.write("<th>");' . "\n";
+    print HTML '        document.write("<table border=\"0\" width=\"100%\"> <tr>");'
. "\n";
+    print HTML '        document.write("<td align=\"left\"><h3>Build process
progress status</h3></td>");' . "\n";
+    print HTML '        document.write("<td align=\"right\">");' . "\n";
     print HTML '        document.write("<FORM name=\"Formular\" onsubmit=\"setRefreshRate()\">");'
. "\n";
     print HTML '        document.write("<input type=\"hidden\" name=\"initTop\" value=\"\"/>");'
. "\n";
     print HTML '        document.write("<input type=\"text\" id=\"RateValue\" name=\"rate\"
autocomplete=\"off\" value=\"" + UpdateRate + "\" size=\"1\"/>");' . "\n";
-    print HTML '        document.write("<input type=\"submit\" value=\"OK\">");' .
"\n";
+    print HTML '        document.write("<input type=\"submit\" value=\"Update refresh
rate (sec)\">");' . "\n";
     print HTML '        document.write("</FORM>");' . "\n";
-    print HTML '        document.write("</th></tr></table>");' . "\n";
-    print HTML '        document.write("</div>");' . "\n";
+    print HTML '        document.write("</td></tr></table>");' . "\n";
     print HTML '        document.write("    </frameset>");' . "\n";
     print HTML '        document.write("</body></html>");' . "\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("<html><head>");' . "\n";
-    print HTML '        document.write(\'    <frameset rows="80%,20%\">\');' . "\n";
-    print HTML '        document.write(\'        <frameset cols="70%,30%">\');' . "\n";
+    print HTML '        document.write(\'    <frameset rows="50%,50%\">\');' . "\n";
+    print HTML '        document.write(\'        <frameset cols="50%,50%">\');' . "\n";
     print HTML '        document.write(\'            <frame src="\');' . "\n";
     print HTML '        document.write(urlquery[0]);' . "\n";
     print HTML '        document.write(\'?initFrame0"/>\');' . "\n";



Mime
View raw message