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

Merge branch 'dev_new_head' of http://git.trustie.net/jacknudt/trustieforge into dev_new_head

This commit is contained in:
SylorHuang 2019-10-26 11:07:16 +08:00
parent ac49cd0fa8 4b483e961e
commit 52bebf73b8
7 changed files with 219 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/views/issues/index.html.erb
View File

@ -316,9 +316,12 @@
</div><!--issues_con_list end-->
<div class="cl"></div>
<!--issues_filter end-->
<div id="issues_list_content_1"></div><!--issues_list_content_1 end-->
<div id="issues_list_content_2" class="undis"></div><!--issues_list_content_2 end-->
<div id="issues_list_content_3" class="undis"></div><!--issues_list_content_3 end-->
<div id="issues_list_content_1">
</div><!--issues_list_content_1 end-->
<div id="issues_list_content_2" class="undis">
</div><!--issues_list_content_2 end-->
<div id="issues_list_content_3" class="undis">
</div><!--issues_list_content_3 end-->
<!--issues_con_list end-->
<!--缺陷列表结束-->

1
app/views/layouts/base_projects.html.erb
View File

@ -29,7 +29,6 @@
<%= render_flash_messages %>
<%= yield %>
<%= call_hook :view_layouts_base_content %>
<div style="clear:both;"></div>
</div>
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>

76
app/views/users/_private_box.html.erb Normal file
View File

@ -0,0 +1,76 @@
<div class="df clearfix">
<div class="flex1">
<p class="clearfix pt30 pb30 t-center font-16 bor-bottom-greyE">
<a href="javascript:void(0)">
<i class="iconfont icon-zuojiantou font-14 fl ml25 color-grey-9" data-tip-down="返回到列表"></i>
</a>
陈晓婷与你的私信
</p>
<div class="letterBox">
<p class="mt30 t-center"><span class="letter-time">2019-10-19</span></p>
<div class="OtherSide clearfix" id="message_content_25148">
<a href="javascript:void(0)"><img alt="头像" class="mr10 radius fl" height="48" width="48" src="https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=1820523987,3798556096&fm=26&gp=0.jpg" /></a>
<div class="fl pr OtherSide-info">
<span class="trangle"></span>
<div class="sms break_word markdown-body" id="Leftdialogue1">
<p><a href="http://www.baidu.com" title="wwwbaidu">wwwbaidu</a></p>
<ol>
<li>kdajlkd</li>
<li>dskdfjslakfj</li>
</ol>
</div>
<div class="edu-txt-right mt5">
<a href="javascript:void(0)" class="color-grey-c">删除</a>
</div>
</div>
<span class="fl ml15 color-grey-c lineh-15 mt15">9:53</span>
</div>
<div class="ThisSide clearfix" id="message_content_25149">
<a href="javascript:void(0)"><img alt="头像" class="ml10 radius fr" height="48" width="48" src="https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=1820523987,3798556096&fm=26&gp=0.jpg" /></a>
<div class="fr pr ThisSide-info">
<span class="trangle"></span>
<div class="sms break_word markdown-body" id="Leftdialogue1">
<p><a href="http://www.baidu.com" title="wwwbaidu">wwwbaidu</a></p>
<ol>
<li>kdajlkd</li>
<li>dskdfjslakfj</li>
</ol>
</div>
<div class="edu-txt-left mt5">
<a href="javascript:void(0)" class="color-grey-c">删除</a>
</div>
</div>
<span class="fr mr15 color-grey-c lineh-15 mt15">9:53</span>
</div>
</div>
<div class="repeatBox padding20">
<div>
<textarea></textarea>
</div>
<p class="clearfix mt15">
<span class="fl ml5 color-orange f12 mt5">在问题反馈时，请同时发送问题发生页的网址链接，以便我们高效的为您服务</span>
<a href="javascript:void(0)" class="fr task-btn task-btn-orange">回复</a>
</p>
</div>
</div>
<div class="bor-left-greyE" style="width: 290px;">
<p class="pt30 pb30 pl30 edu-txt-left font-16 bor-bottom-greyE">私信列表</p>
<div class="private-list">
<div class="part-line">
<img height="48" width="48" src="https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=1820523987,3798556096&fm=26&gp=0.jpg" class="radius mr10">
<div class="flex1">
<p class="clearfix mb10 lineh-17">
<span class="fl">
<span class="task-hide privatePartName">陈晓婷</span>
</span>
<span class="color-grey-c fr">2小时前</span>
</p>
<p class="color-grey-6 lh20 justify break_word task-hide-2 markdown-body" id="MakedownHTML" style="word-break: break-word;">
jhgjkhjkh
</p>
</div>
</div>
</div>
</div>
</div>

24
app/views/users/user_issues.html.erb
View File

