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

app/models/course_attachment.rb

@@ -0,0 +1,3 @@
+class CourseAttachment < ActiveRecord::Base
+  attr_accessible :attachtype, :author_id, :content_type, :description, :digest, :disk_directory, :disk_filename, :downloads, :filename, :filesize, :integer, :is_public
+end

app/views/admin/projects.html.erb

@@ -1,45 +1,45 @@
-<div class="contextual">
-<%= link_to l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add' %>
-</div>
-
-<h3><%=l(:label_project_plural)%></h3>
-
-<%= form_tag({}, :method => :get) do %>
-<fieldset><legend><%= l(:label_filter_plural) %></legend>
-<label for='status'><%= l(:field_status) %> :</label>
-<%= select_tag 'status', project_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
-<label for='name'><%= l(:label_project) %>:</label>
-<%= text_field_tag 'name', params[:name], :size => 30 %>
-<%= submit_tag l(:button_apply), :class => "small", :name => nil %>
-<%= link_to l(:button_clear), {:controller => 'admin', :action => 'projects'}, :class => 'icon icon-reload' %>
-</fieldset>
-<% end %>
-&nbsp;
-
-<div class="autoscroll">
-<table class="list">
-  <thead><tr>
-  <th><%=l(:label_project)%></th>
-  <th><%=l(:field_is_public)%></th>
-  <th><%=l(:field_created_on)%></th>
-  <th></th>
-  </tr></thead>
-  <tbody>
-<% project_tree(@projects) do |project, level| %>
-  <tr class="<%= cycle("odd", "even") %> <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
-  <td class="name"><span><%= link_to_project_settings(project, {}, :title => project.short_description) %></span></td>
-  <td align="center"><%= checked_image project.is_public? %></td>
-  <td align="center"><%= format_date(project.created_on) %></td>
-  <td class="buttons">
-    <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project, :status => params[:status] }, :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-lock') unless project.archived? %>
-    <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project, :status => params[:status] }, :method => :post, :class => 'icon icon-unlock') if project.archived? && (project.parent.nil? || !project.parent.archived?) %>
-    <%= link_to(l(:button_copy), { :controller => 'projects', :action => 'copy', :id => project }, :class => 'icon icon-copy') %>
-    <%= link_to(l(:button_delete), project_path(project), :method => :delete, :class => 'icon icon-del') %>
-  </td>
-  </tr>
-<% end %>
-  </tbody>
-</table>
-</div>
-
-<% html_title(l(:label_project_plural)) -%>
+<div class="contextual">
+<%= link_to l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add' %>
+</div>
+
+<h3><%=l(:label_project_plural)%></h3>
+
+<%= form_tag({}, :method => :get) do %>
+<fieldset><legend><%= l(:label_filter_plural) %></legend>
+<label for='status'><%= l(:field_status) %> :</label>
+<%= select_tag 'status', project_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
+<label for='name'><%= l(:label_project) %>:</label>
+<%= text_field_tag 'name', params[:name], :size => 30 %>
+<%= submit_tag l(:button_apply), :class => "small", :name => nil %>
+<%= link_to l(:button_clear), {:controller => 'admin', :action => 'projects'}, :class => 'icon icon-reload' %>
+</fieldset>
+<% end %>
+&nbsp;
+
+<div class="autoscroll">
+<table class="list" style="width: 100%;table-layout: fixed">
+  <thead><tr>
+  <th><%=l(:label_project)%></th>
+  <th><%=l(:field_is_public)%></th>
+  <th><%=l(:field_created_on)%></th>
+  <th></th>
+  </tr></thead>
+  <tbody>
+<% project_tree(@projects) do |project, level| %>
+  <tr class="<%= cycle("odd", "even") %> <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
+  <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=project.name%>'><span><%= link_to_project_settings(project, {}) %></span></td>
+  <td align="center"><%= checked_image project.is_public? %></td>
+  <td align="center"><%= format_date(project.created_on) %></td>
+  <td class="buttons">
+    <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project, :status => params[:status] }, :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-lock') unless project.archived? %>
+    <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project, :status => params[:status] }, :method => :post, :class => 'icon icon-unlock') if project.archived? && (project.parent.nil? || !project.parent.archived?) %>
+    <%= link_to(l(:button_copy), { :controller => 'projects', :action => 'copy', :id => project }, :class => 'icon icon-copy') %>
+    <%= link_to(l(:button_delete), project_path(project), :method => :delete, :class => 'icon icon-del') %>
+  </td>
+  </tr>
+<% end %>
+  </tbody>
+</table>
+</div>
+
+<% html_title(l(:label_project_plural)) -%>

app/views/admin/users.html.erb

@@ -40,13 +40,13 @@
           <th></th>
         </tr>
         </thead>
