Changeset 295 for trunk/bin/module_maker/skel

Timestamp:

Dec 16, 2007 7:21:57 AM (17 years ago)

Author:

quinn

Message:

Updated example config file. Added admin2.inc.css and minor corrections into HTML. Module maker fixes.

Location:

trunk/bin/module_maker/skel

Files:

• adm_form.ihtml (modified) (1 diff)
• adm_list.ihtml (modified) (2 diffs)
• admin.php (modified) (10 diffs)

trunk/bin/module_maker/skel/adm_form.ihtml

@@ -6 +6 @@
 <input type="hidden" name="%PRIMARY_KEY%" value="<?php echo $frm['%PRIMARY_KEY%']; ?>" />
 
-<?php printSubmitButtons($frm['submit_buttons']); ?>
+<div class="sc-form-row sc-submit-buttons">
+    <?php printSubmitButtons($frm['submit_buttons']); ?>
+</div>
 
 %ADM_FORM_TABLE_ROWS%
 
-<?php printSubmitButtons($frm['submit_buttons']); ?>
+<div class="sc-form-row sc-submit-buttons">
+    <?php printSubmitButtons($frm['submit_buttons']); ?>
+</div>
 </form>

trunk/bin/module_maker/skel/adm_list.ihtml

@@ -3 +3 @@
 
 <div id="commandbox">
-<form action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>" method="get">
-<?php $app->printHiddenSession(false); ?>
     <span class="sc-nowrap commandtext"><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?op=add'); ?>"><?php echo _("Add %ITEM_TITLE%"); ?></a></span>
-    <br />
-
-    <input type="text" class="sc-small" size="20" name="search_query" value="<?php echo getFormData('search_query'); ?>" title="<?php echo oTxt(_("Fields searched: __///__ %SEARCH_FIELDS%.")); ?>" />
-    <select name="filter___///__">
-        <?php // printSelectForm('__///___tbl', "CONCAT(__///___id, '&mdash;', city, '&mdash;', title)", '__///___id', getFormData('filter___///__'), array('Any __///__'), 'ORDER BY __///__ ASC'); ?>
-    </select>
-    <input type="submit" value="<?php echo _("Search"); ?>" />
-</form>
+    <form action="<?php echo oTxt($_SERVER['PHP_SELF']); ?>" method="get" class="sc-form">
+        <?php $app->printHiddenSession(false); ?>
+        <input type="text" class="sc-small" size="20" name="search_query" value="<?php echo getFormData('search_query'); ?>" title="<?php echo oTxt(_("Fields searched: __///__ %SEARCH_FIELDS%.")); ?>" />
+        <select name="filter___///__" class="sc-small">
+            <?php // printSelectForm('__///___tbl', "CONCAT(__///___id, '&mdash;', city, '&mdash;', title)", '__///___id', getFormData('filter___///__'), array('Any __///__'), 'ORDER BY __///__ ASC'); ?>
+        </select>
+        <input type="submit" value="<?php echo _("Filter"); ?>" />
+    </form>
 </div>
 
@@ -31 +29 @@
         <td class="sc-padleft sc-nowrap"><a title="<?php printf(_("Versions of %s"), oTxt($list[$i]['__///__'])) ?>" href="<?php echo $app->oHREF('/admin/versions.php?record_table=%DB_TBL%&record_key=%PRIMARY_KEY%&boomerang=true&record_val=' . $list[$i]['%PRIMARY_KEY%']); ?>"><img src="/admin/_widgets/subcategory.gif" alt="" width="18" height="14" border="0" /></a> &nbsp;</td>
 %ADM_LIST_ROWS%
