From ede14268dc76d236d7d57dd3a5a08dc999db35d0 Mon Sep 17 00:00:00 2001 From: z9hang Date: Tue, 21 Oct 2014 11:19:07 +0800 Subject: [PATCH 1/6] =?UTF-8?q?tag=E5=AD=97=E6=95=B0=E8=BF=87=E5=A4=9A?= =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/settings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/settings.yml b/config/settings.yml index f1c584b2b..72f8b73c1 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -242,7 +242,7 @@ tags_min_length: default: 1 tags_max_length: format: int - default: 30 + default: 14 tags_show_search_results: format: int default: 5 From a8bc274621b2471a0c32deaa315d064cc18cfc83 Mon Sep 17 00:00:00 2001 From: z9hang Date: Tue, 21 Oct 2014 11:39:05 +0800 Subject: [PATCH 2/6] =?UTF-8?q?admin=E6=93=8D=E4=BD=9C=E6=97=B6=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E5=A4=9A=E4=B8=80=E6=9D=A1=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=88=E5=8E=BB=E6=8E=89=E4=B8=80=E6=9D=A1=EF=BC=89?= =?UTF-8?q?=E3=80=82=E7=BC=96=E8=BE=91=E8=A7=92=E8=89=B2=E6=97=B6=E2=80=9C?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8F=AF=E6=8C=87=E6=B4=BE=E7=BB=99=E6=AD=A4?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E2=80=9D=E6=A0=87=E7=AD=BE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E5=85=A8=E9=97=AE=E9=A2=98=EF=BC=88=E4=BF=AE=E6=94=B9?= =?UTF-8?q?css=E6=A0=B7=E5=BC=8F=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_admin.html.erb | 1 - public/stylesheets/application.css | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/layouts/base_admin.html.erb b/app/views/layouts/base_admin.html.erb index 636e33a3f..5b36febaf 100644 --- a/app/views/layouts/base_admin.html.erb +++ b/app/views/layouts/base_admin.html.erb @@ -36,7 +36,6 @@ <%= yield %> <%= call_hook :view_layouts_base_content %>
- <%= render_flash_messages %> <%= render :partial => 'layouts/base_footer'%> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 417be6a4b..33b4035d6 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1814,7 +1814,7 @@ html>body .tabular p {overflow:hidden;} float: left; text-align: right; /* width of left column */ - margin-left: -180px; + margin-left: -150px; /* width of labels. Should be smaller than left column to create some right margin */ width: 175px; font-size: 12px; From 38345c0c689dfeadd279fe77d7f28ffbb7d4ea96 Mon Sep 17 00:00:00 2001 From: z9hang Date: Tue, 21 Oct 2014 14:27:58 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=87=8D=E6=96=B0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=A7=92=E8=89=B2=E6=9C=89label=E5=AD=97?= =?UTF-8?q?=E6=9C=AA=E6=98=BE=E7=A4=BA=E5=85=A8=E9=97=AE=E9=A2=98=EF=BC=88?= =?UTF-8?q?=E5=89=8D=E6=AC=A1=E4=BF=AE=E6=94=B9=E5=BD=B1=E5=93=8D=E4=BA=86?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=9C=B0=E6=96=B9=EF=BC=89=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E5=90=88=E4=BD=9C=E5=8D=95=E4=BD=8D=EF=BC=8C=E5=A1=AB?= =?UTF-8?q?=E5=86=99=E5=AD=97=E6=AE=B5=E4=B8=8D=E6=AD=A3=E7=A1=AE=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E6=B8=85=E7=A9=BA=E7=94=A8=E6=88=B7=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/web_footer_companies_controller.rb | 8 ++++++-- app/views/roles/_form.html.erb | 2 +- public/stylesheets/application.css | 13 ++++++++++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/controllers/web_footer_companies_controller.rb b/app/controllers/web_footer_companies_controller.rb index b61a58189..0fa076c2f 100644 --- a/app/controllers/web_footer_companies_controller.rb +++ b/app/controllers/web_footer_companies_controller.rb @@ -10,7 +10,7 @@ class WebFooterCompaniesController < ApplicationController end def new - @company = WebFooterCompany.new + @company ||= WebFooterCompany.new end def create @@ -20,7 +20,11 @@ class WebFooterCompaniesController < ApplicationController redirect_to web_footer_companies_url else flash[:error] = "#{l :web_footer_company_create_fail}: #{@company.errors.full_messages[0]}" - render :action => 'new' + respond_to do |format| + format.html { render :action => 'new'} + format.api { render_validation_errors(@company) } + end + end end diff --git a/app/views/roles/_form.html.erb b/app/views/roles/_form.html.erb index 9ed134f1e..36d3ed8e3 100644 --- a/app/views/roles/_form.html.erb +++ b/app/views/roles/_form.html.erb @@ -1,7 +1,7 @@ <%= error_messages_for 'role' %> <% unless @role.anonymous? %> -
+
<% unless @role.builtin? %>

