diff --git a/app/helpers/challenges_helper.rb b/app/helpers/challenges_helper.rb index 330c4a991..a0d8dd13f 100644 --- a/app/helpers/challenges_helper.rb +++ b/app/helpers/challenges_helper.rb @@ -16,13 +16,13 @@ module ChallengesHelper game = Game.where(:challenge_id => challenge_id, :user_id => User.current.id).first case game.try(:status) when 0 - "待完成  ".html_safe + "待完成  ".html_safe when 1 - "".html_safe + "".html_safe when 2 - "已完成  ".html_safe + "已完成  ".html_safe when 3,nil - "未解锁  ".html_safe + "未解锁  ".html_safe end end end diff --git a/app/views/challenges/_content_list.html.erb b/app/views/challenges/_content_list.html.erb index 672d4c95e..b59820bcc 100644 --- a/app/views/challenges/_content_list.html.erb +++ b/app/views/challenges/_content_list.html.erb @@ -16,11 +16,11 @@

<% if challenge.st == 0 %> - + <% elsif challenge.st == 1 %> - + <% elsif challenge.st == 2 %> - + <% end%> @@ -39,15 +39,15 @@ <% if User.current.manager_of_shixun?(@shixun) %>

<% if @shixun.status == 0 %> - + <% unless challenge.position < 2 %> - + <% end %> <% if @shixun.challenges.count != challenge.position %> - + <% end %> <% end %> - +

diff --git a/app/views/challenges/index.html.erb b/app/views/challenges/index.html.erb index 7872a781f..56affc61d 100644 --- a/app/views/challenges/index.html.erb +++ b/app/views/challenges/index.html.erb @@ -12,7 +12,7 @@ <% end %>
-

简介

+

简介

