Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop_new
commit
37e3377fd3
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,48 @@
|
||||
<% if User.current.logged? %>
|
||||
<div class="navHomepageProfile" id="navHomepageProfile">
|
||||
<ul>
|
||||
<li class="homepageProfileMenuIcon fr" id="homepageProfileMenuIcon">
|
||||
<%= link_to "<div class='mt5 mb8 user-img' id='user_avatar'>#{image_tag(url_to_avatar(User.current), :class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe, user_activities_path(User.current.id) %>
|
||||
<%#= link_to image_tag(url_to_avatar(User.current)), user_url_in_org(User.current.id), :alt => '用户头像', :target => '_blank', :class => "fr user-img" %>
|
||||
<ul class="topnav_login_list none" id="topnav_login_list">
|
||||
<li>
|
||||
<%= link_to "修改资料", my_account_path, :class => "menuGrey"%>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to "我的组织", user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to "新建组织", new_organization_path, :class => "menuGrey"%>
|
||||
</li>
|
||||
<!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
|
||||
<li>
|
||||
<%= link_to "退出", logout_url_without_domain, :class => "menuGrey", :method => "post"%>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<% else %>
|
||||
<div class="login fr" >
|
||||
<a href="<%= signin_url_without_domain %>" class=" " >登陆 | </a>
|
||||
<a href="<%= register_url_without_domain %>" class=" " >退出</a>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<script type="text/javascript">
|
||||
$("#navHomepageProfile").mouseenter(function(){
|
||||
$("#homepageProfileMenuIcon").addClass("homepageProfileMenuIconhover");
|
||||
$("#topnav_login_list").show();
|
||||
});
|
||||
$("#navHomepageProfile").mouseleave(function(){
|
||||
$("#homepageProfileMenuIcon").removeClass("homepageProfileMenuIconhover");
|
||||
$("#topnav_login_list").hide();
|
||||
});
|
||||
|
||||
function signout(){
|
||||
$.post(
|
||||
'<%= signout_path%>',
|
||||
{}
|
||||
);
|
||||
}
|
||||
</script>
|
||||
@ -0,0 +1,5 @@
|
||||
<a href="#" target="_blank" class="row-con">
|
||||
<span class="row-time"><%= format_date(activity.updated_at) %></span>
|
||||
<h3 class="row-title "><%= activity.title %></h3>
|
||||
<div class="row-txt row-txt-line"><%= activity.description %></div>
|
||||
</a>
|
||||
@ -0,0 +1,18 @@
|
||||
<a href="/#" title="">
|
||||
<div class="course-list-img">
|
||||
<% iamge_path = get_image_path_from_content(activity.description) %>
|
||||
<% if iamge_path.nil? %>
|
||||
<img width="370" height="220" alt="#" src="/images/org_new_style/default-img.jpg">
|
||||
<% else %>
|
||||
<img width="370" height="220" src="/files/uploads/image<%= iamge_path %>" alt="" />
|
||||
<% end %>
|
||||
</div>
|
||||
<h5>
|
||||
<span><%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank' %></span>
|
||||
</h5>
|
||||
<div class="item-btm clearfix">
|
||||
<a class="publisher-name fl" href="#" target="_blank"><%= activity.user.realname.nil? ? activity.user : activity.user.realname %></a>
|
||||
<p class="pass-time fl"><span><%= format_date activity.updated_at %></span></p>
|
||||
<div class="fr right-info"> <span> <%= activity.journals_for_messages.count %></span></div>
|
||||
</div>
|
||||
</a>
|
||||
@ -0,0 +1,22 @@
|
||||
<a href="/#" title="">
|
||||
<div class="course-list-img">
|
||||
<% iamge_path = get_image_path_from_content(activity.content) %>
|
||||
<% if iamge_path.nil? %>
|
||||
<img width="370" height="220" alt="#" src="/images/org_new_style/default-img.jpg">
|
||||
<% else %>
|
||||
<img width="370" height="220" src="/files/uploads/image<%= iamge_path %>" alt="" />
|
||||
<% end %>
|
||||
</div>
|
||||
<h5>
|
||||
<% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
|
||||
<%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank' %>
|
||||
<% else %>
|
||||
<%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank' %>
|
||||
<% end %>
|
||||
</h5>
|
||||
<div class="item-btm clearfix">
|
||||
<a class="publisher-name fl" href="#" target="_blank"><%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %></a>
|
||||
<p class="pass-time fl"><span><%= format_date activity.updated_on %></span></p>
|
||||
<div class="fr right-info"> <span> <%= activity.children.count %></span></div>
|
||||
</div>
|
||||
</a>
|
||||
@ -0,0 +1,18 @@
|
||||
<a href="/#" title="">
|
||||
<div class="course-list-img">
|
||||
<% iamge_path = get_image_path_from_content(activity.description) %>
|
||||
<% if iamge_path.nil? %>
|
||||
<img width="370" height="220" alt="#" src="/images/org_new_style/default-img.jpg">
|
||||
<% else %>
|
||||
<img width="370" height="220" src="/files/uploads/image<%= iamge_path %>" alt="" />
|
||||
<% end %>
|
||||
</div>
|
||||
<h5>
|
||||
<span><%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank' %></span>
|
||||
</h5>
|
||||
<div class="item-btm clearfix">
|
||||
<a class="publisher-name fl" href="#" target="_blank"><%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %></a>
|
||||
<p class="pass-time fl"><span><%= format_date activity.created_on %></span></p>
|
||||
<div class="fr right-info"> <span> <%= activity.comments.count %></span></div>
|
||||
</div>
|
||||
</a>
|
||||
@ -0,0 +1,12 @@
|
||||
<div class="cl"></div>
|
||||
<div style="margin-top: 10px">
|
||||
<% iamge_path = get_image_path_from_content(activity.content) %>
|
||||
<% if iamge_path.nil? %>
|
||||
<img src="/images/org_new_style/default-img.jpg" alt="" class="fl con-left-img"/>
|
||||
<% else %>
|
||||
<img src="/files/uploads/image<%= iamge_path %>" alt="" class="fl con-left-img"/>
|
||||
<% end %>
|
||||
<%=link_to activity.content.html_safe, organization_path(organization, :org_subfield_id => field.id), :class => "con-left-txt fl", :target => "_blank" %>
|
||||
</div>
|
||||
|
||||
<div class="cl"></div>
|
||||
@ -0,0 +1,6 @@
|
||||
<a href="#" target="_blank">
|
||||
<div class="con-r-img fl">
|
||||
<%= link_to image_tag(url_to_avatar(activity.creator),:width => "40", :height => "40"), user_path(activity.creator) %>
|
||||
<span class="con-name"><%= activity.try(:creator).try(:realname).nil? ? activity.try(:creator).try(:login) : activity.try(:creator).try(:realname) %></span></div>
|
||||
<p class="fr"><%= activity.content.html_safe %></p>
|
||||
</a>
|
||||
@ -0,0 +1,17 @@
|
||||
<div class="article-rwrap">
|
||||
<h3 class="item-title-r">
|
||||
<%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :class => "title-detail-r" %>
|
||||
</h3>
|
||||
<div class="item-btm clearfix">
|
||||
<ul class="fl left-info">
|
||||
<li class="hd-pic">
|
||||
<%= link_to activity.author.realname.nil? ? activity.author.login : activity.author.realname, user_path(activity.author), :class => "publisher-name fl", :target => "_blank" %>
|
||||
</li>
|
||||
<li class="pass-time"><span><%= format_date(activity.updated_on) %></span></li>
|
||||
</ul>
|
||||
<div class="fr right-info">
|
||||
<span> <%= activity.journals.count %></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
@ -0,0 +1,49 @@
|
||||
<div class="item-img fr">
|
||||
<% iamge_path = get_image_path_from_content(activity.content) %>
|
||||
<% if iamge_path.nil? %>
|
||||
<img src="/images/org_new_style/default-img.jpg" width="180" height="115">
|
||||
<% else %>
|
||||
<img src="/files/uploads/image<%= iamge_path %>" width="180" height="115">
|
||||
<% end %>
|
||||
|
||||
</div>
|
||||
<div class="article-lwrap clearfix">
|
||||
<div class="item-txt fl">
|
||||
<h3 class="item-title">
|
||||
<% if activity.parent_id.nil? %>
|
||||
<%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board.id,activity.id), :class => "title-detail" %>
|
||||
<% else %>
|
||||
<%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board.id,activity.id), :class => "title-detail" %>
|
||||
<% end %>
|
||||
</h3>
|
||||
<% if activity.parent_id.nil? %>
|
||||
<% content = activity.content %>
|
||||
<% else %>
|
||||
<% content = activity.parent.content %>
|
||||
<% end %>
|
||||
<div class="item-bd">
|
||||
<span class="fl"><%= content.to_s.html_safe %></span>
|
||||
<% if activity.parent_id.nil? %>
|
||||
<%= link_to "[查看全文]", board_message_url_in_org(activity.board.id,activity.id), :class => "read-more fl" %>
|
||||
<% else %>
|
||||
<%= link_to "[查看全文]", board_message_url_in_org(activity.board.id,activity.id), :class => "read-more fl" %>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="item-btm clearfix">
|
||||
<ul class="fl left-info">
|
||||
<li class="hd-pic">
|
||||
<%= link_to image_tag(url_to_avatar(activity.author),:width => "20", :height => "20"), user_path(activity.author), :class => "publisher-hd fl", :target => "_blank" %>
|
||||
<a class="publisher-name fl" href="#" target="_blank">
|
||||
<%= link_to activity.author.realname.nil? ? activity.author.login : activity.author.realname, user_path(activity.author), :class => "publisher-name fl", :target => "_blank" %>
|
||||
</a>
|
||||
</li>
|
||||
<li class="pass-time"><span><%= format_date(activity.updated_on) %></span></li>
|
||||
</ul>
|
||||
<div class="fr right-info">
|
||||
<span> <%= activity.children.count %></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
<% org_attachs.each do |attach| %>
|
||||
<div class="row-ziyuan fl">
|
||||
<%= link_to image_tag(url_to_avatar(attach.author),:width => "40", :height => "40"), user_path(attach.author), :class => "fl user-img" %>
|
||||
<!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
|
||||
<div class="ziyuan-box fl">
|
||||
<%= link_to truncate(attach.filename,length: 35, omission: '...'),
|
||||
download_named_attachment_path(attach.id, attach.filename),
|
||||
:title => attach.filename+"\n"+attach.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;", :class => "fl ziyuan-title" %>
|
||||
<p class="fl"><span >上传时间：<%= format_date attach.created_on %></span><span>类型：<%= attach.tag_list[0] %></span><span> 下载次数：<%= attach.downloads%></span> <span>引用：<%= attach.quotes.nil? ? 0:attach.quotes %></span></p>
|
||||
</div>
|
||||
<%= link_to "下载", download_named_attachment_path(attach.id, attach.filename), :class => "download-btn fl" %>
|
||||
<div class="cl"></div>
|
||||
</div><!--row-ziyuan end-->
|
||||
<% end %>
|
||||
|
After Width: | Height: | Size: 48 KiB |
|
After Width: | Height: | Size: 555 B |
|
After Width: | Height: | Size: 6.2 KiB |
|
After Width: | Height: | Size: 4.3 KiB |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue