@ -225,7 +225,8 @@ class BidsController < ApplicationController
respond_to do |format|
layout_file = ''
case @bid.reward_type
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
if @bid.reward_type == 3
format.html {
html_title(l(:label_homework_info))
render :layout => 'base_homework'
}
elsif @bid.reward_type == 1
@ -9,4 +9,5 @@
<%= submit_tag l(:button_create) %>
<%= javascript_tag "$('#bid_name').focus();" %>
<% end %>
</div>
<% html_title(l(:label_newtype_contest)) -%>
@ -312,4 +312,4 @@
<div class="pagination">
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
<% html_title(l(:label_contest_joincontest)) -%>
@ -44,4 +44,4 @@
<%= pagination_links_full @feedback_pages %>
</ul>
<% html_title(l(:label_user_response)) -%>
@ -102,4 +102,5 @@ function checkMaxLength() {
<ul>
<% html_title(l(:label_course_feedback)) -%>
@ -57,3 +57,4 @@ function showSubH(/* ... */){
</script>
<% html_title(l(:label_homework)) -%>
@ -119,6 +119,6 @@
<%= pagination_links_full @events_pages %>
<% html_title(l(:label_course_overview)) -%>
@ -69,5 +69,4 @@
<div id="all_browse_div" class="all_browse_div">
<%= render :partial => 'course_show_all_attachment' %>
<% html_title(l(:label_attachment_plural)) -%>
<% html_title(l(:label_course_file)) -%>
@ -8,7 +8,7 @@
<meta charset="utf-8" />
<meta name="description" content="<%= Redmine::Info.app_name %>" />
<meta name="keywords" content="issue,bug,tracker" />
<title><%=h l(:label_active_homework) << " - Trustie" %></title>
<title><%=h html_title %></title>
<%= csrf_meta_tag %>
<%= favicon %>
@ -480,3 +480,4 @@
});
<% html_title(l(:label_activity)) -%>
@ -30,4 +30,5 @@ $(document).ready(function() {
})
<% html_title(l(:label_user_course)) -%>
@ -15,4 +15,4 @@
<% html_title(l(:label_responses)) -%>
@ -63,3 +63,4 @@
$('[mode=watched]').click(function(event) {window.location.href='<%=watch_projects_user_url(type: 1)%>'; });
<% html_title(l(:label_user_project)) -%>
@ -580,7 +580,7 @@ RedmineApp::Application.routes.draw do
match 'permissions', :via => [:get, :post]
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