Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

Conflicts:
	app/views/layouts/base_projects.html.erb

app/views/applied_project/applied_join_project.js.erb

@@ -1,3 +1,4 @@
+// @status: 0 该项目不存在；1 不重复加入；2 成功加入； 3 已是项目成员；其它 加入失败
 <% if @status == 0%>
     alert("<%= l('project.join.tips.notexist') %>");
 <% elsif @status == 1%>

app/views/attachments/_project_file_links.html.erb

@@ -29,7 +29,7 @@
   <% is_float ||= false %>
   <% for attachment in attachments %>
       <div style="float:left;">
-      <p style="height:14px;line-height:10px;width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+      <p style="height:14px;line-height:12px;width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
         <%if is_float%>
           <div style="max-width:55%;white-space: nowrap; overflow: hidden;  text-overflow: ellipsis;float: left;">
       <% end%>

app/views/projects/_history.html.erb

@@ -9,7 +9,8 @@
                   <span><%= link_to journal.user, user_path(journal.user), :class => 'c_blue fb fl mb10', :target => "_blank" %>
                   </span><span class="c_grey fr"><%= format_time(journal.created_on) %></span>
                   <div class="cl"></div>
-                  <p><%= textilizable journal.notes%></p>
+                  <!--<p><%#= textilizable journal.notes%></p>-->
+                  <p><%=journal.notes.html_safe%>
                 </div>
                 <div class="ping_disfoot">
                   <% ids = 'project_respond_form_'+ journal.id.to_s%>

app/views/projects/_join_project.html.erb

@@ -21,7 +21,7 @@
       .C_form{ margin:20px 0 0 60px;}
       .C_form ul li{ font-size:14px; color:#3f3a39; line-height:30px; padding-left: 60px;}
       .C_form ul li input{ margin-left:20px; border:0px; border:1px solid #e1e1e1; color:#898989; padding-left:5px; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; padding: 0 !important; }
-      .C_form ul li.mB5{ color:#898989; font-size:12px; padding-left:150px;}
+      .C_form ul li.mB5{ color:#898989; font-size:12px; padding-left:140px;}
       .width190{ width:190px; height:26px; border-color:#e1e1e1;}
       .C_form a{ font-size:12px; color:#15bccf; float:left; display:block; height:40px; width:200px;  margin-top:25px;}
       .C_form a:hover{ text-decoration:underline;}

app/views/repositories/_revisions.html.erb

@@ -50,5 +50,4 @@ end %>
     <p style="padding-top: 10px;">
       <%= submit_tag(l(:label_view_diff), :name => nil, :class=>"c_blue") if show_diff %>
     </p>
-
 <% end %>

app/views/repositories/show.html.erb

@@ -7,7 +7,6 @@
     <%= render :partial => 'breadcrumbs',
               :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>
     <%= render :partial => 'navigation' %>
-
   </div>
   <!--contextual end-->
   <div class="cl"></div>
@@ -101,20 +100,23 @@
     <p><a href="/users/646" class="c_orange">李海</a>提供</p>
   </div>
 </div>
+<!-- 代码库显示 -->
 <% if !@entries.nil? && authorize_for('repositories', 'browse') %>
     <%= render :partial => 'dir_list' %>
 <% end %>
-
 <%= render_properties(@properties) %>
+
+<!-- 代码修订 -->
 <% if authorize_for('repositories', 'revisions') %>
-      <% if @changesets && !@changesets.empty? %>
+    <%# if @changesets && !@changesets.empty? %>
         <h3>
           <%= l(:label_latest_revision_plural) %>
         </h3>
         <%= render :partial => 'revisions',
                  :locals => {:project => @project, :path => @path,
                              :revisions => @changesets, :entry => nil} %>
-      <% end %>
+    <%# end %>
+
     <p style="padding-top: 10px;">
       <% has_branches = (!@repository.branches.nil? && @repository.branches.length > 0)
          sep = '' %>

app/views/users/_history.html.erb

@@ -11,7 +11,8 @@
                   <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
                   <span><%= link_to journal.user, user_path(journal.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;"><%= format_time(journal.created_on) %></span>
                   <div class="cl"></div>
-                  <p><%= textilizable journal.notes%></p>
+                  <!--<p><%#= textilizable journal.notes%></p>-->
+                  <p><%=journal.notes.html_safe%></p>
                 </div>
                 <div class="ping_disfoot">
                   <% ids = 'project_respond_form_'+ journal.id.to_s%>

app/views/users/_user_jours.html.erb

@@ -213,9 +213,13 @@
         params.textarea = $("textarea[nhname='new_message_textarea']",params.div_form);
         params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
         params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
+        params.cancel_btn = $("#new_message_cancel_btn");
         if(params.textarea.data('init') == undefined){
           params.editor = init_editor(params);
           init_form(params);
+          params.cancel_btn.click(function(){
+            nh_reset_form(params);
+          });
 //          $("a[nhname='cancel_btn']",params.div_form).click(function(){
 //            nh_reset_form(params);
 //          });

app/views/words/_journal_reply_items.html.erb

@@ -22,7 +22,7 @@
         <% end %>
 
         <p>
-          <%= reply.notes %>
+          <%= reply.notes.html_safe %>
         </p>
             <span class="c_grey fl">
               <%= format_time reply.created_on %>

app/views/words/_new.html.erb

@@ -57,6 +57,7 @@
       <p nhname="contentmsg"></p>
       <div style="padding-top:5px;float:left;" nhname="toolbar_container"></div>
       <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" , :style => "display: block; float: right;  margin-top: 5px;"%>
+      <a href="javascript:;" id="new_message_cancel_btn" style="display:none;"></a>
     <%else %>
       <div style="font-size: 14px;margin:10px;">
 	    <%= l(:label_user_login_tips) %>

app/views/words/create.js.erb

@@ -3,4 +3,7 @@ $('#history').html('<%= escape_javascript(render(:partial => 'users/history',:lo
 $('#jour_count').html('<%= @obj_count%>')
 $('#pre_show').html('<%= escape_javascript(render(:partial => 'pre_show', :locals => {:content => nil})) %>');
 $('#new_form_user_message').val("");
+if($('#new_message_cancel_btn') != undefined && $('#new_message_cancel_btn').length!=0){
+  $('#new_message_cancel_btn').click();
+}
 $('#new_form_reference_user_id').val("");

public/assets/kindeditor/kindeditor.js

@@ -5620,8 +5620,8 @@ _plugin('core', function(K) {
         afterUpload : function(data) {
             if (data.error === 0) {
                 var url = K.formatUrl(data.url, 'absolute');
-                //self.exec('insertimage', url, 'image','','','1','left');
-				self.insertHtml('<img src="'+url+'"/>');
+                self.exec('insertimage', url, 'image','','','1','left');
+                //self.insertHtml('<img src="'+url+'"/>');
                 var asset_id  = data.asset_id;
                 if ( asset_id != "" && parent.document.getElementById('asset_id') != null ) {
                     parent.document.getElementById('asset_id').value += asset_id.toString();