diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index babeb5f30..1d43ff69a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -88,11 +88,13 @@ module ApplicationHelper # 获取组织成员中文名字 def get_org_member_role_name member - case member.roles[0].name - when 'orgManager' - '管理人员' - when 'orgMember' - '组织成员' + unless member.roles[0].nil? + case member.roles[0].name + when 'orgManager' + '管理人员' + when 'orgMember' + '组织成员' + end end end diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index 9b481fac5..799aaa42b 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(); //初始化 @@ -60,13 +60,12 @@
- <%= 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/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb index 87d6e4daa..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.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) %> 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;}