? .bzr
Index: dhtml_menu.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/dhtml_menu/dhtml_menu.admin.inc,v
retrieving revision 1.18
diff -u -p -r1.18 dhtml_menu.admin.inc
--- dhtml_menu.admin.inc	25 Oct 2009 14:36:43 -0000	1.18
+++ dhtml_menu.admin.inc	25 Oct 2009 14:55:27 -0000
@@ -1,6 +1,7 @@
 <?php
 // $Id: dhtml_menu.admin.inc,v 1.18 2009/10/25 14:36:43 arancaytar Exp $
 
+
 /**
  * @file dhtml_menu.admin.inc
  * Functions that are only called on the admin pages.
@@ -17,11 +18,11 @@ function dhtml_menu_settings(&$form_stat
     '#title' => t('Static navigation'),
     '#options' => array(
       'open' => t('<strong>No Collapsing:</strong> Menu items cannot be collapsed dynamically. Instead, clicking on an already expanded item will take you to the page.'),
-      'clone' => t('<strong>Fake child item:</strong> At the top of each submenu, an extra link will be generated that leads to the page of the parent item.'),
-      'bullet' => t('<strong>Link remains static:</strong> All menu links will continue to function as static links. To expand a menu, click the bullet icon next to the link.'),
+      'bullet' => t('<strong>Expand on Bullet:</strong> All links will continue to function as static links. To expand an item, click the bullet icon next to the link.'),
+      'clone' => t('<strong>Cloned Menu Link:</strong> At the top of each menu, an extra link will be generated that leads to the page of the parent item.'),
       'hover' => t('<strong>Expand on Hover:</strong> Items expand when the cursor hovers over them. Links function normally. <em>This is unfamiliar and causes accessibility problems!</em>'),
-      'double-click' => t('<strong>Doubleclick:</strong> To expand a menu, click the link once. To navigate to the page, click it twice. <em>This may be difficult to find for your users!</em>'),
-      'none' => t('<strong>None:</strong> Clicking the link will expand the menu. Navigating to the page is not possible. <em>This will make pages with sub-items very difficult to reach!</em>'),
+      'double-click' => t('<strong>Doubleclick:</strong> To expand an item, click the link once. To navigate to the page, click it twice. <em>This will be difficult to find for your users!</em>'),
+      'none' => t('<strong>None:</strong> Clicking the link will expand the item. Navigating to the page is not possible at all. <em>This will make pages with sub-items very difficult to reach!</em>'),
     ),
     '#default_value' => $settings['nav'],
     '#description' => t('Dynamic expansion of menus competes with the static navigation of content. Choose how to resolve this conflict.'),
@@ -65,9 +66,9 @@ function dhtml_menu_settings(&$form_stat
     '#type' => 'radios',
     '#title' => t('When a menu opens'),
     '#options' => array(
-      'none' => t('Do nothing.'),
+      'none' => t('Keep other menus open.'),
       'close-all' => t('Close all other open menus on the page.'),
-      'close-same-tree' => t('Close other open submenus in the same menu tree.'),
+      'close-same-tree' => t('Close other open menus in the same tree.'),
     ),
     '#default_value' => $settings['effects']['siblings'],
   );
Index: dhtml_menu.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/dhtml_menu/dhtml_menu.css,v
retrieving revision 1.7
diff -u -p -r1.7 dhtml_menu.css
--- dhtml_menu.css	25 Oct 2009 07:07:30 -0000	1.7
+++ dhtml_menu.css	25 Oct 2009 14:55:27 -0000
@@ -42,13 +42,6 @@ a.dhtml-menu-icon {
 }
 
 /*
- * Invisible link shouldn't be underlined.
- */
-a.dhtml-menu-icon:hover {
-  text-decoration: none !important;
-}
-
-/*
  * Provide large and visible folder icons for easy clicking.
  */
 li.dhtml-folder.expanded {
Index: dhtml_menu.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/dhtml_menu/dhtml_menu.info,v
retrieving revision 1.8
diff -u -p -r1.8 dhtml_menu.info
--- dhtml_menu.info	3 Jun 2009 14:07:50 -0000	1.8
+++ dhtml_menu.info	25 Oct 2009 14:55:27 -0000
@@ -1,10 +1,9 @@
 ; $Id: dhtml_menu.info,v 1.8 2009/06/03 14:07:50 arancaytar Exp $
 name = DHTML Menu
-description = Opens menus dynamically to reduce page refreshes.
+description = Opens menus dynamically to reduce page reloads.
 core = 7.x
 
 files[] = dhtml_menu.module
 files[] = dhtml_menu.install
 files[] = dhtml_menu.admin.inc
-files[] = dhtml_menu.rebuild.inc
 files[] = dhtml_menu.theme.inc
Index: dhtml_menu.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/dhtml_menu/dhtml_menu.install,v
retrieving revision 1.14
diff -u -p -r1.14 dhtml_menu.install
--- dhtml_menu.install	25 Oct 2009 14:46:17 -0000	1.14
+++ dhtml_menu.install	25 Oct 2009 14:55:27 -0000
@@ -39,6 +39,7 @@ function dhtml_menu_enable() {
   // Register our theme interceptors.
   // This does not happen on its own because we have no hook_theme().
   drupal_theme_rebuild();
+  drupal_set_message(t('<em>DHTML Menu</em> offers a wide range of customization options. If you wish to change them, please visit the <a href="@url">configuration page</a>.', array('@url' => url('admin/settings/dhtml_menu'))), 'warning');
 }
 
 /**
Index: dhtml_menu.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/dhtml_menu/dhtml_menu.module,v
retrieving revision 1.46
diff -u -p -r1.46 dhtml_menu.module
--- dhtml_menu.module	25 Oct 2009 14:42:44 -0000	1.46
+++ dhtml_menu.module	25 Oct 2009 14:55:27 -0000
@@ -15,7 +15,9 @@ require_once 'dhtml_menu.theme.inc';
 function dhtml_menu_help($path) {
   switch ($path) {
     case 'admin/settings/dhtml_menu':
-      return t('<em>DHTML Menu</em> adds dynamic functionality to the menus of your site. Ordinarily, reaching the child elements below an item requires you to visit its page. With DHTML Menu, clicking on an item with child elements will expand it without leaving the page, saving time. You can reach the actual page of such an item either by double-clicking on it or visiting the small extra link that will be shown right below it when expanded.');
+      $text = '<p>' . t('DHTML Menu adds dynamic functionality to the menus of your site. Ordinarily, reaching the child elements below an item requires you to visit its page. With this module enabled, clicking on an item with child elements will expand it without leaving the page, saving you the time of waiting for the page to load.') . '</p>';
+      $text .= '<p>' . t('<strong>Note:</strong> Links that gain a dynamic Javascript effect naturally stop working as normal links. Since you will occasionally need to visit a page that has sub-items (like the <a href="@url">main administration page</a>), this module provides several different options for static and dynamic navigation to coexist.', array('@url' => url('admin'))) . '</p>';
+      return $text;
   }
 }
 
@@ -36,7 +38,7 @@ function dhtml_menu_init() {
 function dhtml_menu_menu() {
   $menu['admin/settings/dhtml_menu'] = array(
     'title' => 'DHTML Menu',
-    'description' => 'Configure the effects of DHTML Menu',
+    'description' => 'Configure the behavior of DHTML Menu.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('dhtml_menu_settings'),
     'access arguments' => array('administer site configuration'),
Index: translations/dhtml_menu.pot
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/dhtml_menu/translations/dhtml_menu.pot,v
retrieving revision 1.5
diff -u -p -r1.5 dhtml_menu.pot
--- translations/dhtml_menu.pot	5 Nov 2008 17:50:55 -0000	1.5
+++ translations/dhtml_menu.pot	25 Oct 2009 14:55:27 -0000
@@ -1,18 +1,18 @@
-# $Id: dhtml_menu.pot,v 1.5 2008/11/05 17:50:55 arancaytar Exp $
+# $Id$
 #
-# LANGUAGE translation of Drupal (dhtml_menu)
+# LANGUAGE translation of Drupal (general)
 # Copyright YEAR NAME <EMAIL@ADDRESS>
 # Generated from files:
-#  dhtml_menu.admin.inc,v 1.6 2008/11/05 12:14:43 arancaytar
-#  dhtml_menu.rebuild.inc: n/a
-#  dhtml_menu.module,v 1.31 2008/11/05 12:14:43 arancaytar
-#  dhtml_menu.info,v 1.6 2008/07/11 22:15:58 arancaytar
+#  dhtml_menu.admin.inc,v 1.18 2009/10/25 14:36:43 arancaytar
+#  dhtml_menu.module,v 1.46 2009/10/25 14:42:44 arancaytar
+#  dhtml_menu.info,v 1.8 2009/06/03 14:07:50 arancaytar
+#  dhtml_menu.install,v 1.14 2009/10/25 14:46:17 arancaytar
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2008-11-05 07:47-0800\n"
+"Project-Id-Version: DHTML Menu 7.x-1.x\n"
+"POT-Creation-Date: 2009-10-25 15:47+0100\n"
 "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
@@ -21,107 +21,167 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: dhtml_menu.admin.inc:15
+#: dhtml_menu.admin.inc:18
 msgid "Static navigation"
 msgstr ""
 
-#: dhtml_menu.admin.inc:17
-msgid "<strong>Fake child item:</strong> At the top of each submenu, an extra link will be generated that leads to the page of the parent item."
+#: dhtml_menu.admin.inc:20
+msgid "<strong>No Collapsing:</strong> Menu items cannot be collapsed dynamically. Instead, clicking on an already expanded item will take you to the page."
 msgstr ""
 
-#: dhtml_menu.admin.inc:18
-msgid "<strong>Link remains static:</strong> All menu links will continue to function as static links. To expand a menu, click the bullet icon next to the link."
+#: dhtml_menu.admin.inc:21
+msgid "<strong>Expand on Bullet:</strong> All links will continue to function as static links. To expand an item, click the bullet icon next to the link."
 msgstr ""
 
-#: dhtml_menu.admin.inc:19
-msgid "<strong>Doubleclick:</strong> To expand a menu, click the link once. To navigate to the page, click it twice. <em>This may be difficult to find for your users!</em>"
+#: dhtml_menu.admin.inc:22
+msgid "<strong>Cloned Menu Link:</strong> At the top of each menu, an extra link will be generated that leads to the page of the parent item."
 msgstr ""
 
-#: dhtml_menu.admin.inc:20
-msgid "<strong>None:</strong> Clicking the link will expand the menu. Navigating to the page is not possible. <em>This will make pages with sub-items very difficult to reach!</em>"
+#: dhtml_menu.admin.inc:23
+msgid "<strong>Expand on Hover:</strong> Items expand when the cursor hovers over them. Links function normally. <em>This is unfamiliar and causes accessibility problems!</em>"
 msgstr ""
 
-#: dhtml_menu.admin.inc:23
-msgid "Dynamic expansion of menus competes with the static navigation of content. Choose how to resolve this conflict."
+#: dhtml_menu.admin.inc:24
+msgid "<strong>Doubleclick:</strong> To expand an item, click the link once. To navigate to the page, click it twice. <em>This will be difficult to find for your users!</em>"
+msgstr ""
+
+#: dhtml_menu.admin.inc:25
+msgid "<strong>None:</strong> Clicking the link will expand the item. Navigating to the page is not possible at all. <em>This will make pages with sub-items very difficult to reach!</em>"
 msgstr ""
 
 #: dhtml_menu.admin.inc:28
+msgid "Dynamic expansion of menus competes with the static navigation of content. Choose how to resolve this conflict."
+msgstr ""
+
+#: dhtml_menu.admin.inc:33
 msgid "Animation"
 msgstr ""
 
-#: dhtml_menu.admin.inc:35
+#: dhtml_menu.admin.inc:40
 msgid "Effects"
 msgstr ""
 
-#: dhtml_menu.admin.inc:37
+#: dhtml_menu.admin.inc:42
 msgid "Slide in vertically"
 msgstr ""
 
-#: dhtml_menu.admin.inc:38
+#: dhtml_menu.admin.inc:43
 msgid "Slide in horizontally"
 msgstr ""
 
-#: dhtml_menu.admin.inc:39
+#: dhtml_menu.admin.inc:44
 msgid "Fade in"
 msgstr ""
 
-#: dhtml_menu.admin.inc:41
+#: dhtml_menu.admin.inc:46
 msgid "You may pick any number of animation effects that will accompany the opening and closing of a menu."
 msgstr ""
 
-#: dhtml_menu.admin.inc:47
+#: dhtml_menu.admin.inc:52
 msgid "Speed"
 msgstr ""
 
-#: dhtml_menu.admin.inc:50
+#: dhtml_menu.admin.inc:55
 msgid "Choose how quickly the menus should expand and collapse."
 msgstr ""
 
-#: dhtml_menu.admin.inc:55
+#: dhtml_menu.admin.inc:60
 msgid "Other effects"
 msgstr ""
 
-#: dhtml_menu.admin.inc:62
+#: dhtml_menu.admin.inc:67
 msgid "When a menu opens"
 msgstr ""
 
-#: dhtml_menu.admin.inc:64
-msgid "Do nothing."
+#: dhtml_menu.admin.inc:69
+msgid "Keep other menus open."
 msgstr ""
 
-#: dhtml_menu.admin.inc:65
+#: dhtml_menu.admin.inc:70
 msgid "Close all other open menus on the page."
 msgstr ""
 
-#: dhtml_menu.admin.inc:66
-msgid "Close other open submenus in the same menu tree."
+#: dhtml_menu.admin.inc:71
+msgid "Close other open menus in the same tree."
 msgstr ""
 
-#: dhtml_menu.admin.inc:73
+#: dhtml_menu.admin.inc:78
 msgid "When a menu closes"
 msgstr ""
 
-#: dhtml_menu.admin.inc:75
+#: dhtml_menu.admin.inc:80
 msgid "Remember which sub-items were expanded when it next opens."
 msgstr ""
 
-#: dhtml_menu.admin.inc:76
+#: dhtml_menu.admin.inc:81
 msgid "Close all its sub-items, too."
 msgstr ""
 
-#: dhtml_menu.rebuild.inc:40
-msgid "<em>DHTML Menu</em> adds dynamic functionality to the menus of your site. Ordinarily, reaching the child elements below an item requires you to visit its page. With DHTML Menu, clicking on an item with child elements will expand it without leaving the page, saving time. You can reach the actual page of such an item either by double-clicking on it or visiting the small extra link that will be shown right below it when expanded."
+#: dhtml_menu.admin.inc:88
+msgid "When a new page is loaded"
 msgstr ""
 
-#: dhtml_menu.module:0
-msgid "dhtml_menu"
+#: dhtml_menu.admin.inc:90
+msgid "Remember which items were expanded on the last page."
 msgstr ""
 
-#: dhtml_menu.info:0
+#: dhtml_menu.admin.inc:91
+msgid "Expand only the currently active path."
+msgstr ""
+
+#: dhtml_menu.admin.inc:98
+msgid "Disabling DHTML"
+msgstr ""
+
+#: dhtml_menu.admin.inc:105
+msgid "Filter type"
+msgstr ""
+
+#: dhtml_menu.admin.inc:107
+msgid "Disable DHTML on the menus checked below."
+msgstr ""
+
+#: dhtml_menu.admin.inc:108
+msgid "Enable DHTML on the menus checked below."
+msgstr ""
+
+#: dhtml_menu.admin.inc:115
+msgid "List"
+msgstr ""
+
+#: dhtml_menu.admin.inc:118
+msgid "DHTML will be used for all menus by default, but can be switched off for specific menus."
+msgstr ""
+
+#: dhtml_menu.admin.inc:145
+msgid "Book: %title"
+msgstr ""
+
+#: dhtml_menu.admin.inc:154
+msgid "Other menu: %menu"
+msgstr ""
+
+#: dhtml_menu.module:18
+msgid "DHTML Menu adds dynamic functionality to the menus of your site. Ordinarily, reaching the child elements below an item requires you to visit its page. With this module enabled, clicking on an item with child elements will expand it without leaving the page, saving you the time of waiting for the page to load."
+msgstr ""
+
+#: dhtml_menu.module:19
+msgid "<strong>Note:</strong> Links that gain a dynamic Javascript effect naturally stop working as normal links. Since you will occasionally need to visit a page that has sub-items (like the <a href=\"@url\">main administration page</a>), this module provides several different options for static and dynamic navigation to coexist."
+msgstr ""
+
+#: dhtml_menu.module:40 dhtml_menu.info:0
 msgid "DHTML Menu"
 msgstr ""
 
+#: dhtml_menu.module:41
+msgid "Configure the behavior of DHTML Menu."
+msgstr ""
+
+#: dhtml_menu.install:42
+msgid "<em>DHTML Menu</em> offers a wide range of customization options. If you wish to change them, please visit the <a href=\"@url\">configuration page</a>."
+msgstr ""
+
 #: dhtml_menu.info:0
-msgid "Opens menus dynamically to reduce page refreshes."
+msgid "Opens menus dynamically to reduce page reloads."
 msgstr ""
 
