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

Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop

This commit is contained in:
daiao 2016-12-12 15:58:06 +08:00
parent 1fd6ccf3ff 93cf24cf41
commit 120f65401b
4 changed files with 79 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/users/_user_message_course.html.erb
View File

@ -148,8 +148,8 @@
</ul>
<% end %>
</div>
<li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到啦</li>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
<li class="homepageHomeworkContentWarn fr" title="截止时间快到啦">截止时间快到啦</li>
</ul>
<% end %>
<!--作品开启匿评 待整合：时间紧-->
@ -535,8 +535,8 @@
</ul>
<p>如需获得最终成绩，请您联系主讲老师对您的作品进行单独评分!</p>
</div>
<li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp;您成功提交了作品（但被标记为迟交啦）</li>
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
<li class="homepageHomeworkContentWarn fr" title="您成功提交了作品（但被标记为迟交啦）"> 迟交作品</li>
</ul>
<% end %>
@ -827,8 +827,8 @@
<p>请及时完成班级测验，辛苦啦！</p>
</ul>
</div>
<li class="homepageHomeworkContentWarn fl">截止时间快到啦 </li>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
<li class="homepageHomeworkContentWarn fr" title="截止时间快到啦">截止时间快到啦 </li>
</ul>
<% end %>
<% end %>

8
app/views/users/_user_message_forge.html.erb
View File

@ -82,14 +82,14 @@
<!--:onmouseout => "message_titile_hide($(this))" %>-->
</li>
<% unless User.current.member_of?(ma.project) %>
<li class="homepageHomeworkContentWarn fl">
<li class="homepageHomeworkContentWarn fl">
<%=link_to "同意加入", {:controller => 'projects', :action => 'member', :id => ma.project_id, :message_id =>ma.id, :key => ma.secret_key},
:value => ma.secret_key,
:class => "green_btn_cir ml10",
:style => "color:#fff", :target => '_blank' %>
</li>
<% end %>
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
</ul>
<% end %>
<% if ma.forge_message_type == "Issue" %>
@ -112,8 +112,8 @@
<!--:onmouseout => "message_titile_hide($(this))" %>-->
</a>
</li>
<li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到了！</li>
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
<li class="homepageHomeworkContentWarn fr" title="截止时间快到了！">截止时间快到啦</li>
</ul>
<% else %>
<ul class="homepageNewsList fl">

89
app/views/users/show.html.erb
View File

