From 674a8e003566ca58b64c55cc4c1e97351d556a5b Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 29 Jan 2016 16:16:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E8=AF=8D=E6=8A=98=E8=A1=8C=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/org_document_comments/show.html.erb |   4 +-
 .../organizations/_show_home_page.html.erb    | 142 +++++++++---------
 app/views/users/_intro_content.html.erb       |  24 +--
 db/schema.rb                                  |   1 +
 4 files changed, 86 insertions(+), 85 deletions(-)

diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index 405631369..62075dc92 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -150,9 +150,9 @@
 
 <script type="text/javascript">
     $(function(){
-        var postContent = $("#intro_content_<%= @document.id%>").html();
+        /*var postContent = $("#intro_content_<%#= @document.id%>").html();
         postContent = postContent.replace(/&nbsp;/g," ");
-        $("#intro_content_<%= @document.id%>").html(postContent);
+        $("#intro_content_<%#= @document.id%>").html(postContent);*/
     });
     function expand_reply(container, btnid) {
         var target = $(container);
diff --git a/app/views/organizations/_show_home_page.html.erb b/app/views/organizations/_show_home_page.html.erb
index f6d5fc9ea..7b43f0034 100644
--- a/app/views/organizations/_show_home_page.html.erb
+++ b/app/views/organizations/_show_home_page.html.erb
@@ -1,72 +1,72 @@
-<div class="resources mt10">
-  <div class="homepagePostBrief">
-
-    <div class="homepagePostDes" style="width:690px;">
-      <div class="homepagePostTitle postGrey"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></div>
-      <% unless document.content.blank? %>
-          <div class="homepagePostIntro" id="intro_content_<%= document.id%>">
-            <%= document.content.html_safe %>
-          </div>
-      <% end %>
-      <% if params[:show_homepage].nil? %>
-          <div class="homepagePostDate" style="float:right;">
-            发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
-          </div>
-          <div class="cl"></div>
-          <div class="homepagePostDate" style="float:right;">
-            最后编辑：<%= User.find(EditorOfDocument.where("org_document_comment_id =?", document.id).order("created_at desc").first.editor_id).realname %>
-          </div>
-      <% end %>
-      <!--    <%# if defined?(home_id) %>
-        <div style="float:right;">最后编辑：<%#= User.find() %></div>
-    <%# end %>-->
-      <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id)) || User.current.id == document.creator_id %>
-          <div class="homepagePostSetting">
-            <ul>
-              <li class="homepagePostSettingIcon">
-                <ul class="homepagePostSettiongText">
-                  <li>
-                    <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'cancel_homepage', :id => document.organization_id, :home_id => document.id}, :method => "put", :remote => true) do |f| %>
-                        <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">取消首页</a>
-                    <% end %>
-                  </li>
-                  <li>
-                    <%= link_to "编辑首页", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => 2), :class => "postOptionLink" %>
-                  </li>
-                  <li>
-                    <%= link_to "删除首页", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',
-                                :data => {:confirm => l(:text_are_you_sure)},
-                                :remote => true, :class => 'postOptionLink' %>
-                  </li>
-                </ul>
-              </li>
-            </ul>
-          </div>
-          <div class="cl"></div>
-      <% end %>
-    </div>
-  </div>
-
-</div>
-
-<script type="text/javascript">
-    var postContent = $("#intro_content_<%= document.id%>").html();
-    postContent = postContent.replace(/&nbsp;/g," ");
-    $("#intro_content_<%= document.id%>").html(postContent);
-    function expand_reply(container, btnid) {
-        var target = $(container);
-        var btn = $(btnid);
-        if (btn.data('init') == '0') {
-            btn.data('init', 1);
-            btn.html('收起回复');
-            target.show();
-        } else {
-            btn.data('init', 0);
-            btn.html('展开更多');
-            target.hide();
-            target.eq(0).show();
-            target.eq(1).show();
-            target.eq(2).show();
-        }
-    }
+<div class="resources mt10">
+  <div class="homepagePostBrief">
+
+    <div class="homepagePostDes" style="width:690px;">
+      <div class="homepagePostTitle postGrey"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></div>
+      <% unless document.content.blank? %>
+          <div class="homepagePostIntro" id="intro_content_<%= document.id%>">
+            <%= document.content.html_safe %>
+          </div>
+      <% end %>
+      <% if params[:show_homepage].nil? %>
+          <div class="homepagePostDate" style="float:right;">
+            发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
+          </div>
+          <div class="cl"></div>
+          <div class="homepagePostDate" style="float:right;">
+            最后编辑：<%= User.find(EditorOfDocument.where("org_document_comment_id =?", document.id).order("created_at desc").first.editor_id).realname %>
+          </div>
+      <% end %>
+      <!--    <%# if defined?(home_id) %>
+        <div style="float:right;">最后编辑：<%#= User.find() %></div>
+    <%# end %>-->
+      <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id)) || User.current.id == document.creator_id %>
+          <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li>
+                    <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'cancel_homepage', :id => document.organization_id, :home_id => document.id}, :method => "put", :remote => true) do |f| %>
+                        <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">取消首页</a>
+                    <% end %>
+                  </li>
+                  <li>
+                    <%= link_to "编辑首页", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => 2), :class => "postOptionLink" %>
+                  </li>
+                  <li>
+                    <%= link_to "删除首页", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :remote => true, :class => 'postOptionLink' %>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+          <div class="cl"></div>
+      <% end %>
+    </div>
+  </div>
+
+</div>
+
+<script type="text/javascript">
+    /*var postContent = $("#intro_content_<%#= document.id%>").html();
+    postContent = postContent.replace(/&nbsp;/g," ");
+    $("#intro_content_<%#= document.id%>").html(postContent);*/
+    function expand_reply(container, btnid) {
+        var target = $(container);
+        var btn = $(btnid);
+        if (btn.data('init') == '0') {
+            btn.data('init', 1);
+            btn.html('收起回复');
+            target.show();
+        } else {
+            btn.data('init', 0);
+            btn.html('展开更多');
+            target.hide();
+            target.eq(0).show();
+            target.eq(1).show();
+            target.eq(2).show();
+        }
+    }
 </script>
