? .DS_Store
? edit-shortcuts.patch
? head.db
? includes/.DS_Store
? modules/.DS_Store
? modules/node/.DS_Store
? sites/default/files
? sites/default/private
? sites/default/settings.php
Index: modules/node/content_types.js
===================================================================
RCS file: modules/node/content_types.js
diff -N modules/node/content_types.js
--- modules/node/content_types.js 4 Jul 2009 14:57:23 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-// $Id: content_types.js,v 1.5 2009/07/04 14:57:23 dries Exp $
-(function ($) {
-
-Drupal.behaviors.contentTypes = {
- attach: function () {
- if ($('#edit-type').val() == $('#edit-name').val().toLowerCase().replace(/[^a-z0-9]+/g, '_').replace(/_+/g, '_') || $('#edit-type').val() == '') {
- $('.form-item-type-wrapper').hide();
- $('#edit-name').keyup(function () {
- var machine = $(this).val().toLowerCase().replace(/[^a-z0-9]+/g, '_').replace(/_+/g, '_');
- if (machine != '_' && machine != '') {
- $('#edit-type').val(machine);
- $('#node-type-name-suffix').empty().append(' Machine name: ' + machine + ' [').append($('' + Drupal.t('Edit') + '').click(function () {
- $('.form-item-type-wrapper').show();
- $('#node-type-name-suffix').hide();
- $('#edit-name').unbind('keyup');
- return false;
- })).append(']');
- }
- else {
- $('#edit-type').val(machine);
- $('#node-type-name-suffix').text('');
- }
- });
- $('#edit-name').keyup();
- }
- }
-};
-
-})(jQuery);
Index: modules/toolbar/toolbar.admin.inc
===================================================================
RCS file: modules/toolbar/toolbar.admin.inc
diff -N modules/toolbar/toolbar.admin.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/toolbar/toolbar.admin.inc 28 Aug 2009 01:56:28 -0000
@@ -0,0 +1,11 @@
+fields(array(
- 'menu_name' => 'admin_shortcuts',
- 'title' => $t('Administration shortcuts'),
- 'description' => $t('The Admininstration shortcuts menu contains commonly used links for administrative tasks.')
- ))
- ->execute();
-
- // Add starter convenience shortcuts.
- menu_rebuild();
- $items = array(
- 'node/add' => 'Add',
- 'admin/content' => 'Find content',
- 'admin' => 'Dashboard',
+ drupal_install_schema('toolbar');
+ include_once DRUPAL_ROOT . '/modules/toolbar';
+ $sid = toolbar_set_save(array('name' => t('Default')));
+ toolbar_shortcut_save(array(
+ 'sid' => $sid,
+ 'weight' => 0,
+ 'path' => 'node/add',
+ 'title' => t('Add'),
+ 'status' => 1,
+ ));
+ toolbar_shortcut_save(array(
+ 'sid' => $sid,
+ 'weight' => 0,
+ 'path' => 'admin/content',
+ 'title' => t('Find Content'),
+ 'status' => 1,
+ ));
+ toolbar_shortcut_save(array(
+ 'sid' => $sid,
+ 'weight' => 0,
+ 'path' => 'admin',
+ 'title' => t('Dashboard'),
+ 'status' => 1,
+ ));
+}
+
+/**
+ * Implement hook_uninstall().
+ */
+function toolbar_uninstall() {
+ drupal_uninstall_schema('toolbar');
+}
+
+/**
+ * Implement hook_schema().
+ */
+function toolbar_schema() {
+ $schema = array();
+
+ $schema['toolbar_sets'] = array(
+ 'description' => 'Stores configuration options for toolbar shortcut sets.',
+ 'fields' => array(
+ 'sid' => array(
+ 'description' => 'The primary identifier for the set.',
+ 'type' => 'serial',
+ 'unsigned' => TRUE,
+ 'not null' => TRUE,
+ ),
+ 'name' => array(
+ 'description' => 'The set name.',
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'not null' => TRUE,
+ ),
+ ),
+ 'primary key' => array('sid'),
+ 'indexes' => array(
+ 'name' => array('name'),
+ ),
);
- $weight = -20;
- foreach ($items as $path => $title) {
- $link = array(
- 'mlid' => 0,
- 'link_title' => $title,
- 'link_path' => $path,
- 'router_path' => $path,
- 'menu_name' => 'admin_shortcuts',
- 'module' => 'menu',
- 'weight' => $weight,
- );
-
- // Check for an existing menu item before attempting to create a new one.
- $menu_link = db_query("SELECT mlid FROM {menu_links} WHERE link_path = :path AND menu_name = :menu_name", array(
- ':path' => $link['link_path'],
- ':menu_name' => $link['menu_name']
- ))
- ->fetchField();
- if (!$menu_link) {
- menu_link_save($link);
- }
-
- // Increment weight so items can be displayed in desired order.
- $weight++;
- }
+
+ $schema['toolbar_set_shortcuts'] = array(
+ 'description' => 'Stores shortcuts in toolbar sets.',
+ 'fields' => array(
+ 'scid' => array(
+ 'description' => 'The primary identifier for the shortcut.',
+ 'type' => 'serial',
+ 'unsigned' => TRUE,
+ 'not null' => TRUE,
+ ),
+ 'sid' => array(
+ 'description' => 'The {toolbar_sets}.sid for this shortcut.',
+ 'type' => 'int',
+ 'unsigned' => TRUE,
+ 'not null' => TRUE,
+ 'default' => 0,
+ ),
+ 'weight' => array(
+ 'description' => 'The weight of the set in the shortcut.',
+ 'type' => 'int',
+ 'unsigned' => FALSE,
+ 'not null' => TRUE,
+ 'default' => 0,
+ ),
+ 'path' => array(
+ 'description' => 'The path of the shortcut.',
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'not null' => TRUE,
+ ),
+ 'title' => array(
+ 'description' => 'The name of the shortcut.',
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'not null' => TRUE,
+ ),
+ 'status' => array(
+ 'description' => 'Boolean indicating whether or not this shortcut is enabled.',
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'default' => 0,
+ ),
+ ),
+ 'primary key' => array('scid'),
+ 'indexes' => array(
+ 'sid' => array('sid'),
+ 'weight' => array('weight'),
+ ),
+ 'foreign keys' => array(
+ 'sid' => array('toolbar_sets' => 'sid'),
+ ),
+ );
+
+ $schema['toolbar_set_users'] = array(
+ 'description' => 'Maps users to toolbar sets.',
+ 'fields' => array(
+ 'uid' => array(
+ 'description' => 'The {user}.uid for this set.',
+ 'type' => 'int',
+ 'unsigned' => TRUE,
+ 'not null' => TRUE,
+ 'default' => 0,
+ ),
+ 'sid' => array(
+ 'description' => 'The {toolbar_sets}.sid for this user.',
+ 'type' => 'int',
+ 'unsigned' => TRUE,
+ 'not null' => TRUE,
+ 'default' => 0,
+ ),
+ ),
+ 'primary key' => array('uid'),
+ 'indexes' => array(
+ 'sid' => array('sid'),
+ ),
+ 'foreign keys' => array(
+ 'sid' => array('toolbar_sets' => 'sid'),
+ 'uid' => array('users' => 'uid'),
+ ),
+ );
+
+ $schema['toolbar_set_roles'] = array(
+ 'description' => 'Maps roles to toolbar sets.',
+ 'fields' => array(
+ 'rid' => array(
+ 'description' => 'The {role}.rid for this set.',
+ 'type' => 'int',
+ 'unsigned' => TRUE,
+ 'not null' => TRUE,
+ 'default' => 0,
+ ),
+ 'sid' => array(
+ 'description' => 'The {toolbar_sets}.sid for this role.',
+ 'type' => 'int',
+ 'unsigned' => TRUE,
+ 'not null' => TRUE,
+ 'default' => 0,
+ ),
+ ),
+ 'primary key' => array('rid'),
+ 'indexes' => array(
+ 'sid' => array('sid'),
+ ),
+ 'foreign keys' => array(
+ 'sid' => array('toolbar_sets' => 'sid'),
+ 'rid' => array('role' => 'rid'),
+ ),
+ );
+
+ return $schema;
}
Index: modules/toolbar/toolbar.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.module,v
retrieving revision 1.6
diff -u -p -r1.6 toolbar.module
--- modules/toolbar/toolbar.module 22 Aug 2009 14:34:22 -0000 1.6
+++ modules/toolbar/toolbar.module 28 Aug 2009 01:56:28 -0000
@@ -7,7 +7,7 @@
*/
/**
- * Implementation of hook_permission().
+ * Implement hook_permission().
*/
function toolbar_permission() {
return array(
@@ -15,6 +15,14 @@ function toolbar_permission() {
'title' => t('Access administration toolbar'),
'description' => t('Access the persistent administration toolbar displayed on all pages.'),
),
+ 'customize toolbar shortcuts' => array(
+ 'title' => t('Customize toolbar shortcuts'),
+ 'description' => t('Customize the shortcuts in the toolbar displayed on all pages.')
+ ),
+ 'choose toolbar shortcut set' => array(
+ 'title' => t('Choose toolbar shortcut set'),
+ 'description' => t('Choose which set of toolbar shortcuts appear in the user\'s toolbar.')
+ ),
);
}
@@ -31,6 +39,66 @@ function toolbar_theme($existing, $type,
}
/**
+ * Implement hook_menu().
+ */
+
+function toolbar_menu() {
+ $items = array();
+
+ $items['admin/settings/shortcuts'] = array(
+ 'title' => 'Shortcuts',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('toolbar_admin_shortcuts'),
+ 'access arguments' => array('customize toolbar shortcuts'),
+ 'type' => MENU_NORMAL_ITEM,
+ 'file' => 'toolbar.admin.inc',
+ );
+
+ $items['admin/settings/shortcuts/add-link'] = array(
+ 'title' => 'Add link',
+ 'page callback' => 'toolbar_admin_shortcut_add_link',
+ 'access arguments' => array('customize toolbar shortcuts'),
+ 'type' => MENU_NORMAL_ITEM,
+ 'file' => 'toolbar.admin.inc',
+ );
+
+ $items['admin/settings/shortcuts/switch-set'] = array(
+ 'title' => 'Switch set',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('toolbar_admin_shortcuts_switch_set'),
+ 'access arguments' => array('customize toolbar shortcuts'),
+ 'type' => MENU_NORMAL_ITEM,
+ 'file' => 'toolbar.admin.inc',
+ );
+
+ $items['admin/settings/shortcuts/shortcut/%toolbar_shortcut'] = array(
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('toolbar_admin_shortcut_edit', 4),
+ 'access arguments' => array('customize toolbar shortcuts'),
+ 'type' => MENU_CALLBACK,
+ 'file' => 'toolbar.admin.inc',
+ );
+
+ $items['admin/settings/shortcuts/shortcut/%toolbar_shortcut/edit'] = array(
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('toolbar_admin_shortcut_edit', 4),
+ 'access arguments' => array('customize toolbar shortcuts'),
+ 'type' => MENU_DEFAULT_LOCAL_TASK,
+ 'file' => 'toolbar.admin.inc',
+ );
+
+ $items['admin/settings/shortcuts/shortcut/%toolbar_shortcut/delete'] = array(
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('toolbar_admin_shortcut_delete', 4),
+ 'access arguments' => array('customize toolbar shortcuts'),
+ 'type' => MENU_LOCAL_TASK,
+ 'file' => 'toolbar.admin.inc',
+ );
+
+ return $items;
+}
+
+/**
* Implement hook_page_alter().
*
* Add admin toolbar to the page_top region automatically.
@@ -53,6 +121,89 @@ function toolbar_preprocess_page(&$vars)
}
/**
+ * Find the set for the current user.
+ *
+ * @todo
+ * Implement this.
+ */
+function toolbar_current_set($account = NULL) {
+ if (!isset($account)) {
+ global $user;
+ $account = $user;
+ }
+ // Magic here.
+ return 1;
+}
+
+/**
+ * Load a toolbar shortcut by ID.
+ */
+function toolbar_shortcut_load($scid) {
+ return db_select('toolbar_set_shortcuts')
+ ->fields('toolbar_set_shortcuts')
+ ->condition('scid', $scid)
+ ->execute()
+ ->fetchAssoc();
+}
+
+/**
+ * Save a toolbar shortcut.
+ */
+function toolbar_shortcut_save($shortcut) {
+ if (isset($shortcut['scid'])) {
+ $scid = $shortcut['scid'];
+ unset($shortcut['scid']);
+ db_update('toolbar_shortcuts')
+ ->fields($shortcut)
+ ->condition('scid', $scid)
+ ->execute;
+ return $scid;
+ }
+ else {
+ return db_insert('toolbar_shortcuts')
+ ->fields($shortcut)
+ ->execute();
+ }
+}
+
+/**
+ * Load a toolbar set by ID.
+ */
+function toolbar_set_load($sid) {
+ $set = db_select('toolbar_sets')
+ ->fields('toolbar_sets')
+ ->condition('sid', $sid)
+ ->execute()
+ ->fetchAssoc();
+ $set['shortcuts'] = db_select('toolbar_set_shortcuts')
+ ->fields('toolbar_set_shortcuts')
+ ->condition('sid', $sid)
+ ->execute()
+ ->fetchAllAssoc('scid');
+ return $set;
+}
+
+/**
+ * Save a toolbar set.
+ */
+function toolbar_set_save($set) {
+ if (isset($set['sid'])) {
+ $sid = $set['sid'];
+ unset($set['sid']);
+ db_update('toolbar_sets')
+ ->fields($set)
+ ->condition('sid', $sid)
+ ->execute;
+ return $sid;
+ }
+ else {
+ return db_insert('toolbar_sets')
+ ->fields($set)
+ ->execute();
+ }
+}
+
+/**
* Build the admin menu as a structured array ready for drupal_render().
*/
function toolbar_build() {
@@ -99,9 +250,14 @@ function toolbar_build() {
$shortcuts = menu_tree_all_data('admin_shortcuts');
$shortcuts = toolbar_menu_navigation_links($shortcuts);
$build['toolbar_shortcuts'] = array(
- '#theme' => 'links',
- '#links' => $shortcuts,
- '#attributes' => array('id' => 'toolbar-shortcuts'),
+ 'shortcuts' => array(
+ '#theme' => 'links',
+ '#links' => $shortcuts,
+ '#attributes' => array('id' => 'toolbar-shortcuts'),
+ ),
+ 'configure' => array(
+ '#markup' => l(t('edit shortcuts'), 'admin/structure/menu-customize/admin_shortcuts', array('attributes' => array('id' => 'toolbar-customize'))),
+ ),
);
return $build;