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

issues#555

This commit is contained in:
yanxd 2014-05-20 09:12:15 +08:00
parent 9373666576
commit f9166a71a7
2 changed files with 97 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/layouts/base_courses.html.erb
View File

@ -140,7 +140,7 @@
<!--info--> <!--info-->
<div class="inf_user_context"> <div class="inf_user_context">
<table style="font-family:微软雅黑"> <table>
<!-- addedby bai 教师姓名加超链接、加入开课时间、结课时间与课时 --> <!-- addedby bai 教师姓名加超链接、加入开课时间、结课时间与课时 -->
<tr> <tr>
@ -266,5 +266,7 @@
</div> </div>
</div> </div>
<%= call_hook :view_layouts_base_body_bottom %> <%= call_hook :view_layouts_base_body_bottom %>
</div>
</body> </body>
</html> </html>

180
app/views/news/index.html.erb
View File

@ -1,100 +1,108 @@
<!-- added by huang -->
<% <%
if @project.project_type == 1 if @project.project_type == Project::ProjectType_course
btn_tips = l(:label_news_notice) btn_tips = l(:label_news_notice)
label_tips = l(:label_course_news) label_tips = l(:label_course_news)
else else
btn_tips = l(:label_news_new) btn_tips = l(:label_news_new)
label_tips = l(:label_news) label_tips = l(:label_news)
end end
%> %>
<% if @project && User.current.allowed_to?(:manage_news, @project) %>
<div class="content-title-top">
<%= link_to(btn_tips,
new_project_news_path(@project),
:class => 'icon icon-add',
:onclick => 'showAndScrollTo("add-news", "news_title"); return false;') %>
</div>
<div id="add-news" class="add_frame" style="display:none;"> <span style="font-size: 16px; border-bottom:1px solid #f0f0f0; margin-right: 15px;">
<%= labelled_form_for @news, :url => project_news_index_path(@project), <%= label_tips %>
:html => { :id => 'news-form', :multipart => true } do |f| %> </span>
<%= render :partial => 'news/form', :locals => { :f => f } %> <%= link_to(btn_tips,
<%= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %><!-- button-submit --> | new_project_news_path(@project),
<%= preview_link preview_news_path(:project_id => @project), 'news-form' ,target='preview',{:class => 'whiteButton m3p10'}%> | :class => 'icon icon-add',
<%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()' ,:class => 'whiteButton m3p10' %> :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') %>
<% end if @project %>
<div id="preview" class="wiki"></div> <% if @project && User.current.allowed_to?(:manage_news, @project) %>
</div> <div id="add-news" class="add_frame" style="display:none;">
<%= labelled_form_for @news, :url => project_news_index_path(@project),
:html => {:id => 'news-form', :multipart => true} do |f| %>
<%= render :partial => 'news/form', :locals => {:f => f} %>
<%= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %><!-- button-submit --> |
<%= preview_link preview_news_path(:project_id => @project), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
|
<%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'whiteButton m3p10' %>
<% end if @project %>
<div id="preview" class="wiki"></div>
</div>
<% end %> <% end %>
<!--add by huang :list news-->
<h3 style="font-weight:400; margin-left:0px; margin-top:-12px; margin-left:-5px; border-bottom:1px solid #f0f0f0"><%=label_tips%></h3>
<div> <div>
<% if @newss.empty? %> <% if @newss.empty? %>
<p class="nodata"> <p class="nodata">
<%= l(:label_no_data) %> <%= l(:label_no_data) %>
</p> </p>
<% else %> <% else %>
<% @newss.each do |news| %> <% @newss.each do |news| %>
<table class="content-text-list"> <table class="content-text-list">
<tr> <tr>
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(news.author), :class => "avatar"), user_path(news.author) %></td> <td colspan="2" valign="top" width="50"><%= link_to image_tag(url_to_avatar(news.author), :class => "avatar"), user_path(news.author) %></td>
<td> <td>
<table width="580px" border="0"> <table width="580px" border="0">
<% if @project.project_type == 1 %> <% if @project.project_type == 1 %>
<tr> <tr>
<td colspan="2" valign="top"><strong><%= link_to_user(news.author)if news.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_notice)%></span><span><%= link_to h(news.title), news_path(news) %></span> <td colspan="2" valign="top">
<span style="float: right"><%= delete_link news_path(news) if User.current.allowed_to?(:manage_news, @project) %> </span></td> <strong><%= link_to_user(news.author) if news.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_notice) %></span><span><%= link_to h(news.title), news_path(news) %></span>
</tr> <span style="float: right"><%= delete_link news_path(news) if User.current.allowed_to?(:manage_news, @project) %> </span>
<% else %> </td>
<tr> </tr>
<td colspan="2" valign="top"><strong><%= link_to_user(news.author)if news.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_newshare)%></span><span> <%= link_to h(news.title), news_path(news) %></span> <% else %>
<span style="float: right" class='delete_icon'> <%= delete_link news_path(news) if User.current.allowed_to?(:manage_news, @project) %> </span></td> <tr>
</tr> <td colspan="2" valign="top">
<% end %> <strong><%= link_to_user(news.author) if news.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_newshare) %></span><span> <%= link_to h(news.title), news_path(news) %></span>
<tr> <span style="float: right" class='delete_icon'> <%= delete_link news_path(news) if User.current.allowed_to?(:manage_news, @project) %> </span>
<td colspan="2" width="580px" ><span class="font_description"><%= textilizable(news, :description) %></span></td> </td>
</tr> </tr>
<tr> <% end %>
<td align="left"><span class="font_lighter"> <%= l :label_update_time %>：&nbsp;<%= format_time(news.created_on) %></span></td> <tr>
<td width="350" align="right" class="a"><%= link_to l(:label_project_newother),news_path(news)%><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count >= 0 %></td> <td colspan="2" width="580px">
</tr> <span class="font_description"><%= textilizable(news, :description) %></span></td>
</table></td> </tr>
</tr> <tr>
</table> <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
<% end %> ：&nbsp;<%= format_time(news.created_on) %></span></td>
<% end %> <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), news_path(news) %><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count >= 0 %></td>
</tr>
</table>
</td>
</tr>
</table>
<% end %>
<% end %>
</div> </div>
<!--end--> <!--end-->
<div style="padding-right: 10px"> <div style="padding-right: 10px">
<div class="pagination"> <div class="pagination">
<ul> <ul>
<%= pagination_links_full @news_pages %> <%= pagination_links_full @news_pages %>
</ul> </ul>
</div> </div>
<% other_formats_links do |f| %> <% other_formats_links do |f| %>
<%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %> <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %>
<% end %> <% end %>
<% content_for :header_tags do %> <% content_for :header_tags do %>
<%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %> <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
<%= stylesheet_link_tag 'scm' %> <%= stylesheet_link_tag 'scm' %>
<% end %> <% end %>
<% html_title(l(:label_news_plural)) -%> <% html_title(l(:label_news_plural)) -%>
</div> </div>
<script type='text/javascript'> <script type='text/javascript'>
$(document).ready(function($) { $(document).ready(function ($) {
$('.content-text-list').each(function(){ $('.content-text-list').each(function () {
$(this).find('.delete_icon').hide(); $(this).find('.delete_icon').hide();
$(this).mouseenter(function(event) { $(this).mouseenter(function (event) {
$(this).find('.delete_icon').show(); $(this).find('.delete_icon').show();
}); });
$(this).mouseleave(function(event) { $(this).mouseleave(function (event) {
$(this).find('.delete_icon').hide(); $(this).find('.delete_icon').hide();
}); });
}); });
}); });
</script> </script>