jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into szzh

This commit is contained in:
sw 2014-10-14 17:18:15 +08:00
parent 2ed4ace7c9 2780cd6317
commit 97f66a2b08
47 changed files with 448 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/application_controller.rb
View File

@ -496,12 +496,14 @@ class ApplicationController < ActionController::Base
def render_403(options={}) def render_403(options={})
@project = nil @project = nil
render_error({:message => :notice_not_authorized, :status => 403}.merge(options)) #render_error({:message => :notice_not_authorized, :status => 403}.merge(options))
render :template => 'common/403'
return false return false
end end
def render_404(options={}) def render_404(options={})
render_error({:message => :notice_file_not_found, :status => 404}.merge(options)) #render_error({:message => :notice_file_not_found, :status => 404}.merge(options))
render :template => 'common/404'
return false return false
end end

1
app/controllers/courses_controller.rb
View File

@ -544,7 +544,6 @@ class CoursesController < ApplicationController
def finishcourse def finishcourse
yesterday = Date.today.prev_day.to_time yesterday = Date.today.prev_day.to_time
@course_prefs.endup_time = yesterday @course_prefs.endup_time = yesterday
@save_flag = @course_prefs.save @save_flag = @course_prefs.save
get_courses get_courses

11
app/controllers/welcome_controller.rb
View File

@ -62,11 +62,12 @@ class WelcomeController < ApplicationController
def course def course
@course_page = FirstPage.where("page_type = 'course'").first @course_page = FirstPage.where("page_type = 'course'").first
if params[:school_id] #if params[:school_id]
@school_id = params[:school_id] # @school_id = params[:school_id]
elsif User.current.logged? && User.current.user_extensions.try(:school) #elsif User.current.logged? && User.current.user_extensions.try(:school)
@school_id = User.current.user_extensions.school.try(:id) # @school_id = User.current.user_extensions.school.try(:id)
end #end
@school_id = params[:school_id] || User.current.user_extensions.school.try(:id)
@logoLink ||= logolink() @logoLink ||= logolink()
end end

2
app/controllers/words_controller.rb
View File

@ -236,7 +236,7 @@ class WordsController < ApplicationController
#modify by nwb #modify by nwb
#添加对课程留言的支持 #添加对课程留言的支持
referer = request.headers["Referer"] referer = request.headers["Referer"]
obj_id = referer.match(%r(/([0-9]{1,})(/|$)))[1] obj_id = referer.match(%r(/([0-9]{1,})(/|\?|$)))[1]
if referer.match(/project/) if referer.match(/project/)
obj = Project.find_by_id(obj_id) obj = Project.find_by_id(obj_id)
elsif referer.match(/course/) elsif referer.match(/course/)

3
app/controllers/zipdown_controller.rb
View File

@ -31,7 +31,8 @@ class ZipdownController < ApplicationController
end end
send_file zipfile, :filename => obj.name+".zip", :type => detect_content_type(zipfile) if zipfile send_file zipfile, :filename => obj.name+".zip", :type => detect_content_type(zipfile) if zipfile
#rescue NameError, ActiveRecord::RecordNotFound => e rescue Exception => e
render file: 'public/no_file_found.html' , :layout => 'course_base'
#logger.error "[ZipDown] ===> #{e}" #logger.error "[ZipDown] ===> #{e}"
#@error = e #@error = e
end end

44
app/helpers/welcome_helper.rb
View File

@ -136,31 +136,33 @@ module WelcomeHelper
#获取课程列表 #获取课程列表
# add by nwb # add by nwb
def find_miracle_course(sum=10, max_rate=7, school_id) def find_miracle_course(sum=10, max_rate=7, school_id, time,term)
if User.current.user_extensions.nil? && User.current.user_extensions.school.nil? and school_id.nil? if User.current.user_extensions.nil? && User.current.user_extensions.school.nil? and school_id.nil?
Course.active.visible. Course.active.visible.
joins(:memberships). joins(:memberships).
where("courses.time = #{time} and courses.term = #{term}").
group('members.course_id'). group('members.course_id').
reorder("courses.created_at DESC, COUNT(members.course_id) DESC").take sum reorder("courses.created_at DESC, COUNT(members.course_id) DESC").take sum
else else
if school_id.nil? if school_id.nil?
Course.active.visible. Course.active.visible.
joins(:memberships). joins(:memberships).
where("#{Course.table_name}.school_id = ?", User.current.user_extensions.school.id). where("#{Course.table_name}.school_id = ? and courses.time = ? and courses.term = ?", User.current.user_extensions.school.id, time, term).
group('members.course_id'). group('members.course_id').
reorder("courses.created_at DESC, COUNT(members.course_id) DESC").take sum reorder("COUNT(members.course_id) DESC").take sum
else else
if school_id == "0" if school_id == "0"
Course.active.visible. Course.active.visible.
joins(:memberships). joins(:memberships).
where("courses.time = #{time} and courses.term = #{term}").
group('members.course_id'). group('members.course_id').
reorder("courses.created_at DESC, COUNT(members.course_id) DESC").take sum reorder("COUNT(members.course_id) DESC").take sum
else else
Course.active.visible. Course.active.visible.
joins(:memberships). joins(:memberships).
where("#{Course.table_name}.school_id = ?", school_id). where("#{Course.table_name}.school_id = ? and courses.time = ? and courses.term = ?", school_id, time, term).
group('members.course_id'). group('members.course_id').
reorder("courses.created_at DESC, COUNT(members.course_id) DESC").take sum reorder("COUNT(members.course_id) DESC").take sum
end end
end end
end end
@ -229,16 +231,28 @@ module WelcomeHelper
end end
# modif by nwb # modif by nwb
def find_all_new_hot_course limit = 9 ,school_id = 0 def find_all_new_hot_course limit = 9 ,school_id = nil, year_now, course_term
#sort_project_by_hot_rails 1, 'course_ac_para DESC', limit #sort_project_by_hot_rails 1, 'course_ac_para DESC', limit
time_now = Time.new.strftime("%Y") #time_now = Time.new.strftime("%Y")
if school_id #if school_id
courses = Course.includes(:school, :members).visible.joins(:course_status).where("#{Course.table_name}.created_at like '%#{time_now}%' and #{Course.table_name}.school_id <> #courses = Course.includes(:school, :members).visible.joins(:course_status).where("#{Course.table_name}.created_at like '%#{time_now}%' and #{Course.table_name}.school_id <>
?", school_id).order("course_ac_para DESC").limit(limit).all # ?", school_id).order("course_ac_para DESC").limit(limit).all
else #else
courses = Course.includes(:school, :members).visible.joins(:course_status).where("#{Course.table_name}.created_at like '%#{time_now}%' and #{Course.table_name}.school_id is not NULL # courses = Course.includes(:school, :members).visible.joins(:course_status).where("#{Course.table_name}.created_at like '%#{time_now}%' and #{Course.table_name}.school_id is not NULL
").order("course_ac_para DESC").limit(limit).all # ").order("course_ac_para DESC").limit(limit).all
end # end
school_id.nil? ?
courses = Course.includes(:school, :members).visible.
joins(:memberships).
where("courses.time = ? and courses.term = ? and courses.school_id is not NULL", year_now, course_term).
group('members.course_id').
reorder("COUNT(members.course_id) DESC").limit(limit).all
:
courses = Course.includes(:school, :members).visible.
joins(:course_status).
where("courses.time = ? and courses.term = ? and courses.school_id <> ?",year_now, course_term, school_id).
group('members.course_id').
reorder("COUNT(members.course_id) DESC").limit(limit).all
courses courses
end end

