diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb
index c55143ca8..dba45cb43 100644
--- a/app/models/issue_query.rb
+++ b/app/models/issue_query.rb
@@ -310,7 +310,7 @@ class IssueQuery < Query
:order => options[:order],
:limit => options[:limit],
:offset => options[:offset]
- )
+ ).reverse
rescue ::ActiveRecord::StatementInvalid => e
raise StatementInvalid.new(e.message)
end
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index b90034c14..2948872dc 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -15,7 +15,7 @@
<%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
<%= render :partial => 'messages/form_project', :locals => {:f => f} %>
- <%= l(:button_submit)%>
+ <%= l(:button_submit)%>
<%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;', :class => 'grey_btn ml10 fl' %>
<% end %>
@@ -72,9 +72,9 @@
-<% other_formats_links do |f| %>
- <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
-<% end %>
+<%# other_formats_links do |f| %>
+ <%#= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
+<%# end %>
<% html_title @board.name %>
diff --git a/app/views/issues/_history.html.erb b/app/views/issues/_history.html.erb
index 5b55de2fb..e1e2de6a3 100644
--- a/app/views/issues/_history.html.erb
+++ b/app/views/issues/_history.html.erb
@@ -1,5 +1,5 @@
<% reply_links = authorize_for('issues', 'edit') -%>
-<% for journal in journals %>
+<% journals.reverse.each do |journal| %>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 7df8fd389..33f55cfac 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -6,7 +6,7 @@
<%=link_to image_tag(url_to_avatar(@topic.author), :width => "46", :height => "46"), user_path(@topic.author) %>
-
+
<%= @topic.subject %>
由<%= link_to_user_header @topic.author,false,:class=> 'problem_name c_orange' %> 添加于<%= format_time(@topic.created_on) %>
@@ -26,7 +26,7 @@
:class => 'talk_edit fr'
) if @message.destroyable_by?(User.current) %>
-
<%= textilizable(@topic, :content) %>
+
<%= textilizable(@topic, :content) %>
<%= link_to_attachment_project @topic, :author => false %>
@@ -55,7 +55,7 @@
<%= format_time(message.created_on) %>
<%= textilizable message,:content,:attachments => message.attachments %>
- <%= link_to_attachments message, :author => false %>
+ <%= link_to_attachment_project message, :author => false %>
diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index eed2864d0..fc12a8006 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -82,7 +82,7 @@
:onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @project) %>
<%= delete_link news_path(@news),:class => 'talk_edit fr' if User.current.allowed_to?(:manage_news, @project) %>
- <%= textAreailizable(@news, :description) %>
<%= l(:label_create_time) %> : <%= format_time(@news.created_on) %>
+ <%= textAreailizable(@news, :description) %>
<%= l(:label_create_time) %> : <%= format_time(@news.created_on) %>
<%= link_to_attachments_course @news %>
diff --git a/app/views/projects/settings/_new_modules.html.erb b/app/views/projects/settings/_new_modules.html.erb
index 281d07fef..c6aa26348 100644
--- a/app/views/projects/settings/_new_modules.html.erb
+++ b/app/views/projects/settings/_new_modules.html.erb
@@ -16,6 +16,8 @@
<%= check_all_links 'modules-form' %>
- <%= l(:button_save) %>
+
+ <%= l(:button_save) %>
+
<% end %>
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 2fb78efde..e15c4dcdb 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -271,7 +271,7 @@ zh:
# 项目得分
#
label_projects_score: 项目综合得分
- label_project_new_list: 条项目新闻
+ label_project_new_list: 条新闻
label_issue_score: issue得分
label_issue_number: issue的数量
diff --git a/public/javascripts/project.js b/public/javascripts/project.js
index 18d461029..424aeb7cc 100644
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@@ -183,16 +183,15 @@ function project_setting(n)
}
}
}
-
-// 配置模块提交
-function submitModules()
-{
- $("#modules-form").submit();
-}
-
//配置--成员---申请列表--拒绝
function refusal_applied_member()
{
$('#new_membership').append("");
$('#new_membership').submit();
+}
+
+//新闻描述显示更多信息
+function news_show_more_des(id)
+{
+ $('#news_description_' + id).toggleClass("news_description_none");
}
\ No newline at end of file
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 4633c95f7..e2859c9ae 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -28,6 +28,10 @@ a.project_txt{ color:#0781b4; width:445px; display:block; float:left; overflow:
a.project_txt02{ color:#0781b4; width:618px; display:block; float:left; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
a:hover.project_txt{ color:#066e9a;}
.noline{ border-bottom:none;}
+.news_description{max-height: 38px;overflow:hidden; }
+.news_description_none{max-height: none;}
+a.news_foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:600px; height:20px; padding-top:3px; cursor:pointer;}
+a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
/*弹框*/
.floatbox{ width:420px; border:3px solid #15bccf; background:#fff; padding:5px;}