From a44c700e1469e7ffbaf9265b4724f0b941edc62f Mon Sep 17 00:00:00 2001 From: Philipp Tessenow Date: Mon, 21 Oct 2013 17:36:39 +0200 Subject: [PATCH] Rename Redmine::Info to OpenProject::Info --- app/helpers/application_helper.rb | 4 ++-- app/models/work_package/pdf_exporter.rb | 4 ++-- app/views/admin/info.html.erb | 2 +- app/views/common/feed.atom.builder | 2 +- app/views/layouts/base.html.erb | 2 +- lib/redmine.rb | 2 +- lib/redmine/info.rb | 2 +- script/about | 2 +- spec/helpers/application_helper_spec.rb | 4 ++-- test/unit/lib/redmine/menu_manager/mapper_test.rb | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 50ef04814b..9b9e651f52 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1076,8 +1076,8 @@ module ApplicationHelper # def footer_content elements = [] - elements << I18n.t(:text_powered_by, :link => link_to(Redmine::Info.app_name, - Redmine::Info.url)) + elements << I18n.t(:text_powered_by, :link => link_to(OpenProject::Info.app_name, + OpenProject::Info.url)) unless OpenProject::Footer.content.nil? OpenProject::Footer.content.each do |name, value| content = value.respond_to?(:call) ? value.call : value diff --git a/app/models/work_package/pdf_exporter.rb b/app/models/work_package/pdf_exporter.rb index 027d96ded9..11939e7c25 100644 --- a/app/models/work_package/pdf_exporter.rb +++ b/app/models/work_package/pdf_exporter.rb @@ -340,7 +340,7 @@ module WorkPackage::PdfExporter set_language_if_valid lang @font_for_content = 'FreeSans' @font_for_footer = 'FreeSans' - SetCreator(Redmine::Info.app_name) + SetCreator(OpenProject::Info.app_name) SetFont(@font_for_content) end @@ -394,7 +394,7 @@ module WorkPackage::PdfExporter @font_for_content = 'Arial' @font_for_footer = 'Helvetica' - SetCreator(Redmine::Info.app_name) + SetCreator(OpenProject::Info.app_name) SetFont(@font_for_content) end diff --git a/app/views/admin/info.html.erb b/app/views/admin/info.html.erb index 74b35bdc22..c4027a5636 100644 --- a/app/views/admin/info.html.erb +++ b/app/views/admin/info.html.erb @@ -31,7 +31,7 @@ See doc/COPYRIGHT.rdoc for more details. <%= call_hook(:view_admin_info_top) %> <%= content_tag :h3, I18n.t('label_core_version') %> -

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

+

<%= OpenProject::Info.versioned_name %> (<%= @db_adapter_name %>)

<%= content_tag :h3, I18n.t('label_system') %> diff --git a/app/views/common/feed.atom.builder b/app/views/common/feed.atom.builder index e2b1553d44..96038047c6 100644 --- a/app/views/common/feed.atom.builder +++ b/app/views/common/feed.atom.builder @@ -38,7 +38,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do xml.id url_for(:controller => '/welcome', :only_path => false) xml.updated(updated_time.xmlschema) xml.author { xml.name "#{Setting.app_title}" } - xml.generator(:uri => Redmine::Info.url) { xml.text! Redmine::Info.app_name; } + xml.generator(:uri => OpenProject::Info.url) { xml.text! OpenProject::Info.app_name; } @items.each do |item| item_event = (not first_item.nil? and first_item.respond_to?(:data)) ? item.data : item diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb index f318a6cdb8..ec9b9504cd 100644 --- a/app/views/layouts/base.html.erb +++ b/app/views/layouts/base.html.erb @@ -30,7 +30,7 @@ See doc/COPYRIGHT.rdoc for more details. <%= html_title %> - + <%= csrf_meta_tags %> diff --git a/lib/redmine.rb b/lib/redmine.rb index f4bc74707d..dc33945c4d 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -227,7 +227,7 @@ Redmine::MenuManager.map :top_menu do |menu| menu.push :my_page, { :controller => '/my', :action => 'page' }, :if => Proc.new { User.current.logged? } # projects menu will be added by Redmine::MenuManager::TopMenuHelper#render_projects_top_menu_node menu.push :administration, { :controller => '/admin', :action => 'projects' }, :if => Proc.new { User.current.admin? }, :last => true - menu.push :help, Redmine::Info.help_url, :last => true, :caption => "?", :html => { :accesskey => Redmine::AccessKeys.key_for(:help) } + menu.push :help, OpenProject::Info.help_url, :last => true, :caption => "?", :html => { :accesskey => Redmine::AccessKeys.key_for(:help) } end Redmine::MenuManager.map :account_menu do |menu| diff --git a/lib/redmine/info.rb b/lib/redmine/info.rb index f9c241bfe5..3d1622f136 100644 --- a/lib/redmine/info.rb +++ b/lib/redmine/info.rb @@ -27,7 +27,7 @@ # See doc/COPYRIGHT.rdoc for more details. #++ -module Redmine +module OpenProject module Info class << self def app_name; Setting.software_name end diff --git a/script/about b/script/about index cfec3b4066..d72b80e74f 100755 --- a/script/about +++ b/script/about @@ -3,4 +3,4 @@ ENV["RAILS_ENV"] ||= "production" require File.expand_path(File.dirname(__FILE__) + "/../config/environment") puts -puts Redmine::Info.environment +puts OpenProject::Info.environment diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 2e56500a3f..6aa77db494 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -57,7 +57,7 @@ describe ApplicationHelper do OpenProject::Footer.content = nil end - it { footer_content.should == I18n.t(:text_powered_by, :link => link_to(Redmine::Info.app_name, Redmine::Info.url)) } + it { footer_content.should == I18n.t(:text_powered_by, :link => link_to(OpenProject::Info.app_name, OpenProject::Info.url)) } end context "string as additional footer content" do @@ -66,7 +66,7 @@ describe ApplicationHelper do OpenProject::Footer.add_content("openproject","footer") end - it { footer_content.include?(I18n.t(:text_powered_by, :link => link_to(Redmine::Info.app_name, Redmine::Info.url))).should be_true } + it { footer_content.include?(I18n.t(:text_powered_by, :link => link_to(OpenProject::Info.app_name, OpenProject::Info.url))).should be_true } it { footer_content.include?("footer").should be_true } end diff --git a/test/unit/lib/redmine/menu_manager/mapper_test.rb b/test/unit/lib/redmine/menu_manager/mapper_test.rb index 991cc225c6..3466b20dc2 100644 --- a/test/unit/lib/redmine/menu_manager/mapper_test.rb +++ b/test/unit/lib/redmine/menu_manager/mapper_test.rb @@ -178,9 +178,9 @@ class Redmine::MenuManager::MapperTest < ActiveSupport::TestCase test 'deleting all items' do # Exposed by deleting :last items Redmine::MenuManager.map :test_menu do |menu| - menu.push :not_last, Redmine::Info.help_url + menu.push :not_last, OpenProject::Info.help_url menu.push :administration, { :controller => 'projects', :action => 'show'}, {:last => true} - menu.push :help, Redmine::Info.help_url, :last => true + menu.push :help, OpenProject::Info.help_url, :last => true end assert_nothing_raised do