Changeset 324

Timestamp:

Apr 26, 2008 1:25:46 AM (16 years ago)

Author:

quinn

Message:

Minor updates.

Location:

trunk

Files:

• bin/module_maker/form_template.cli.php (modified) (1 diff)
• lib/Navigation.inc.php (modified) (5 diffs)
• lib/TemplateGlue.inc.php (modified) (2 diffs)

trunk/bin/module_maker/form_template.cli.php

@@ -66 +66 @@
     <label for="$field"><\x3fphp echo _("$title"); \x3f></label>
     <select name="$field" id="$field" class="sc-small"><\x3fphp printSelectForm('__///___tbl', "CONCAT(__///___id, '&mdash;', __///__)", '$field', \$frm['$field'], true, 'ORDER BY $field ASC'); \x3f></select>
-    <span class="commanditem commandtext"><a href="<\x3fphp echo \$app->oHREF('__///__.php?op=add&boomerang=true'); \x3f>" onclick="javascript:return confirm('<\x3fphp echo _("Notice: You are about to leave this form page and any changes you may have made without saving will be lost."); \x3f>');"><\x3fphp echo _("Add __///__") \x3f></a></span>
-    <\x3fphp if ('' != \$frm['__///___id']) { \x3f>
-        <span class="commanditem commandtext"><a href="<\x3fphp echo \$app->oHREF('__///__.php?op=edit&boomerang=true&__///___id=' . \$frm['__///___id']); \x3f>" onclick="javascript:return confirm('<\x3fphp echo _("Notice: You are about to leave this form page and any changes you may have made without saving will be lost."); \x3f>');"><\x3fphp echo sprintf(_("Edit __///__ <em>%s</em>"), \$frm['__///__']) \x3f></a></span>
-    <\x3fphp } \x3f>
+    <a href="<\x3fphp echo \$app->oHREF('/admin/__///__.php?op=add&boomerang=true'); \x3f>" class="sc-warn sc-add-link"><img src="/admin/i/plus.gif" width="10" height="10" alt="[+]" /></a>
+    <a href="<\x3fphp echo \$app->oHREF('/admin/__///__.php?op=edit&boomerang=true&__///___id=' . \$frm['__///___id']); \x3f>" class="sc-warn sc-edit-link"><img src="/admin/i/pen.gif" width="12" height="12" alt="Edit" /></a>
 </div>
 E_O_F;

trunk/lib/Navigation.inc.php

@@ -205 +205 @@
      *
      * @access  public
-     *
-     * @return  mixed   Breadcrumbs (string) or false if breadcrumbs param not set.
+     * @return  string   Breadcrumbs or empty string if breadcrumbs param not set.
      */
     function getBreadcrumbs()
@@ -213 +212 @@
 
         if ($this->getParam('breadcrumbs')) {
-            $breadcrumbs = '';
+            $breadcrumbs = array();
             $pathmark = '';
             $crumb_count = sizeof($this->pages);
@@ -219 +218 @@
                 if ($crumb_count <= $this->getParam('chop_breadcrumbs')) {
                     // Stop gathering crumbs.
-                    return $breadcrumbs;
+                    break;
                 }
                 if ($crumb_count <= 1) {
@@ -225 +224 @@
                     if ('' == trim($page['url']) || $crumb_count <= $this->getParam('chop_breadcrumb_links')) {
                         // A crumb with no link.
-                        $breadcrumbs .= oTxt($pathmark, true) . sprintf($this->getParam('last_crumb_format'), oTxt($page['title'], true));
+                        $breadcrumbs[] =  sprintf($this->getParam('last_crumb_format'), oTxt($page['title'], true));
                     } else if ($crumb_count > $this->getParam('chop_breadcrumb_links')) {
                         // A normal linked crumb.
-                        $breadcrumbs .= oTxt($pathmark, true) . '<a href="' . $app->oHREF($page['url']) . '">' . sprintf($this->getParam('last_crumb_format'), oTxt($page['title'], true)) . '</a>';
+                        $breadcrumbs[] =  '<a href="' . $app->oHREF($page['url']) . '">' . sprintf($this->getParam('last_crumb_format'), oTxt($page['title'], true)) . '</a>';
                     }
                 } else {
                     if ('' == trim($page['url'])) {
                         // A crumb with no link.
-                        $breadcrumbs .= oTxt($pathmark . $page['title'], true);
+                        $breadcrumbs[] = oTxt($pathmark . $page['title'], true);
                     } else {
                         // A normal linked crumb.
-                        $breadcrumbs .= oTxt($pathmark, true) . '<a href="' . $app->oHREF($page['url']) . '">' . oTxt($page['title'], true) . '</a>';
+                        $breadcrumbs[] = '<a href="' . $app->oHREF($page['url']) . '">' . oTxt($page['title'], true) . '</a>';
                     }
                 }
@@ -242 +241 @@
                 $crumb_count--;
             }
-            return $breadcrumbs;
-        } else {
-            return false;
+            return join(oTxt($pathmark, true), $breadcrumbs);
+        } else {
+            return '';
         }
     }

trunk/lib/TemplateGlue.inc.php

@@ -302 +302 @@
  * @param  string $extra_clause     SQL exclude cluase. Something like "WHERE girls != 'buckteeth'"
  */
-function printSelectForm($db_table, $key_column, $val_column, $preselected, $blank=false, $extra_clause='')
+function printSelectForm($db_table, $key_column, $val_column, $preselected, $blank=false, $extra_clause='', $sql_format='SELECT %1$s, %2$s FROM %3$s %4$s')
 {
     $db =& DB::getInstance();
@@ -326 +326 @@
         }
     }
-    $qid = $db->query("SELECT $key_column, $val_column FROM $db_table $extra_clause",false);
+    // $qid = $db->query("SELECT $key_column, $val_column FROM $db_table $extra_clause",false);
+    $qid = $db->query(sprintf($sql_format, $key_column, $val_column, $db_table, $extra_clause),false);
     while ($row = mysql_fetch_assoc($qid)) {
         $selected = in_array($row[$val_column], $preselected) ? ' selected="selected"' : '';