Changeset 254

Timestamp:

May 5, 2007 8:56:36 AM (17 years ago)

Author:

quinn

Message:

Various bug fixes to make compatible with Trendease 2.0.

• Minor CSS admin tweaks.
• PHP Notice warnings.
• Minor bugs fixed.

Location:

trunk

Files:

• css/admin.inc.css (modified) (3 diffs)
• css/utilities.inc.css (modified) (1 diff)
• lib/Prefs.inc.php (modified) (1 diff)
• lib/TemplateGlue.inc.php (modified) (1 diff)
• services/logs.php (modified) (4 diffs)
• services/templates/versions_view.ihtml (modified) (1 diff)

trunk/css/admin.inc.css

@@ -34 +34 @@
 
 .help,
+.sc-help,
 .commandtext { font-size: 70%; }
 
@@ -172 +173 @@
 td {
     vertical-align: top;
-    padding: 8px 6px 0 0;
+/*  
+    padding: 8px 6px 0 0;
+    Why was this here? ///
+*/
 }
 
@@ -193 +197 @@
     border-bottom: 1px dotted #000;
 }
+
+table.list tr:hover {
+    background: #FAF8C7;
+}
+
 
 /* BEAU: The old stuff that was here...

trunk/css/utilities.inc.css

@@ -40 +40 @@
 .sc-padright { padding: 0 10px 0 0; }
 .sc-right { text-align: right; }
+.sc-normal { font-weight: normal; }
 
 /* .sc-pkg class wraps enclosing block element around inner floated elements */

trunk/lib/Prefs.inc.php

@@ -183 +183 @@
         // - there isn't a default.
         // - the new value is different than the default
-        // - there is a previously existing pesistent key.
+        // - there is a previously existing persistent key.
         if (!isset($_SESSION['_prefs'][$this->_ns]['defaults'][$key]) || $_SESSION['_prefs'][$this->_ns]['defaults'][$key] != $val || isset($_SESSION['_prefs'][$this->_ns]['persistent'][$key])) {
             $_SESSION['_prefs'][$this->_ns]['persistent'][$key] = $val;            

trunk/lib/TemplateGlue.inc.php

@@ -422 +422 @@
         // Print a cell with basic named checkboxes.
         $html_name = $val_column . '[' . $box[$val_column] . ']';
+        $html_id = $val_column . '-' . $box[$val_column] . '';
         ?>
-        <td><input type="checkbox" name="<?php echo $html_name ?>" id="<?php echo $html_name ?>"<?php echo $checked; ?> /></td>
-        <td><label for="<?php echo $html_name ?>" class="normal"><?php echo oTxt($box[$key_column]); ?></label></td>
-        <?php /// FIXME: class=normal?
+        <td><input type="checkbox" name="<?php echo $html_name ?>" id="<?php echo $html_id ?>"<?php echo $checked; ?> /></td>
+        <td><label for="<?php echo $html_id ?>" class="sc-normal"><?php echo oTxt($box[$key_column]); ?></label></td>
+        <?php
     }
 

trunk/services/logs.php

@@ -43 +43 @@
     'log_file' => $app->getParam('log_filename')
 ));
-$tmp_prefs->set('log_file', getFormData('log'));
+if (getFormData('log', false)) {
+    $tmp_prefs->set('log_file', getFormData('log'));    
+}
 
 // Titles and navigation header.
@@ -230 +232 @@
     $app =& App::getInstance();
 
+    $log = array();
+
     if (!is_file($app->getParam('log_directory') . '/' . $log_file)) {
         $app->raiseMsg(sprintf(_("Log file %s not found."), $log_file), MSG_WARNING, __FILE__, __LINE__);
         $app->logMsg(sprintf('Log file %s not found.', $app->getParam('log_directory') . '/' . $log_file), LOG_WARNING, __FILE__, __LINE__);
-        return false;
+        return $log;
     }
     $log = file($app->getParam('log_directory') . '/' . $log_file);
@@ -244 +248 @@
         }
     }
-    return array_values($log);
+    $log = array_values($log);
+    return $log;
 }
 
@@ -266 +271 @@
     if (is_array($list) && !empty($list)) {
         sort($list);
-        return $list;
-    } else {
-        return false;
-    }
+    }
+    return $list;
 }
 

trunk/services/templates/versions_view.ihtml

@@ -1 +1 @@
 <div id="commandbox">
+<span class="sc-nowrap commandtext"><a href="<?php echo $app->ohref(oTxt($_SERVER['PHP_SELF'])); ?>"><?php echo _("Back to the Versions List"); ?></a></span>
 <?php if (!getFormData('current', false)) { ?>
     <span class="sc-nowrap commandtext"><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?op=restore', array('version_id', 'version_title')); ?>"><?php echo _("Restore this saved version"); ?></a></span>
-<?php } else { ?>
-    <span class="sc-nowrap commandtext">&nbsp;</span>
 <?php } ?>
 </div>