diff --git a/README.txt b/README.txt index 4c6c80d0..6793a196 100644 --- a/README.txt +++ b/README.txt @@ -34,4 +34,5 @@ jQuery Superfish: http://users.tpg.com.au/j_birch/plugins/superfish/ ---------------------- - new CHANGELOG to keep track of changes - #156256 upgrade to SuperFish 1.3.2 -- upgrade to bgIframe 2.1.1 (for IE6 compatibility with forms) \ No newline at end of file +- upgrade to bgIframe 2.1.1 (for IE6 compatibility with forms) +- remove RTL option; this conflicts with other changes and is properly implemented in Drupal 6 \ No newline at end of file diff --git a/simplemenu.module b/simplemenu.module index ec476757..7300b117 100644 --- a/simplemenu.module +++ b/simplemenu.module @@ -36,11 +36,7 @@ function simplemenu_footer() { global $theme, $custom_theme; $path = drupal_get_path('module', 'simplemenu'); drupal_add_css($path .'/simplemenu.css'); - - if (variable_get('simplemenu_rtl', 0)) { - drupal_add_css($path .'/simplemenu_rtl.css'); - } - + $settings = array( // pass in base path to the JS file // url() handles appending ?q= but in this case, we need to pass in the variable so the menus work when mod_rewrite is off @@ -112,14 +108,7 @@ function simplemenu_admin_settings() { '#default_value' => variable_get('simplemenu_exclusions', array()), '#description' => t('Select which themes to not display the menu. Use this when you have a theme that displays its own admin navigation.'), ); - - $form['default_menu']['advanced']['simplemenu_rtl'] = array( - '#type' => 'checkbox', - '#title' => t('Set menu orientation to RTL'), - '#default_value' => variable_get('simplemenu_rtl', 0), - '#description' => t('Set the orientation of the menu to RTL for Eastern languages.') - ); - + return system_settings_form($form); } diff --git a/simplemenu_rtl.css b/simplemenu_rtl.css deleted file mode 100644 index 9f2e657e..00000000 --- a/simplemenu_rtl.css +++ /dev/null @@ -1,30 +0,0 @@ -/* $Id$ */ - -#simplemenu li -{ - float:right; - border-right:1px solid #eee; - border-left:1px solid #999; -} - -#simplemenu a -{ - padding:.3em .6em .3em 2em; -} - -#simplemenu li.expanded > a -{ - background:url(left-green.gif) no-repeat 3%; - padding-left:2em; -} - -#simplemenu li.root > a -{ - font-weight:700; - background:url(down-green.gif) no-repeat 3%; -} - -#simplemenu li li:hover ul,#simplemenu li li.sfhover ul -{ - left:-14.2em; -} \ No newline at end of file