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

更新css，编辑个人简介功能BUG

This commit is contained in:
sw 2015-08-25 10:30:31 +08:00
parent 67c4561b28
commit 5b99effbc8
3 changed files with 52 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,5 @@
这位童鞋很懒，什么也没有留下～ 
<% end %>
<% if User.current == user%>
<a href="javascript:void(0);" onclick="show_edit_user_introduction();">
<img src="../images/signature_edit.png" width="12" height="12" />
</a>
<%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_user_introduction();"%>
<% end%>

77
app/views/users/user_homeworks.html.erb
View File

@ -1,56 +1,45 @@
<div class="HomeWork mb10">
<div class="HomeWork">
<div class="RightBanner">
<div class="NewsBannerName">发布作业</div>
</div>
<div class="HomeWorkCon">
<div class="mt15">
<textarea class="InputBox fl W350 mr15" placeholder="请输入作业标题"></textarea>
<a href="javascript:void(0);" class="BlueCirBtn fl mr15">课程名称</a>
<a href="javascript:void(0);" class="BlueCirBtn fl mr15">导入作业</a>
<div class="">
<textarea class="InputBox fl W120 mr5" placeholder="截止日期"></textarea>
<a href="javascript:void(0);" class="pic_date fl mt8"></a>
</div>
<div class="cl"></div>
<textarea class="InputBox W700 " placeholder="请输入作业标题"></textarea>
</div>
<div class="mt15">
<textarea class="InputBox W700" placeholder="请输入作业描述"></textarea>
</div>
<div class="mt15">
<a href="javascript:void(0);" class="AnnexBtn fl mt3">上传附件</a>
<a href="javascript:void(0);" class="FilesBtn fl mr15 mt3">资源库</a>
<div class=" mt10">
<a href="javascript:void(0);" class="BlueCirBtn fl mr10">导入作业</a>
<textarea class="InputBox fl W120 " placeholder="截止日期"></textarea>
<div class="fl DateBorder mr10"><a href="javascript:void(0);" class="pic_date "></a></div>
<textarea class="InputBox fl W120 " placeholder="发布日期"></textarea>
<div class="fl DateBorder" ><a href="javascript:void(0);" class="pic_date "></a></div>
<div class="cl"></div>
</div>
<div class="mt10">
<a href="javascript:void(0);" class=" fl DropBtn">高级配置</a>
<div class="DropLine" ></div>
<div class="cl"></div>
<textarea class="InputBox W700" placeholder="请输入作业描述"></textarea>
</div>
<div class="mt15">
<select class="InputBox W120">
<option value="语言选择">语言选择</option>
<option value="C语言">C语言</option>
<option value="C++">C++</option>
</select>
<div class="mt10">
<textarea class="InputBox W700 SearchIcon" placeholder="发送到课程"></textarea>
</div>
<div class="mt15">
<textarea class="InputBox W315 fl mr15" placeholder="测试输入"></textarea><textarea class="InputBox W315 fl mr10" placeholder="测试输出"></textarea>
<div class="cl"></div>
<div class="mt10">
<span class="pic_img fl "></span><a href="javascript:void(0);" class=" fl FilesName02">附件名称附件名称附件名称附件名称附件附件名称件名称附件名称附件附件名称附件名称件名称附件名称附件附件名称附件名称件名称附件名称附件附件名称附件名称件名称附件名称附件附件名称附件名称附件附件名称附件名附件名称附件附件名称.png（123KB）</a><span class="pic_del fl "></span><div class="cl"></div>
<span class="pic_files fl "></span><a href="javascript:void(0);" class=" fl FilesName02">附件名称.zip（123KB）</a><span class="pic_del fl "></span><div class="cl"></div>
</div>
<div class="mt15">
<textarea class="InputBox W315 fl mr15" placeholder="测试输入"></textarea><textarea class="InputBox W315 fl mr10" placeholder="测试输出"></textarea>
<a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
<a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
<div class="cl"></div>
</div>
<div class="mt15">
<a href="javascript:void(0);" class="BlueCirBtnMini fr">确定</a>
<div class="mt5">
<a href="javascript:void(0);" class="AnnexBtn fl mt3">上传附件</a>
<a href="javascript:void(0);" class="FilesBtn fl mr15 mt3">资源库</a>
<a href="javascript:void(0);" class="BlueCirBtnMini fr">发送</a>
<span class="fr mr10 mt3">或</span><a href="javascript:void(0);" class=" fr mr10 mt3">取消</a>
<div class="cl"></div>
</div>
<div class="mt10">
<a href="javascript:void(0);" class=" fl DropBtn">高级功能</a>
<div class="DropLine" ></div>
<div class="cl"></div>
</div>
</div>
</div><!----HomeWork end-->
<div class="HomeWork mb10">
<div class="HomeWork mt10">
<div class="homepagePostBrief">
<div class="homepagePostPortrait"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像" /></a></div>
<div class="homepagePostDes">
@ -61,8 +50,10 @@
<div class="homepagePostDeadline">时间：2015-08-20</div>
</div>
<div class="homepagePostIntro">（缺陷描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
<div class="mt10"><a href="javascript:void(0);" class="homepagePostFileAtt newsBlue">文件附件.zip</a><span class="postAttSize">(123KB)</span></div>
<div><a href="javascript:void(0);" class="homepagePostImageAtt newsBlue">图片附件.png</a><span class="postAttSize">(123KB)</span></div>
<div class="mt10">
<span class="pic_img fl "></span><a href="javascript:void(0);" class=" fl FilesName">附件名称附件名称附件名称附件名称附件名附件名称附件名附件附件名称附件名附件附件名称附件附件名称.png（123KB）</a><span class="pic_del fl "></span><div class="cl"></div>
<span class="pic_files fl "></span><a href="javascript:void(0);" class=" fl ">附件名称.zip（123KB）</a><span class="pic_del fl "></span><div class="cl"></div>
</div>
<div class="homepagePostSetting">
<ul>
<li class="homepagePostSettingIcon">
@ -78,19 +69,21 @@
<div class="cl"></div>
</div>
</div><!----HomeWork end-->
<div class="HomeWork mb10">
<div class="HomeWork mt10">
<div class="homepagePostBrief">
<div class="homepagePostPortrait"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像" /></a></div>
<div class="homepagePostDes">
<div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO <a href="javascript:void(0);" class="newsBlue ml15">Trustie Forge（项目名称）</a></div>
<div class="homepagePostTitle"><a href="javascript:void(0);" class="postGrey">上传资源未显示在项目动态中（缺陷标题）</a><span class="red_btn_cir">紧急</span></div>
<div class="homepagePostTitle"><a href="javascript:void(0);" class="postGrey">上传资源未显示在项上传资源未显示在项目动上传资源未显示在项目动上传资源未显示在项目动上传资源未显示在项目动目动态中（缺陷标题）</a><span class="red_btn_cir">紧急</span></div>
<div class="homepagePostSubmitContainer">
<div class="homepagePostAssignTo">指派给&nbsp;&nbsp;<a href="javascript:void(0);" class="newsBlue mr15">苏稳</a></div>
<div class="homepagePostDeadline">时间：2015-08-20</div>
</div>
<div class="homepagePostIntro">（缺陷描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
<div class="mt10"><a href="javascript:void(0);" class="homepagePostFileAtt newsBlue">文件附件.zip</a><span class="postAttSize">(123KB)</span></div>
<div><a href="javascript:void(0);" class="homepagePostImageAtt newsBlue">图片附件.png</a><span class="postAttSize">(123KB)</span></div>
<div class="mt10">
<span class="pic_img fl "></span><a href="javascript:void(0);" class=" fl FilesName">附件名称附件名称附件名称附件名称附件名附件名称附件名附件附件名称附件名附件附件名称附件附件名称.png（123KB）</a><span class="pic_del fl "></span><div class="cl"></div>
<span class="pic_files fl "></span><a href="javascript:void(0);" class=" fl ">附件名称.zip（123KB）</a><span class="pic_del fl "></span><div class="cl"></div>
</div>
<div class="homepagePostSetting">
<ul>
<li class="homepagePostSettingIcon">