8
app/views/bids/_fork_form.html.erb
View File

@ -10,13 +10,13 @@
<p style="margin-left:-10px;padding-right: 20px;"> <p style="margin-left:-10px;padding-right: 20px;">
<%= f.text_area :description, :rows => 8, :value => @bid.description, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;", :maxlength => Bid::DESCRIPTION_LENGTH_LIMIT %></p> <%= f.text_area :description, :rows => 8, :value => @bid.description, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;", :maxlength => Bid::DESCRIPTION_LENGTH_LIMIT %></p>
<!-- <p><%= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '3'>#{l(:label_bids_credit)}</option><option value = '2'>#{l(:label_reward_1)}</option>".html_safe, <!-- <p><%#= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '3'>#{l(:label_bids_credit)}</option><option value = '2'>#{l(:label_reward_1)}</option>".html_safe,
:onChange => "show('bid_reward_type', 'bid_budget', '"+l(:label_bids_reward_what)+"','"+l(:label_bids_new_money)+"','"+l(:label_bids_new_credit)+"','"+l(:label_bids_new_content)+"')" %> :onChange => "show('bid_reward_type', 'bid_budget', '"+l(:label_bids_reward_what)+"','"+l(:label_bids_new_money)+"','"+l(:label_bids_new_credit)+"','"+l(:label_bids_new_content)+"')" %>
<%= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %> <%#= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
</p> --> </p> -->
<p><%= f.text_field :deadline, :value => nil,:required => true, :size => 60, :style => "width:150px;" %><%= calendar_for('bid_deadline')%> <p><%= f.text_field :deadline, :value => nil,:required => true, :size => 60, :style => "width:150px;" , :readonly => true %><%= calendar_for('bid_deadline')%>
<!-- <!--
<p><%= f.select :homework_type, homework_type_option %> <p><%#= f.select :homework_type, homework_type_option %>
</p> </p>
--> -->
<p><%= f.select :is_evaluation, is_evaluation_option %> <p><%= f.select :is_evaluation, is_evaluation_option %>

2
app/views/bids/_form.html.erb
View File

@ -30,6 +30,6 @@
<!-- 设置奖项设置的打开 关闭开关--> <!-- 设置奖项设置的打开 关闭开关-->
</p> </p>
<p><%= f.text_field :deadline, :required => true, :size => 60, :style => "width:150px;", :placeholder => "#{l(:label_deadline)}" %><%= calendar_for('bid_deadline')%> <p><%= f.text_field :deadline, :required => true, :size => 60, :style => "width:150px;", :placeholder => "#{l(:label_deadline)}", :readonly => true %><%= calendar_for('bid_deadline')%>
</p> </p>

2
app/views/bids/_form_contest.html.erb
View File

@ -33,4 +33,4 @@
<!-- 设置奖项设置的打开 关闭开关--> <!-- 设置奖项设置的打开 关闭开关-->
</p> </p>
<!-- <em class="info" style="margin-left:95px;"><%= l(:text_contest_reward) %></em> --> <!-- <em class="info" style="margin-left:95px;"><%= l(:text_contest_reward) %></em> -->
<p><%= f.text_field :deadline, :required => true, :size => 60, :style => "width:150px;", :placeholder => "#{l(:label_deadline)}" %><%= calendar_for('bid_deadline')%></p> <p><%= f.text_field :deadline, :required => true, :size => 60, :style => "width:150px;", :readonly => true, :placeholder => "#{l(:label_deadline)}" %><%= calendar_for('bid_deadline')%></p>

15
app/views/bids/_history.html.erb
View File

@ -27,18 +27,25 @@
<span class="user"><%= link_to journal.user, user_path(journal.user)%></span> <span class="user"><%= link_to journal.user, user_path(journal.user)%></span>
<span class="font_lighter"><%= label %></span> <span class="font_lighter"><%= label %></span>
<div> <%= textilizable journal.notes%> </div> <div> <%= textilizable journal.notes%> </div>
<span class="font_lighter"><%= l(:label_bids_published) %>&nbsp;<%= time_tag(journal.created_on).html_safe %>&nbsp;<%= l(:label_bids_published_ago) %></span> <span class="font_lighter">
<%= l(:label_bids_published) %>&nbsp;
<%= time_tag(journal.created_on).html_safe %>&nbsp;
<%= l(:label_bids_published_ago) %>
</span>
<% ids = 'project_respond_form_'+ journal.id.to_s%> <% ids = 'project_respond_form_'+ journal.id.to_s%>
<span> <span>
<% if reply_allow %> <% if reply_allow %>
<%= link_to(l(:button_quote), {:controller => 'bids', :action => 'new', :id => bid, :journal_id => journal}, :remote => true, <%= link_to(l(:button_quote), {:controller => 'bids', :action => 'new', :id => bid, :journal_id => journal},
:method => 'post', :title => l(:button_quote))%> :remote => true,:method => 'post', :title => l(:button_quote))%>
<%= link_to l(:label_bid_respond_quote),'', <%= link_to l(:label_bid_respond_quote),'',
{:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.name}: '); $('##{ids} textarea') ;return false;"} {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.name}: '); $('##{ids} textarea') ;return false;"}
%> %>
<% end %> <% end %>
<% if @user==User.current|| User.current.admin? %> <% if @user==User.current|| User.current.admin? %>
<%= link_to(l(:label_bid_respond_delete), {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user}, :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete)) %> <%= link_to(l(:label_bid_respond_delete),
{:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user},
:remote => true, :confirm => l(:text_are_you_sure), :method => 'delete',
:class => "delete", :title => l(:button_delete)) %>
<% end %> <% end %>
</span> </span>
</span> </span>

16
app/views/bids/_homework_form.html.erb
View File

@ -29,17 +29,21 @@
<p><span id="bid_name_span"></span></p> <p><span id="bid_name_span"></span></p>
<p><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;", :maxlength => Bid::DESCRIPTION_LENGTH_LIMIT %></p> <p><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;", :maxlength => Bid::DESCRIPTION_LENGTH_LIMIT %></p>
<p><%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:150px;", :onchange => "regexDeadLine();") %> <p><%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:150px;", :readonly => true, :onchange => "regexDeadLine();") %>
<%= calendar_for('bid_deadline')%> <%= calendar_for('bid_deadline')%>
<span id="bid_deadline_span"> <span id="bid_deadline_span">
</span> </span>
</p> </p>
<p><%= f.select :is_evaluation, is_evaluation_option %> <p>
<%= f.select :is_evaluation, is_evaluation_option %>
</p> </p>
<p><%= f.select :proportion, proportion_option %> <p>
<%= f.select :proportion, proportion_option %>
</p> </p>
<p><%= hidden_field_tag 'course_id', @course.id %> <p>
<%= hidden_field_tag 'course_id', @course.id %>
</p> </p>
<fieldset><legend><%= l(:label_attachment_plural) %></legend> <fieldset>
<p><%= render :partial => 'attachments/form', :locals => {:container => @homework} %></p> <legend><%= l(:label_attachment_plural) %></legend>
<p><%= render :partial => 'attachments/form', :locals => {:container => @bid} %></p>
</fieldset> </fieldset>

