Merge branch 'develop' into ouyang

Conflicts:
	app/views/blog_comments/show.html.erb
	app/views/courses/syllabus.html.erb
	app/views/messages/_org_subfield_show.html.erb

app/views/blog_comments/show.html.erb

@@ -1,5 +1,6 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false) %>
+    <%#= javascript_include_tag "init_activity_KindEditor",'blog' %>
     <%= javascript_include_tag "create_kindeditor",'blog' %>
 <% end %>
 

app/views/courses/syllabus.html.erb

@@ -40,6 +40,7 @@
         }
     }
     $(function() {
+        //init_activity_KindEditor_data(<%= @article.id%>,null,"87%", "<%=@article.class.to_s%>");
         sd_create_editor_from_data(<%= @article.id%>,null,"100%", "<%=@article.class.to_s%>");
         showNormalImage('message_description_<%= @article.id %>');
     });
@@ -217,8 +218,13 @@
 </div>
 <script type="text/javascript">
     $(function(){
-        var postContent = $("#message_description_<%= @article.id %>").html();
+        $("#message_description_<%= @article.id %> p,#message_description_<%= @article.id %> span,#message_description_<%= @article.id %> em").each(function(){
+            var postContent = $(this).html();
             postContent = postContent.replace(/&nbsp;/g," ");
-        $("#message_description_<%= @article.id %>").html(postContent);
+            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+            $(this).html(postContent);
+        });
     });
 </script>

app/views/memos/show.html.erb

@@ -126,8 +126,13 @@
 </div>
 <script type="text/javascript">
     $(function(){
-        var postContent = $("#message_description_<%= @memo.id %>").html();
+            $("#message_description_<%= @memo.id %> p,#message_description_<%= @memo.id %> span,#message_description_<%= @memo.id %> em").each(function(){
+                var postContent = $(this).html();
                 postContent = postContent.replace(/&nbsp;/g," ");
-        $("#message_description_<%= @memo.id %>").html(postContent);
+                postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+                postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+                postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+                $(this).html(postContent);
+            });
     });
 </script>

app/views/messages/_course_show.html.erb

@@ -171,8 +171,13 @@
 </div>
 <script type="text/javascript">
     $(function(){
-        var postContent = $("#message_description_<%= @topic.id %>").html();
+        $("#message_description_<%= @topic.id %> p,#message_description_<%= @topic.id %> span,#message_description_<%= @topic.id %> em").each(function(){
+            var postContent = $(this).html();
             postContent = postContent.replace(/&nbsp;/g," ");
-        $("#message_description_<%= @topic.id %>").html(postContent);
+            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+            $(this).html(postContent);
+        });
     });
 </script>

app/views/messages/_org_subfield_show.html.erb

@@ -58,6 +58,7 @@
     }
 
     $(function() {
+        //init_activity_KindEditor_data(<%= @topic.id%>,null,"94%", "<%=@topic.class.to_s%>");
         sd_create_editor_from_data(<%= @topic.id%>,null,"100%", "<%=@topic.class.to_s%>");
         showNormalImage('message_description_<%= @topic.id %>');
     });
@@ -201,8 +202,13 @@
 </div>
 <script type="text/javascript">
     $(function(){
-        var postContent = $("#message_description_<%= @topic.id %>").html();
+        $("#message_description_<%= @topic.id %> p,#message_description_<%= @topic.id %> span,#message_description_<%= @topic.id %> em").each(function(){
+            var postContent = $(this).html();
             postContent = postContent.replace(/&nbsp;/g," ");
-        $("#message_description_<%= @topic.id %>").html(postContent);
+            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+            $(this).html(postContent);
+        });
     });
 </script>

app/views/messages/_project_show.html.erb

@@ -227,8 +227,13 @@
 </div>
 <script type="text/javascript">
     $(function(){
-        var postContent = $("#message_description_<%= @topic.id %>").html();
+        $("#message_description_<%= @topic.id %> p,#message_description_<%= @topic.id %> span,#message_description_<%= @topic.id %> em").each(function(){
+            var postContent = $(this).html();
             postContent = postContent.replace(/&nbsp;/g," ");
-        $("#message_description_<%= @topic.id %>").html(postContent);
+            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+            $(this).html(postContent);
+        });
     });
 </script>

app/views/news/_course_show.html.erb