\ No newline at end of file
diff --git a/app/views/users/_intro_content.html.erb b/app/views/users/_intro_content.html.erb
index 668a26cec..53d556e86 100644
--- a/app/views/users/_intro_content.html.erb
+++ b/app/views/users/_intro_content.html.erb
@@ -1,13 +1,13 @@
-<div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth lh18" id="activity_description_<%= user_activity_id%>">
-  <div id="intro_content_<%= user_activity_id%>">
-    <%= content.to_s.html_safe%>
-  </div>
-</div>
-<script type="text/javascript">
-  $(function(){
-      var postContent = $("#intro_content_<%= user_activity_id%>").html();
-      postContent = postContent.replace(/&nbsp;/g," ");
-      $("#intro_content_<%= user_activity_id%>").html(postContent);
-      description_show_hide(<%=user_activity_id %>);
-  });
+<div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth lh18" id="activity_description_<%= user_activity_id%>">
+  <div id="intro_content_<%= user_activity_id%>">
+    <%= content.to_s.html_safe%>
+  </div>
+</div>
+<script type="text/javascript">
+  $(function(){
+      /*var postContent = $("#intro_content_<%#= user_activity_id%>").html();
+      postContent = postContent.replace(/&nbsp;/g," ");
+      $("#intro_content_<%#= user_activity_id%>").html(postContent);*/
+      description_show_hide(<%=user_activity_id %>);
+  });
 </script>
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index b2c74a96c..29a9329a3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1217,6 +1217,7 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
   create_table "org_members", :force => true do |t|
     t.integer  "user_id"
     t.integer  "organization_id"
+    t.string   "role"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
   end