From b0f9d0280f70df692e205b4561db0c95486aef3f Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 17 May 2016 09:06:38 +0800 Subject: [PATCH 1/7] 0 --- app/views/organizations/setting.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb index 87d6e4daa..1eb98d229 100644 --- a/app/views/organizations/setting.html.erb +++ b/app/views/organizations/setting.html.erb @@ -111,7 +111,7 @@

添加成员

<%= form_tag url_for(:controller => 'org_member', :action => 'create', :org => @organization),:id=>'org_member_add_form',:remote=>true do |f|%> - <% if @organization.secdomain.nil? %> + <% if @organization.secdomain_name.nil? %> <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript host_with_protocol + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %> <% else %> <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript secdomain_with_protocol(@organization.secdomain_name) + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %> From 76d125154625d4a70c615bb071296dedee2b6656 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 17 May 2016 09:36:55 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=B0=86=E7=BB=84=E7=BB=87=E9=97=A8?= =?UTF-8?q?=E6=88=B7=E7=99=BB=E5=BD=95=E6=A0=8F=E6=8C=AA=E5=88=B0=E4=B8=8E?= =?UTF-8?q?logo=E5=90=8C=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org2.html.erb | 4 +- .../_org_logined_header.html.erb | 52 ++++++++----------- public/stylesheets/org2.css | 2 +- 3 files changed, 26 insertions(+), 32 deletions(-) diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index 9b481fac5..4cae284f5 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -60,11 +60,10 @@
- <%= render :partial => 'organizations/org_logined_header' %>
diff --git a/app/views/organizations/_org_logined_header.html.erb b/app/views/organizations/_org_logined_header.html.erb index 22cf920e9..74e313f6a 100644 --- a/app/views/organizations/_org_logined_header.html.erb +++ b/app/views/organizations/_org_logined_header.html.erb @@ -1,37 +1,31 @@ <% if User.current.logged? %> -
-
- + +
<% else %> -
- +
+ 登录  |   + 注册
<% end %> diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css index c2cf0a478..3d46a9296 100644 --- a/public/stylesheets/org2.css +++ b/public/stylesheets/org2.css @@ -47,6 +47,7 @@ a.sn-link-select {color:#809df9;} .sn-mt10 {margin-top:10px;} .sn-mt13 {margin-top:13px;} .sn-mt15 {margin-top:15px;} +.sn-mt23 {margin-top:23px;} .sn-mt28 {margin-top:28px;} .sn-mb20 {margin-bottom:20px;} .sn-mb40 {margin-bottom:40px;} @@ -65,7 +66,6 @@ a.sn-link-select {color:#809df9;} .sn-bg-white {background-color:#fff;} .sn-bg-blue {background-color:#24366e;} .sn-login {width:1200px; height:45px; line-height:45px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;} -.sn-login2 {width:1200px; height:54px; line-height:54px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;} .sn-logo {width:1200px; height:90px; line-height:90px; margin:0 auto; vertical-align:middle;position:relative;} .sn-search-input {width:328px; height:40px; font-size:16px; color:#ccc; padding-left:10px; border:1px solid #ccc; border-right:none; float:right; background-color:#fff; outline:none;} a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:none; float:right; outline:none; background:url(../images/sn_search_icon.jpg) 0 3px no-repeat;} From 326c3a84a0ff336b98a4c3ef3ab8032787516f3b Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 17 May 2016 09:52:26 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/setting.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb index 1eb98d229..0c8af8471 100644 --- a/app/views/organizations/setting.html.erb +++ b/app/views/organizations/setting.html.erb @@ -111,11 +111,11 @@

添加成员

<%= form_tag url_for(:controller => 'org_member', :action => 'create', :org => @organization),:id=>'org_member_add_form',:remote=>true do |f|%> - <% if @organization.secdomain_name.nil? %> + <%# if @organization.secdomain_name.nil? %> <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript host_with_protocol + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %> - <% else %> - <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript secdomain_with_protocol(@organization.secdomain_name) + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %> - <% end %> + <%# else %> + <%#= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript secdomain_with_protocol(@organization.secdomain_name) + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %> + <%# end %>
<%= find_user_not_in_current_org_by_name(@project) %> From 1402ae190daac64787b0c5ffd7338de14bf644b4 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 17 May 2016 10:03:26 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org2.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index 4cae284f5..0249cb34c 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -65,7 +65,7 @@ <% if @org_logo_attchment.blank? %> <% else %> - + <% end %> <% if User.current.admin_of_org?(@organization) %> From 15ea9a96598222b3c617bb23741837c24cdb3550 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 17 May 2016 10:04:23 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=97=A8=E6=88=B7?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=92=AD=E6=94=BE=E7=A6=81=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org2.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index 0249cb34c..dd85d2e4b 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -46,7 +46,7 @@ scrollPic.speed = 10; //移动速度(单位毫秒，越小越快) scrollPic.space = 10; //每次移动像素(单位px，越大越快) - scrollPic.autoPlay = true; //自动播放 + scrollPic.autoPlay = false; //自动播放 scrollPic.autoPlayTime = 3; //自动播放间隔时间(秒) scrollPic.initialize(); //初始化 From e9c35ae20f90dd621cea1667477958754fef88d1 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 17 May 2016 10:13:03 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=AA=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=83=85=E5=86=B5=E9=BB=98=E8=AE=A4=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org2.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index dd85d2e4b..799aaa42b 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -62,7 +62,7 @@