diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 63ce5a2df..c54a419cb 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -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) } diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 0fe5f1a3e..8d6943f02 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -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 diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index 19a0669f3..a3f07e21a 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -24,6 +24,7 @@ class SettingsController < ApplicationController before_filter :require_admin def index + edit render :action => 'edit' end diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb index 66a7eec03..988f03952 100644 --- a/app/controllers/trackers_controller.rb +++ b/app/controllers/trackers_controller.rb @@ -57,6 +57,7 @@ class TrackersController < ApplicationController redirect_to trackers_url return end + new render :action => 'new' end diff --git a/app/controllers/web_footer_companies_controller.rb b/app/controllers/web_footer_companies_controller.rb index b61a58189..4c5748e40 100644 --- a/app/controllers/web_footer_companies_controller.rb +++ b/app/controllers/web_footer_companies_controller.rb @@ -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 diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb index 2acbd660a..de9e53554 100644 --- a/app/controllers/wiki_controller.rb +++ b/app/controllers/wiki_controller.rb @@ -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 diff --git a/app/views/common/403.html b/app/views/common/403.html index 8462570e4..39df9d70e 100644 --- a/app/views/common/403.html +++ b/app/views/common/403.html @@ -31,7 +31,7 @@ a:hover{ } 没有访问权限！建议您

- 后退一步 + 后退一步 给我留言
diff --git a/app/views/common/404.html b/app/views/common/404.html index 5a3eaec9f..f4ec0e8f0 100644 --- a/app/views/common/404.html +++ b/app/views/common/404.html @@ -31,7 +31,7 @@ a:hover{ } 页面不见了！建议您

- 后退一步 + 后退一步 给我留言
diff --git a/app/views/courses/_set_join.js.erb b/app/views/courses/_set_join.js.erb index 8b5c1fb36..fb9b9924e 100644 --- a/app/views/courses/_set_join.js.erb +++ b/app/views/courses/_set_join.js.erb @@ -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 %> diff --git a/app/views/settings/_display.html.erb b/app/views/settings/_display.html.erb index 71c44be03..1ae5a351a 100644 --- a/app/views/settings/_display.html.erb +++ b/app/views/settings/_display.html.erb @@ -3,7 +3,7 @@

<%= setting_select :ui_theme, Redmine::Themes.themes.collect {|t| [t.name, t.id]}, :blank => :label_default, :label => :label_theme %>

-

<%= setting_select :default_language, :Chinese简体中文 => :zh, :English => :en %>

+

<%= setting_select :default_language, lang_options_for_select(false) %>

<%= setting_select :start_of_week, [[day_name(1),'1'], [day_name(6),'6'], [day_name(7),'7']], :blank => :label_language_based %>

<% locale = User.current.language.blank? ? ::I18n.locale : User.current.language %> diff --git a/app/views/tags/_show_attachments.html.erb b/app/views/tags/_show_attachments.html.erb index 83fb857f4..4accf4f64 100644 --- a/app/views/tags/_show_attachments.html.erb +++ b/app/views/tags/_show_attachments.html.erb @@ -7,7 +7,7 @@ -
+
<%= l(:label_attachment) %>:  <%= file.filename %> diff --git a/app/views/welcome/_more_course.html.erb b/app/views/welcome/_more_course.html.erb index a5464c27c..66f15fdf2 100644 --- a/app/views/welcome/_more_course.html.erb +++ b/app/views/welcome/_more_course.html.erb @@ -4,7 +4,8 @@ :class => 'icon icon-add') if User.current.allowed_to?(:add_course,nil, :global => true) %> <% end %>      + <%= link_to l(:label_course_join_student), join_private_courses_courses_path ,:remote => true, :class => 'icon icon-add' %> +      <% end %> -<%= link_to l(:label_course_join_student), join_private_courses_courses_path ,:remote => true, :class => 'icon icon-add' %> -     + <%= link_to l(:label_more), {:controller => 'courses', :action => 'index', :school_id => school_id} %> \ No newline at end of file diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 8e6d5f439..417be6a4b 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -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;} diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css index 0b5e32f2f..1693b3a09 100644 --- a/public/stylesheets/nyan.css +++ b/public/stylesheets/nyan.css @@ -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 {