@ -197,7 +197,6 @@
<li>关闭<a href="javascript:void(0);" class="issues_greycirbg_btn "><%= @issue_close_count %></a></li>
</ul>
</div><!--issues_statistics end-->
</div>
<%= form_tag( user_issues_user_path(@user), :remote=>'xls', :method => "post", :id=>"issue_query_form", :class => 'query_form') do %>
<div class="clear mb10">
@ -278,6 +277,7 @@
</div>
<div class="cl"></div>
</div>
</div>
<% end %>
<% if @issues.empty? %>
<p class="nodata mt10"><%= l(:label_no_data) %></p>
@ -286,15 +286,19 @@
<%= render :partial => 'users/all_issue_list', :locals => {:issues => @issues, :issue_pages => @issue_pages,:issue_count => @issue_count, :subject => @subject } %>
</div>
<% end %>
</div>
<div class="cl"></div>
</div><!--issues_filter end-->
<div id="issues_list_content_1">
</div><!--issues_list_content_1 end-->
<div id="issues_list_content_2" class="undis">
</div><!--issues_list_content_2 end-->
<div id="issues_list_content_3" class="undis">
</div><!--issues_list_content_3 end-->
</div>
<div class="cl"></div>
<!--issues_filter end-->
<div id="issues_list_content_1"></div>
<!--issues_list_content_1 end-->
<div id="issues_list_content_2" class="undis"></div>
<!--issues_list_content_2 end-->
<div id="issues_list_content_3" class="undis"></div>
<!--issues_list_content_3 end-->
<!--issues_con_list end-->

2
app/views/users/user_messages.html.erb
View File

@ -3,7 +3,7 @@
<%= render partial: "users/infos" %>
</div>
<%#= render partial: "users/private_file" %>
<%#= render partial: "users/private_box" %>

38
public/stylesheets/css/common.css
View File