@@ -184,8 +184,13 @@
 </div>
 <script type="text/javascript">
     $(function(){
-        var postContent = $("#message_description_<%= @news.id %>").html();
+        $("#message_description_<%= @news.id %> p,#message_description_<%= @news.id %> span,#message_description_<%= @news.id %> em").each(function(){
+            var postContent = $(this).html();
             postContent = postContent.replace(/&nbsp;/g," ");
-        $("#message_description_<%= @news.id %>").html(postContent);
+            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+            $(this).html(postContent);
+        });
     });
 </script>

app/views/news/_organization_show.html.erb

@@ -174,8 +174,13 @@
 </div>
 <script type="text/javascript">
     $(function(){
-        var postContent = $("#message_description_<%= @news.id %>").html();
+        $("#message_description_<%= @news.id %> p,#message_description_<%= @news.id %> span,#message_description_<%= @news.id %> em").each(function(){
+            var postContent = $(this).html();
             postContent = postContent.replace(/&nbsp;/g," ");
-        $("#message_description_<%= @news.id %>").html(postContent);
+            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+            $(this).html(postContent);
+        });
     });
 </script>

app/views/news/_project_show.html.erb

@@ -184,8 +184,13 @@
 </div>
 <script type="text/javascript">
     $(function(){
-        var postContent = $("#message_description_<%= @news.id %>").html();
+        $("#message_description_<%= @news.id %> p,#message_description_<%= @news.id %> span,#message_description_<%= @news.id %> em").each(function(){
+            var postContent = $(this).html();
             postContent = postContent.replace(/&nbsp;/g," ");
-        $("#message_description_<%= @news.id %>").html(postContent);
+            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+            $(this).html(postContent);
+        });
     });
 </script>

app/views/org_document_comments/show.html.erb

@@ -150,9 +150,14 @@
 
 <script type="text/javascript">
     $(function(){
-        var postContent = $("#intro_content_<%= @document.id%>").html();
+        $("#intro_content_<%= @document.id%> p,#intro_content_<%= @document.id%> span,#intro_content_<%= @document.id%> em").each(function(){
+            var postContent = $(this).html();
             postContent = postContent.replace(/&nbsp;/g," ");
-        $("#intro_content_<%= @document.id%>").html(postContent);
+            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+            $(this).html(postContent);
+        });
     });
     function expand_reply(container, btnid) {
         var target = $(container);

app/views/organizations/_show_home_page.html.erb

@@ -50,9 +50,14 @@
 </div>
 
 <script type="text/javascript">
-    var postContent = $("#intro_content_<%= document.id%>").html();
+    $("#intro_content_<%= @document.id%> p,#intro_content_<%= @document.id%> span,#intro_content_<%= @document.id%> em").each(function(){
+        var postContent = $(this).html();
         postContent = postContent.replace(/&nbsp;/g," ");
-    $("#intro_content_<%= document.id%>").html(postContent);
+        postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+        postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+        postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+        $(this).html(postContent);
+    });
     function expand_reply(container, btnid) {
         var target = $(container);
         var btn = $(btnid);

app/views/users/_intro_content.html.erb

@@ -5,9 +5,14 @@
 </div>
 <script type="text/javascript">
   $(function(){
-      var postContent = $("#intro_content_<%= user_activity_id%>").html();
+      $("#intro_content_<%= user_activity_id%> p,#intro_content_<%= user_activity_id%> span,#intro_content_<%= user_activity_id%> em").each(function(){
+          var postContent = $(this).html();
           postContent = postContent.replace(/&nbsp;/g," ");
-      $("#intro_content_<%= user_activity_id%>").html(postContent);
+          postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+          postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+          postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+          $(this).html(postContent);
+      });
       description_show_hide(<%=user_activity_id %>);
   });
 </script>

db/schema.rb

@@ -1219,6 +1219,7 @@ ActiveRecord::Schema.define(:version => 20160128024452) 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

public/stylesheets/new_user.css

@@ -694,6 +694,8 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;}
 .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;}
 .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
+.whiteSettingIcon {background:url(../images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;}
+.whiteSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
 a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;text-align:center;}
 a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyPortrait {float:left; width:33px;}

public/stylesheets/public.css

@@ -612,6 +612,8 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;}
 .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;}
 .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
+.whiteSettingIcon {background:url(../images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;}
+.whiteSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
 /*a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;}*/
 /*a.postOptionLink:hover {color:#ffffff; background-color:#15bccf;}*/
 .homepagePostReplyPortrait {float:left; width:45px;}