Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
This commit is contained in:
commit
afa5c3a4f9
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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} %>
|
||||
<p>
|
||||
<a herf="#" onclick="submitProjectBoard();" class="blue_btn fl ml55" style="margin-left: 55px"><%= l(:button_submit)%></a>
|
||||
<a href="javascript:void(0)" onclick="submitProjectBoard();" class="blue_btn fl ml55" style="margin-left: 55px"><%= l(:button_submit)%></a>
|
||||
<%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;', :class => 'grey_btn ml10 fl' %>
|
||||
</p>
|
||||
<% end %>
|
||||
|
|
@ -72,9 +72,9 @@
|
|||
</ul>
|
||||
<!--讨论主类容 end-->
|
||||
|
||||
<% 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 %>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<% reply_links = authorize_for('issues', 'edit') -%>
|
||||
<% for journal in journals %>
|
||||
<% journals.reverse.each do |journal| %>
|
||||
<!-- modified by bai -->
|
||||
<div id="change-<%= journal.id %>" class="<%= journal.css_classes %>" style=" word-wrap: break-word; word-break: break-all">
|
||||
<!-- end -->
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<%=link_to image_tag(url_to_avatar(@topic.author), :width => "46", :height => "46"), user_path(@topic.author) %>
|
||||
</div>
|
||||
<div class="talk_txt fl">
|
||||
<p class="problem_tit fl fb" >
|
||||
<p class="problem_tit fl fb" style="word-break:break-all;" >
|
||||
<%= @topic.subject %></p>
|
||||
<br/>
|
||||
<p>由<%= link_to_user_header @topic.author,false,:class=> 'problem_name c_orange' %> 添加于<%= format_time(@topic.created_on) %></p>
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
:class => 'talk_edit fr'
|
||||
) if @message.destroyable_by?(User.current) %>
|
||||
<div class="cl"></div>
|
||||
<div class="talk_info mb10"><%= textilizable(@topic, :content) %></div>
|
||||
<div class="talk_info mb10" style="word-break:break-all;"><%= textilizable(@topic, :content) %></div>
|
||||
<div class="talk_info mb10"><%= link_to_attachment_project @topic, :author => false %></div>
|
||||
<!-- <a href="#" class=" link_file ml60">附件：爱覅俄方if.zip(27.5kB)</a>-->
|
||||
<div class="cl"></div>
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
<span class="c_grey fr"><%= format_time(message.created_on) %></span>
|
||||
<div class="cl"></div>
|
||||
<p><%= textilizable message,:content,:attachments => message.attachments %></p>
|
||||
<%= link_to_attachments message, :author => false %>
|
||||
<%= link_to_attachment_project message, :author => false %>
|
||||
</div>
|
||||
<div class="ping_disfoot">
|
||||
<%= link_to(
|
||||
|
|
|
|||
|
|
@ -29,8 +29,9 @@
|
|||
<%= link_to_user_header(news.author,false,{:class=> 'problem_name c_orange fl'}) if news.respond_to?(:author) %>
|
||||
<span class="fl"> <%= l(:label_add_news) %>：</span><%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %><br />
|
||||
<div class="cl mb5"></div>
|
||||
<p id="news_description_<%= news.id %>" class="news_description mt5"><%= news.description %><br /> <%= l(:label_create_time) %> ：<%= format_time(news.created_on) %></p>
|
||||
<p id="news_description_<%= news.id %>" class="news_description mt5"><%= news.description %><br /> </p>
|
||||
<div class="news_foot" style="display: none;" onclick="news_show_more_des(<%= news.id %>);" id="news_foot_<%= news.id %>"><%= l(:label_expend_information) %> <span class="g-arr-down"><img src="/images/jiantou.jpg" width="12" height="6" /></span></div>
|
||||
<span class="f1"><%= l(:label_create_time) %> ：<%= format_time(news.created_on) %></span>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
</div><!--problem_main end-->
|
||||
|
|
|
|||
|
|
@ -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) %>
|
||||
<div class="cl"></div>
|
||||
<div class="mb5"><%= textAreailizable(@news, :description) %><br /> <%= l(:label_create_time) %> ： <%= format_time(@news.created_on) %></div>
|
||||
<div class="mb5" style="word-break:break-all;"><%= textAreailizable(@news, :description) %><br /> <%= l(:label_create_time) %> ： <%= format_time(@news.created_on) %></div>
|
||||
<%= link_to_attachments_course @news %>
|
||||
<!--<a href="#" class=" link_file">附件：爱覅俄方if.zip(27.5kB)</a> -->
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@
|
|||
<%= check_all_links 'modules-form' %>
|
||||
</p>
|
||||
<p>
|
||||
<a onclick="submitModules();" class="blue_btn" href="javascript:void(0)" ><%= l(:button_save) %></a>
|
||||
<a remote="true" href="javascript:void(0)" class="blue_btn" onclick="$('#modules-form').submit();">
|
||||
<%= l(:button_save) %>
|
||||
</a>
|
||||
</p>
|
||||
<% end %>
|
||||
|
|
|
|||
|
|
@ -271,7 +271,7 @@ zh:
|
|||
# 项目得分
|
||||
#
|
||||
label_projects_score: 项目综合得分
|
||||
label_project_new_list: 条项目新闻
|
||||
label_project_new_list: 条新闻
|
||||
|
||||
label_issue_score: issue得分
|
||||
label_issue_number: issue的数量
|
||||
|
|
|
|||
|
|
@ -183,16 +183,15 @@ function project_setting(n)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 配置模块提交
|
||||
function submitModules()
|
||||
{
|
||||
$("#modules-form").submit();
|
||||
}
|
||||
|
||||
//配置--成员---申请列表--拒绝
|
||||
function refusal_applied_member()
|
||||
{
|
||||
$('#new_membership').append("<input name = 'refusal_button' style='display: none;'>");
|
||||
$('#new_membership').submit();
|
||||
}
|
||||
|
||||
//新闻描述显示更多信息
|
||||
function news_show_more_des(id)
|
||||
{
|
||||
$('#news_description_' + id).toggleClass("news_description_none");
|
||||
}
|
||||
|
|
@ -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;}
|
||||
|
|
|
|||
Loading…
Reference in New Issue