From d574521b48769661b5ae0f21eb8a4957fb035f08 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 8 Jan 2016 18:03:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_org.html.erb | 26 +++++++++++++++------ db/schema.rb | 7 +++--- public/images/hwork_icon.png | Bin 5024 -> 10436 bytes public/stylesheets/share.css | 6 +++-- 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/app/views/users/_user_message_org.html.erb b/app/views/users/_user_message_org.html.erb index 56d7d7b29..b2801a618 100644 --- a/app/views/users/_user_message_org.html.erb +++ b/app/views/users/_user_message_org.html.erb @@ -12,12 +12,24 @@ <%= ma.content %>
  • - <%=link_to ma.organization.domain.nil? ? "同意申请":"已同意申请", agree_apply_subdomain_organizations_path( :organization_id => ma.organization_id, :org_domain => ma.content, :user_id => ma.sender_id ), - :id => 'agree_apply_subdomain', - :method => 'post', - :remote => true, - :class => "green_btn_cir ml10", - :style => "color:#fff" %> + <% if ma.status == 0 %> + <%=link_to "同意", agree_apply_subdomain_organizations_path( :organization_id => ma.organization_id, :org_domain => ma.content, :user_id => ma.sender_id, :message_id => ma.id ), + :id => 'agree_apply_subdomain', + :method => 'post', + :remote => true, + :class => "green_btn_cir ml10", + :style => "color:#fff" %> + <%=link_to "拒绝", agree_apply_subdomain_organizations_path( :organization_id => ma.organization_id, :org_domain => ma.content, :user_id => ma.sender_id,:message_id => ma.id ), + :id => 'agree_apply_subdomain', + :method => 'post', + :remote => true, + :class => "green_btn_cir ml10", + :style => "color:#fff" %> + <% elsif ma.status == 1 %> + 已同意 + <% elsif ma.status == 2 %> + 已拒绝 + <% end %>
  • <%= time_tag(ma.created_at).html_safe %>
  • @@ -28,7 +40,7 @@
  • - '>管理员同意了您的子域名申请: + '>管理员<%= ma.status == 1 ? '同意':'拒绝' %>了您的子域名申请:
  • <%= ma.content %> diff --git a/db/schema.rb b/db/schema.rb index dee504e39..7a2f8e3d0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20160108024752) do +ActiveRecord::Schema.define(:version => 20160108093752) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -1225,8 +1225,9 @@ ActiveRecord::Schema.define(:version => 20160108024752) do t.integer "message_id" t.integer "viewed" t.string "content" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "status", :default => 0 end create_table "org_projects", :force => true do |t| diff --git a/public/images/hwork_icon.png b/public/images/hwork_icon.png index 0e79e32c09370841f31639791c351a6dfe330dbf..8ae87460fd13f21c15c187d31792b29d6d0ae6dd 100644 GIT binary patch literal 10436 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 D0VF*3 delta 4393 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 ajLYkmp*2Wg_Q#LNF=Ksmy>eZ*=zjpP`ChdE diff --git a/public/stylesheets/share.css b/public/stylesheets/share.css index 251abf24c..59b3b63f9 100644 --- a/public/stylesheets/share.css +++ b/public/stylesheets/share.css @@ -1,5 +1,5 @@ /*151228样式更新*/ -.menuSetting {background:url(../images/hwork_icon.png) -79px -132px no-repeat; display:inline-block; width:20px; height:20px;} +.menuSetting {background:url(../images/hwork_icon.png) -5px -303px no-repeat; display:inline-block; width:20px; height:20px;} .boxShadow {box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);} a.greyBtn{ display:inline-block; background:#f2f3f3; padding:0px 5px; height:20px; border:1px solid #d3d3d3; color:#888888; line-height:1.9;-moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px;} a:hover.greyBtn{border:1px solid #888888; } @@ -26,4 +26,6 @@ a.greyBtn2 {float:right; text-align:center; font-size:12px; color:#ffffff; backg .upload_con h2{ display:block; background:#eaeaea; font-size:14px; color:#343333; height:31px; width: auto; margin-top:25px; padding-left:20px; padding-top:5px;} .upload_box{ width:430px; margin:15px auto;} a.grey_btn{ background:#d9d9d9; color:#656565;font-size:14px; font-weight:normal; text-align:center; margin-left:10px; margin-bottom:10px; padding:2px 10px;} -a.blue_btn{background:#64bdd9;color:#fff;font-size:14px; font-weight:normal; padding:2px 8px; text-align:center;cursor: pointer;} \ No newline at end of file +a.blue_btn{background:#64bdd9;color:#fff;font-size:14px; font-weight:normal; padding:2px 8px; text-align:center;cursor: pointer;} +.homepageImageSex {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;} +.homepageImageName {font-size:16px; color:#484848; margin-left:15px; margin-right:8px; height:21px; float:left;} \ No newline at end of file