@ -1,35 +1,82 @@
<script src="/javascripts/i18n/jquery.ui.datepicker-zh-CN.js" type="text/javascript"></script>
<input type="hidden" value="<%= @type %>" name="type" id="user_activities_type">
<script>
$(function(){
$($(".homepage_tab_div")[$(".homepage_tab_div").length - 1]).css("border", "none");
});
</script>
<% if is_current_user %>
<div class="homepagetopBanner mb10">
<div class="flex-container_homepage" style="width:750px;">
<div class="flex-cell_homepage" id="user_homepage_tab_01" style="padding-top: 10px">
<li class="homepage_issue_tab ml20 mb5"><span class="ml35" style="font-size: 20px;">248</span></li>
待解决Issue<br />
<div class="flex-cell_homepage">
<div class="homepage_tab_div" id="user_homepage_tab_01" style="">
<span style="margin: 5px auto; vertical-align: middle; display: inline-block;">
<li class="homepage_issue_tab mb5 fl"></li>
<span class="ml5 fl" style="font-size: 20px;">248</span>
<div class="cl"></div>
</span>
<br />待解决Issue
</div>
</div>
<div class="flex-cell_homepage" id="user_homepage_tab_02" style="padding-top: 10px">
<li class="homepage_work_tab ml20 mb5"><span class="ml35" style="font-size: 20px;">21</span></li>
待完成作业<br />
<div class="flex-cell_homepage">
<div class="homepage_tab_div" id="user_homepage_tab_02" style="">
<span style="margin: 5px auto; vertical-align: middle; display: inline-block;">
<li class="homepage_issue_tab mb5 fl"></li>
<span class="ml5 fl" style="font-size: 20px;">21</span>
<div class="cl"></div>
</span>
<br />待完成作业
</div>
</div>
<div class="flex-cell_homepage" id="user_homepage_tab_03" style="padding-top: 10px">
<li class="homepage_test_tab ml20 mb5"><span class="ml35" style="font-size: 20px;">18</span></li>
待完成测验<br />
<div class="flex-cell_homepage">
<div class="homepage_tab_div" id="user_homepage_tab_03" style="">
<span style="margin: 5px auto; vertical-align: middle; display: inline-block;">
<li class="homepage_issue_tab mb5 fl"></li>
<span class="ml5 fl" style="font-size: 20px;">21</span>
<div class="cl"></div>
</span>
<br />待完成测验
</div>
</div>
<div class="flex-cell_homepage" id="user_homepage_tab_04" style="padding-top: 10px">
<li class="homepage_poll_tab ml20 mb5"><span class="ml35" style="font-size: 20px;">11</span></li>
待完成问卷<br />
<div class="flex-cell_homepage">
<div class="homepage_tab_div" id="user_homepage_tab_04" style="">
<span style="margin: 5px auto; vertical-align: middle; display: inline-block;">
<li class="homepage_issue_tab mb5 fl"></li>
<span class="ml5 fl" style="font-size: 20px;">11</span>
<div class="cl"></div>
</span>
<br />待完成问卷
</div>
</div>
<div class="flex-cell_homepage" id="user_homepage_tab_05" style="padding-top: 10px">
<li class="homepage_anonymity_tab ml20 mb5"><span class="ml35" style="font-size: 20px;">16</span></li>
待匿评作业<br />
<div class="flex-cell_homepage">
<div class="homepage_tab_div" id="user_homepage_tab_05" style="">
<span style="margin: 5px auto; vertical-align: middle; display: inline-block;">
<li class="homepage_issue_tab mb5 fl"></li>
<span class="ml5 fl" style="font-size: 20px;">21</span>
<div class="cl"></div>
</span>
<br />待匿评作业
</div>
</div>
<div class="flex-cell_homepage" id="user_homepage_tab_06" style="padding-top: 10px">
<li class="homepage_review_tab ml20 mb5"><span class="ml35" style="font-size: 20px;">13</span></li>
待评阅作业<br />
<div class="flex-cell_homepage">
<div class="homepage_tab_div" id="user_homepage_tab_06" style="">
<span style="margin: 5px auto; vertical-align: middle; display: inline-block;">
<li class="homepage_issue_tab mb5 fl"></li>
<span class="ml5 fl" style="font-size: 20px;">21</span>
<div class="cl"></div>
</span>
<br />待评阅作业
</div>
</div>
<div class="flex-cell_homepage" id="user_homepage_tab_07" style="padding-top: 10px">
<li class="homepage_apply_tab ml20 mb5"><span class="ml35" style="font-size: 20px;">16</span></li>
待审批申请<br />
<div class="flex-cell_homepage">
<div class="homepage_tab_div" id="user_homepage_tab_07" style="">
<span style="margin: 5px auto; vertical-align: middle; display: inline-block;">
<li class="homepage_issue_tab mb5 fl"></li>
<span class="ml5 fl" style="font-size: 20px;">2</span>
<div class="cl"></div>
</span>
<br />待审批申请
</div>
</div>
</div>
</div>

5
public/stylesheets/css/structure.css
View File

@ -500,8 +500,9 @@ a.user_leftinfo_img { display:block; width:80px; height:80px; margin:15px auto;}
.user_atten li a:hover{ color:#3b94d6;}
.flex-container_homepage {display:flex;}
.flex-container_homepage div{ width:68px; float:left; border-right:1px solid #62ACE2; text-align:center; font-size:14px; height: 70px; margin:10px 0px; color: #ffffff;}
.flex-container_homepage div:last-child { border:none; }
.homepage_tab_div{width:100%; border-right:1px solid #62ACE2; text-align:center; font-size:14px; height: 70px; margin:15px 0px; color: #ffffff;}
/*.flex-container_homepage div{ width:68px; float:left; border-right:1px solid #62ACE2; text-align:center; font-size:14px; height: 70px; margin:10px 0px; color: #ffffff;}*/
/*.flex-container_homepage div:last-child { border:none; }*/
.flex-cell_homepage {flex:1; text-align: center}
.homepage_review_tab{ display:block; background:url(/images/user/homepage_tab.png) -15px -185px no-repeat; width:32px; height:32px; }
.homepage_issue_tab { display:block; background:url(/images/user/homepage_tab.png) -15px -12px no-repeat; width:32px; height:32px; }