2
app/views/bids/_new_bid.html.erb
View File

@ -69,7 +69,7 @@ border-top: 1px solid #acaeb1; border-bottom: 1px solid #acaeb1; margin-top: 30p
</tr> </tr>
<tr> <tr>
<td colspan="2"><%= text_field_tag 'bid_deadline', "#{l(:label_deadline)}", :class => 'noline', :required => true, <td colspan="2"><%= text_field_tag 'bid_deadline', "#{l(:label_deadline)}", :class => 'noline', :required => true,
:onfocus => "clearInfo('bid_deadline', '#{l(:label_deadline)}')", :onblur => "showInfo('bid_deadline', '#{l(:label_deadline)}')"%> :onfocus => "clearInfo('bid_deadline', '#{l(:label_deadline)}')", :readonly => true, :onblur => "showInfo('bid_deadline', '#{l(:label_deadline)}')"%>
<%= calendar_for('bid_deadline')%></td> <%= calendar_for('bid_deadline')%></td>
</tr> </tr>
</table> </table>

2
app/views/boards/_course_show.html.erb
View File

@ -17,7 +17,7 @@
<%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %> <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
<%= render :partial => 'messages/form', :locals => {:f => f} %> <%= render :partial => 'messages/form', :locals => {:f => f} %>
<p><%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %> <p><%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
<%= preview_link(preview_board_message_path(@board), 'message-form' ,target='preview',{:class => 'whiteButton m3p10'} )%> | <%#= preview_link(preview_board_message_path(@board), 'message-form' ,target='preview',{:class => 'whiteButton m3p10'} )%>
<%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;' ,:class => 'whiteButton m3p10' %></p> <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;' ,:class => 'whiteButton m3p10' %></p>
<% end %> <% end %>
<div id="preview" class="wiki"></div> <div id="preview" class="wiki"></div>

4
app/views/boards/_project_show.html.erb
View File

@ -18,8 +18,8 @@
<%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %> <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
<%= render :partial => 'messages/form', :locals => {:f => f} %> <%= render :partial => 'messages/form', :locals => {:f => f} %>
<p><%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %> <p><%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
<%= preview_link(preview_board_message_path(@board), 'message-form', target='preview', {:class => 'whiteButton m3p10'}) %> <%#= preview_link(preview_board_message_path(@board), 'message-form', target='preview', {:class => 'whiteButton m3p10'}) %>
|
<%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;', :class => 'whiteButton m3p10' %></p> <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;', :class => 'whiteButton m3p10' %></p>
<% end %> <% end %>
<div id="preview" class="wiki"></div> <div id="preview" class="wiki"></div>

41
app/views/common/403.html Normal file
View File

