jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改新闻中测出的bug， 

讨论区中附件显示形式
This commit is contained in:
huang 2015-04-14 23:58:27 +08:00
parent 478c6b6d65
commit b7537ad518
7 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/messages/_project_show.html.erb
View File

@ -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(

3
app/views/news/_project_news.html.erb
View File

@ -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-->

2
app/views/news/_project_show.html.erb
View File

@ -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>

4
app/views/projects/settings/_new_modules.html.erb
View File

@ -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 %>

2
config/locales/projects/zh.yml
View File

@ -271,7 +271,7 @@ zh:
# 项目得分
#
label_projects_score: 项目综合得分
label_project_new_list: 条项目新闻
label_project_new_list: 条新闻
label_issue_score: issue得分
label_issue_number: issue的数量

13
public/javascripts/project.js
View File

@ -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");
}

4
public/stylesheets/project.css
View File

@ -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;}