diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 433d30214..f7dcc40f5 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -12,7 +12,7 @@
<%= favicon %>
<%= javascript_heads %>
<%= heads_for_theme %>
- <%= stylesheet_link_tag 'public', 'pleft', 'project','courses','prettify','jquery/jquery-ui-1.9.2','header','repository' %>
+ <%= stylesheet_link_tag 'public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','header','repository' %>
<%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','attachments' %>
<%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 1eecc6b18..b9ebc2135 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -16,15 +16,20 @@
<% if activity.parent_id.nil? %>
- <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board,activity), :class=> "postGrey"
- %>
+ <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board,activity), :class=> "postGrey fl" %>
<% else %>
- <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board,activity), :class=> "postGrey"
- %>
+ <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board,activity), :class=> "postGrey fl" %>
<% end %>
+ <% if activity.sticky == 1%>
+
置顶
+ <% end%>
+ <% if activity.locked %>
+
+ <% end%>
+
- 时间:<%= format_time(activity.created_on) %>
+ 发帖时间:<%= format_time(activity.created_on) %>
diff --git a/db/schema.rb b/db/schema.rb
index fab2d5700..0960439bb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1642,10 +1642,6 @@ ActiveRecord::Schema.define(:version => 20151224090313) do
t.string "extra"
end
- create_table "temp", :id => false, :force => true do |t|
- t.integer "id", :default => 0, :null => false
- end
-
create_table "time_entries", :force => true do |t|
t.integer "project_id", :null => false
t.integer "user_id", :null => false
diff --git a/public/javascripts/project.js b/public/javascripts/project.js
index 1e2e71e4e..24e864780 100644
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@@ -603,7 +603,6 @@ function submit_topic_project()
{
if(regexTopicSubject() && regexTopicDescription())
{
- alert("Test");
message_content_editor.sync();
$("#message-form-project").submit();
}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 672db9bcc..826dbf98f 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -1101,4 +1101,6 @@ select.InputBox, input.InputBox, textarea.InputBox {border: 1px solid #D9D9D9;co
.w713 {width: 713px;}
a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #269ac9; color:#269ac9; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;}
a.AnnexBtn{ background: url(images/homepage_icon2.png) 0px -343px no-repeat !important; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
-a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
\ No newline at end of file
+a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
+.sticky_btn_cir{ background:#269ac9; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+.locked_btn_cir{background: url("../images/locked.png") 0 0 no-repeat; cursor: default;}