From: Eric Davis Date: Fri, 30 Jul 2010 19:20:52 +0000 (+0000) Subject: Merged r3898 from trunk X-Git-Tag: 1.0.1~67 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=df120e43cd5872045852e6ec57894173b01a4d28;p=redmine.git Merged r3898 from trunk git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3901 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/issues/_changesets.rhtml b/app/views/issues/_changesets.rhtml index 0b1f10b72..52cd60ff5 100644 --- a/app/views/issues/_changesets.rhtml +++ b/app/views/issues/_changesets.rhtml @@ -3,6 +3,8 @@

<%= link_to("#{l(:label_revision)} #{changeset.revision}", :controller => 'repositories', :action => 'revision', :id => changeset.project, :rev => changeset.revision) %>
<%= authoring(changeset.committed_on, changeset.author) %>

- <%= textilizable(changeset, :comments) %> +
+ <%= textilizable(changeset, :comments) %> +
<% end %> diff --git a/app/views/issues/_history.rhtml b/app/views/issues/_history.rhtml index 7459eb352..a95cbf81c 100644 --- a/app/views/issues/_history.rhtml +++ b/app/views/issues/_history.rhtml @@ -1,7 +1,7 @@ <% reply_links = authorize_for('issues', 'edit') -%> <% for journal in journals %>
-

<%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %>
+

<%= avatar(journal.user, :size => "24") %> <%= content_tag('a', '', :name => "note-#{journal.indice}")%> <%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %>

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index b3dbfd7f2..59a2c3edd 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -903,6 +903,10 @@ td.username img.gravatar { clear: left; } +.journal-link { + float: right; +} + h2 img { vertical-align:middle; } .hascontextmenu { cursor: context-menu; } diff --git a/public/themes/rtl/stylesheets/application.css b/public/themes/rtl/stylesheets/application.css new file mode 100644 index 000000000..74f20b43c --- /dev/null +++ b/public/themes/rtl/stylesheets/application.css @@ -0,0 +1,50 @@ +@import url(../../alternate/stylesheets/application.css); + +body, #wrapper { direction: rtl;} + +#quick-search { float: left; } +#main-menu { margin-left: -500px; left: auto; right: 6px; margin-right: 0px;} +#main-menu li { float: right; } +#top-menu ul { float: right; } +#account { float: left; } +#top-menu #loggedas { float: left; } +#top-menu li { float: right; } +.tabular label.floating +{ + margin-right: 0; + margin-left: auto; + text-align: right; +} +.tabular label +{ + float: right; + margin-left: auto; +} +.tabular p { clear: right; } +.tabular label.block { text-align: right; } + +.icon { background-position: 100% 40%; padding-right: 20px; padding-left: 0px; } +div#activity dt, #search-results dt { background-position: 100% 50%; padding-right: 20px; padding-left: 0px; } +#content .tabs ul li { float: right; } +#content .tabs ul { padding-left: auto; padding-right: 1em; } +table.progress { float: right; } +.contextual { float: left; } +.icon22 { background-position: 100% 40%; padding-right: 26px; padding-left: auto; } +h3, .wiki h2 { padding: 10px 2px 1px 0; } +.tooltip span.tip { text-align: right; } +tr.issue td.subject { text-align: right; } +tr.time-entry td.subject, tr.time-entry td.comments { text-align: right; } +#sidebar { float: left; } +#main.nosidebar #content { border-width: 1px; border-style: solid; border-color: #D7D7D7 #BBBBBB #BBBBBB #D7D7D7;} +.tabular.settings label { margin-left: auto; } +.splitcontentleft { float: right; } +.splitcontentright { float: left; } +p.progress-info { clear: right; } +table.list td.buttons a { padding-right: 20px; } +.filecontent { direction: ltr; } +.entries { direction: ltr; } +.changeset-changes { direction: ltr; padding-left: 2em } +.changesets { direction: ltr; } +div#issue-changesets { float: left; margin-right: 1em; margin-left: 0 } +#activity dt, .journal { clear: right; } +.journal-link { float: left; } diff --git a/public/themes/rtl/stylesheets/context_menu.css b/public/themes/rtl/stylesheets/context_menu.css new file mode 100644 index 000000000..c400d3e84 --- /dev/null +++ b/public/themes/rtl/stylesheets/context_menu.css @@ -0,0 +1,6 @@ +@import url(../../../stylesheets/context_menu.css); + +#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; }