From f785277d42c242b1a6f041901012a60ebf191c0d Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 23 Feb 2016 16:17:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9B=9E=E5=A4=8D=E6=A1=86?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E4=B9=B1=E7=A0=81=E3=80=81=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E5=AD=90=E5=9F=9F=E5=90=8D=E7=AD=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../blog_comments/_simple_ke_reply_form.html.erb    | 13 -------------
 .../courses/_user_homework_search_list.html.erb     | 12 ------------
 app/views/issues/index.html.erb                     | 13 +------------
 app/views/layouts/base_org.html.erb                 |  2 +-
 app/views/news/_course_news_detail.html.erb         | 12 ------------
 app/views/news/_project_news_detail.html.erb        | 12 ------------
 app/views/organizations/_show_home_page.html.erb    |  1 +
 app/views/projects/_project_activities.html.erb     | 13 +------------
 app/views/users/_user_activities.html.erb           | 13 +------------
 app/views/users/_user_jours_list.html.erb           | 13 +------------
 app/views/users/_user_message_org.html.erb          |  2 +-
 11 files changed, 7 insertions(+), 99 deletions(-)

diff --git a/app/views/blog_comments/_simple_ke_reply_form.html.erb b/app/views/blog_comments/_simple_ke_reply_form.html.erb
index 292587cad..e222d8e56 100644
--- a/app/views/blog_comments/_simple_ke_reply_form.html.erb
+++ b/app/views/blog_comments/_simple_ke_reply_form.html.erb
@@ -1,16 +1,3 @@
-<style type="text/css">
-    /*回复框*/
-    .ReplyToMessageInputContainer .ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
-    .ReplyToMessageInputContainer .ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
-    .ReplyToMessageInputContainer .ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
-    .ReplyToMessageInputContainer .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
-    .ReplyToMessageInputContainer .ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
-    .ReplyToMessageInputContainer .ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
-    .ReplyToMessageInputContainer .ke-outline{border:none;}
-    .ReplyToMessageInputContainer .ke-inline-block{display: none;}
-    .ReplyToMessageInputContainer .ke-container{float:left;}
-</style>
-
 <div class="ReplyToMessageContainer borderBottomNone"id="reply_to_message_<%= reply.id%>">
   <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
   <div class="ReplyToMessageInputContainer mb10">
diff --git a/app/views/courses/_user_homework_search_list.html.erb b/app/views/courses/_user_homework_search_list.html.erb
index 585d8761a..750e7537c 100644
--- a/app/views/courses/_user_homework_search_list.html.erb
+++ b/app/views/courses/_user_homework_search_list.html.erb
@@ -2,18 +2,6 @@
     <%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
 <% end %>
 
-<style type="text/css">
-    /*回复框*/
-    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url("/images/public_icon.png")}
-    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-outline {border: none;}
-    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
-    .homepagePostReplyInputContainer .ke-container {float: left;}
-</style>
 <div id="user_homework_list">
   <% homework_commons.each do |homework_common|%>
       <script type="text/javascript">
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index ad5d971ed..b63897951 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,18 +1,7 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: true,init_activity: true) %>
 <% end %>
