[fltk.commit] [WWW] r658 - in trunk: . phplib

[fltk-dev]

Author: greg.ercolano
Date: 2012-02-24 10:03:04 -0800 (Fri, 24 Feb 2012)
New Revision: 658
Log:
Revisiting having dev and public releases 
in same table to match column alignment.

Also: some mods to standardize naming of the classname
argument for funcs in the html.php lib.



Modified:
   trunk/phplib/html.php
   trunk/software.php

Modified: trunk/phplib/html.php
===================================================================
--- trunk/phplib/html.php       2012-02-24 04:24:53 UTC (rev 657)
+++ trunk/phplib/html.php       2012-02-24 18:03:04 UTC (rev 658)
@@ -98,7 +98,7 @@
            $refresh = "",              // I - Refresh URL
            $tab_links = "",            // I - Tab links, if any
            $javascript = "",           // I - Javascript, if any
-           $class = "header")          // I - CSS class, if any
+           $classname = "header")      // I - CSS class, if any
 {
   global $html_keywords, $html_links, $html_names, $html_path, $html_sections,
          $argc, $argv, $PHP_SELF, $LOGIN_USER, $LOGIN_LEVEL, $_SERVER,
@@ -230,7 +230,7 @@
 
     print("<table width='100%' border='0' cellspacing='0' "
         ."cellpadding='0' summary='Page'>\n"
-        ."<tr class='${class}'>"
+        ."<tr class='${classname}'>"
         ."<td valign='top' width='15' rowspan='2'>"
         ."<a href='${path}index.php'><img src='${path}images/top-left.gif' "
         ."width='15' height='70' border='0' alt=''></a>"
@@ -250,7 +250,7 @@
         ."</tr>\n");
 
     // Tabs
-    print("<tr class='${class}'>"
+    print("<tr class='${classname}'>"
         ."<td width='100%' colspan='2' valign='bottom' nowrap>");
 
     reset($html_sections);
@@ -381,7 +381,7 @@
 //
 
 function
-html_footer($class = "header") // I - CSS class, if any
+html_footer($classname = "header") // I - CSS class, if any
 {
   global $html_path, $html_show_all;
 
@@ -390,7 +390,7 @@
   {
     print("</td></tr></table></td><td width='15'>&nbsp;</td></tr>\n");
     print("<tr class='page'><td colspan='5'>&nbsp;</td></tr>\n");
-    print("<tr class='${class}'>"
+    print("<tr class='${classname}'>"
         ."<td valign='bottom' width='15'><img 
src='${html_path}images/bottom-left.gif' "
         ."width='4' height='4' alt=''></td>"
         ."<td colspan='3' width='100%'><small> <br>"
@@ -492,7 +492,7 @@
 function
 html_start_table($headings,            // I - Array of heading strings 
                  $title="",            // I - Table title (if any)
-                 $class="header")      // I - CSS class to use for heading (if 
any)
+                 $classname="header")  // I - CSS class to use for heading (if 
any)
 {
   global $html_row, $html_cols, $html_path, $html_show_all;
 
@@ -508,13 +508,13 @@
     print("<br><table border='0' cellpadding='0' cellspacing='0' width='100%' 
summary=''>\n");
     if ( $title != "" )
     {
-       print("  <tr class='${class}'>\n"
+       print("  <tr class='${classname}'>\n"
             ."    <th align='left' valign='top'>$toplt_img</th>\n"
             ."    <th align=center colspan='$html_cols'>$title</th>\n"
             ."    <th align='right' valign='top'>$toprt_img</th>\n"
             ."  </tr>\n");
     }
-    print("  <tr class='${class}'>\n"
+    print("  <tr class='${classname}'>\n"
          ."    <th></th>\n");
   }
   else
@@ -522,7 +522,7 @@
     print("<br><table border='1' cellpadding='5' cellspacing='0' width='100%' 
summary=''>");
     if ( $title != "" )
     {
-       print("  <tr class='${class}'>\n"
+       print("  <tr class='${classname}'>\n"
             ."    <th align=center colspan='$html_cols'>$title</th>\n"
             ."  </tr>\n");
     }
@@ -562,12 +562,12 @@
 //
 
 function
-html_end_table($class="header")                // I - CSS class to use (if any)
+html_end_table($classname="header")            // I - CSS class to use (if any)
 {
   global $html_cols, $html_path, $html_show_all;
 
   if ($html_show_all)
-    print("  <tr class='${class}'>\n"
+    print("  <tr class='${classname}'>\n"
          ."    <th align='left' valign='bottom'>"
         ."<img src='${html_path}images/hdr-bottom-left.gif' width='4' 
height='4' "
         ."alt=''></th>\n"
@@ -623,7 +623,16 @@
     print("  </tr>\n");
 }
 
+function
+html_empty_row($classname = "")                // I - HTML class to use
+{
+  if ( $classname != "" )
+    { print "  <tr><td>&nbsp;</td></tr>\n"; }
+  else
+    { print "  <tr class='$classname'><td>&nbsp;</td></tr>\n"; }
+}
 
+
 //
 // 'html_search_words()' - Generate an array of search words.
 //

Modified: trunk/software.php
===================================================================
--- trunk/software.php  2012-02-24 04:24:53 UTC (rev 657)
+++ trunk/software.php  2012-02-24 18:03:04 UTC (rev 658)
@@ -144,11 +144,23 @@
       // Start dev section of table?
       if ( $dev == 0 )
       {
-         html_end_table();
          $dataclass = "data0-red";
          $headerclass = "header-red";
-         html_start_table($headings, "- - - &nbsp; Development Only &nbsp; - - 
-", $headerclass);
          $dev = 1;
+         // Spacers to separate public + dev download tables
+         html_empty_row();
+         html_empty_row();
+
+         // New section title
+         html_start_row($headerclass);
+         print("    <th colspan='4' align=center>- - - &nbsp; Development Only 
&nbsp; - - -</th>\n");
+         html_end_row();
+
+         // Column headings
+         html_start_row($headerclass);
+         for ($h = 0; $h < count($headings); $h ++)
+             { $header = $headings[$h]; print("    <th 
nowrap>$header</th>\n"); }
+         html_end_row();
       }
     }
 

_______________________________________________
fltk-commit mailing list
fltk-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/fltk-commit