diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-08-22 19:49:31 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-08-22 19:49:31 +0000 |
| commit | c8c4fb130c8c0e786e4f0ce5160bbfa90ab4a9ef (patch) | |
| tree | 3c9fc9c7b547b52271a65e693529303da768d0ab | |
| parent | 0d7cead4790555d8e0f792fc36ca6173865d100a (diff) | |
| download | redmine-c8c4fb130c8c0e786e4f0ce5160bbfa90ab4a9ef.tar.gz redmine-c8c4fb130c8c0e786e4f0ce5160bbfa90ab4a9ef.zip | |
Merged r4014 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4026 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/application_helper.rb | 5 | ||||
| -rw-r--r-- | app/views/issues/show.rhtml | 1 | ||||
| -rw-r--r-- | public/stylesheets/context_menu_rtl.css | 9 | ||||
| -rw-r--r-- | public/stylesheets/rtl.css | 4 |
4 files changed, 15 insertions, 4 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2c334b7f0..19dd654db 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -737,6 +737,11 @@ module ApplicationHelper javascript_include_tag('context_menu') + stylesheet_link_tag('context_menu') end + if l(:direction) == 'rtl' + content_for :header_tags do + stylesheet_link_tag('context_menu_rtl') + end + end @context_menu_included = true end javascript_tag "new ContextMenu('#{ url_for(url) }')" diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml index 83652b3e0..b3493cf7c 100644 --- a/app/views/issues/show.rhtml +++ b/app/views/issues/show.rhtml @@ -128,6 +128,7 @@ <%= stylesheet_link_tag 'scm' %> <%= javascript_include_tag 'context_menu' %> <%= stylesheet_link_tag 'context_menu' %> + <%= stylesheet_link_tag 'context_menu_rtl' if l(:direction) == 'rtl' %> <% end %> <div id="context-menu" style="display: none;"></div> <%= javascript_tag "new ContextMenu('#{issues_context_menu_path}')" %> diff --git a/public/stylesheets/context_menu_rtl.css b/public/stylesheets/context_menu_rtl.css new file mode 100644 index 000000000..205bb9184 --- /dev/null +++ b/public/stylesheets/context_menu_rtl.css @@ -0,0 +1,9 @@ +#context-menu li.folder ul { left:auto; right:168px; } +#context-menu li.folder>ul { left:auto; right:148px; } +#context-menu li a.submenu { background:url("../images/bullet_arrow_left.png") left no-repeat; } + +#context-menu a { + background-position: 100% 40%; + padding-right: 20px; + padding-left: 0px; +} diff --git a/public/stylesheets/rtl.css b/public/stylesheets/rtl.css index 913667381..5dfe320bc 100644 --- a/public/stylesheets/rtl.css +++ b/public/stylesheets/rtl.css @@ -60,7 +60,3 @@ div#issue-changesets { float: left; margin-right: 1em; margin-left: 0 } .journal-link { float: left; } div.wiki pre { direction: ltr; } -#context-menu li.folder ul { left:auto; right:168px; } -#context-menu li.folder>ul { left:auto; right:148px; } - -#context-menu li a.submenu { background:url("../images/bullet_arrow_left.png") left no-repeat; } |