-        <col style="width: 20%" />
         <col style="width: 10%" />
         <col style="width: 5%" />
-        <col style="width: 20%" />
         <col style="width: 5%" />
-        <col style="width: 15%" />
-        <col style="width: 15%" />
+        <col style="width: 10%" />
+        <col style="width: 5%" />
+        <col style="width: 10%" />
+        <col style="width: 10%" />
         <col style="width: 5%" />
         <col style="width: 5%" />
         <tbody>

app/views/messages/_project_show.html.erb

@@ -161,7 +161,8 @@
 
               <td class="comments">
                 <div class="wiki">
-                  <%= textilizable message, :content, :attachments => message.attachments %>
+                  <%#= textilizable message,:content,:attachments => message.attachments %>
+                  <%= message.content.html_safe  %>
                 </div>
                 <%= link_to_attachments message, :author => false %> </td>
             </tr>

app/views/messages/show.html.erb

@@ -1,5 +1,5 @@
-<% if @project %>
-    <%= render :partial => 'project_show', locals: {project: @project} %>
-<% elsif @course %>
-    <%= render :partial => 'course_show', locals: {course: @course} %>
-<% end %>
+<% if @project %>
+    <%= render :partial => 'project_show', locals: {project: @project} %>
+<% elsif @course %>
+    <%= render :partial => 'course_show', locals: {course: @course} %>
+<% end %>

app/views/wiki/_content.html.erb

@@ -1,4 +1,5 @@
 <div class="wiki wiki-page">
   <%= textilizable content, :text, :attachments => content.page.attachments,
         :edit_section_links => (@sections_editable && {:controller => 'wiki', :action => 'edit', :project_id => @page.project, :id => @page.title}) %>
+  <%#= content.text.html_safe  %>
 </div>

app/views/wiki/edit.html.erb

@@ -1,5 +1,6 @@
 <%= wiki_page_breadcrumb(@page) %>
 
+<script src="/javascripts/ckeditor/ckeditor.js?1404953555" type="text/javascript"></script>
 <h3><%= h @page.pretty_title %></h3>
 
 <%= form_for @content, :as => :content,
@@ -12,8 +13,15 @@
 <% end %>
 <%= error_messages_for 'content' %>
 
+    <div class="actions" style="max-width:680px">
+      <p style="max-width:680px;"><%=text_area_tag 'content[text]', @text, :required => true, :id => 'editor02', :cols => 100, :rows => 25 %></p>
+      <script type="text/javascript">
+          var ckeditor=CKEDITOR.replace('editor02');
+      </script>
+    </div>
+
 <div class="box tabular">
-<%= text_area_tag 'content[text]', @text, :cols => 100, :rows => 25,
+<%#= text_area_tag 'content[text]', @text, :cols => 100, :rows => 25,
                   :class => 'wiki-edit', :accesskey => accesskey(:edit) %>
 
   <!--p style="max-width:680px"><input id="editor02" required="true" /><%#= f.text_area :comments, :required => true, :id => 'editor02' %></p>
@@ -31,7 +39,7 @@
   <% end %>
 <% end %>
 
-<p><label><%= l(:field_comments) %></label><%= f.text_field :comments, :size => 120 %></p>
+<p style="width: 100%;"><label><%= l(:field_comments) %></label><%= f.text_field :comments, :style => "width:75%;" %></p>
 <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
 </div>
 

db/migrate/20140812032957_create_course_attachments.rb

@@ -0,0 +1,20 @@
+class CreateCourseAttachments < ActiveRecord::Migration
+  def change
+    create_table :course_attachments do |t|
+      t.string :filename
+      t.string :disk_filename
+      t.integer :filesize
+      t.string :content_type
+      t.string :digest
+      t.integer :downloads
+      t.string :author_id
+      t.string :integer
+      t.string :description
+      t.string :disk_directory
+      t.integer :attachtype
+      t.integer :is_public
+
+      t.timestamps
+    end
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140801034242) do
+ActiveRecord::Schema.define(:version => 20140812032957) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -291,6 +291,23 @@ ActiveRecord::Schema.define(:version => 20140801034242) do
     t.datetime "updated_on",                  :null => false
   end
 
+  create_table "course_attachments", :force => true do |t|
+    t.string   "filename"
+    t.string   "disk_filename"
+    t.integer  "filesize"
+    t.string   "content_type"
+    t.string   "digest"
+    t.integer  "downloads"
+    t.string   "author_id"
+    t.string   "integer"
+    t.string   "description"
+    t.string   "disk_directory"
+    t.integer  "attachtype"
+    t.integer  "is_public"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
   create_table "course_infos", :force => true do |t|
     t.integer  "course_id"
     t.integer  "user_id"