diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb index dc4ccbc67..30eeb722c 100644 --- a/app/controllers/boards_controller.rb +++ b/app/controllers/boards_controller.rb @@ -31,10 +31,10 @@ class BoardsController < ApplicationController @boards = @project.boards.includes(:last_message => :author).all # show the board if there is only one unless @project.project_type == 1 - if @boards.size == 1 - @board = @boards.first - show - end + if @boards.size == 1 + @board = @boards.first + show + end end if @project.project_type == 1 render :layout => 'base_courses' diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index ff16d5d60..0b3f337bc 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -134,7 +134,7 @@ module ProjectsHelper #Added by young def course_settings_tabs tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural, :course=>'1'}, - # {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural}, + {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural, :project_type => 1}, # {:name => 'repositories', :action => :manage_repository, :partial => 'projects/settings/repositories', :label => :label_repository_plural}, {:name => 'members', :action => :manage_members, :partial => 'projects/settings/members', :label => :label_member_plural} ] diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index 2ac62c2f3..59202a844 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -1,3 +1,3 @@ -
+
<%= render_menu :admin_menu %>
diff --git a/app/views/bids/_homework.html.erb b/app/views/bids/_homework.html.erb index e89fdb4fe..a7a1df85a 100644 --- a/app/views/bids/_homework.html.erb +++ b/app/views/bids/_homework.html.erb @@ -2,19 +2,27 @@ <%= form_for "bid_for_save", :remote=>true, :url => {:controller => 'bids', :action => 'add_homework'}, :update => "bidding_project_list", :complete => '$("#put-bid-form").hide();' do |f| %> -
<%= l(:label_attachment_plural) %> -

<%= render :partial => 'attachments/form', :locals => {:container => @homework} %>

-
-<%= submit_tag l(:button_create) %> -<% end %> +
+ + <%= l(:label_attachment_plural) %> + +

+ <%= render :partial => 'attachments/form', :locals => {:container => @homework} %> +

+
+ <%= submit_tag l(:button_create) %> + <% end %>
<% if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.roles&Role.where('id = ? or id = ? or id =?',5, 10, 7)).size >0) %> -
<%= toggle_link l(:label_commit_homework), 'put-bid-form' %>
-<% elsif @homework_list.empty? %> -
暂无学生提交作业！
+<% end %> + +<% if @homework_list.empty? %> +
+ 暂无学生提交作业！ +
<% end %>
diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb index e6c846569..f016eafc5 100644 --- a/app/views/bids/_homework_list.html.erb +++ b/app/views/bids/_homework_list.html.erb @@ -4,7 +4,7 @@
- + - + @@ -213,7 +213,7 @@ <%= link_to l(:label_course_overview), project_path(@project), :class => link_class(:overview) %>
  • - <%= link_to l(:label_homework), homework_project_path(@project), :class => link_class('Task')%> + <%= link_to l(:label_homework), {:controller => 'projects', :action => 'homework'}, :class => link_class('Task'), :project_type => 1 %>
  • <%= link_to l(:label_course_board), { :controller => 'boards', :action => 'index', :project_id => @project}, :class => link_class(:boards) %> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 95cccd3cc..43e402949 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -621,7 +621,7 @@ zh: label_course_overview: "课程动态" label_question_student: 作业交流 #bai label_homework_commit: 提交作业 #huang - label_homework_info: 作业提交情况 #huang + label_homework_info: 提交情况 #huang label_course_news: 课程通知 label_course_board: 讨论区 label_version: 版本 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index a0135fbbe..d6709d448 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1723,7 +1723,7 @@ button.tab-right { #content .tabs_new {height: 2.6em; margin-bottom:1.2em; margin-top: 0.8em; position:relative; overflow:hidden;} #content .tabs_new ul {margin:0; position:absolute; bottom:0; padding-left: 0.5em; width: 2000px; border-bottom: 1px solid #15BCCF;font-size:14px;} #content .tabs_new ul li { - width:100px; /*modified by linchun*/ + width:85px; /*modified by linchun*/ float:left; list-style-type:none; white-space:nowrap; diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index b8cfe6688..921d4ce2d 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -1711,8 +1711,8 @@ div.left_wf a { #sidebar a, #sidebar a.selected{ display: inline-block; -padding: 0px !important; -transition: all 0.2s linear 0s; + padding: 0px !important; + transition: all 0.2s linear 0s; }
    • <%= l(:label_task_plural)%><%= l(:label_task_plural)%>
    <%= text_field_tag 'student_id', params[:student_id], :size => 30 %> diff --git a/app/views/layouts/base_admin.html.erb b/app/views/layouts/base_admin.html.erb index fe31c0816..6a6e7ae23 100644 --- a/app/views/layouts/base_admin.html.erb +++ b/app/views/layouts/base_admin.html.erb @@ -1,80 +1,56 @@ - - -<%=h html_title %> - - -<%= csrf_meta_tag %> -<%= favicon %> -<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %> -<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> -<%= javascript_heads %> -<%= heads_for_theme %> -<%= call_hook :view_layouts_base_html_head %> - -<%= yield :header_tags -%> - - -
    -
    -
    -
    -
    - <%= render_menu :account_menu -%> -
    - <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %> - <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%> -
    + + + <%= h html_title %> + + + <%= csrf_meta_tag %> + <%= favicon %> + <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %> + <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> + <%= javascript_heads %> + <%= heads_for_theme %> + <%= call_hook :view_layouts_base_html_head %> + + <%= yield :header_tags -%> + + +
    +
    +
    + <%= render :partial => 'layouts/base_header'%> +
    +
    + +
    + <%= render_flash_messages %> + <%= yield %> + <%= call_hook :view_layouts_base_content %> +
    + <%= render_flash_messages %> +
    + <%= render :partial => 'layouts/base_footer'%> +
    +
    +
    + + - - - -
    - - - - - -
    -
    -<%= call_hook :view_layouts_base_body_bottom %> - + +
    +
    + <%= call_hook :view_layouts_base_body_bottom %> + diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 7de1f5e48..b11d2a46e 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -135,7 +135,7 @@
    <%= l(:label_main_teacher) %> :<%= link_to(@course.teacher.lastname+@course.teacher.firstname, user_path(@course.teacher)) %><%= l(:label_main_teacher) %> :<%= link_to(@course.teacher.lastname+@course.teacher.firstname, user_path(@course.teacher)) %>