-<style type="text/css">
-    /*回复框*/
-    /*div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}*/
-    /*span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}*/
-    /*span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}*/
-    /*div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}*/
-    /*span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}*/
-    /*span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}*/
-    /*div.ke-toolbar .ke-outline{border:none;}*/
-    /*.ke-inline-block{display: none;}*/
-    /*div.ke-container{float:left;}*/
-</style>
+
 <script>
     $(function(){
         $("#RSide").removeAttr("id");
diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index d20d637ee..6062d760b 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -46,7 +46,7 @@
           <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;">
             <%= link_to image_tag(url_to_avatar(User.current),:width => '23',:height => '23'), request.local? ? user_path(User.current):("https://www.trustie.net/users/" + User.current.id.to_s),:alt => '用户头像', :target => '_blank',:style=>'border-radius:3px; vertical-align:top; margin-top:3px; display:inline-block; margin-right:3px;' %>
             <%= link_to User.current, (request.local? || request.subdomain.blank?) ? user_path(User.current):("https://www.trustie.net/users/" + User.current.id.to_s),:id => "orgUserName",:class => 'fontGrey2 f14 mr5',:target => '_blank' %>
-            <%= link_to "退出",(request.local? || request.subdomain.nil?) ? logout_organization_path(@organization):"https://www.trustie.net/logout", :class =>"menuGrey", :method => 'post', :rel => "nofollow" %>
+            <%= link_to "退出",(request.local? || request.subdomain.nil?) ? signout_path():"https://www.trustie.net/logout", :class =>"menuGrey", :method => 'post', :rel => "nofollow" %>
           </li>
           <!--<li class="navOrgMenu fr"><%#=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %></li>-->
       <% else %>
diff --git a/app/views/news/_course_news_detail.html.erb b/app/views/news/_course_news_detail.html.erb
index 61db84134..bd3215fb3 100644
--- a/app/views/news/_course_news_detail.html.erb
+++ b/app/views/news/_course_news_detail.html.erb
@@ -3,18 +3,6 @@
     <%= javascript_include_tag "create_kindeditor" %>
 <% end %>
 
-<style type="text/css">
-    /*回复框*/
-    /*.homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}*/
-    /*.homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}*/
-    /*.homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}*/
-    /*.homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-outline {border: none;}*/
-    /*.homepagePostReplyInputContainer .ke-inline-block {display: none;}*/
-    /*.homepagePostReplyInputContainer .ke-container {float: left;}*/
-</style>
 <% if newss%>
     <% newss.each do |news| %>
         <script>
diff --git a/app/views/news/_project_news_detail.html.erb b/app/views/news/_project_news_detail.html.erb
index 518a29fa9..b3e6de5cf 100644
--- a/app/views/news/_project_news_detail.html.erb
+++ b/app/views/news/_project_news_detail.html.erb
@@ -3,18 +3,6 @@
     <%= javascript_include_tag "create_kindeditor" %>
 <% end %>
 
-<style type="text/css">
-    /*回复框*/
-    /*.homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}*/
-    /*.homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}*/
-    /*.homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}*/
-    /*.homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-outline {border: none;}*/
-    /*.homepagePostReplyInputContainer .ke-inline-block {display: none;}*/
-    /*.homepagePostReplyInputContainer .ke-container {float: left;}*/
-</style>
 <% if all_news %>
     <% all_news.each do |news| %>
         <script>
diff --git a/app/views/organizations/_show_home_page.html.erb b/app/views/organizations/_show_home_page.html.erb
index 0e725532e..63eb1808b 100644
--- a/app/views/organizations/_show_home_page.html.erb
+++ b/app/views/organizations/_show_home_page.html.erb
@@ -17,6 +17,7 @@
             最后编辑：<%= User.find(EditorOfDocument.where("org_document_comment_id =?", document.id).order("created_at desc").first.editor_id).realname %>
           </div>
       <% end %>
+      <div class="cl"></div>
       <!--    <%# if defined?(home_id) %>
         <div style="float:right;">最后编辑：<%#= User.find() %></div>
     <%# end %>-->
diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb
index 062d64096..c036633a5 100644
--- a/app/views/projects/_project_activities.html.erb
+++ b/app/views/projects/_project_activities.html.erb
@@ -35,18 +35,7 @@
         })
     })
 </script>
-<style type="text/css">
-    /*回复框*/
-    /*div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}*/
-    /*span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}*/
-    /*span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}*/
-    /*div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}*/
-    /*span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}*/
-    /*span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}*/
-    /*div.ke-toolbar .ke-outline{border:none;}*/
-    /*.ke-inline-block{display: none;}*/
-    /*div.ke-container{float:left;}*/
-</style>
+
 <% unless forge_acts.empty? %>
     <% forge_acts.each do |activity| -%>
         <script>
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 59d605a09..0e55c246c 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -38,18 +38,7 @@
         })
     })
 </script>
-<style type="text/css">
-    /*回复框*/
-    /*div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}*/
-    /*span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}*/
-    /*span.ke-toolbar-icon-url{background-image:url( "/images/public_icon.png" )}*/
-    /*div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}*/
-    /*span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}*/
-    /*span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}*/
-    /*div.ke-toolbar .ke-outline{border:none;}*/
-    /*.ke-inline-block{display: none;}*/
-    /*div.ke-container{float:left;}*/
-</style>
+
 <% user_activities.each do |user_activity|
   if user_activities %>
         <script>
diff --git a/app/views/users/_user_jours_list.html.erb b/app/views/users/_user_jours_list.html.erb
index 779b98a75..94d2998ae 100644
--- a/app/views/users/_user_jours_list.html.erb
+++ b/app/views/users/_user_jours_list.html.erb
@@ -2,18 +2,7 @@
     <%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
     <%#= javascript_include_tag "init_KindEditor","user" %>
 <% end %>
-<style type="text/css">
-    /*回复框*/
-    /*.homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}*/
-    /*.homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}*/
-    /*.homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}*/
-    /*.homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-outline {border: none;}*/
-    /*.homepagePostReplyInputContainer .ke-inline-block {display: none;}*/
-    /*.homepagePostReplyInputContainer .ke-container {float: left;}*/
-</style>
+
 <%if jours %>
     <% jours.each do |jour|%>
         <% unless jour.private == 1 && (!User.current || (User.current && jour.jour_id != User.current.id && jour.user_id != User.current.id)) %>
diff --git a/app/views/users/_user_message_org.html.erb b/app/views/users/_user_message_org.html.erb
index e3b656a46..8c6159a58 100644
--- a/app/views/users/_user_message_org.html.erb
+++ b/app/views/users/_user_message_org.html.erb
@@ -12,7 +12,7 @@
             <%= ma.content %>
           </li>
           <li class="homepageHomeworkContentWarn fl">
-            <%=link_to (ma.organization.domain.nil? || (ma.organization.domain && ma.organization.domain != ma.content)) ? "同意申请":"申请已批准",
+            <%=link_to (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准",
                        agree_apply_subdomain_organizations_path( :organization_id => ma.organization_id, :org_domain => ma.content, :user_id => ma.sender_id, :act_id => ma.id ),
                        :id => "agree_apply_subdomain_#{ma.id}",
                        :method => 'post',