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

创建时间统一date

This commit is contained in:
huang 2016-03-29 19:04:51 +08:00
parent 65e80b1978
commit 961a264e05
11 changed files with 62 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

153
app/views/layouts/base_org_newstyle.html.erb
View File

@ -28,23 +28,7 @@
});
</script>
<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>
</head>
<!--add by huang-->
<body onload="prettyPrint();">
@ -54,91 +38,7 @@
<div class="header-con">
<a href="index.html" class="fl logo"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
<%# 登录 %>
<% 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>
<!--<li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;">-->
<%#= link_to image_tag(url_to_avatar(User.current)), user_url_in_org(User.current.id), :alt => '用户头像', :target => '_blank', :class => "fr user-img" %>
<%#= link_to User.current, user_url_in_org(User.current.id),:id => "orgUserName",:class => 'fontGrey2 f14 mr5',:target => '_blank' %>
<%#= link_to "退出",logout_url_without_domain, :class =>"menuGrey", :method => 'post', :rel => "nofollow" %>
<!--</li>-->
<!--<li class="navOrgMenu fr"><%#=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %></li>-->
<% else %>
<li class="navOrgMenu fr"><a href="<%= signin_url_without_domain %>" class="login fr"></a></li>
<li class="navOrgMenu fr"><a href="<%= register_url_without_domain %>" class="register fr"></a></li>
<% end %>
<!--<a href="#" class="fr user-img" ><img src="/images/org_new_style/detailimg4.jpg" /></a>-->
</div>
<div class="cl"></div>
</div><!--header end-->
<div class="nav-box">
<div class="nav fl">
<% @subfield_content.each do |field| %>
<% if is_default_field?(field) %>
<% case field.name %>
<% when 'activity' %>
<%= link_to "首页", organization_path(@organization), :class => "fl navact" %>
<% when 'course' %>
<a href="#course_<%= field.id %>" class="fl"> 课程动态</a>
<% when 'project' %>
<a href="#project_<%= field.id %>" class="fl">项目动态</a>
<% end %>
<% else %>
<% if field.field_type == "Post" && field.hide == 0 %>
<a href="#message_<%= field.id %>" class="fl"><%= field.name %></a>
<% elsif field.field_type == "Resource" && field.hide == 0%>
<a href="#resource_<%= field.id %>" class="fl"><%= field.name %></a>
<% end %>
<% end %>
<% end %>
</div>
</div><!--nav end-->
<div class="banner">
<h2><%= @organization.name %></h2>
<p>ＣＮＳＳ<br><span>open laboratory of simulation and testing</span></p>
</div>
<div class="header">
<div class="header-con">
<a href="index.html" class="fl"><%= image_tag(url_to_avatar(@organization),width:"60", height: "60", :id=>'nh_user_tx') %><img src="/images/org_new_style/logo.jpg" alt=""/></a>
<% if User.current.logged? %>
<li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;">
<%= link_to image_tag(url_to_avatar(User.current),:width => '23',:height => '23'), user_url_in_org(User.current.id),:alt => '用户头像', :target => '_blank',:style=>'border-radius:3px; vertical-align:top; margin-top:3px; display:inline-block; margin-right:3px;' %>
<%= link_to User.current, user_url_in_org(User.current.id),:id => "orgUserName",:class => 'fontGrey2 f14 mr5',:target => '_blank' %>
<%= link_to "退出",logout_url_without_domain, :class =>"menuGrey", :method => 'post', :rel => "nofollow" %>
</li>
<!--<li class="navOrgMenu fr"><%#=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %></li>-->
<% else %>
<li class="navOrgMenu fr"><a href="<%= signin_url_without_domain %>" class="login fr"></a></li>
<li class="navOrgMenu fr"><a href="<%= register_url_without_domain %>" class="register fr"></a></li>
<% end %>
<%= render :partial => 'organizations/org_logined_header' %>
</div>
<div class="cl"></div>
</div><!--header end-->
@ -164,52 +64,13 @@
<% end %>
<% end %>
</div>
<div class="fr">
<form class="searchbox">
<input type="text" name="search" class="search-input fl" value="search" />
<a href="#" class="search-icon fl"></a>
</form>
</div>
<div class="cl" ></div>
</div><!--nav end-->
<div class="header-content home" >
<div class="parallax-bg" id="slider-wrap">
<div class="slider parallax-bg" id="slider">
<div class="slider-sections sandbox">
<section class="first">
<div class="text">
<h2><%= @organization.name %><br /></h2>
<p class="copy">course activities</p>
<p class="button">
<a class="dimmed" href="#"> More</a>
</p>
</div>
</section>
<section>
<div class="text">
<h2><%= @organization.name %></h2>
<p class="copy">open laboratory of simulation and testing</p>
<p class="button">
<a class="dimmed" href="#">More</a>
</p>
</div>
</section>
<div class="banner">
<h2><%= @organization.name %></h2>
<p><span><%= @organization.description %></span></p>
</div>
<section>
<div class="text">
<h2><%= @organization.name %></h2>
<p class="copy">open laboratory of simulation and testing</p>
<p class="button">
<a class="dimmed" href="#"> More</a>
</p>
</div>
</section>
</div>
</div>
<a class="slider-prev" href="javascript: void(0)">?</a> <a class="slider-next" href="javascript: void(0)">?</a>
</div>
</div><!--header-content end-->
<div class="cl"></div>
<!--模块-->
@ -246,7 +107,7 @@
<% @course_acts_message.each do |act| %>
<% if act.container_type == 'Course' %>
<% case act.org_act_type.to_s %>
<% when 'HomeworkCommon' %>
<% when 'HomeworkCommon' %>
<%= render :partial => 'org_new_course_homework', :locals => {:activity => HomeworkCommon.find(act.org_act_id),:user_activity_id =>act.id,:course_activity => 0} %>
<% when 'News' %>
<%= render :partial => 'org_new_course_news', :locals => {:activity => News.find(act.org_act_id),:user_activity_id =>act.id} %>
@ -360,7 +221,7 @@
<a href="#" target="_blank" class="row-img2"><img src="/images/org_new_style/pic1.jpg"></a>
<a href="#" target="_blank" class="row-con">
<h3 class="row-title3 fl"><%=link_to message.title %></h3>
<span class="row-time fr"><%= format_time(message.updated_at) %></span>
<span class="row-time fr"><%= format_date(message.updated_at) %></span>
<div class="cl"></div>
<div class="row-txt"><%= message.content.html_safe %></div>
</a>