24
public/stylesheets/new_public.css
View File

@ -783,11 +783,11 @@ a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
/*20150820课程作业 LB*/
.HomeWork {width:708px; background-color:#ffffff; padding:20px; border:1px solid #dddddd;}
.RightBanner {width:708px; height:34px; border-bottom:1px solid #e9e9e9;}
.InputBox{ border:1px solid #d9d9d9; height:28px; line-height:28px; padding-left:5px; font-size:14px;}
select.InputBox,input.InputBox,textarea.InputBox{ border:1px solid #d9d9d9; color:#888888; height:28px; line-height:28px; padding-left:5px; font-size:14px;}
a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; text-align:center; border:1px solid #15bccf; color:#15bccf; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;}
a:hover.BlueCirBtn{ background:#15bccf; color:#fff;}
.W350{ width:350px;}
.W120{ width:120px;}
.W440{ width:440px;}
.W120{ width:110px;}
.W700{ width:700px;}
a.AnnexBtn{ background: url(../images/homepage_icon.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat; color:#15bccf;}
@ -799,7 +799,7 @@ a.DropBtn{background: url(../images/homepage_icon.png) -125px -339px no-repeat;
a:hover.DropBtn{background: url(../images/homepage_icon.png) -125px -370px no-repeat;}
.DropLine{border-top:1px solid #d9d9d9; float:left; width:623px; height:10px; margin-top:10px;}
/*20150820编程作业 LB*/
.W315{ width:315px;}
.W320{ width:320px;}
.icon_add{ background:url(images/icons.png) 0px -310px no-repeat; width:16px; height:27px; display:block;float:left; margin-right:5px;}
a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;}
.icon_remove{background:url(images/icons.png) 0px -338px no-repeat; width:16px; height:27px; display:block;float:left;}
@ -809,14 +809,22 @@ a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;}
.c_grey{ color:#888888;}
.HomeWorkP{ width:690px; font-size:14px;}
.H150{ height:150px;}
.ProResult{width:748px; background-color:#fff; border:1px solid #dddddd; border-bottom:none;}
.ProResult{width:748px; background-color:#fff; border:1px solid #dddddd;border-bottom:none; }
.ProResultTop{ height:38px; line-height:38px; border-bottom:1px solid #dddddd; background:#f2f2f2; padding:0 10px;}
.ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd;}
.ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; }
.W50{ width:50px;}
.W200{ width:210px;}
.ProResultTable tr td{ height:35px; border-bottom:1px solid #dddddd; }
.W200{ width:200px;}
.ProResultTable{ color:#888888;}
.T_C{ text-align:center;}
.SearchIcon{background:url(../images/homepage_icon.png) 676px -393px no-repeat; }
.SearchIcon:hover{background:url(../images/homepage_icon.png) 676px -419px no-repeat; }
a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
a.FilesName{ max-width:540px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
.ProResultUl span { display:block; float:left;}
.ProResultUl li{ line-height:35px; border-bottom:1px solid #dddddd; }
.DateBorder{border:1px solid #d9d9d9; border-left:none; padding:7px 6px 6px 6px;}