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

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
z9hang 2014-10-17 15:02:22 +08:00
parent e4ff85894d 98c2313a66
commit aef3847290
14 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/courses_controller.rb
View File

@ -39,6 +39,8 @@ class CoursesController < ApplicationController
else
@state = 3
end
else
@state = 4
end
respond_to do |format|
# format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
@ -101,6 +103,7 @@ class CoursesController < ApplicationController
else
respond_to do |format|
format.html {
settings
render :action => 'settings'
}
format.api { render_validation_errors(@course) }

2
app/controllers/messages_controller.rb
View File

@ -141,7 +141,7 @@ class MessagesController < ApplicationController
if @message.parent
redirect_to board_message_url(@board, @message.parent, :r => r)
else
redirect_to board_message_url(@project, @board)
redirect_to project_boards_url(@project)
end
elsif @course
if @message.parent

1
app/controllers/settings_controller.rb
View File

@ -24,6 +24,7 @@ class SettingsController < ApplicationController
before_filter :require_admin
def index
edit
render :action => 'edit'
end

1
app/controllers/trackers_controller.rb
View File

@ -57,6 +57,7 @@ class TrackersController < ApplicationController
redirect_to trackers_url
return
end
new
render :action => 'new'
end

2
app/controllers/web_footer_companies_controller.rb
View File

@ -20,6 +20,7 @@ class WebFooterCompaniesController < ApplicationController
redirect_to web_footer_companies_url
else
flash[:error] = "#{l :web_footer_company_create_fail}: #{@company.errors.full_messages[0]}"
new
render :action => 'new'
end
end
@ -41,6 +42,7 @@ class WebFooterCompaniesController < ApplicationController
redirect_to web_footer_companies_url
else
flash[:error] = "#{l :web_footer_company_update_fail}: #{@company.errors.full_messages[0]}"
edit
render :action => 'edit'
end
end

1
app/controllers/wiki_controller.rb
View File

@ -68,6 +68,7 @@ class WikiController < ApplicationController
def show
if @page.new_record?
if User.current.allowed_to?(:edit_wiki_pages, @project) && editable? && !api_request?
edit
render :action => 'edit'
else
render_404

2
app/views/common/403.html
View File

@ -31,7 +31,7 @@ a:hover{ }
没有访问权限！建议您</p>
<div class="error_link">
<!---<a href="http://forge.trustie.net/" target="_blank">返回首页</a>---->
<a href="#" target="_blank">后退一步</a>
<a href="javascript:history.back()" target="_blank">后退一步</a>
<a href="http://user.trustie.net/users/5/user_newfeedback" target="_blank">给我留言</a>
</div>
</div>

2
app/views/common/404.html
View File

@ -31,7 +31,7 @@ a:hover{ }
页面不见了！建议您</p>
<div class="error_link">
<!---<a href="http://forge.trustie.net/" target="_blank">返回首页</a>---->
<a href="#" target="_blank">后退一步</a>
<a href="javascript:history.back()" target="_blank">后退一步</a>
<a href="http://user.trustie.net/users/5/user_newfeedback" target="_blank">给我留言</a>
</div>
</div>

14
app/views/courses/_set_join.js.erb
View File

@ -3,16 +3,18 @@
<% end %>
<% if @state %>
<% if @state == 0 %>
alert("加入成功")
alert("加入成功");
<% elsif @state == 1 %>
alert("密码错误")
alert("密码错误");
<% elsif @state == 2 %>
alert("课程已过期\n请联系课程管理员重启课程。(在配置课程处)")
alert("课程已过期\n请联系课程管理员重启课程。(在配置课程处)");
<% elsif @state == 3 %>
alert("您已经加入了课程");
<% elsif @state == 3 %>
alert("您已经的课程不存在")
<% elsif @state == 4 %>
alert("您已经的课程不存在");
<% elsif @state == 4 %>
alert("您还未登录");
<% else %>
alert("未知错误，请稍后再试")
alert("未知错误，请稍后再试");
<% end %>
<% end %>

2
app/views/settings/_display.html.erb
View File

@ -3,7 +3,7 @@
<div class="box tabular settings">
<p><%= setting_select :ui_theme, Redmine::Themes.themes.collect {|t| [t.name, t.id]}, :blank => :label_default, :label => :label_theme %></p>
<p><%= setting_select :default_language, :Chinese简体中文 => :zh, :English => :en %></p>
<p><%= setting_select :default_language, lang_options_for_select(false) %></p>
<p><%= setting_select :start_of_week, [[day_name(1),'1'], [day_name(6),'6'], [day_name(7),'7']], :blank => :label_language_based %></p>
<% locale = User.current.language.blank? ? ::I18n.locale : User.current.language %>

2
app/views/tags/_show_attachments.html.erb
View File

@ -7,7 +7,7 @@
<table border=0 cellSpacing=0 cellPadding=0 style="width: 100%;table-layout: fixed;">
<tbody>
<tr>
<td class="r1">
<td class="r1" style="word-break: break-all;word-wrap: break-word;">
<div class="cb">
<strong><%= l(:label_attachment) %>:&nbsp;&nbsp;<%= file.filename %></strong>
<span style="margin-left: 4px;">

5
app/views/welcome/_more_course.html.erb
View File

@ -4,7 +4,8 @@
:class => 'icon icon-add') if User.current.allowed_to?(:add_course,nil, :global => true) %>
<% end %>
&nbsp;&nbsp;&nbsp;&nbsp;
<%= link_to l(:label_course_join_student), join_private_courses_courses_path ,:remote => true, :class => 'icon icon-add' %>
&nbsp;&nbsp;&nbsp;&nbsp;
<% end %>
<%= link_to l(:label_course_join_student), join_private_courses_courses_path ,:remote => true, :class => 'icon icon-add' %>
&nbsp;&nbsp;&nbsp;&nbsp;
<%= link_to l(:label_more), {:controller => 'courses', :action => 'index', :school_id => school_id} %>

2
public/stylesheets/application.css
View File

@ -1390,7 +1390,7 @@ a.toggle-all:hover {text-decoration:none;}
table.list tbody tr:hover { background-color:#ffffdd; }
table.list tbody tr.group:hover { background-color:inherit; }
table td {padding:2px;word-break: break-all;word-wrap: break-word;}
table td {padding:2px;}
table p {margin:0;}
.odd {background-color:#f6f7f8;}
.even {background-color: #fff;}

2
public/stylesheets/nyan.css
View File

@ -718,6 +718,8 @@ div.actions input[type="text"] {
margin-bottom: 40px;
background-color: #F8F8F8;
border-radius: 3px;
word-break: break-all;
word-wrap: break-word;
}
.memo-timestamp {