Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course

db/migrate/20151231012634_add_last_term_to_course.rb

@@ -1,17 +0,0 @@
-class AddLastTermToCourse < ActiveRecord::Migration
-  def change
-    add_column :courses, :end_time, :integer
-    add_column :courses, :end_term, :string
-
-    count = Course.all.count / 30 + 2
-    transaction do
-      for i in 1 ... count do
-        Course.page(i).per(30).each do |course|
-          course.end_time = course.time
-          course.end_term = course.term
-          course.save
-        end
-      end
-    end
-  end
-end

db/schema.rb

@@ -1213,6 +1213,7 @@ ActiveRecord::Schema.define(:version => 20160108024752) 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/courses.css

@@ -1099,6 +1099,7 @@ a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; c
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{overflow: hidden; text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: normal !important;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;}
@@ -1255,3 +1256,4 @@ div.disable_link {background-color: #c1c1c1 !important;}
 .boxShadow {box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);}
 
 .fn {font-weight:normal}
+.boutiqueP {position:absolute; left:0px; top:0px;}

public/stylesheets/new_user.css

@@ -836,6 +836,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{overflow: hidden; text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: normal !important;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;display: inline}

public/stylesheets/project.css

@@ -1109,6 +1109,7 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{overflow: hidden; text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: normal !important;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;}