diff --git a/app/assets/javascripts/web_footer_company.js.coffee b/app/assets/javascripts/web_footer_company.js.coffee new file mode 100644 index 000000000..761567942 --- /dev/null +++ b/app/assets/javascripts/web_footer_company.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/stylesheets/web_footer_company.css.scss b/app/assets/stylesheets/web_footer_company.css.scss new file mode 100644 index 000000000..e68badbc2 --- /dev/null +++ b/app/assets/stylesheets/web_footer_company.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the WebFooterCompany controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/web_footer_companies_controller.rb b/app/controllers/web_footer_companies_controller.rb new file mode 100644 index 000000000..499e6288d --- /dev/null +++ b/app/controllers/web_footer_companies_controller.rb @@ -0,0 +1,50 @@ +class WebFooterCompaniesController < ApplicationController + layout 'admin' + menu_item :projects, :only => :projects + menu_item :plugins, :only => :plugins + menu_item :info, :only => :info + before_filter :require_admin + + def index + @companys = WebFooterCompany.all + end + + def new + @company = WebFooterCompany.new + end + + def create + @company = WebFooterCompany.new(params[:web_footer_company]) + if @company.save + flash[:notice] = l(:notice_successful_create) + redirect_to web_footer_companies_path + else + flash[:error] = "#{l :web_footer_company_create_fail}: #{@company.errors.full_messages[0]}" + new + render :action => 'new' + end + end + + def destroy + @company = WebFooterCompany.find(params[:id]) + @company.destroy + redirect_to web_footer_companies_path + end + + def edit + @company = WebFooterCompany.find(params[:id]) + end + + def update + @company = WebFooterCompany.find(params[:id]) + if @company.update_attributes(params[:web_footer_company]) + flash[:notice] = l(:notice_successful_update) + redirect_to web_footer_companies_path + else + flash[:error] = "#{l :web_footer_company_update_fail}: #{@company.errors.full_messages[0]}" + edit + render :action => 'edit' + end + end + +end diff --git a/app/helpers/web_footer_companies_helper.rb b/app/helpers/web_footer_companies_helper.rb new file mode 100644 index 000000000..ac4b7da09 --- /dev/null +++ b/app/helpers/web_footer_companies_helper.rb @@ -0,0 +1,2 @@ +module WebFooterCompaniesHelper +end diff --git a/app/models/web_footer_company.rb b/app/models/web_footer_company.rb new file mode 100644 index 000000000..0e5f37976 --- /dev/null +++ b/app/models/web_footer_company.rb @@ -0,0 +1,6 @@ +class WebFooterCompany < ActiveRecord::Base + attr_accessible :logo_size, :name, :url + validates_presence_of :name,:url + validates_length_of :name,:url, :maximum => 255 + validates_format_of :url,:with => /(http|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:\/~\+#]*[\w\-\@?^=%&\/~\+#])?/,:message => l(:is_not_url_error) +end diff --git a/app/models/web_footer_oranizer.rb b/app/models/web_footer_oranizer.rb new file mode 100644 index 000000000..f47d4131f --- /dev/null +++ b/app/models/web_footer_oranizer.rb @@ -0,0 +1,3 @@ +class WebFooterOranizer < ActiveRecord::Base + attr_accessible :description, :name +end diff --git a/app/views/files/_project_file.html.erb b/app/views/files/_project_file.html.erb index 84a86d209..532cf0e6c 100644 --- a/app/views/files/_project_file.html.erb +++ b/app/views/files/_project_file.html.erb @@ -72,4 +72,4 @@ <%= render :partial => 'show_all_attachment' %> -<% html_title(l(:label_attachment_plural)) -%> \ No newline at end of file +<% html_title(l(:project_module_files)) -%> \ No newline at end of file diff --git a/app/views/projects/_member_list.html.erb b/app/views/projects/_member_list.html.erb index 670519bc0..09173b835 100644 --- a/app/views/projects/_member_list.html.erb +++ b/app/views/projects/_member_list.html.erb @@ -37,4 +37,5 @@

<%= l(:label_no_data) %>

-<% end %> \ No newline at end of file +<% end %> +<% html_title(l(:label_member)) -%> \ No newline at end of file diff --git a/app/views/projects/feedback.html.erb b/app/views/projects/feedback.html.erb index f9182c544..85bd27c78 100644 --- a/app/views/projects/feedback.html.erb +++ b/app/views/projects/feedback.html.erb @@ -110,4 +110,5 @@ function checkMaxLength() { <%= pagination_links_full @feedback_pages %> - \ No newline at end of file + +<% html_title(l(:label_project_tool_response)) -%> \ No newline at end of file diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb index 184a67e3d..f08d8618f 100644 --- a/app/views/projects/new.html.erb +++ b/app/views/projects/new.html.erb @@ -13,3 +13,5 @@ <%#= submit_tag l(:button_create_and_continue), :name => 'continue' %> <%= javascript_tag "$('#project_name').focus();" %> <% end %> + +<% html_title(l(:label_project_new)) -%> \ No newline at end of file diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index a08577c80..7a06c57cd 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -100,5 +100,5 @@ <%= pagination_links_full @events_pages %> - +<% html_title(l(:label_overview)) -%> diff --git a/app/views/projects/watcherlist.html.erb b/app/views/projects/watcherlist.html.erb index 790eae70c..6a44a4d86 100644 --- a/app/views/projects/watcherlist.html.erb +++ b/app/views/projects/watcherlist.html.erb @@ -30,4 +30,5 @@ <% end %> - \ No newline at end of file + +<% html_title(l(:label_followers)) -%> \ No newline at end of file diff --git a/db/migrate/20141013014908_create_web_footer_oranizers.rb b/db/migrate/20141013014908_create_web_footer_oranizers.rb new file mode 100644 index 000000000..13a84ef82 --- /dev/null +++ b/db/migrate/20141013014908_create_web_footer_oranizers.rb @@ -0,0 +1,10 @@ +class CreateWebFooterOranizers < ActiveRecord::Migration + def change + create_table :web_footer_oranizers do |t| + t.string :name + t.text :description + + t.timestamps + end + end +end diff --git a/db/migrate/20141013023400_create_web_footer_companies.rb b/db/migrate/20141013023400_create_web_footer_companies.rb new file mode 100644 index 000000000..9310e5920 --- /dev/null +++ b/db/migrate/20141013023400_create_web_footer_companies.rb @@ -0,0 +1,11 @@ +class CreateWebFooterCompanies < ActiveRecord::Migration + def change + create_table :web_footer_companies do |t| + t.string :name + t.string :logo_size + t.string :url + + t.timestamps + end + end +end diff --git a/plugins/redmine_code_review/app/views/code_review/index.html.erb b/plugins/redmine_code_review/app/views/code_review/index.html.erb index e342d9b3e..8282a7d1c 100644 --- a/plugins/redmine_code_review/app/views/code_review/index.html.erb +++ b/plugins/redmine_code_review/app/views/code_review/index.html.erb @@ -108,3 +108,4 @@ function change_option(flag) { <%= stylesheet_link_tag "code_review.css", :plugin => "redmine_code_review", :media => "screen" %> <% end %> +<% html_title(l(:code_reviews)) -%> \ No newline at end of file diff --git a/test/fixtures/web_footer_companies.yml b/test/fixtures/web_footer_companies.yml new file mode 100644 index 000000000..64ef47d9e --- /dev/null +++ b/test/fixtures/web_footer_companies.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html + +one: + name: MyString + logo_size: MyString + url: MyString + +two: + name: MyString + logo_size: MyString + url: MyString diff --git a/test/fixtures/web_footer_oranizers.yml b/test/fixtures/web_footer_oranizers.yml new file mode 100644 index 000000000..53b2c6af5 --- /dev/null +++ b/test/fixtures/web_footer_oranizers.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html + +one: + name: MyString + description: MyText + +two: + name: MyString + description: MyText diff --git a/test/functional/web_footer_companies_controller_test.rb b/test/functional/web_footer_companies_controller_test.rb new file mode 100644 index 000000000..d225b6110 --- /dev/null +++ b/test/functional/web_footer_companies_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class WebFooterCompaniesControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/unit/helpers/web_footer_companies_helper_test.rb b/test/unit/helpers/web_footer_companies_helper_test.rb new file mode 100644 index 000000000..aea13fc78 --- /dev/null +++ b/test/unit/helpers/web_footer_companies_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class WebFooterCompaniesHelperTest < ActionView::TestCase +end diff --git a/test/unit/web_footer_company_test.rb b/test/unit/web_footer_company_test.rb new file mode 100644 index 000000000..7b97d1107 --- /dev/null +++ b/test/unit/web_footer_company_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class WebFooterCompanyTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/unit/web_footer_oranizer_test.rb b/test/unit/web_footer_oranizer_test.rb new file mode 100644 index 000000000..dabe0f562 --- /dev/null +++ b/test/unit/web_footer_oranizer_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class WebFooterOranizerTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end