diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index 0d48dc8d2..09d1aa27d 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -47,6 +47,7 @@

<%= e.event_description.html_safe %>
+

<%= l :label_activity_time %> : <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %>

<%= link_to_attachments_course(e) if e.class.to_s == "News" %> diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index ffeeaef82..ca7bb6159 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -70,6 +70,7 @@ :class => "problem_tit fl fb " %>

<%= textAreailizable act,:content %>
+

<%= l :label_create_time %> :<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %>

diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index a128f917a..474ac638f 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -29,7 +29,7 @@

-
展开Git操作指南
+
展开Git操作指南

diff --git a/app/views/users/_user_show.html.erb b/app/views/users/_user_show.html.erb index 3bea6d420..8e3d27666 100644 --- a/app/views/users/_user_show.html.erb +++ b/app/views/users/_user_show.html.erb @@ -42,7 +42,7 @@ <%# memberships = user.memberships.all(:conditions => cond) %> <% user_courses = user_courses_list(user) %> <%= l(:label_x_course_contribute_to, :count => user_courses.count) %> - <%= ":" unless user_courses.empty? %> + <%#= ":" unless user_courses.empty? %> <% for course in user_courses %> <%# if course.name != nil %> <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host: Setting.host_course} %><%= (user_courses.last == course) ? '' : ',' %> diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index a728d4f85..b2c13c3f7 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/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(''); + //self.exec('insertimage', url, 'image','','','1','left'); + self.insertHtml(''); var asset_id = data.asset_id; if ( asset_id != "" && parent.document.getElementById('asset_id') != null ) { parent.document.getElementById('asset_id').value += asset_id.toString();