p49726105
/
bigdir
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

This commit is contained in:
yanxd 2013-10-31 20:14:27 +08:00
parent b55c5d20a3 c7d96dd183
commit 54d9566a7b
5 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/bids_controller.rb
View File

@ -585,14 +585,18 @@ class BidsController < ApplicationController
end
def edit
@bid = Bid.find(params[:bid_id])
if (User.current.admin?||User.current.id==@bid.author_id)&&(@bid.homework_type == 1)
@project_id = params[:project_id]
@bid = Bid.find(params[:bid_id])
respond_to do |format|
format.html {
@project = Project.find(params[:project_id])
@user= User.find(User.current.id)
render :layout => 'base_courses'
}
end
else
render 403
end
end

6
app/views/layouts/base_homework.html.erb
View File

@ -35,13 +35,15 @@
<table style="width: 232px ; height: 80px; padding-left: 8px">
<tr style="font-size:16px">
<td width="70px">课程名：</td>
<td aligin = "center">
<td align="center" style="font-size: 18px">
<strong> <%= link_to(@bid.courses.first.name, project_path(@bid.courses.first)) %></strong>
</td>
</tr>
<tr style="font-size:16px">
<td width="70px">作业名：</td>
<td align="center"><span style="color:#ed8924"><%= h @bid.name %></span></td>
<td align="center">
<span style="color:#ed8924"><%= h @bid.name %></span>
</td>
</tr>
<tr>
<td></td>

14
app/views/layouts/base_users.html.erb
View File

@ -149,15 +149,19 @@
</div>
<!--Modified by nie-->
<!--tags-->
<div class="user_underline"></div>
<% if User.current.logged? %>
<% if User.current.admin?||User.current.login==@user.login%>
<div class="user_underline"></div>
<!-- <div class="user_fans"> -->
<!-- added by william -for tag -->
<!-- <div class="user_tags"> -->
<div class="user_tags">
<div id="tags">
<%= render :partial => 'tags/tag', :locals => {:obj => @user,:object_flag => "1"}%>
<div class="user_tags">
<div id="tags">
<%= render :partial => 'tags/tag', :locals => {:obj => @user,:object_flag => "1"}%>
</div>
</div>
</div>
<% end %>
<% end %>
<!-- </div> -->
<!-- </div> -->

22
app/views/projects/_course_form.html.erb
View File

@ -10,21 +10,15 @@
<% end %>
<p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;" %></p>
<p style="margin-left:-10px;padding-right: 20px;"><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %></p><!--by young-->
<!-- <p><%= f.text_field :identifier, :required => true, :size => 60, :style => "width:488px;", :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH %>
<% unless @project.identifier_frozen? %>
<em class="info"><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %></em>
<% end %></p> -->
<%= f.fields_for @course do |m| %>
<!-- added by huang -->
<p style="margin-left:-10px;"><%= m.text_field :password, :required => true, :size => 60, :style => "width:488px;margin-left: 10px;" %></p>
<em class="info" style="margin-left:95px;"><%= l(:text_command) %></em>
<!-- added by bai 增加了“年度”和“学期” -->
<p><table><tr><td>
<%= f.fields_for @course do |m| %>
<!-- added by bai 增加了“年度”和“学期” -->
<p><table><tr><td>
<% unless @course.nil? %>
<% if @course.time == 2008 %>
<p><table><tr><td class="info" align="right" style="width: 90px"><strong><%= l(:label_term) %><span class="required"> *&nbsp;&nbsp;</span></strong></td>
@ -227,10 +221,12 @@
<% end %>
<% end %></td></tr></table></p>
<!-- end -->
<% end %>
<!-- end -->
<!-- added by huang -->
<p style="margin-left:-10px;"><%= m.text_field :password, :required => true, :size => 60, :style => "width:488px;margin-left: 10px;" %></p>
<em class="info" style="margin-left:95px;"><%= l(:text_command) %></em>
<% end %>
<p style="margin-left:-10px;padding-right: 20px;"><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %></p><!--by young-->
<p style="margin-left:-10px;"><em style ="color: #888888;display: block;font-size: 90%;font-style: normal;"><%= f.check_box :is_public, :style => "margin-left:10px;" %></em></p>
<p style="display:none;"><%= f.text_field :project_type, :value => 1 %></p>

5
app/views/tags/_tag.html.erb
View File

@ -2,11 +2,10 @@
<!-- 1代表是user类型 2代表是project类型 3代表是issue类型 -->
<!-- 3 代表的是issue 当是issue是 处理方式与前2个对象不同 -->
<% if object_flag == '3' %>
<span><%= image_tag("/images/sidebar/tags.png") %></span>
<span><%= image_tag("/images/sidebTar/tags.png") %></span>
<span class="font_title_tag"><%= l(:label_tag) %>:</span>
<% if User.current.logged? %>
<span> <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form-issue', {:focus => 'name-issue'} %></span>
<span> <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form-issue', {:focus => 'name-issue'} %></span>
<% end %>
<div id="tags_show_issue">