diff --git a/app/views/admin/info.rhtml b/app/views/admin/info.rhtml index dd11aeb..a4b4496 100644 --- a/app/views/admin/info.rhtml +++ b/app/views/admin/info.rhtml @@ -1,6 +1,6 @@

<%=l(:label_information_plural)%>

-

<%=l(:field_version)%>: redMine <%= Redmine::VERSION %> (<%= @db_adapter_name %>)

+

<%=l(:field_version)%>: <%= Redmine::Info.versioned_name %> (<%= @db_adapter_name %>)

diff --git a/app/views/common/feed.atom.rxml b/app/views/common/feed.atom.rxml index fa00d75..b5f7334 100644 --- a/app/views/common/feed.atom.rxml +++ b/app/views/common/feed.atom.rxml @@ -6,7 +6,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do xml.id url_for(:controller => 'welcome', :only_path => false) xml.updated((@items.first ? @items.first.event_datetime : Time.now).xmlschema) xml.author { xml.name "#{Setting.app_title}" } - xml.generator(:uri => Redmine::Info.url, :version => Redmine::VERSION) { xml.text! "#{Redmine::Info.name} #{Redmine::VERSION}" } + xml.generator(:uri => Redmine::Info.url, :version => Redmine::VERSION) { xml.text! Redmine::Info.versioned_name; } @items.each do |item| xml.entry do xml.title truncate(item.event_title, 100) diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml index 9c81a31..1beb51c 100644 --- a/app/views/layouts/base.rhtml +++ b/app/views/layouts/base.rhtml @@ -3,7 +3,7 @@ <%= Setting.app_title + (@html_title ? ": #{@html_title}" : "") %> - +
File repository writable<%= image_tag (@flags[:file_repository_writable] ? 'true.png' : 'false.png'), :style => "vertical-align:bottom;" %>