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 @@
<%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %>
- '>管理员同意了您的子域名申请:
+ '>管理员<%= 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 0e79e32c0..8ae87460f 100644
Binary files a/public/images/hwork_icon.png and b/public/images/hwork_icon.png differ
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