[Gforge-commits] gforge/www/tracker/include ArtifactTypeHtml.class, 1.19, 1.20

[tperdue]

Update of /cvsroot/gforge/gforge/www/tracker/include
In directory 
db.perdue.net:/home/tperdue/share/dev.gforge.org/www/tracker/include

Modified Files:
        ArtifactTypeHtml.class 
Log Message:
adding the rest of the multiple renderer code for unlimited fields in tracker

Index: ArtifactTypeHtml.class
===================================================================
RCS file: /cvsroot/gforge/gforge/www/tracker/include/ArtifactTypeHtml.class,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ArtifactTypeHtml.class      8 Oct 2004 02:26:31 -0000       1.19
+++ ArtifactTypeHtml.class      8 Oct 2004 17:47:05 -0000       1.20
@@ -79,12 +79,16 @@
 
 //TODO - add code for "display only" such as mod-limited and detail.php pages
 
+               echo '
+                       <!-- Start Extra Fields Rendering -->
+                       <tr>';
                $col_count=0;
                for ($i=0; $i<$count; $i++) {
+//echo "|||$col_count***".$efarr[$i]['attribute2'];
                        if ($efarr[$i]['field_type'] == 
ARTIFACT_EXTRAFIELDTYPE_SELECT) {
 
                                echo '
-                                       <td 
width="50%"><strong>'.$efarr[$i]['field_name'].'</strong><br />'.
+                                       <td width="50%" 
valign="top"><strong>'.$efarr[$i]['field_name'].'</strong><br />'.
                                                
$this->renderSelect($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$show_100,$text_100).'</td>';
 
 
@@ -93,19 +97,41 @@
                        } elseif ($efarr[$i]['field_type'] == 
ARTIFACT_EXTRAFIELDTYPE_RADIO) {
 
                                echo '
-                                       <td 
width="50%"><strong>'.$efarr[$i]['field_name'].'</strong><br />'.
+                                       <td width="50%" 
valign="top"><strong>'.$efarr[$i]['field_name'].'</strong><br />'.
                                                
$this->renderRadio($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$show_100,$text_100).'</td>';
 
                        } elseif ($efarr[$i]['field_type'] == 
ARTIFACT_EXTRAFIELDTYPE_TEXT) {
 
+                               //text fields might be really wide, so need a 
row to themselves.
+                               if (($col_count == 1) && 
($efarr[$i]['attribute1'] > 30)) {
+                                       $col_count = 0;
+                                       $colspan=2;
+                                       echo '
+                                       <td>&nbsp;</td>
+                               </tr>
+                               <tr>';
+                               } else {
+                                       $colspan=1;
+                               }
                                echo '
-                                       <td 
width="50%"><strong>'.$efarr[$i]['field_name'].'</strong><br />'.
+                                       <td width="50%" colspan="'.$colspan.'" 
valign="top"><strong>'.$efarr[$i]['field_name'].'</strong><br />'.
                                                
$this->renderTextField($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$efarr[$i]['attribute1'],$efarr[$i]['attribute2']).'</td>';
 
                        } elseif ($efarr[$i]['field_type'] == 
ARTIFACT_EXTRAFIELDTYPE_TEXTAREA) {
 
+                               //text areas might be really wide, so need a 
row to themselves.
+                               if (($col_count == 1) && 
($efarr[$i]['attribute2'] > 30)) {
+                                       $col_count = 0;
+                                       $colspan=2;
+                                       echo '
+                                       <td>&nbsp;</td>
+                               </tr>
+                               <tr>';
+                               } else {
+                                       $colspan=1;
+                               }
                                echo '
-                                       <td 
width="50%"><strong>'.$efarr[$i]['field_name'].'</strong><br />'.
+                                       <td width="50%" colspan="'.$colspan.'" 
valign="top"><strong>'.$efarr[$i]['field_name'].'</strong><br />'.
                                                
$this->renderTextArea($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$efarr[$i]['attribute1'],$efarr[$i]['attribute2']).'</td>';
 
 //                     } elseif ($efarr[$i]['field_type'] == 
ARTIFACT_EXTRAFIELDTYPE_MULTISELECT) {
@@ -115,11 +141,19 @@
                        $col_count++;
                        //we've done two columns - if there are more to do, 
start a new row
                        if (($col_count == 2) && ($i != $count-1)) {
+                               $col_count = 0;
                                echo '
                                </tr>
                                <tr>';
                        }
                }
+               if ($col_count == 1) {
+                       echo '
+                                       <td>&nbsp;</td>';
+               }
+               echo '
+                       </tr>
+                       <!-- End Extra Fields Rendering -->';
        }
 
        /**