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

app/helpers/application_helper.rb

@@ -329,7 +329,7 @@ module ApplicationHelper
     imagesize = attachment.thumbnail(:size => "50*50")
     imagepath = named_attachment_path(attachment, attachment.filename)
     if imagesize
-      link_to image_tag(imagesize),
+      link_to image_tag(thumbnail_path(attachment,"50")),
               imagepath,
               :title => attachment.filename
     else

app/helpers/repositories_helper.rb

@@ -18,7 +18,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module RepositoriesHelper
-  ROOT_PATH="/home/pdl/redmine-2.3.2-0/apache2/"
+  if Rails.env.development?
+    ROOT_PATH="/tmp/" if Rails.env.development?
+  else
+    ROOT_PATH="/home/pdl/redmine-2.3.2-0/apache2/"
+  end
   PROJECT_PATH_CUT =  40
   REPO_IP_ADDRESS = Setting.repository_domain
 

app/views/issues/_form.html.erb

@@ -38,8 +38,7 @@
               <!--Added by young-->
               <%= javascript_tag do %>
                   observeAutocompleteField('issue_subject',
-                  '<%= escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (Setting.cross_project_issue_relations? ? 'all' : nil)) %>
-                  ',
+                  '<%= escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (Setting.cross_project_issue_relations? ? 'all' : nil)) %>',
                   { select: function(event, ui) {
                   $('input#issue_subject').val(ui.item.value);
                   }
@@ -113,4 +112,4 @@
     <!--<div class="cl"></div>-->
     <!--</div>-->
     <%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %>
-<% end %>
+<% end %>

public/assets/kindeditor/kindeditor.js

@@ -257,7 +257,7 @@ K.options = {
 	minHeight : 100,
 	minChangeSize : 50,
 	zIndex : 811213,
-	items : [ 'emoticons','code',
+	items : [ 'emoticons',
 		'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|',
 		'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
 		'italic', 'underline', 'removeformat', '|','imagedirectupload','table',   'link'