diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index a050eb7f2..d9b28c08a 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -225,7 +225,8 @@ class BidsController < ApplicationController
respond_to do |format|
layout_file = ''
case @bid.reward_type
- when 3
+ when 3
+ html_title(l(:label_question_student))
layout_file = 'base_homework'
when 1
layout_file = 'base_bids'
@@ -523,6 +524,7 @@ class BidsController < ApplicationController
respond_to do |format|
if @bid.reward_type == 3
format.html {
+ html_title(l(:label_homework_info))
render :layout => 'base_homework'
}
elsif @bid.reward_type == 1
diff --git a/app/views/contests/new_contest.html.erb b/app/views/contests/new_contest.html.erb
index 019c8c1db..9aa70d370 100644
--- a/app/views/contests/new_contest.html.erb
+++ b/app/views/contests/new_contest.html.erb
@@ -9,4 +9,5 @@
<%= submit_tag l(:button_create) %>
<%= javascript_tag "$('#bid_name').focus();" %>
<% end %>
-
\ No newline at end of file
+
+<% html_title(l(:label_newtype_contest)) -%>
\ No newline at end of file
diff --git a/app/views/contests/show_attendingcontest.html.erb b/app/views/contests/show_attendingcontest.html.erb
index 9d5b08ea9..053630a8e 100644
--- a/app/views/contests/show_attendingcontest.html.erb
+++ b/app/views/contests/show_attendingcontest.html.erb
@@ -312,4 +312,4 @@
-
+<% html_title(l(:label_contest_joincontest)) -%>
diff --git a/app/views/contests/show_contest.html.erb b/app/views/contests/show_contest.html.erb
index cc1210751..3654fa6a1 100644
--- a/app/views/contests/show_contest.html.erb
+++ b/app/views/contests/show_contest.html.erb
@@ -44,4 +44,4 @@
<%= pagination_links_full @feedback_pages %>
-
+<% html_title(l(:label_user_response)) -%>
diff --git a/app/views/courses/feedback.html.erb b/app/views/courses/feedback.html.erb
index a5d7326e0..574061034 100644
--- a/app/views/courses/feedback.html.erb
+++ b/app/views/courses/feedback.html.erb
@@ -102,4 +102,5 @@ function checkMaxLength() {
<%= pagination_links_full @feedback_pages %>
-
\ No newline at end of file
+
+<% html_title(l(:label_course_feedback)) -%>
\ No newline at end of file
diff --git a/app/views/courses/homework.html.erb b/app/views/courses/homework.html.erb
index acbbaeb4b..52d97cfbf 100644
--- a/app/views/courses/homework.html.erb
+++ b/app/views/courses/homework.html.erb
@@ -57,3 +57,4 @@ function showSubH(/* ... */){
}
+<% html_title(l(:label_homework)) -%>
\ No newline at end of file
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index a6575784d..6ea67c7cd 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -119,6 +119,6 @@
<%= pagination_links_full @events_pages %>
-
+<% html_title(l(:label_course_overview)) -%>
diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb
index 55a36e125..cb0084b25 100644
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@@ -69,5 +69,4 @@
<%= render :partial => 'course_show_all_attachment' %>
-
-<% html_title(l(:label_attachment_plural)) -%>
\ No newline at end of file
+<% html_title(l(:label_course_file)) -%>
\ No newline at end of file
diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb
index 87893e5c4..01813bf52 100644
--- a/app/views/layouts/base_homework.html.erb
+++ b/app/views/layouts/base_homework.html.erb
@@ -8,7 +8,7 @@
- <%=h l(:label_active_homework) << " - Trustie" %>
+ <%=h html_title %>
<%= csrf_meta_tag %>
<%= favicon %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index bc485325c..3d2b7b0f0 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -480,3 +480,4 @@
});
});
+<% html_title(l(:label_activity)) -%>
\ No newline at end of file
diff --git a/app/views/users/user_courses.html.erb b/app/views/users/user_courses.html.erb
index 6a4d7afdd..16f6414d9 100644
--- a/app/views/users/user_courses.html.erb
+++ b/app/views/users/user_courses.html.erb
@@ -30,4 +30,5 @@ $(document).ready(function() {
})
});
});
-
\ No newline at end of file
+
+<% html_title(l(:label_user_course)) -%>
\ No newline at end of file
diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb
index d6337e1d0..6086c0242 100644
--- a/app/views/users/user_newfeedback.html.erb
+++ b/app/views/users/user_newfeedback.html.erb
@@ -15,4 +15,4 @@
-
\ No newline at end of file
+<% html_title(l(:label_responses)) -%>
\ No newline at end of file
diff --git a/app/views/users/user_projects.html.erb b/app/views/users/user_projects.html.erb
index b312ed0d4..1129af514 100644
--- a/app/views/users/user_projects.html.erb
+++ b/app/views/users/user_projects.html.erb
@@ -63,3 +63,4 @@
$('[mode=watched]').click(function(event) {window.location.href='<%=watch_projects_user_url(type: 1)%>'; });
});
+<% html_title(l(:label_user_project)) -%>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index dedf15dfe..04b3cd1fc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -580,7 +580,7 @@ RedmineApp::Application.routes.draw do
match 'permissions', :via => [:get, :post]
end
end
- resources :web_footer_companies, :only => [:index, :new, :edit, :create,:update,:destroy]
+ resources :web_footer_companies, :except => :show
resources :enumerations, :except => :show
match 'enumerations/:type', :to => 'enumerations#index', :via => :get