From 67ecc89ce6d66167027ae4d76279b552b6abb6f9 Mon Sep 17 00:00:00 2001 From: miss <994230062@qq.com> Date: Wed, 6 Sep 2017 17:35:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84tab=E6=A0=B7=E5=BC=8F=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=9B=B4=E6=8D=A2=E6=88=90=E4=B8=8E=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?TPI=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2tab=E4=B8=80=E8=87=B4?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=BB=BA=E5=AE=9E=E8=AE=AD=E3=80=81=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E5=AE=9E=E8=AE=AD=E8=B7=AF=E5=BE=84=E3=80=81=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=AE=9E=E8=AE=AD=E8=B7=AF=E5=BE=84=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E9=98=B4=E5=BD=B1=EF=BC=8CStep2=E5=AE=9E?= =?UTF-8?q?=E8=AE=ADTPM=E7=9A=84=E9=A1=B5=E9=9D=A2=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E8=BE=B9=E6=A1=86=E5=92=8C=E9=98=B4=E5=BD=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/challenges/_content_list.html.erb | 2 +- app/views/challenges/index.html.erb | 2 +- app/views/layouts/base_shixun.html.erb | 2 +- .../repositories/_shixun_dir_list.html.erb | 2 +- app/views/repositories/shixun_show.html.erb | 2 +- app/views/shixuns/_form.html.erb | 2 +- app/views/shixuns/_shixun_list.html.erb | 9 +++++++- app/views/shixuns/collaborators.html.erb | 2 +- app/views/shixuns/index.html.erb | 22 ++++++------------- app/views/shixuns/new.html.erb | 7 ++++-- app/views/shixuns/propaedeutics.html.erb | 2 +- app/views/shixuns/search.js.erb | 2 +- app/views/shixuns/settings.html.erb | 4 ++-- app/views/subjects/edit.html.erb | 8 ++++--- app/views/subjects/new.html.erb | 8 ++++--- public/stylesheets/css/taskstyle.css | 8 +++---- 16 files changed, 45 insertions(+), 39 deletions(-) diff --git a/app/views/challenges/_content_list.html.erb b/app/views/challenges/_content_list.html.erb index f425f70ab..5f331cfed 100644 --- a/app/views/challenges/_content_list.html.erb +++ b/app/views/challenges/_content_list.html.erb @@ -1,4 +1,4 @@ -
+

全部任务

<% if @challenges.count != 0 %> diff --git a/app/views/challenges/index.html.erb b/app/views/challenges/index.html.erb index 56affc61d..57f1913fc 100644 --- a/app/views/challenges/index.html.erb +++ b/app/views/challenges/index.html.erb @@ -10,7 +10,7 @@ <% if @shixun.status == 1 && (User.current.manager_of_shixun?(@shixun) || User.current.admin?) %>
正在等待管理员的审核。如果需要编辑更新，请先撤销发布
<% end %> -
+

简介

diff --git a/app/views/layouts/base_shixun.html.erb b/app/views/layouts/base_shixun.html.erb index 8e2e16f05..aa188b0b6 100644 --- a/app/views/layouts/base_shixun.html.erb +++ b/app/views/layouts/base_shixun.html.erb @@ -24,7 +24,7 @@
<%= render :partial => 'shixuns/shixun_top' %>
-
+
  • " id="shixun_tab">实训
  • " >背景知识
    • diff --git a/app/views/repositories/_shixun_dir_list.html.erb b/app/views/repositories/_shixun_dir_list.html.erb index f248cc678..037d6afec 100644 --- a/app/views/repositories/_shixun_dir_list.html.erb +++ b/app/views/repositories/_shixun_dir_list.html.erb @@ -1,5 +1,5 @@
    - +
    <% unless @path.blank? %> diff --git a/app/views/repositories/shixun_show.html.erb b/app/views/repositories/shixun_show.html.erb index 27ccaa746..287b74392 100644 --- a/app/views/repositories/shixun_show.html.erb +++ b/app/views/repositories/shixun_show.html.erb @@ -9,7 +9,7 @@

    -
      +
      • <%=link_to "#{choise_commit_count(@changesets_all_count, @g_project.commit_count.to_i)}", {:action => 'commits', :path => to_path_param(@path), :id => @shixun, :repository_id => @repository.identifier_param, diff --git a/app/views/shixuns/_form.html.erb b/app/views/shixuns/_form.html.erb index fef674277..3429f1b81 100644 --- a/app/views/shixuns/_form.html.erb +++ b/app/views/shixuns/_form.html.erb @@ -1,6 +1,6 @@ <%= stylesheet_link_tag '/editormd/css/editormd' %> <%= javascript_include_tag '/editormd/editormd' %> -
        +
          diff --git a/app/views/shixuns/_shixun_list.html.erb b/app/views/shixuns/_shixun_list.html.erb index 184a19a98..92ab5dbe6 100644 --- a/app/views/shixuns/_shixun_list.html.erb +++ b/app/views/shixuns/_shixun_list.html.erb @@ -1,4 +1,11 @@ - +
            +
          • "> + <%= link_to "最热", search_shixuns_path(:order => "myshixun_count", :shixun_status => @shixun_status, :status => @status, :language => @language, :search => @search, :trainee => @trainee, :major =>@major, :course => @course, :sort => @sort), :remote => true %> +
            • +
          • " id="nav_check_item_2"> + <%= link_to "最新", search_shixuns_path(:order => "created_at", :shixun_status => @shixun_status, :status => @status, :language => @language, :search => @search, :trainee => @trainee, :major =>@major, :course => @course, :sort => @sort), :remote => true %> +
            • +
          <% if @shixuns.blank? %>
          diff --git a/app/views/shixuns/collaborators.html.erb b/app/views/shixuns/collaborators.html.erb index e181d1b6c..51e692ece 100644 --- a/app/views/shixuns/collaborators.html.erb +++ b/app/views/shixuns/collaborators.html.erb @@ -1,4 +1,4 @@ -
          +
          <%= image_tag(url_to_avatar(@shixun.owner), :width => 60, :height => 60, :class => 'panel-list-img mr15 mt5') %>
            diff --git a/app/views/shixuns/index.html.erb b/app/views/shixuns/index.html.erb index 900b16976..a6583fef3 100644 --- a/app/views/shixuns/index.html.erb +++ b/app/views/shixuns/index.html.erb @@ -179,17 +179,7 @@
            -
              -
            • "> - <%= link_to "最热", search_shixuns_path(:order => "myshixun_count", :shixun_status => @shixun_status, :status => @status, :language => @language, :search => @search, :trainee => @trainee, :major =>@major, :course => @course, :sort => @sort), :remote => true %> -
              • -
            • "> - <%= link_to "最新", search_shixuns_path(:order => "created_at", :shixun_status => @shixun_status, :status => @status, :language => @language, :search => @search, :trainee => @trainee, :major =>@major, :course => @course, :sort => @sort), :remote => true %> -
              • -
            -
            <%= render "shixun_list" %> -
          @@ -197,6 +187,12 @@ <%= render :partial => 'layouts/public_left_info' %>