diff --git a/app/views/games/_game_show.html.erb b/app/views/games/_game_show.html.erb index a795d662c..0daa13b4b 100644 --- a/app/views/games/_game_show.html.erb +++ b/app/views/games/_game_show.html.erb @@ -68,10 +68,10 @@ <%= render :partial => "games/shixun_comment_block" %>
  • 发送
  • - " onclick="game_praise('<%= @game_challenge.id %>', '<%= @game_challenge.class %>')" id="game_praise_tread" class="pt5 color-grey mr20"> + " onclick="game_praise('<%= @game_challenge.id %>', '<%= @game_challenge.class %>')" id="game_praise_tread" class="pt5 color-grey mr20"> " alt="赞" ><%= @praise_count %> - " onclick="game_tread('<%= @game_challenge.id %>')" id="game_tread" class="color-grey" style="padding-top:7px;"> + " onclick="game_tread('<%= @game_challenge.id %>')" id="game_tread" class="color-grey" style="padding-top:7px;"> " ><%= @tread_count %>
    • diff --git a/app/views/games/_pass_game_show.html.erb b/app/views/games/_pass_game_show.html.erb index 717ecb2cc..ef9d9a815 100644 --- a/app/views/games/_pass_game_show.html.erb +++ b/app/views/games/_pass_game_show.html.erb @@ -19,5 +19,7 @@ url: "<%= refresh_game_list_myshixun_game_path(game, :myshixun_id => myshixun) %>", dataType: "script" }); - }; + + //$("#all_task_show").css("display","none"); + } \ No newline at end of file diff --git a/app/views/games/_repository.html.erb b/app/views/games/_repository.html.erb index 68013b7ba..49a506214 100644 --- a/app/views/games/_repository.html.erb +++ b/app/views/games/_repository.html.erb @@ -12,7 +12,7 @@
    <% if @path == @game.challenge.path.try(:strip) %> - + <% end %>
    diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index 2aa77eb47..b2f3e0146 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -261,7 +261,7 @@
    - +
      diff --git a/app/views/school/upload_logo.html.erb b/app/views/school/upload_logo.html.erb index 85cfe7986..1145c3f0a 100644 --- a/app/views/school/upload_logo.html.erb +++ b/app/views/school/upload_logo.html.erb @@ -74,3 +74,119 @@ function showPreview(source) { } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/views/subjects/show.html.erb b/app/views/subjects/show.html.erb index 8b96050c1..672ba35c2 100644 --- a/app/views/subjects/show.html.erb +++ b/app/views/subjects/show.html.erb @@ -33,7 +33,7 @@ <% stage.stage_shixuns.each_with_index do |stage_shixun, index| %> <% shixun = stage_shixun.shixun %>
      ;" onclick="<%= allow_shixun_exec(shixun) ? "" : "shixun_link('#{shixun.identifier}')" %>"> + style="<%= allow_shixun_exec(shixun) ? "" : "cursor: pointer" %>;" onclick="<%= allow_shixun_exec(shixun) ? "" : (shixun.status < 2 && !User.current.manager_of_shixun?(shixun) ? "" : "shixun_link('#{shixun.identifier}')") %>">
    • <%= s_index + 1 %>-<%= index + 1 %>  <%= shixun.name %> @@ -68,7 +68,7 @@ <% end %> <% end %> <% if shixun.status < 2 && !User.current.manager_of_shixun?(shixun) %> - + <% else %> <%= link_to "查看详情", shixun_path(shixun), :class => "task-btn task-btn-green ml10", :style=>"display: none", :target => "_blank" %> <% end %> diff --git a/app/views/users/_myjoin_shixun_list.html.erb b/app/views/users/_myjoin_shixun_list.html.erb index f18800d49..4c8b340ff 100644 --- a/app/views/users/_myjoin_shixun_list.html.erb +++ b/app/views/users/_myjoin_shixun_list.html.erb @@ -22,7 +22,7 @@ <% end %> - <%= format_time(shixun.updated_at) %> 开启 + <%= format_time(shixun.updated_at) %> 更新

      • 查看详情 diff --git a/public/javascripts/edu/application.js b/public/javascripts/edu/application.js index 98776a516..ca1ca577b 100644 --- a/public/javascripts/edu/application.js +++ b/public/javascripts/edu/application.js @@ -120,7 +120,7 @@ $(function(){ $desc.show().css({ left:$(this).offset().left +30, opacity:0.7, - top:$(this).offset().top-$desc.height()/4 + top:$(this).offset().top-$desc.height()/8 }); }); $("[data-tip-left]").live("mouseenter",function(){ @@ -129,7 +129,7 @@ $(function(){ $desc.show().css({ left:$(this).offset().left-$desc.width()-10, opacity:0.7, - top:$(this).offset().top-$desc.height()/4 + top:$(this).offset().top-$desc.height()/8 }); }); diff --git a/public/javascripts/edu/base_edu.js b/public/javascripts/edu/base_edu.js index 266da3302..12ec72bf0 100644 --- a/public/javascripts/edu/base_edu.js +++ b/public/javascripts/edu/base_edu.js @@ -536,6 +536,7 @@ function search_group_member_submit(){ } function submit_new_student_work(type){ + console.log($("#_file").attr("name")); var result = true; if(student_work_description_editor.isEmpty()){ result = false; @@ -557,9 +558,13 @@ function submit_new_student_work(type){ notice_box("成员人数不符合要求"); } } +// if(lebel_file_uploding!==0){ +// result = false; +// notice_box("有文件正在上传请洒红后提交"); +// } if(result){ student_work_description_editor.sync(); - $("#student_work_form").submit(); + //$("#student_work_form").submit(); } } diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css index a540760d6..7a06866c6 100644 --- a/public/stylesheets/css/taskstyle.css +++ b/public/stylesheets/css/taskstyle.css @@ -92,6 +92,7 @@ a.task-header-name{ max-width:200px;} .panel-form-label{ display:inline-block; width:10%; min-width:90px; text-align:right; line-height:40px; } +.panel-form-label1{ display:inline-block; width:20%; min-width:90px; text-align:right; line-height:40px; } .panel-form input,.panel-form textarea{ border:1px solid #e2e2e2;color:#666;line-height: 1.9;} .panel-box-sizing{-moz-box-sizing: border-box; /*Firefox3.5+*/-webkit-box-sizing: border-box; /*Safari3.2+*/-o-box-sizing: border-box; /*Opera9.6*/-ms-box-sizing: border-box; /*IE8*/box-sizing: border-box; } input.panel-form-width-690{ padding:5px;width:90%; height:40px; min-width:700px;}