diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/menu.module | 7 | ||||
| -rw-r--r-- | modules/menu/menu.module | 7 | ||||
| -rw-r--r-- | modules/node.module | 2 | ||||
| -rw-r--r-- | modules/node/node.module | 2 |
4 files changed, 12 insertions, 6 deletions
diff --git a/modules/menu.module b/modules/menu.module index 9b4827f5c..7a77dc493 100644 --- a/modules/menu.module +++ b/modules/menu.module @@ -224,6 +224,7 @@ function menu_edit_item($mid = 0) { $edit['pid'] = $item->pid; $edit['path'] = $item->path; $edit['title'] = $item->title; + $edit['description'] = $item->description; $edit['weight'] = $item->weight; $edit['type'] = $item->type; } @@ -253,6 +254,8 @@ function menu_edit_item_form($edit) { $form .= form_hidden('weight', 0); } else { + $form .= form_textfield(t('Description'), 'description', $edit['description'], 60, 128, t('The description displayed when hovering over a menu item.')); + if ($edit['type'] & MENU_CREATED_BY_ADMIN) { $form .= form_textfield(t('Path'), 'path', $edit['path'], 60, 128); } @@ -287,12 +290,12 @@ function menu_edit_item_form($edit) { */ function menu_edit_item_save($edit) { if ($edit['mid']) { - db_query("UPDATE {menu} SET pid = %d, path = '%s', title = '%s', weight = %d, type = %d WHERE mid = %d", $edit['pid'], $edit['path'], $edit['title'], $edit['weight'], $edit['type'] | MENU_MODIFIED_BY_ADMIN, $edit['mid']); + db_query("UPDATE {menu} SET pid = %d, path = '%s', title = '%s', description = '%s', weight = %d, type = %d WHERE mid = %d", $edit['pid'], $edit['path'], $edit['title'], $edit['description'], $edit['weight'], $edit['type'] | MENU_MODIFIED_BY_ADMIN, $edit['mid']); drupal_set_message(t('updated menu item "%title".', array('%title' => $edit['title']))); } else { $mid = db_next_id('{menu}_mid'); - db_query("INSERT INTO {menu} (mid, pid, path, title, weight, type) VALUES (%d, %d, '%s', '%s', %d, %d)", $mid, $edit['pid'], $edit['path'], $edit['title'], $edit['weight'], $edit['type'] | MENU_MODIFIED_BY_ADMIN); + db_query("INSERT INTO {menu} (mid, pid, path, title, description, weight, type) VALUES (%d, %d, '%s', '%s', '%s', %d, %d)", $mid, $edit['pid'], $edit['path'], $edit['title'], $edit['description'], $edit['weight'], $edit['type'] | MENU_MODIFIED_BY_ADMIN); drupal_set_message(t('created new menu item "%title".', array('%title' => $edit['title']))); } diff --git a/modules/menu/menu.module b/modules/menu/menu.module index 9b4827f5c..7a77dc493 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -224,6 +224,7 @@ function menu_edit_item($mid = 0) { $edit['pid'] = $item->pid; $edit['path'] = $item->path; $edit['title'] = $item->title; + $edit['description'] = $item->description; $edit['weight'] = $item->weight; $edit['type'] = $item->type; } @@ -253,6 +254,8 @@ function menu_edit_item_form($edit) { $form .= form_hidden('weight', 0); } else { + $form .= form_textfield(t('Description'), 'description', $edit['description'], 60, 128, t('The description displayed when hovering over a menu item.')); + if ($edit['type'] & MENU_CREATED_BY_ADMIN) { $form .= form_textfield(t('Path'), 'path', $edit['path'], 60, 128); } @@ -287,12 +290,12 @@ function menu_edit_item_form($edit) { */ function menu_edit_item_save($edit) { if ($edit['mid']) { - db_query("UPDATE {menu} SET pid = %d, path = '%s', title = '%s', weight = %d, type = %d WHERE mid = %d", $edit['pid'], $edit['path'], $edit['title'], $edit['weight'], $edit['type'] | MENU_MODIFIED_BY_ADMIN, $edit['mid']); + db_query("UPDATE {menu} SET pid = %d, path = '%s', title = '%s', description = '%s', weight = %d, type = %d WHERE mid = %d", $edit['pid'], $edit['path'], $edit['title'], $edit['description'], $edit['weight'], $edit['type'] | MENU_MODIFIED_BY_ADMIN, $edit['mid']); drupal_set_message(t('updated menu item "%title".', array('%title' => $edit['title']))); } else { $mid = db_next_id('{menu}_mid'); - db_query("INSERT INTO {menu} (mid, pid, path, title, weight, type) VALUES (%d, %d, '%s', '%s', %d, %d)", $mid, $edit['pid'], $edit['path'], $edit['title'], $edit['weight'], $edit['type'] | MENU_MODIFIED_BY_ADMIN); + db_query("INSERT INTO {menu} (mid, pid, path, title, description, weight, type) VALUES (%d, %d, '%s', '%s', '%s', %d, %d)", $mid, $edit['pid'], $edit['path'], $edit['title'], $edit['description'], $edit['weight'], $edit['type'] | MENU_MODIFIED_BY_ADMIN); drupal_set_message(t('created new menu item "%title".', array('%title' => $edit['title']))); } diff --git a/modules/node.module b/modules/node.module index 68fcaf2e9..aa2f4963f 100644 --- a/modules/node.module +++ b/modules/node.module @@ -775,7 +775,7 @@ function node_admin_nodes() { $header = array(NULL, t('title'), t('type'), t('author'), t('status'), array('data' => t('operations'), 'colspan' => 2)); while ($node = db_fetch_object($result)) { - $rows[] = array(form_checkbox(NULL, 'status]['. $node->nid, 1, 0), l($node->title, 'node/'. $node->nid) .' '. (node_is_new($node->nid, $node->changed) ? theme_mark() : ''), node_invoke($node, 'node_name'), format_name($node), ($node->status ? t('published') : t('not published')), l(t('edit %post', array('%post' => t($node->type))), 'node/'. $node->nid .'/edit'), l(t('delete %post', array('%post' => t($node->type))), 'admin/node/delete/'. $node->nid)); + $rows[] = array(form_checkbox(NULL, 'status]['. $node->nid, 1, 0), l($node->title, 'node/'. $node->nid) .' '. (node_is_new($node->nid, $node->changed) ? theme_mark() : ''), node_invoke($node, 'node_name'), format_name($node), ($node->status ? t('published') : t('not published')), l(t('edit'), 'node/'. $node->nid .'/edit'), l(t('delete'), 'admin/node/delete/'. $node->nid)); } if ($pager = theme('pager', NULL, 50, 0)) { diff --git a/modules/node/node.module b/modules/node/node.module index 68fcaf2e9..aa2f4963f 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -775,7 +775,7 @@ function node_admin_nodes() { $header = array(NULL, t('title'), t('type'), t('author'), t('status'), array('data' => t('operations'), 'colspan' => 2)); while ($node = db_fetch_object($result)) { - $rows[] = array(form_checkbox(NULL, 'status]['. $node->nid, 1, 0), l($node->title, 'node/'. $node->nid) .' '. (node_is_new($node->nid, $node->changed) ? theme_mark() : ''), node_invoke($node, 'node_name'), format_name($node), ($node->status ? t('published') : t('not published')), l(t('edit %post', array('%post' => t($node->type))), 'node/'. $node->nid .'/edit'), l(t('delete %post', array('%post' => t($node->type))), 'admin/node/delete/'. $node->nid)); + $rows[] = array(form_checkbox(NULL, 'status]['. $node->nid, 1, 0), l($node->title, 'node/'. $node->nid) .' '. (node_is_new($node->nid, $node->changed) ? theme_mark() : ''), node_invoke($node, 'node_name'), format_name($node), ($node->status ? t('published') : t('not published')), l(t('edit'), 'node/'. $node->nid .'/edit'), l(t('delete'), 'admin/node/delete/'. $node->nid)); } if ($pager = theme('pager', NULL, 50, 0)) { |