@ -3,7 +3,7 @@
/* 2015-06-26 */
html,body{height: 100%;}
body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.5; background:#eaebec;}
body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:14px;line-height:1.5; background:#eaebec;}
div,img,tr,td,table{ border:0;}
table,tr,td{border:0;}
ol,ul,li{ list-style-type:none}
@ -124,8 +124,11 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
.mb5{ margin-bottom:5px;}.mb8 {margin-bottom:8px !important;}.pb5{ padding-bottom: 5px;}.mb10{ margin-bottom:10px !important;}.mb12 {margin-bottom:12px !important;}
.mb15{margin-bottom: 15px;}.mb20{ margin-bottom:20px;}.mb25{ margin-bottom:25px;}.mb30 {margin-bottom:30px;}.mb40 {margin-bottom:40px;}.pl5{ padding-left:5px;}
.mb70{ margin-bottom:70px;}.mb60{ margin-bottom:60px;}.mb90{ margin-bottom:90px;}.mb80{ margin-bottom:80px;}.mb100{ margin-bottom:100px;}
.pl10 {padding-left:10px;}.pr5 {padding-right:5px;}.pr10{padding-right: 10px;}.pl62 {padding-left: 62px;}.pl15{ padding-left:15px;}.pt5{ padding-top:5px;}
.pt10{ padding-top:10px;}.pt20{ padding-top:20px;}.pb5{ padding-bottom: 5px;}.w20{ width:20px;}.w40{width: 40px;}.w45{ width: 45px;}.w46{ width: 46px;}.w48{width:48px;}.w50 {width:50px;}
.pl10 {padding-left:10px;}.pl30 {padding-left:30px;}.pr5 {padding-right:5px;}.pr10{padding-right: 10px;}.pl62 {padding-left: 62px;}.pl15{ padding-left:15px;}.pt5{ padding-top:5px;}
.pt10{ padding-top:10px;}.pt30{padding-top: 30px;}
.pt20{ padding-top:20px;}
.pb5{ padding-bottom: 5px;}.pb30{padding-bottom: 30px}.w20{ width:20px;}.w40{width: 40px;}.w45{ width: 45px;}.w46{ width: 46px;}.w48{width:48px;}.w50 {width:50px;}
.w56 {width:56px;}.w60{ width:60px;}.w61{ width:61px;}.w65{ width:65px;}.w70{ width:70px;}.w80{ width:80px;}.w90{ width:90px;}.w100 {width: 100px;}.w110{width:110px !important;}
.w108 {width:108px;}.w125{width:125px;}.w128{ width:128px;}.w130{ width:130px;}.w140{ width:140px;}.w145{ width:145px;}.w150{ width:150px;}
.w160{width:160px !important;}.w170{width:170px;}.w180{width:180px;}.w186{ width:186px;}.w190{width: 190px;}.w196{ width:196px;}.w200{width: 200px;}.w210{ width:210px;}
@ -158,8 +161,19 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
.wb60{width: 59%;}.wb40{width: 40%;}.wb45{width: 45%;}
.wb50{width: 49%;}.wb50{width: 50%;}.wb35{width: 35%;}
.task-hide {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.task-hide-2 {
height: 40px;
overflow: hidden;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
}
/*该高度会写入配置文件*/
.maxh360 {max-height: 810px;}
.maxh300 { max-height: 300px; }
@ -225,6 +239,9 @@ a:hover.c_grey{ color:#333;}
.b_red {background:#d60308;}
.b_lblue{ background:#3b94d6;}
.edu-txt-right{text-align: right}
.edu-txt-center{text-align: center}
.edu-txt-left{text-align: left}
.task-hide-2{overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;}
/*font&color add by Tim*/
@ -290,7 +307,7 @@ a.submit_btn2:hover {background-color: #2788d0;}
input.submit_btn {border:1px solid #3498db; padding:3px 10px; border-radius:3px; color:#3498db;}
input.submit_btn:hover {background-color:#3498db; color:#ffffff;}
a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;}
.radius{border-radius: 50%}
/* commonBtn */
.grey_btn{background:#d9d9d9; color:#656565; font-weight:normal; text-align:center;padding:2px 10px;}
a.grey_btn{background:#d9d9d9; color:#656565; font-weight:normal; text-align:center;padding:2px 10px; display: inline-block; border-radius: 3px;}
@ -503,6 +520,7 @@ a.btn_green_64_width{ width: 64px; display:inline-block; color: #fff; background
a:hover.btn_green_64_width{ background: #14ad5a; color: #fff;}
.padding10{padding:10px;box-sizing: border-box}
.padding20{padding:20px;box-sizing: border-box}
.f12 {font-size:12px;}
.f13 {font-size:13px;}
.f14 {font-size:14px;}
@ -549,10 +567,14 @@ a:hover.btn_green_64_width{ background: #14ad5a; color: #fff;}
.c-blue {color:#3b94d6!important;}
.c-white {color:#ffffff;}
.c-black {color:#333}
.color-orange {
color: #ff6800!important;
}
.padding30-20{padding:30px 20px;}
.bor-bottom-greyE{border-bottom: 1px solid #eee;}
.bor-left-greyE {
border-left: 1px solid #EEEEEE!important;
}
.bg_white_bor{background-color: #fff;border:1px solid #dddddd}
#intro_content p{word-break:break-word!important;}

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

@ -567,6 +567,98 @@ a.user_editinfo{border-top:1px solid #e5e5e5; height:30px; line-height:30px; tex
.private-item:hover {
background-color: #f5f5f5;
}
/*私信对话框*/
.letterBox {
padding: 0px 20px;
height: 545px;
overflow-y: auto;
border-bottom: 1px solid #eaeaea;
}
.letter-time {
width: auto;
padding: 0px 10px;
background-color: #999;
color: #fff;
border-radius: 10px;
height: 20px;
line-height: 20px;
}
.OtherSide-info,.ThisSide-info{
font-size: 14px;
}
.OtherSide-info .trangle {
position: absolute;
left: -5px;
top: 10px;
width: 0;
height: 0px;
border-top: 6px solid transparent;
border-right: 5px solid #f5f5f5;
border-bottom: 6px solid transparent;
}
.ThisSide-info .trangle{
position: absolute;
right:-5px;
top: 10px;
width: 0;
height: 0px;
border-top: 6px solid transparent;
border-left: 5px solid #f5f5f5;
border-bottom: 6px solid transparent;
}
.OtherSide-info .sms,.ThisSide-info .sms {
max-width: 300px;
padding: 10px 15px;
box-sizing: border-box;
background-color: #F5F5F5;
color: #666;
border-radius: 6px;
text-align: justify;
}
.OtherSide, .ThisSide {
margin-top: 30px;
}
a.task-btn-orange {
background: #4CACFF!important;
color: #fff!important;
}
a.task-btn {
cursor: pointer;
display: inline-block;
border: none;
padding: 0 12px;
color: #fff;
background: #CDCDCD;
letter-spacing: 1px;
text-align: center;
font-size: 14px;
height: 30px;
line-height: 30px;
border-radius: 2px;
font-weight: 400;
}
.private-list {
min-height: 660px;
max-height: 831px;
overflow-y: auto;
overflow-x: hidden;
}
.part-line {
padding: 20px;
border-bottom: 1px solid #f5f5f5;
display: flex;
font-size: 14px;
}
.part-line:hover {
background-color: #F5F5F5;
}
.private-part:last-child .part-line {
border: none;
}
.privatePartName {
max-width: 70px;
float: left;
}
/*oschina授权页*/
.authTop{width: 100%;position: fixed;left: 0px;top:0px;background-color: #51B7EC;height: 58px;color: #fff;}
.authmain{width: 1000px;margin:0px auto;display: block!important;}