<%= f.text_field :name, :required => true %>

<%= f.check_box :assignable %>

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 33b4035d6..1f53d9903 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1814,12 +1814,23 @@ html>body .tabular p {overflow:hidden;} float: left; text-align: right; /* width of left column */ - margin-left: -150px; + margin-left: -180px; /* width of labels. Should be smaller than left column to create some right margin */ width: 175px; font-size: 12px; } +.role label{ + font-weight: bold; + float: left; + text-align: right; + /* width of left column */ + margin-left: -60px; + /* width of labels. Should be smaller than left column to create some right margin */ + width: 175px; + font-size: 12px; +} + .tabular label.floating{ font-weight: normal; margin-left: 0px; From b84e19846bb20f1a095dfef4d72c28a46be3f14a Mon Sep 17 00:00:00 2001 From: gonglexin <18008490802@163.com> Date: Tue, 21 Oct 2014 15:38:25 +0800 Subject: [PATCH 4/6] =?UTF-8?q?#1360=20=E5=88=A0=E9=99=A4=E6=88=90?= =?UTF-8?q?=E5=91=98=E6=97=B6=E7=BB=99=E5=87=BA=E7=A1=AE=E8=AE=A4=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=88=A0=E9=99=A4=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/settings/_members.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/courses/settings/_members.html.erb b/app/views/courses/settings/_members.html.erb index f685e4543..5432db8e6 100644 --- a/app/views/courses/settings/_members.html.erb +++ b/app/views/courses/settings/_members.html.erb @@ -51,7 +51,7 @@ :class => 'icon icon-edit' %> <%= delete_link membership_path(member), :remote => true, - :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %> + :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %> <% end %> From 164297e30fa91e0c3bba5264cec940448aff335e Mon Sep 17 00:00:00 2001 From: z9hang Date: Tue, 21 Oct 2014 16:34:46 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=B8=96=E5=AD=90?= =?UTF-8?q?=E8=A6=81=E7=82=B9=E4=B8=A4=E6=AC=A1=E6=8F=90=E4=BA=A4=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/messages/_course_show.html.erb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb index 51764341d..6977385d8 100644 --- a/app/views/messages/_course_show.html.erb +++ b/app/views/messages/_course_show.html.erb @@ -178,7 +178,7 @@ <%= 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} %> <%#= submit_tag l(:button_submit) %> - + <%#= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form') %> <% end %>
@@ -188,12 +188,13 @@ <% html_title @topic.subject %> \ No newline at end of file From 0ba1477f1bd86aa3269f6b96ca393bcd58d80994 Mon Sep 17 00:00:00 2001 From: gonglexin <18008490802@163.com> Date: Tue, 21 Oct 2014 16:51:30 +0800 Subject: [PATCH 6/6] =?UTF-8?q?#1360=20=E7=BF=BB=E9=A1=B5=E6=88=96?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B9=8B=E5=89=8D=E8=8B=A5=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BA=86=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=99=E7=BB=99=E5=87=BA=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/settings/_members.html.erb | 6 +++++- app/views/members/autocomplete.js.erb | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/views/courses/settings/_members.html.erb b/app/views/courses/settings/_members.html.erb index 5432db8e6..ab0f20257 100644 --- a/app/views/courses/settings/_members.html.erb +++ b/app/views/courses/settings/_members.html.erb @@ -82,7 +82,11 @@

<%= l(:label_role_plural) %>: <% roles.each do |role| %> - + <% if role.id == 10 %> + + <% else %> + + <% end %> <% end %>

<%= submit_tag l(:button_add), :id => 'member-add-submit' %>

diff --git a/app/views/members/autocomplete.js.erb b/app/views/members/autocomplete.js.erb index 5ef01c04d..d1e7a884b 100644 --- a/app/views/members/autocomplete.js.erb +++ b/app/views/members/autocomplete.js.erb @@ -1,6 +1,11 @@ <% if @project%> $('#principals_for_new_member').html('<%= escape_javascript(render_principals_for_new_members(@project)) %>'); <% elsif @course%> + var checked = $("#principals input:checked").size(); + if(checked > 0) + { + alert('翻页或搜索后将丢失当前选择的用户数据!'); + } $('#principals_for_new_member').html('<%= escape_javascript(render_principals_for_new_course_members(@course)) %>'); <%end%> var collection=$("#principals_for_new_member").children("#principals").children("label");