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

理理css

This commit is contained in:
yanxd 2014-03-28 17:08:34 +08:00
parent 378e8cbefd
commit ad23ba646e
3 changed files with 36 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/issues/show.html.erb
View File

@ -1,3 +1,6 @@
<%# html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
<% html_title "#{@issue.tracker.name} #{@issue.source_from}: #{@issue.subject}" %>
<%= render :partial => 'action_menu' %>
<h3><%= issue_heading(@issue) %></h3>
@ -152,7 +155,6 @@ end %>
<%= f.link_to 'PDF' %>
<% end %>
<% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
<% content_for :sidebar do %>
<%= render :partial => 'issues/sidebar' %>

15
app/views/welcome/course.html.erb
View File

@ -111,22 +111,23 @@
<div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
<h3 style="margin-left: 5px; color: #e8770d;"><strong>新开课程</strong></h3>
<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", {:controller => 'projects', :action => 'course', :project_type => 1}, :target => "_blank" %></span>
<h3><strong>新开课程</strong></h3>
<span><%= link_to "更多>>", {:controller => 'projects', :action => 'course', :project_type => 1} %></span>
<div class="d-p-projectlist-box">
<ul class="d-p-projectlist">
<% find_miracle_course(10, 7).map do |project| %>
<li style="position:relative; height:5em;" class='<%= cycle("odd", "even") %>' title=<%=project.description.to_s%>>
<div style="float: left; height: 100%;">
<li class='<%= cycle("odd", "even") %>' title=<%=project.description.to_s%>>
<div class='avatar'>
<%= image_tag(get_course_avatar(project), :class => "avatar-4") %>
</div>
<!-- 上左下右 -->
<div class='desc_item' style="" >
<div class='desc_item text_nowrap' >
[<%= get_course_term project %>]
<%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%>
(<%= link_to "#{studentCount(project)}人", project_member_path(project, :role => 2) ,:course =>'1' %>)
(<%=(project.attachments.count.to_i+Version.joins(:project).where("projects.id=#{project.id}").count.to_i).to_s%>份资料)
</div>
<div class='desc_item' style="">
<div class='desc_item' >
<span class=''>
<% course = Course.find_by_extra(project.identifier) %>
<%= course.teacher.user_extensions.occupation.try(:gsub, /(.+)$/, '\1:') %>
@ -139,7 +140,7 @@
<!-- <div class='desc_item' style="">
<span class='font_lighter' title=<%#=project.description.to_s%>><%#=project.description.truncate(25, omission: '...')%></span>
</div> -->
<div style="position:absolute; bottom:0;right:0;margin:5px 10px 5px 5px ;">
<div class='join_course_link'>
<% if !course_endTime_timeout?(project)%>
<div >
<%= join_in_course(project, User.current)%>

87
public/stylesheets/welcome.css
View File

@ -1,63 +1,3 @@
/*.body_resize { width:950px; margin:0 auto; padding:0;}
.left { width:371px; float:left; margin:20px 5px 10px 5px; padding:5px;}
.right { width:527px; float:left; margin:20px 5px 10px 5px; padding:5px;}
.right ul { list-style:none; margin:5px 20px; padding:0;}
.right li { font: bold 12px Arial, Helvetica, sans-serif; color:#6f6f6f; padding:5px 20px; margin:0; background:url(images/about_ul_li.gif) left no-repeat;}
.body { background:#ebebeb; border-bottom:1px solid #fff; }
.home {
font:bold 16px Helvetica, Tahoma, Arial, STXihei, "华文细黑", "Microsoft YaHei", "微软雅黑", SimSun, "宋体", Heiti, "黑体", sans-serif;
color:#2c2c2c;
border-bottom:1px solid #cccccc;
padding:10px 5px;
margin:0 0 10px 0;
}
p {
font:normal 13px Helvetica, Tahoma, Arial, STXihei, "华文细黑", "Microsoft YaHei", "微软雅黑", SimSun, "宋体", Heiti, "黑体", sans-serif;
color:#6f6f6f;
line-height:1.8em;
padding:5px 5px;
margin:0;
}
div.project {
font:normal 15px Helvetica, Tahoma, Arial, STXihei, "华文细黑", "Microsoft YaHei", "微软雅黑", SimSun, "宋体", Heiti, "黑体", sans-serif;
color:#6f6f6f;
line-height:1.8em;
padding:5px 5px;
margin:0;
border-bottom:1px solid #eeeeee;
width: 95%;
float: right;
}
div.project a{
color: #5B5B5B;
}
div.project {
overflow: hidden;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
}
div.project>.nowrap {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
}
span.grey {
float: right;
font: normal 13px Helvetica, Tahoma, Arial, STXihei, "华文细黑", "Microsoft YaHei", "微软雅黑", SimSun, "宋体", Heiti, "黑体", sans-serif;
color:#afaeae;
line-height:1.8em;
padding:5px 5px;
margin:0;
}*/
.top_bar{
height: auto;
}
@ -120,7 +60,6 @@ ul.welcome-message-list{
height: 25px;
line-height: 25px;
background-color: rgb(252, 252, 252);
color: green;
/*text-indent: 8px;*/
margin: 0;
padding: 0px;
@ -200,17 +139,41 @@ ul.even{
font-weight: 700;
}
/*course welcome，左侧新开课程部分开始*/
ul.d-p-projectlist{
margin-top: 0px;
}
#J_Slide h3{
margin-left: 5px;
color: #e8770d;
}
#J_Slide h3~span{
margin-top: -20px;
float: right;
display: block;
}
.d-p-projectlist li{
position: relative;
height:5em;
}
.d-p-projectlist li > .avatar{
float: left;
height: 100%;
}
.d-p-projectlist li > .join_course_link{
position:absolute;
bottom:0;
right:0;
margin:5px 10px 5px 5px;
}
.d-p-projectlist li .desc_item{
float: left;
display: inline-block;
/*margin: 2px;*/
line-height: 2em;
margin-left: 10px;
width: 380px;
}
/*course welcome，左侧新开课程部分结束?*/
/*