-        <td class="sc-padleft sc-nowrap" align="right"><a title="<?php printf(_("Delete %s"), oTxt($list[$i]['__///__'])) ?>" href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . "?op=del&%PRIMARY_KEY%=" . $list[$i]['%PRIMARY_KEY%']); ?>" onclick"javascript:return confirm('<?php printf(_("Are you sure you want to delete the record %s? This action is permanent and cannot be undone."), oTxt($list[$i]['__///__'])) ?>')"><img src="/admin/_widgets/delete.gif" alt="Delete" width="16" height="17" border="0" /></a> &nbsp;</td>
+        <td class="sc-padleft sc-nowrap" align="right"><a title="<?php printf(_("Delete %s"), oTxt($list[$i]['__///__'])) ?>" href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . "?op=del&%PRIMARY_KEY%=" . $list[$i]['%PRIMARY_KEY%']); ?>" onclick"javascript:return confirm('<?php printf(_("Are you sure you want to delete the record %s? This action is permanent and cannot be undone."), oTxt($list[$i]['__///__'])) ?>');"><img src="/admin/_widgets/delete.gif" alt="Delete" width="16" height="17" border="0" /></a> &nbsp;</td>
     </tr>
     <?php } ?>

trunk/bin/module_maker/skel/admin.php

@@ -203 +203 @@
         'new_op' => 'insert',
         'submit_buttons' => array(
-            'submit' => _("Add %ITEM_TITLE%"),
-            'repeat' => _("Add & repeat"),
-            'cancel' => _("Cancel"),
+            array('name' => 'submit', 'value' => _("Add %ITEM_TITLE%"), 'accesskey' => 's'),
+            array('name' => 'repeat', 'value' => _("Add & repeat"), 'accesskey' => 'r'),
+            array('name' => 'cancel', 'value' => _("Cancel"), 'accesskey' => 'c'),
         ),
     );
@@ -216 +216 @@
     global $lock;
     $db =& DB::getInstance();
+    $app =& App::getInstance();
     
     $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $id);
@@ -242 +243 @@
         'new_op' => 'update',
         'submit_buttons' => array(
-            'submit' => _("Save changes"),
-            'repeat' => _("Save & edit next"),
-            'reset' => _("Reset"),
-            'cancel' => _("Cancel"),
+            array('name' => 'submit', 'value' => _("Save changes"), 'accesskey' => 's'),
+            array('name' => 'repeat', 'value' => _("Save & edit next"), 'accesskey' => 'e'),
+            array('name' => 'reset', 'value' => _("Reset"), 'accesskey' => 'r'),
+            array('name' => 'cancel', 'value' => _("Cancel"), 'accesskey' => 'c'),
         ),
     ), $frm);
@@ -257 +258 @@
     global $cache;
     $db =& DB::getInstance();
+    $app =& App::getInstance();
     
     $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $id);
@@ -292 +294 @@
     global $cache;
     $db =& DB::getInstance();
+    $app =& App::getInstance();
     
     // Remove any stale cached list data.
@@ -313 +316 @@
     global $lock;
     global $cache;
+    $db =& DB::getInstance();
     $app =& App::getInstance();
     
@@ -342 +346 @@
     global $cache;
     $db =& DB::getInstance();   
+    $app =& App::getInstance();
     
     $where_clause = '';
@@ -374 +379 @@
         SELECT
             %DB_TBL%.*,
-            a1.username AS added_admin_username,
-            a2.username AS modified_admin_username
+            a1.username AS added_by_username,
+            a2.username AS modified_by_username
         FROM %DB_TBL%
-        LEFT JOIN admin_tbl a1 ON (%DB_TBL%.added_by_user_id = a1.admin_id)
-        LEFT JOIN admin_tbl a2 ON (%DB_TBL%.modified_by_user_id = a2.admin_id)
+        LEFT JOIN user_tbl a1 ON (%DB_TBL%.added_by_user_id = a1.user_id)
+        LEFT JOIN user_tbl a2 ON (%DB_TBL%.modified_by_user_id = a2.user_id)
         $where_clause
         " . $so->getSortOrderSQL() . "
@@ -398 +403 @@
     // First try to return from the cache.
     if ($cache->exists('list')) {
-        return $cache->get('list');
+        $list = $cache->get('list');
+        return $list;
     }
     
@@ -419 +425 @@
     global $cache;
     $db =& DB::getInstance();
+    $app =& App::getInstance();
     
     if (!is_array($ranks)) {