46
app/views/organizations/_org_logined_header.html.erb Normal file
View File

@ -0,0 +1,46 @@
<% 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 %>
<li class="navOrgMenu fr"><a href="<%= signin_url_without_domain %>" class="login fr"></a></li>
<li class="navOrgMenu fr"><a href="<%= register_url_without_domain %>" class="register fr"></a></li>
<% 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>

2
app/views/organizations/_org_new_course_create.html.erb
View File

@ -1,5 +1,5 @@
<a href="#" target="_blank" class="row-con">
<span class="row-time"><%= format_time(activity.updated_at) %></span>
<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>

2
app/views/organizations/_org_new_course_homework.html.erb
View File

@ -1,5 +1,5 @@
<a href="#" target="_blank" class="row-con">
<span class="row-time"><%= format_time activity.updated_at %></span>
<span class="row-time"><%= format_date activity.updated_at %></span>
<h3 class="row-title "><%= activity.name %></h3>
<div class="row-txt row-txt-line"><%= activity.description.html_safe %></div>
</a>

2
app/views/organizations/_org_new_course_message.html.erb
View File

@ -1,5 +1,5 @@
<a href="#" target="_blank" class="row-con">
<span class="row-time"><%= format_time activity.updated_on %></span>
<span class="row-time"><%= format_date activity.updated_on %></span>
<h3 class="row-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=> "postGrey" %>

2
app/views/organizations/_org_new_course_news.html.erb
View File

@ -1,5 +1,5 @@
<a href="#" target="_blank" class="row-con">
<span class="row-time"><%= format_time activity.updated_at %></span>
<span class="row-time"><%= format_date activity.updated_at %></span>
<h3 class="row-title ">首届卫星导航仿真与测试专题研讨会在...首届卫星导航仿真与测试专题研讨会在...</h3>
<div class="row-txt row-txt-line">10月15日，由卫星导航仿真与测试开放实验室联盟主办的首次专题研讨会在西安国家民用航天产业基地隆重召开...</div>
</a>

2
app/views/organizations/_org_new_course_poll.html.erb
View File

@ -1,5 +1,5 @@
<a href="#" target="_blank" class="row-con">
<span class="row-time"><%= format_time activity.updated_at %></span>
<span class="row-time"><%= format_date activity.updated_at %></span>
<h3 class="row-title ">首届卫星导航仿真与测试专题研讨会在...首届卫星导航仿真与测试专题研讨会在...</h3>
<div class="row-txt row-txt-line">10月15日，由卫星导航仿真与测试开放实验室联盟主办的首次专题研讨会在西安国家民用航天产业基地隆重召开...</div>
</a>

2
app/views/organizations/_org_new_project_issues.html.erb
View File

@ -1,4 +1,4 @@
<h3><span><%= format_time(activity.updated_on) %>项目社区</span>
<h3><span><%= format_date(activity.updated_on) %>项目社区</span>
<%= link_to activity.subject.to_s, issue_url_in_org(activity.id) %>
</h3>
<p><%= activity.description.html_safe %></p>

2
app/views/organizations/_org_new_project_message.html.erb
View File

@ -1,4 +1,4 @@
<h3><span><%= format_time(activity.updated_on) %>项目社区</span>
<h3><span><%= format_date(activity.updated_on) %>项目社区</span>
<% if activity.parent_id.nil? %>
<%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board.id,activity.id) %>
<% else %>

2
app/views/organizations/_org_new_resource.html.erb
View File

@ -6,7 +6,7 @@
<%= 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_time attach.created_on %></span><span>类型：软件</span><span> 上传者：尹刚</span> <span>下载次数：40</span></p>
<p class="fl"><span >上传时间：<%= format_date attach.created_on %></span><span>类型：软件</span><span> 上传者：尹刚</span> <span>下载次数：40</span></p>
</div>
<a href="#" class="download-btn fl" >下载</a>
<div class="cl"></div>

2
public/stylesheets/org_new_style.css
View File

@ -93,7 +93,7 @@ ul.callbacks_tabs.callbacks1_tabs {position:absolute;bottom: 7.3%;z-index: 999;l
/** 开源 **/
.box2{ height:569px; padding:70px 0; width:100%; background:url(../images/org_new_style/bg.jpg) no-repeat; }
.row-box3{ width:370px;}
.row-title3{ width:290px; font-size:18px;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; font-weight:bold; }
.row-title3{ width:288px; font-size:18px;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; font-weight:bold; }
.box3{height:540px; width:100%; padding:70px 0; background:url(../images/org_new_style/bg2.jpg) no-repeat; }
.box-title-p3{font-size:14px; color:#999999;}
.row-img2{ margin-bottom:10px; width:380px; height:310px; display:block;}