@ -0,0 +1,41 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>没有访问权限</title>
<style>
body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margin:0; padding:0;}
div,img,tr,td{ border:0;}
table,tr,td{border:0 cellspacing:0; cellpadding:0;}
ul,li{ list-style-type:none}
.cl{ clear:both; overflow:hidden; }
a{ text-decoration:none; }
a:hover{ }
.error_content{ width:550px; height:200px; margin:0 auto; padding:10px 0;}
.error_left{color:#15bccf; font-size:100px; font-weight:bold; font-style:oblique; width:200px; height:120px; padding-right:30px; float:left;}
.error_right{ width:240px; height:120px; float:left;color:#15bccf; font-size: 17px; font-weight:bold; padding-left:30px; margin-top:40px; border-left:1px dashed #CCC; }
.error_link{ margin-top:8px;}
.error_link a{ display:block; width:80px; height:28px; font-size:14px; font-weight:bold; color:#fff; text-align:center; background:#15bccf; float:left; margin-right:10px;}
.error_link a:hover{ background:#ff8417;}
</style>
</head>
<body>
<div class="error_content">
<div class="error_left">403</div>
<div class="error_right">
<p>ERROR FORBIDDEN<br />
没有访问权限！建议您</p>
<div class="error_link">
<!---<a href="http://forge.trustie.net/" target="_blank">返回首页</a>---->
<a href="#" target="_blank">后退一步</a>
<a href="http://user.trustie.net/users/5/user_newfeedback" target="_blank">给我留言</a>
</div>
</div>
</div>
</body>
</html>

41
app/views/common/404.html Normal file
View File

@ -0,0 +1,41 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>页面不见了</title>
<style>
body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff;}
div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margin:0; padding:0;}
div,img,tr,td{ border:0;}
table,tr,td{border:0 cellspacing:0; cellpadding:0;}
ul,li{ list-style-type:none}
.cl{ clear:both; overflow:hidden; }
a{ text-decoration:none; }
a:hover{ }
.error_content{ width:550px; height:200px; margin:0 auto; padding:10px 0;}
.error_left{color:#15bccf; font-size:100px; font-weight:bold; font-style:oblique; width:200px; height:120px; padding-right:30px; float:left;}
.error_right{ width:240px; height:120px; float:left;color:#15bccf; font-size: 18px; font-weight:bold; padding-left:30px; margin-top:40px; border-left:1px dashed #CCC; }
.error_link{ margin-top:8px;}
.error_link a{ display:block; width:80px; height:28px; font-size:14px; font-weight:bold; color:#fff; text-align:center; background:#15bccf; float:left; margin-right:10px;}
.error_link a:hover{ background:#ff8417;}
</style>
</head>
<body>
<div class="error_content">
<div class="error_left">404</div>
<div class="error_right">
<p><span style="font-size:24px;">ERROR PAGE</span><br />
页面不见了！建议您</p>
<div class="error_link">
<!---<a href="http://forge.trustie.net/" target="_blank">返回首页</a>---->
<a href="#" target="_blank">后退一步</a>
<a href="http://user.trustie.net/users/5/user_newfeedback" target="_blank">给我留言</a>
</div>
</div>
</div>
</body>
</html>

2
app/views/contestnotifications/edit.html.erb
View File

@ -7,7 +7,7 @@
:method => :put } do |f| %> :method => :put } do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<%= submit_tag l(:button_save) %> <%= submit_tag l(:button_save) %>
<%= preview_link preview_contestnotifications_path(id: @contestnotification), <%#= preview_link preview_contestnotifications_path(id: @contestnotification),
'contestnotifications-form' 'contestnotifications-form'
%> %>
<% end %> <% end %>

1
app/views/contests/_form_contest.html.erb
View File

@ -68,6 +68,7 @@
:required => true, :required => true,
:size => 60, :size => 60,
:style => "width:150px;", :style => "width:150px;",
:readonly => true,
:placeholder => "#{l(:label_deadline)}" :placeholder => "#{l(:label_deadline)}"
%> %>
<%= calendar_for('contest_deadline')%> <%= calendar_for('contest_deadline')%>

8
app/views/contests/_new_softapplication.html.erb
View File

@ -4,7 +4,7 @@
//验证作品名称 //验证作品名称
function regexName() function regexName()
{ {
var name = $("#softapplication_name").val(); var name = $.trim($("#softapplication_name").val());
if(name.length == 0) if(name.length == 0)
{ {
$("#spane_name_notice").text("<%= l(:label_no_softapplication_name) %>"); $("#spane_name_notice").text("<%= l(:label_no_softapplication_name) %>");
@ -31,7 +31,7 @@
//验证作品简介 //验证作品简介
function regexDescription() function regexDescription()
{ {
var name = $("#softapplication_description").val(); var name = $.trim($("#softapplication_description").val());
if(name.length ==0) if(name.length ==0)
{ {
$("#span_sofapplication_description").text("<%= l(:label_no_softapplication_description) %>"); $("#span_sofapplication_description").text("<%= l(:label_no_softapplication_description) %>");
@ -56,7 +56,7 @@
//验证运行平台 //验证运行平台
function regexWorkdescription() function regexWorkdescription()
{ {
var workDescription = $("#softapplication_android_min_version_available").val(); var workDescription = $.trim($("#softapplication_android_min_version_available").val());
if(workDescription.length ==0) if(workDescription.length ==0)
{ {
$("#spane_workdescription_notice").text("<%= l(:label_no_softapplication_platform) %>"); $("#spane_workdescription_notice").text("<%= l(:label_no_softapplication_platform) %>");
@ -80,7 +80,7 @@
//验证开发人员 //验证开发人员
function regexDevelopers() function regexDevelopers()
{ {
var workDescription = $("#softapplication_application_developers").val(); var workDescription = $.trim($("#softapplication_application_developers").val());
if(workDescription.length ==0) if(workDescription.length ==0)
{ {
$("#span_softapplication_application_developers").text("<%= l(:label_no_softapplication_developers) %>"); $("#span_softapplication_application_developers").text("<%= l(:label_no_softapplication_developers) %>");

2
app/views/courses/_homework_form.html.erb
View File

@ -34,7 +34,7 @@
<%#= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %> <%#= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
</p> --> </p> -->
<% time = (Time.now + 3600 * 24).strftime('%Y-%m-%d') %> <% time = (Time.now + 3600 * 24).strftime('%Y-%m-%d') %>
<p><%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:150px;",:value => "#{time}", :onchange => "regexDeadLine();") %> <p><%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:150px;",:value => "#{time}", :onchange => "regexDeadLine();", :readonly => true) %>
<%= calendar_for('bid_deadline')%> <%= calendar_for('bid_deadline')%>
<span id="bid_deadline_span"> <span id="bid_deadline_span">
</span> </span>

4
app/views/courses/finishcourse.js.erb
View File

@ -3,8 +3,8 @@
console.debug('课程修改成功：结束时间改为<%=Course.find_by_extra(@course.extra).try(:endup_time)%>'); console.debug('课程修改成功：结束时间改为<%=Course.find_by_extra(@course.extra).try(:endup_time)%>');
<% end %> <% end %>
$('#content-title-top-div').html("<%= j(render partial: 'users/my_course_ex', :locals => {:memberships => @memberships,:user=>@user, $('#content-title-top-div').html("<%= j(render partial: 'users/my_course_ex', :locals => {:memberships => @memberships,:user=>@user,
:memberships_doing=>@memberships_doing,:memberships_done=>@memberships_done} )%>") :memberships_doing=>@memberships_doing,:memberships_done=>@memberships_done} )%>");
$('#finish_course_<%=@course.id%>').replaceWith("<%= j(render partial: 'courses/set_course_time', :locals => {:course => @course} )%>") $('#finish_course_<%=@course.id%>').replaceWith("<%= j(render partial: 'courses/set_course_time', :locals => {:course => @course} )%>");
<% else %> <% else %>
alert('权限不足，设置失败，请在论坛提交问题，等待管理员处理。'); alert('权限不足，设置失败，请在论坛提交问题，等待管理员处理。');
<% end %> <% end %>

6
app/views/courses/index.html.erb
View File

@ -56,9 +56,9 @@
</p> </p>
<% end %> <% end %>
<% other_formats_links do |f| %> <%# other_formats_links do |f| %>
<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %> <%#= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
<% end %> <%# end %>
<% content_for :sidebar do %> <% content_for :sidebar do %>
<%= form_tag({}, :method => :get) do %> <%= form_tag({}, :method => :get) do %>

8
app/views/courses/search.html.erb
View File

@ -45,13 +45,13 @@
<% if User.current.logged? %> <% if User.current.logged? %>
<p style="text-align:right;"> <p style="text-align:right;">
<span class="my-project"><%= l(:label_my_projects) %></span> <span class="my-project"><%= l(:label_my_course) %></span>
</p> </p>
<% end %> <% end %>
<% other_formats_links do |f| %> <%# other_formats_links do |f| %>
<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %> <%#= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
<% end %> <%# end %>
<% content_for :sidebar do %> <% content_for :sidebar do %>
<%= form_tag({}, :method => :get) do %> <%= form_tag({}, :method => :get) do %>

4
app/views/issues/bulk_edit.html.erb
View File

@ -107,14 +107,14 @@
<% if @safe_attributes.include?('start_date') %> <% if @safe_attributes.include?('start_date') %>
<p> <p>
<label for='issue_start_date'><%= l(:field_start_date) %></label> <label for='issue_start_date'><%= l(:field_start_date) %></label>
<%= text_field_tag 'issue[start_date]', '', :size => 10 %><%= calendar_for('issue_start_date') %> <%= text_field_tag 'issue[start_date]', '', :size => 10, :readonly => true %><%= calendar_for('issue_start_date') %>
</p> </p>
<% end %> <% end %>
<% if @safe_attributes.include?('due_date') %> <% if @safe_attributes.include?('due_date') %>
<p> <p>
<label for='issue_due_date'><%= l(:field_due_date) %></label> <label for='issue_due_date'><%= l(:field_due_date) %></label>
<%= text_field_tag 'issue[due_date]', '', :size => 10 %><%= calendar_for('issue_due_date') %> <%= text_field_tag 'issue[due_date]', '', :size => 10, :readonly => true %><%= calendar_for('issue_due_date') %>
</p> </p>
<% end %> <% end %>

37
app/views/layouts/_base_header.html.erb
View File

@ -42,48 +42,25 @@
<ul class="sub_menu"> <ul class="sub_menu">
<% if @show_course == 1 %> <% if @show_course == 1 %>
<% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%> <% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%>
<% hasCourse=false %> <% hasCourse=false %>
<% User.current.courses.each do |course| %> <% User.current.courses.each do |course| %>
<% if !course_endTime_timeout?(course) %> <% if !course_endTime_timeout?(course) %>
<% hasCourse=true %> <% hasCourse=true %>
<% end %> <% end %>
<% end %> <% end %>
<% if hasCourse %> <%= render :partial => 'layouts/user_courses_list', :locals => {:hasCourse => hasCourse} %>
<li id="course_loggedas_li" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id} %>
<ul class="course_sub_menu">
<% User.current.courses.each do |course| %>
<% if !course_endTime_timeout?(course) %>
<li style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="<%=course.name%>"><%= link_to course.name, {:controller => 'courses',:action => 'show',id:course.id} %></li>
<% end %>
<% end %>
</ul>
</li>
<% end %>
<% end -%> <% end -%>
<% end %> <% end %>
<%= render :partial => 'layouts/user_project_list', :locals => {:hasCourse => hasCourse} %>
<% if User.current.projects.count>0 %> <li style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
<li id="project_loggedas_li" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"> <%=link_to l(:label_user_edit), {:controller => 'my', :action=> 'account', host: Setting.user_domain}%>
<%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.project_domain} %>
<% if hasCourse %>
<ul class="project_sub_menu" style="top: 35px">
<% else %>
<ul class="project_sub_menu" style="top: 0px">
<% end %>
<% User.current.projects.each do |project| %>
<li style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="<%=project.name%>"><%= link_to project.name, {:controller => 'projects', :action => 'show',id: project.id, host: Setting.project_domain } %></li>
<% end %>
</ul>
</li>
<% end %>
<li style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%=link_to l(:label_user_edit), {:controller => 'my', :action=> 'account', host: Setting.user_domain}%>
</li> </li>
</ul> </ul>
</li> </li>
<li style="padding:0 0; margin:0 0;display:inline;border-bottom: 0;"> <li style="padding:0 0; margin:0 0;display:inline;border-bottom: 0;">
<%=link_to l(:label_my_message)+'('+User.current.count_new_jour.to_s+')', { :controller => 'users', :action => 'user_newfeedback', id: User.current.id, host: Setting.user_domain }, {:class => 'my-message'} if User.current.logged?%> <%=link_to l(:label_my_message)+'('+User.current.count_new_jour.to_s+')',
{ :controller => 'users', :action => 'user_newfeedback', id: User.current.id, host: Setting.user_domain },
{:class => 'my-message'} if User.current.logged?%>
</li> </li>
</ul> </ul>
</div> </div>

14
app/views/layouts/_user_courses_list.html.erb Normal file
View File

@ -0,0 +1,14 @@
<% if hasCourse %>
<li id="course_loggedas_li" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
<%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id} %>
<ul class="course_sub_menu">
<% User.current.courses.each do |course| %>
<% if !course_endTime_timeout?(course) %>
<li style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="<%=course.name%>">
<%= link_to course.name, {:controller => 'courses',:action => 'show',id:course.id} %>
</li>
<% end %>
<% end %>
</ul>
</li>
<% end %>

12
app/views/layouts/_user_project_list.html.erb Normal file
View File

@ -0,0 +1,12 @@
<% if User.current.projects.count>0 %>
<li id="project_loggedas_li" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
<%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.project_domain} %>
<ul class="project_sub_menu" style="top:<%= hasCourse ? 35 : 0 %>px;">
<% User.current.projects.each do |project| %>
<li style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="<%=project.name%>">
<%= link_to project.name, {:controller => 'projects', :action => 'show',id: project.id, host: Setting.project_domain } %>
</li>
<% end %>
</ul>
</li>
<% end %>

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

@ -107,7 +107,7 @@
<tr> <tr>
<td valign="top" style="padding-left: 8px; width:60px">主讲老师 :</td> <td valign="top" style="padding-left: 8px; width:60px">主讲老师 :</td>
<td class="font_lighter_sidebar"><%= link_to(@user.lastname+@user.firstname, user_path(@user)) %></td> <td class="font_lighter_sidebar"><%= link_to(course.teacher.lastname+course.teacher.firstname, user_path(course.teacher)) %></td>
</tr> </tr>
<tr> <tr>

36
app/views/messages/_course_show.html.erb
View File

@ -58,7 +58,6 @@
/*border-radius: 10px;*/ /*border-radius: 10px;*/
} }
</style> </style>
<div class="lz"> <div class="lz">
<!-- 在这里添加赞和踩--> <!-- 在这里添加赞和踩-->
<span id="praise_tread" style="float: right"> <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @topic,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%> </span> <span id="praise_tread" style="float: right"> <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @topic,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%> </span>
@ -132,20 +131,20 @@
<td> <td>
<div class="contextual-borad"> <div class="contextual-borad">
<%= link_to( <%= link_to(
"引用", l(:button_quote),
{:action => 'quote', :id => message}, {:action => 'quote', :id => message},
:remote => true, :remote => true,
:method => 'get', :method => 'get',
:title => l(:button_quote)) if !@topic.locked? && authorize_for('messages', 'reply') %> :title => l(:button_quote)) if !@topic.locked? && authorize_for('messages', 'reply') %>
<%= link_to( <%= link_to(
#image_tag('edit.png'), #image_tag('edit.png'),
"编辑", l(:button_edit),
{:action => 'edit', :id => message}, {:action => 'edit', :id => message},
:title => l(:button_edit) :title => l(:button_edit)
) if message.course_editable_by?(User.current) %> ) if message.course_editable_by?(User.current) %>
<%= link_to( <%= link_to(
#image_tag('delete.png'), #image_tag('delete.png'),
"删除", l(:button_delete),
{:action => 'destroy', :id => message}, {:action => 'destroy', :id => message},
:method => :post, :method => :post,
:data => {:confirm => l(:text_are_you_sure)}, :data => {:confirm => l(:text_are_you_sure)},
@ -175,10 +174,12 @@
<% end %> <% end %>
<% if !@topic.locked? && authorize_for_course('messages', 'reply') %> <% if !@topic.locked? && authorize_for_course('messages', 'reply') %>
<div id="reply" style="display:none;"> <div id="reply" style="display:none;">
<%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %> <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
<%= render :partial => 'form', :locals => {:f => f, :replying => true} %> <%= render :partial => 'form', :locals => {:f => f, :replying => true} %>
<%= submit_tag l(:button_submit) %> <%#= submit_tag l(:button_submit) %>
<%= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form') %> <input type="button" class="enterprise" value="<%=l(:button_submit) %>" onclick="submit_message_replay();" >
<%#= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form') %>
<% end %> <% end %>
<div id="preview" class="wiki"></div> <div id="preview" class="wiki"></div>
</div> </div>
@ -190,4 +191,27 @@
jQuery(document).ready(function($) { jQuery(document).ready(function($) {
transpotUrl('#content'); transpotUrl('#content');
}); });
function submit_message_replay()
{
if(regexContent())
{
$("#message-form").submit();
}
}
function regexContent()
{
var content = $.trim($("#message_content").val());
if(content.length ==0)
{
$("#message_content_span").text("<%= l(:label_reply_empty) %>");
$("#message_content_span").css('color','#ff0000');
return false;
}
else
{
$("#message_content_span").text("<%= l(:label_field_correct) %>");
$("#message_content_span").css('color','#008000');
return true;
}
}
</script> </script>

17
app/views/messages/_form.html.erb
View File

@ -5,11 +5,21 @@
<div class="box ph10_5"> <div class="box ph10_5">
<!--[form:message]--> <!--[form:message]-->
<% unless replying %> <% unless replying %>
<p><label for="message_subject"><%= l(:field_subject) %><span class="required"> *&nbsp;&nbsp;</span></label><br/> <p>
<label for="message_subject">
<%= l(:field_subject) %>
<span class="required"> *&nbsp;&nbsp;</span>
</label>
<br/>
<%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject", :maxlength => 254 %><!--by young--> <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject", :maxlength => 254 %><!--by young-->
</p> </p>
<% else %> <% else %>
<p><label for="message_subject"><%= l(:field_subject) %><span class="required"> *&nbsp;&nbsp;</span></label><br/> <p>
<label for="message_subject">
<%= l(:field_subject) %>
<span class="required"> *&nbsp;&nbsp;</span>
</label>
<br/>
<%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject", :readonly => true %> <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject", :readonly => true %>
</p> </p>
<% end %> <% end %>
@ -31,7 +41,8 @@
</p> </p>
<p> <p>
<%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %> <%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %>
<%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content' %> <%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content', :onblur => "regexContent();" %>
<span id="message_content_span"></span>
</p> </p>
<!--[eoform:message]--> <!--[eoform:message]-->

6
app/views/news/_course_news.html.erb
View File

@ -74,9 +74,9 @@
<%= labelled_form_for @news, :url => course_news_index_path(@course), <%= labelled_form_for @news, :url => course_news_index_path(@course),
:html => {:id => 'news-form', :multipart => true} do |f| %> :html => {:id => 'news-form', :multipart => true} do |f| %>
<%= render :partial => 'news/course_form', :locals => {:f => f, :is_new => true} %> <%= render :partial => 'news/course_form', :locals => {:f => f, :is_new => true} %>
<%= link_to l(:button_create), "#", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'whiteButton m3p10' %>| <%= link_to l(:button_create), "#", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'whiteButton m3p10' %>
<%= preview_link preview_news_path(:course_id => @course), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %> <%#= preview_link preview_news_path, 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
|
<%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'whiteButton m3p10' %> <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'whiteButton m3p10' %>
<% end if @course %> <% end if @course %>
<div id="preview" class="wiki"></div> <div id="preview" class="wiki"></div>

2
app/views/news/_course_show.html.erb
View File

@ -70,7 +70,7 @@
<%= render :partial => 'course_form', :locals => { :f => f, :is_new => false } %> <%= render :partial => 'course_form', :locals => { :f => f, :is_new => false } %>
<%#= submit_tag l(:button_save) %> <%#= submit_tag l(:button_save) %>
<%= link_to l(:button_save), "#", :onclick => 'submitNews();',:onmouseover => 'this.focus()',:class => 'whiteButton m3p10' %> <%= link_to l(:button_save), "#", :onclick => 'submitNews();',:onmouseover => 'this.focus()',:class => 'whiteButton m3p10' %>
<%= preview_link preview_news_path(:course_id => @course, :id => @news), 'news-form',target='preview',{:class => 'whiteButton m3p10'} %> | <%#= preview_link preview_news_path(:course_id => @course, :id => @news), 'news-form',target='preview',{:class => 'whiteButton m3p10'} %>
<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;',:class => 'whiteButton m3p10' %> <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;',:class => 'whiteButton m3p10' %>
<% end %> <% end %>
<div id="preview" class="wiki"></div> <div id="preview" class="wiki"></div>

4
app/views/news/_project_news.html.erb
View File

@ -84,8 +84,8 @@
<%#= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %><!-- button-submit --> <%#= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %><!-- button-submit -->
<%= link_to l(:button_create), "#", :onclick => 'submitNews();',:onmouseover => 'submitFocus(this);', :class => 'whiteButton m3p10' %> <%= link_to l(:button_create), "#", :onclick => 'submitNews();',:onmouseover => 'submitFocus(this);', :class => 'whiteButton m3p10' %>
| |
<%= preview_link preview_news_path(:project_id => @project), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %> <%#= preview_link preview_news_path(:project_id => @project), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
|
<%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'whiteButton m3p10' %> <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'whiteButton m3p10' %>
<% end if @project %> <% end if @project %>
<div id="preview" class="wiki"></div> <div id="preview" class="wiki"></div>

2
app/views/news/_project_show.html.erb
View File

@ -70,7 +70,7 @@
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<%#= submit_tag l(:button_save) %> <%#= submit_tag l(:button_save) %>
<%= link_to l(:button_save), "#", :onclick => 'submitNews();',:onmouseover => 'this.focus()',:class => 'whiteButton m3p10' %> <%= link_to l(:button_save), "#", :onclick => 'submitNews();',:onmouseover => 'this.focus()',:class => 'whiteButton m3p10' %>
<%= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form',target='preview',{:class => 'whiteButton m3p10'} %> | <%#= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form',target='preview',{:class => 'whiteButton m3p10'} %>
<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;',:class => 'whiteButton m3p10' %> <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;',:class => 'whiteButton m3p10' %>
<% end %> <% end %>
<div id="preview" class="wiki"></div> <div id="preview" class="wiki"></div>

2
app/views/news/edit.html.erb
View File

@ -3,7 +3,7 @@
<%= labelled_form_for @news, :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %> <%= labelled_form_for @news, :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<%= submit_tag l(:button_save) %> <%= submit_tag l(:button_save) %>
<%= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form' %> <%#= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form' %>
<% end %> <% end %>
<div id="preview" class="wiki"></div> <div id="preview" class="wiki"></div>

4
app/views/news/new.html.erb
View File

@ -4,14 +4,14 @@
:html => {:id => 'news-form', :multipart => true} do |f| %> :html => {:id => 'news-form', :multipart => true} do |f| %>
<%= render :partial => 'news/form', :locals => {:f => f} %> <%= render :partial => 'news/form', :locals => {:f => f} %>
<%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %> <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
<%= preview_link preview_news_path(:project_id => @project), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %> <%#= preview_link preview_news_path(:project_id => @project), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
<% end %> <% end %>
<% elsif @course %> <% elsif @course %>
<%= labelled_form_for @news, :url => course_news_index_path(@course), <%= labelled_form_for @news, :url => course_news_index_path(@course),
:html => {:id => 'news-form', :multipart => true} do |f| %> :html => {:id => 'news-form', :multipart => true} do |f| %>
<%= render :partial => 'news/form', :locals => {:f => f} %> <%= render :partial => 'news/form', :locals => {:f => f} %>
<%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %> <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
<%= preview_link preview_news_path(:course_id => @course), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %> <%#= preview_link preview_news_path(:course_id => @course), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
<% end %> <% end %>
<% end %> <% end %>
<div id="preview" class="wiki"></div> <div id="preview" class="wiki"></div>

2
app/views/projects/_new_homework.html.erb
View File

@ -68,7 +68,7 @@ border-top: 1px solid #acaeb1; border-bottom: 1px solid #acaeb1; margin-top: 30p
<td colspan="2"><div class="tableline"></div></td> <td colspan="2"><div class="tableline"></div></td>
</tr> </tr>
<tr> <tr>
<td colspan="2"><%= text_field_tag 'bid_deadline', "#{l(:label_deadline)}", :class => 'noline', :required => true, <td colspan="2"><%= text_field_tag 'bid_deadline', "#{l(:label_deadline)}", :class => 'noline', :readonly => true, :required => true,
:onfocus => "clearInfo('bid_deadline', '#{l(:label_deadline)}')", :onblur => "showInfo('bid_deadline', '#{l(:label_deadline)}')"%> :onfocus => "clearInfo('bid_deadline', '#{l(:label_deadline)}')", :onblur => "showInfo('bid_deadline', '#{l(:label_deadline)}')"%>
<%= calendar_for('bid_deadline')%></td> <%= calendar_for('bid_deadline')%></td>
</tr> </tr>

2
app/views/timelog/_form.html.erb
View File

@ -13,7 +13,7 @@
<%= f.text_field :issue_id, :size => 6 %> <%= f.text_field :issue_id, :size => 6 %>
<span id="time_entry_issue"><%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %></span> <span id="time_entry_issue"><%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %></span>
</p> </p>
<p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p> <p><%= f.text_field :spent_on, :size => 10, :required => true, :readonly => true %><%= calendar_for('time_entry_spent_on') %></p>
<p><%= f.text_field :hours, :size => 6, :required => true %></p> <p><%= f.text_field :hours, :size => 6, :required => true %></p>
<p><%= f.text_field :comments, :size => 100, :maxlength => 255 %></p> <p><%= f.text_field :comments, :size => 100, :maxlength => 255 %></p>
<p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p> <p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p>

2
app/views/timelog/bulk_edit.html.erb
View File

@ -18,7 +18,7 @@
<p> <p>
<label><%= l(:field_spent_on) %></label> <label><%= l(:field_spent_on) %></label>
<%= text_field :time_entry, :spent_on, :size => 10 %><%= calendar_for('time_entry_spent_on') %> <%= text_field :time_entry, :spent_on, :size => 10, :readonly => true %><%= calendar_for('time_entry_spent_on') %>
</p> </p>
<p> <p>

39
app/views/versions/_form.html.erb
View File

@ -2,15 +2,40 @@
<%= error_messages_for 'version' %> <%= error_messages_for 'version' %>
<div class="box tabular"> <div class="box tabular">
<p style="margin-left:-10px;"><%= f.text_field :name, :size => 60, :required => true %></p> <p style="margin-left:-10px;">
<p style="margin-left:-20px;"><%= f.text_field :description, :size => 60, :style => "margin-left:10px;" %></p> <%= f.text_field :name, :size => 60, :required => true %>
<p style="margin-left:-20px;"><span style="margin-left:10px;"><%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %></span></p> </p>
<p style="margin-left:-20px;"><span style="margin-left:10px;"><%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %></span></p> <p style="margin-left:-20px;">
<p style="margin-left:-20px;"><span style="margin-left:10px;"><%= f.text_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></span></p> <%= f.text_field :description, :size => 60, :style => "margin-left:10px;" %>
<p style="margin-left:-20px;"><span style="margin-left:10px;"><%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %></span></p> </p>
<p style="margin-left:-20px;">
<span style="margin-left:10px;">
<%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %>
</span>
</p>
<p style="margin-left:-20px;">
<span style="margin-left:10px;">
<%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %>
</span>
</p>
<p style="margin-left:-20px;">
<span style="margin-left:10px;">
<%= f.text_field :effective_date, :size => 10, :readonly => true %>
<%= calendar_for('version_effective_date') %>
</span>
</p>
<p style="margin-left:-20px;">
<span style="margin-left:10px;">
<%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %>
</span>
</p>
<% @version.custom_field_values.each do |value| %> <% @version.custom_field_values.each do |value| %>
<p style="margin-left:-20px;"><span style="margin-left:10px;"><%= custom_field_tag_with_label :version, value %></span></p> <p style="margin-left:-20px;">
<span style="margin-left:10px;">
<%= custom_field_tag_with_label :version, value %>
</span>
</p>
<% end %> <% end %>
</div> </div>

48
app/views/welcome/course.html.erb
View File

@ -78,29 +78,28 @@
<div id="J_Slide" class="d-p-index-box d-p-index-hotproject"> <div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
<h3><strong><%= l(:lable_hot_course)%></strong></h3> <h3><strong><%= l(:lable_hot_course)%></strong></h3>
<% if @school_id %>
<% school_course = find_miracle_course(10,7, @school_id) %>
<% else %>
<%school_course=[]%>
<% end %>
<% if (school_course.count == 0) %>
<span><%= render :partial => 'more_course', :locals => {:school_id => nil}%></span>
<% month_now = Time.now.strftime("%m").to_i %>
<% year_now = Time.new.strftime("%Y") %>
<!-- 3-8月份为查找春季课程，9-2月份为查找秋季课程 -->
<% (month_now >= 3 && month_now < 9) ? course_term = "春季学期" : course_term = "秋季学期" %>
<% @school_id.nil? ? cur_school_course = [] : cur_school_course = find_miracle_course(10,7,@school_id, year_now, course_term) %>
<% if cur_school_course.count == 0 %>
<span><%= render :partial => 'more_course', :locals => {:school_id => nil}%></span>
<div class="d-p-projectlist-box"> <div class="d-p-projectlist-box">
<ul class="d-p-projectlist"> <ul class="d-p-projectlist">
<% if User.current.logged? %> <% if User.current.logged? %>
<li> <li>
<%= render :partial => 'no_course_title', :locals => {:course_title => l(:label_school_no_course)} %> <%= render :partial => 'no_course_title', :locals => {:course_title => l(:label_school_no_course)} %>
</li> </li>
<%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(9, @school_id)} %>
<% else %>
<%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(10, @school_id)} %>
<% end %> <% end %>
<% User.current.logged? ? course_count = 9 : course_count = 10 %>
<%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(course_count, @school_id, year_now, course_term)} %>
</ul> </ul>
</div> </div>
<% else %> <% else %>
<% if school_course.count < 9 %> <% if cur_school_course.count < 9 %>
<span> <span>
<%= render :partial => 'more_course', :locals => {:school_id => nil}%> <%= render :partial => 'more_course', :locals => {:school_id => nil}%>
</span> </span>
@ -111,12 +110,12 @@
<% end %> <% end %>
<div class="d-p-projectlist-box"> <div class="d-p-projectlist-box">
<ul class="d-p-projectlist"> <ul class="d-p-projectlist">
<%= render :partial => 'course_list', :locals => {:course_list => school_course} %> <%= render :partial => 'course_list', :locals => {:course_list => cur_school_course} %>
<% if school_course.count < 9 %> <% if cur_school_course.count < 9 %>
<li> <li>
<%= render :partial => 'no_course_title', :locals => {:course_title => l(:label_school_less_course)} %> <%= render :partial => 'no_course_title', :locals => {:course_title => l(:label_school_less_course)} %>
</li> </li>
<%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(9 - school_course.count, @school_id)} %> <%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(9-cur_school_course.count, @school_id, year_now, course_term)} %>
<% end %> <% end %>
</ul> </ul>
</div> </div>
@ -136,19 +135,26 @@
<% find_new_forum_topics(10).each do |topic| %> <% find_new_forum_topics(10).each do |topic| %>
<li class="message-brief-intro" style="min-height: 65px; line-height:2em; "> <li class="message-brief-intro" style="min-height: 65px; line-height:2em; ">
<div style="display: inline-block; width: 100%;"> <div style="display: inline-block; width: 100%;">
<span class="memo_activity text_nowrap" style="color:gray; display: inline-block; margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="memo_activity text_nowrap" title="<%= topic.subject%>"
<%= link_to '['+topic.forum.name + ']', forum_path(topic.forum), :class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray", :style => "font-size: 10pt !important;" %> style="color:gray; display: inline-block; margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<%= link_to '['+topic.forum.name + ']', forum_path(topic.forum), :class => 'memo_Bar_title' %>
<%= link_to topic.subject, topic.event_url, :class => "gray", :style => "font-size: 10pt !important;" %>
</span> </span>
<div class='memo_activity memo_attr'> <div class='memo_activity memo_attr'>
<span class='memo_timestamp'> <span class='memo_timestamp'>
<%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %> <%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
</span> </span>
<span class="memo_author"> <span class="memo_author" title="<%= topic.author.login%>">
<%= l(:label_question_sponsor)%>： <%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %> <%= l(:label_question_sponsor)%>：
<%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %>
</span> </span>
<span class="memo_last_person"> <span class="memo_last_person" title="<%= topic.last_reply.author.login unless (topic.last_reply.nil? || topic.last_reply.author.nil?)%>">
<%= l(:label_final_reply)%>：<% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %><%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%><% end %> <%= l(:label_final_reply)%>：
<% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %>
<%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%>
<% end %>
</span> </span>
<span class="memo_reply"> <span class="memo_reply">
<%= l(:label_reply)%>(<%= link_to topic.try(:replies_count), topic.event_url %>) <%= l(:label_reply)%>(<%= link_to topic.try(:replies_count), topic.event_url %>)

2
app/views/wiki/edit.html.erb
View File

@ -44,7 +44,7 @@
</div> </div>
<p><%= submit_tag l(:button_save) %> <p><%= submit_tag l(:button_save) %>
<%= preview_link({:controller => 'wiki', :action => 'preview', :project_id => @project, :id => @page.title }, 'wiki_form') %></p> <%#= preview_link({:controller => 'wiki', :action => 'preview', :project_id => @project, :id => @page.title }, 'wiki_form') %></p>
<%= wikitoolbar_for 'content_text' %> <%= wikitoolbar_for 'content_text' %>
<% end %> <% end %>

4
app/views/words/_new_respond.html.erb
View File

@ -8,6 +8,8 @@
<%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %> <%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
<%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %> <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %>
<%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id.id %> <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id.id %>
<%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "enterprise", :style => "float: right; margin-top: 1px; margin-right: 4px;"%> <%= submit_tag l(:button_projects_feedback_respond), :name => nil ,
:class => "enterprise",
:style => "float: right; margin-top: 1px; margin-right: 4px;"%>
<% end %> <% end %>

19
config/routes.rb
View File

@ -100,7 +100,6 @@ RedmineApp::Application.routes.draw do
#resources :contestnotifications, :only => [:index, :show, :edit, :update, :destroy] #resources :contestnotifications, :only => [:index, :show, :edit, :update, :destroy]
# match '/contestnotifications/:id/notificationcomments', :to => 'notificationcomments#create', :via => :post # match '/contestnotifications/:id/notificationcomments', :to => 'notificationcomments#create', :via => :post
# match '/contestnotifications/:id/notificationcomments/:notificationcomment_id', :to => 'notificationcomments#destroy', :via => :delete # match '/contestnotifications/:id/notificationcomments/:notificationcomment_id', :to => 'notificationcomments#destroy', :via => :delete
match '/contestnotifications/preview', :to => 'previews#contestnotification', :as => 'preview_contestnotifications', :via => [:get, :post, :put]
## new added by linchun #新竞赛相关 ## new added by linchun #新竞赛相关
resources :contests, only: [:index] do resources :contests, only: [:index] do
resources :contestnotifications do resources :contestnotifications do
@ -136,6 +135,19 @@ RedmineApp::Application.routes.draw do
end end
end end
match '/news/preview', :to => 'previews#news', :as => 'preview_news', :via => [:get, :post, :put]
match '/issues/preview/new/:project_id', :to => 'previews#issue', :as => 'preview_new_issue', :via => [:get, :post, :put]
match '/issues/preview/edit/:id', :to => 'previews#issue', :as => 'preview_edit_issue', :via => [:get, :post, :put]
match '/issues/preview', :to => 'previews#issue', :as => 'preview_issue', :via => [:get, :post, :put]
match '/contestnotifications/preview', :to => 'previews#contestnotification', :as => 'preview_contestnotifications', :via => [:get, :post, :put]
#resource :previews, only: [] do
# collection do
# match 'news', :via => [:get, :post, :put]
# match 'issue', :via => [:get, :post, :put]
# end
#end
resources :stores do resources :stores do
collection do collection do
match 'search', :via => [:get, :post] match 'search', :via => [:get, :post]
@ -188,11 +200,6 @@ RedmineApp::Application.routes.draw do
match 'account/activate', :via => :get match 'account/activate', :via => :get
match 'account/valid_ajax', :via => :get match 'account/valid_ajax', :via => :get
match '/news/preview', :to => 'previews#news', :as => 'preview_news', :via => [:get, :post, :put]
match '/issues/preview/new/:project_id', :to => 'previews#issue', :as => 'preview_new_issue', :via => [:get, :post, :put]
match '/issues/preview/edit/:id', :to => 'previews#issue', :as => 'preview_edit_issue', :via => [:get, :post, :put]
match '/issues/preview', :to => 'previews#issue', :as => 'preview_issue', :via => [:get, :post, :put]
match 'projects/:id/wiki', :to => 'wikis#edit', :via => :post match 'projects/:id/wiki', :to => 'wikis#edit', :via => :post
match 'projects/:id/wiki/destroy', :to => 'wikis#destroy', :via => [:get, :post] match 'projects/:id/wiki/destroy', :to => 'wikis#destroy', :via => [:get, :post]

54
public/404.html
View File

@ -1,23 +1,41 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
"http://www.w3.org/TR/html4/loose.dtd"> <html xmlns="http://www.w3.org/1999/xhtml">
<html> <head>
<title>Trustie 404 error</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>页面不见了</title>
<style> <style>
body{ body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff;}
font-family: Trebuchet MS,Georgia,"Times New Roman",serif; div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margin:0; padding:0;}
color:#303030; div,img,tr,td{ border:0;}
margin:10px; table,tr,td{border:0 cellspacing:0; cellpadding:0;}
} ul,li{ list-style-type:none}
h1{ .cl{ clear:both; overflow:hidden; }
font-size:1.5em; a{ text-decoration:none; }
} a:hover{ }
p{
font-size:0.8em; .content{ width:550px; height:200px; margin:0 auto; padding:10px 0;}
} .left{color:#15bccf; font-size:100px; font-weight:bold; font-style:oblique; width:200px; height:120px; padding-right:30px; float:left;}
.right{ width:240px; height:120px; float:left;color:#15bccf; font-size: 18px; font-weight:bold; padding-left:30px; margin-top:40px; border-left:1px dashed #CCC; }
.link{ margin-top:8px;}
.link a{ display:block; width:80px; height:30px; font-size:14px; font-weight:bold; color:#fff; text-align:center; background:#15bccf; float:left; margin-right:10px;}
.link a:hover{ background:#ff8417;}
</style> </style>
</head>
<body> <body>
<h1>Page not found</h1>
<p>The page you were trying to access doesn't exist or has been removed.</p> <div class="content">
<p><a href="javascript:history.back()">Back</a></p> <div class="left">404</div>
<div class="right">
<p><span style="font-size:24px;">ERROR PAGE</span><br />
页面不见了！建议您</p>
<div class="link">
<!---<a href="http://forge.trustie.net/" target="_blank">返回首页</a>---->
<a href="#" target="_blank">后退一步</a>
<a href="http://user.trustie.net/users/5/user_newfeedback" target="_blank">给我留言</a>
</div>
</div>
</div>
</body> </body>
</html> </html>