diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index ae44bf0ac..fbc545607 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -8,11 +8,11 @@
<%= csrf_meta_tag %>
<%= favicon %>
-<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','prettify', 'nyan', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
<%= javascript_include_tag "jquery.leanModal.min" %>
-<%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
+<%= javascript_include_tag 'seems_rateable/jRating','prettify', 'seems_rateable/rateable'%>
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index c2f159f28..7841ead91 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -17,8 +17,8 @@
<%= javascript_heads %>
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
- <%= stylesheet_link_tag 'public', 'leftside', 'jquery/jquery-ui-1.9.2', 'courses','header'%>
- <%= javascript_include_tag "course","header","attachments" %>
+ <%= stylesheet_link_tag 'public', 'leftside', 'jquery/jquery-ui-1.9.2','prettify', 'courses','header'%>
+ <%= javascript_include_tag "course","header","attachments",'prettify' %>
<%= yield :header_tags -%>
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index 7cd0022ea..c68e917f5 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -7,10 +7,10 @@
<%= csrf_meta_tag %>
<%= favicon %>
- <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+ <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','prettify', 'nyan', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
- <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
+ <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'prettify' %>
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/layouts/base_memos.html.erb b/app/views/layouts/base_memos.html.erb
index 2831d642e..02cdf4485 100644
--- a/app/views/layouts/base_memos.html.erb
+++ b/app/views/layouts/base_memos.html.erb
@@ -7,12 +7,12 @@
<%= csrf_meta_tag %>
<%= favicon %>
- <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+ <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','prettify', 'nyan', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
- <%= javascript_include_tag "ckeditor/ckeditor.js" %>
+ <%= javascript_include_tag "ckeditor/ckeditor.js",'prettify' %>
<%= yield :header_tags -%>
<%= stylesheet_link_tag 'base','header', :media => 'all'%>
diff --git a/app/views/layouts/base_tags.html.erb b/app/views/layouts/base_tags.html.erb
index 3fd00e042..7fb129cb2 100644
--- a/app/views/layouts/base_tags.html.erb
+++ b/app/views/layouts/base_tags.html.erb
@@ -12,8 +12,9 @@
<%= csrf_meta_tag %>
<%= favicon %>
-<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','prettify', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+ <%= javascript_include_tag 'prettify' %>
<%= javascript_heads %>
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 5686c9a1b..f0a433205 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -13,10 +13,10 @@
<%= csrf_meta_tag %>
<%= favicon %>
- <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+ <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','prettify', 'nyan', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
-
+ <%= javascript_include_tag 'prettify' %>
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb
index e4fe188d2..91357d09a 100644
--- a/app/views/layouts/base_users_new.html.erb
+++ b/app/views/layouts/base_users_new.html.erb
@@ -14,10 +14,10 @@
<%= csrf_meta_tag %>
<%= favicon %>
-<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'public_new', 'leftside_new','users', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'public_new', 'leftside_new',prettify,'users', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
-<%= javascript_include_tag "avatars"%>
+<%= javascript_include_tag "avatars",'prettify'%>
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
<%= yield :header_tags -%>
diff --git a/app/views/layouts/course_base.html.erb b/app/views/layouts/course_base.html.erb
index 24a784cd5..35ae21fd0 100644
--- a/app/views/layouts/course_base.html.erb
+++ b/app/views/layouts/course_base.html.erb
@@ -12,10 +12,10 @@
<%= csrf_meta_tag %>
<%= favicon %>
- <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+ <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan','prettify', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
- <%= javascript_include_tag "jquery.leanModal.min" %>
+ <%= javascript_include_tag "jquery.leanModal.min",'prettify' %>
<%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/layouts/new_base.html.erb b/app/views/layouts/new_base.html.erb
index db93ee495..98eea13bf 100644
--- a/app/views/layouts/new_base.html.erb
+++ b/app/views/layouts/new_base.html.erb
@@ -13,8 +13,8 @@
<%= javascript_heads %>
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
- <%= stylesheet_link_tag 'public', 'leftside', 'courses','header'%>
- <%= javascript_include_tag "course","header" %>
+ <%= stylesheet_link_tag 'public', 'leftside', 'courses','header','prettify'%>
+ <%= javascript_include_tag "course","header",'prettify' %>
<%= yield :header_tags -%>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index ae8fd774e..419931936 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -7,10 +7,10 @@
<%= csrf_meta_tag %>
<%= favicon %>
- <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_user', 'user_leftside','users',:media => 'all' %>
+ <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_user', 'user_leftside','prettify','users',:media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
- <%= javascript_include_tag "bootstrap","avatars","new_user"%>
+ <%= javascript_include_tag "bootstrap","avatars","new_user",'prettify'%>
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
<%= yield :header_tags -%>
diff --git a/app/views/layouts/static_base.html.erb b/app/views/layouts/static_base.html.erb
index b81b0755d..15dd9145b 100644
--- a/app/views/layouts/static_base.html.erb
+++ b/app/views/layouts/static_base.html.erb
@@ -7,10 +7,10 @@
<%= csrf_meta_tag %>
<%= favicon %>
- <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+ <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan','prettify', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
- <%= javascript_include_tag "jquery.leanModal.min" %>
+ <%= javascript_include_tag "jquery.leanModal.min",'prettify' %>
<%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/layouts/users_base.html.erb b/app/views/layouts/users_base.html.erb
index e356c0560..0caa5e39b 100644
--- a/app/views/layouts/users_base.html.erb
+++ b/app/views/layouts/users_base.html.erb
@@ -7,10 +7,10 @@
<%= csrf_meta_tag %>
<%= favicon %>
- <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+ <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan','prettify', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
- <%= javascript_include_tag "jquery.leanModal.min" %>
+ <%= javascript_include_tag "jquery.leanModal.min" ,'prettify'%>
<%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index ab49fd9d6..f134e8f42 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -11,7 +11,7 @@
- <%= link_to truncate(attach.filename,:length=>18), download_named_attachment_path(attach.id, attach.filename),
+ <%= link_to truncate(attach.filename,:length=>30), download_named_attachment_path(attach.id, attach.filename),
:title => attach.filename,:class=>'resourcesBlack'%>
<%= number_to_human_size(attach.filesize) %>
diff --git a/db/schema.rb b/db/schema.rb
index 9c0f8e373..96b243891 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -764,6 +764,16 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
+ create_table "journal_details_copy", :force => true do |t|
+ t.integer "journal_id", :default => 0, :null => false
+ t.string "property", :limit => 30, :default => "", :null => false
+ t.string "prop_key", :limit => 30, :default => "", :null => false
+ t.text "old_value"
+ t.text "value"
+ end
+
+ add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id"
+
create_table "journal_replies", :id => false, :force => true do |t|
t.integer "journal_id"
t.integer "user_id"
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 0515da364..9cfebf8b3 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -313,10 +313,10 @@ a.uploadText {color:#ffffff; font-size:14px;}
/*.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}*/
/*.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}*/
/*.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}*/
-.resourcesListName {width:180px; height:40px; line-height:40px; text-align:left;}
-.resourcesListSize {width:105px; height:40px; line-height:40px; text-align:center;}
-.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}
-.resourcesListUploader {width:160px; height:40px; line-height:40px; text-align:center;}
+.resourcesListName {width:340px; height:40px; line-height:40px; text-align:left;}
+.resourcesListSize {width:85px; height:40px; line-height:40px; text-align:center;}
+.resourcesListType {width:85px; height:40px; line-height:40px; text-align:center;}
+.resourcesListUploader {width:85px; height:40px; line-height:40px; text-align:center;}
.resourcesListTime {width:95px; height:40px; line-height:40px; text-align:center;}
/*.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}*/
a.resourcesBlack {font-size:12px; color:#4c4c4c;white-space: nowrap;text-align: left}