实训版本库的样式与其它页面不一致
This commit is contained in:
parent
e5dc4a904d
commit
25abf51158
|
|
@ -23,7 +23,7 @@
|
|||
<%#= form_tag(url_for(new_or_edit_choose_question_shixun_challenge_path(@challenge, :shixun_id => @shixun, :type => @type, :position => @position)), :remote => true, :id => 'challenge_choose_update') do |f| %>
|
||||
<!--<li class="clearfix pt30 pr30">
|
||||
<a href="javascript:void(0);" class="task-btn task-btn-green fr" >编辑</a>
|
||||
<a href="<%= edit_shixun_challenge_path(@challenge, :shixun_id => @shixun) %>" class="task-btn fr mr10 deloption-btn" id="skill_cancel">删除</a>
|
||||
<a href="<%#= edit_shixun_challenge_path(@challenge, :shixun_id => @shixun) %>" class="task-btn fr mr10 deloption-btn" id="skill_cancel">删除</a>
|
||||
</li>-->
|
||||
<div class="panel-form">
|
||||
<div id="shixun_form">
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
<% if @changesets_latest_coimmit && @changesets_latest_coimmit.try(:time) %>
|
||||
<div class="recordBanner mt3 fl" style="width: 96%;">
|
||||
<%= image_tag(url_to_avatar(user_commit_rep(@changesets_latest_coimmit.try(:author_email))), :width => "25", :height => "25", :class => "fl portraitRadius mt2 ml4 mr5") %>
|
||||
<div class="recordBanner mb10 fl" style="width: 96%;">
|
||||
<%= image_tag(url_to_avatar(user_commit_rep(@changesets_latest_coimmit.try(:author_email))), :width => "35", :height => "35", :class => "fl portraitRadius mt2 ml4 mr5") %>
|
||||
<%= link_to_user_mail(@changesets_latest_coimmit.try(:author_email), "fb fontGrey3 mr5 fl hidden maxwidth150 ml5") %>
|
||||
<div class="fl">提交于 <%= time_tag(@changesets_latest_coimmit.try(:time)) %> 前：</div>
|
||||
<div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.message %>"><%= @changesets_latest_coimmit.message %></div>
|
||||
</div>
|
||||
<div id="file_action" class="recordBanner mt3 fl" style="width: 4%;float: right;">
|
||||
<div id="file_action" class="recordBanner mb10 fl" style="width: 4%;float: right;">
|
||||
<%= render :partial => 'link_to_functions' %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
<%# latest_changes = get_trees_last_changes(@project.gpid, @rev, ent_path, @g) %>
|
||||
|
||||
<tr id="<%= tr_id %>" class="<%= h params[:parent_id] %> entry <%= entry.kind %>">
|
||||
<td style="padding-left: <%=18 * depth%>px;" class="filename_no_report hidden">
|
||||
<td style="padding-left: <%=10 * (depth + 1)%>px;" class="filename_no_report hidden">
|
||||
|
||||
<%= link_to h(ent_name),
|
||||
{:action => (entry.is_dir? ? 'shixun_show' : 'shixun_entry'), :id => @shixun, :repository_id => @repository.identifier_param, :path => to_path_param(ent_path), :rev => @rev},
|
||||
|
|
|
|||
|
|
@ -1,59 +1,66 @@
|
|||
<div class="wrap-big mt20 pr" style="min-height: 600px">
|
||||
<div class="popup_tip_box fontGrey2" style="right:-315px; top:68px;position: absolute">
|
||||
<em></em>
|
||||
<span></span>
|
||||
<p class="font-12">
|
||||
提交代码的方法：<br/>
|
||||
1、在你自己的电脑安装Git tortoise客户端，<br/>
|
||||
或者其他你熟悉的Git客户端；<br/>
|
||||
2、在Git客户端向左侧的地址提交代码。<br/>
|
||||
注意：<br/>
|
||||
请务必在Git客户端填写如下信息：<br/>
|
||||
* 用户名：使用您在本平台绑定的邮箱<br/>
|
||||
* 口令：使用您在本平台的登录口令<br/>
|
||||
</p>
|
||||
<div class="box_bg_shandow border-arroud mt20 mb20">
|
||||
<div class="panel-header clearfix">
|
||||
<h3 class="shixun_title fl mt5">版本库</h3>
|
||||
</div>
|
||||
<div class="repository_con" style="line-height:1.9;">
|
||||
<ul class="clearfix pro-top-info mb10 box_bg_shandow">
|
||||
<%=link_to "<li style=\"width: 459px;\"><i class=\"icon-time mr5 c_grey02 f16 fb\"></i>#{choise_commit_count(@changesets_all_count, @g_project.commit_count.to_i)}提交</li>".html_safe,
|
||||
{:action => 'commits', :path => to_path_param(@path), :id => @shixun, :repository_id => @repository.identifier_param,
|
||||
:rev => @rev, :page => 1 ,:commit_count =>"#{@changesets_all_count}"}, :class => "linkBlue fb" %>
|
||||
<li style="width: 459px;"><i class="icon-sitemap mr5 c_grey02 f16 fb"></i>
|
||||
<a class="linkBlue fb"><%= @branchs.count %></a>分支
|
||||
</li>
|
||||
</ul>
|
||||
<div class=" clearfix mb5">
|
||||
<div class=" fl clearfix">
|
||||
<%= render :partial => 'shixun_navigation' %>
|
||||
</div>
|
||||
<% if !@entries.blank? %>
|
||||
<a href="<%= @zip_path %>" class="btn_zipdown fl ml10" onclick="">ZIP下载</a>
|
||||
<% end %>
|
||||
|
||||
<div class="fr">
|
||||
<label class="pro-fenzhi-label fl">克隆网址</label>
|
||||
<input type="text" id="copy_rep_content" class="pro-fenzhi-input fl" value="<%= @repos_url.to_s.lstrip %>"/>
|
||||
<a href="javascript:void(0);" alt="点击复制版本库地址" onclick="jsCopy()" title="点击复制版本库地址" class="fl pro-fenzhi-a">
|
||||
<i class="fa fa-copy" style="font-size:12px"></i>
|
||||
</a>
|
||||
</div>
|
||||
<div class="new_wrap-big">
|
||||
<div class="popup_tip_box fontGrey2" style="right:75px; top:360px;position: absolute">
|
||||
<em></em>
|
||||
<span></span>
|
||||
<p class="font-12">
|
||||
提交代码的方法：<br/>
|
||||
1、在你自己的电脑安装Git tortoise客户端，<br/>
|
||||
或者其他你熟悉的Git客户端；<br/>
|
||||
2、在Git客户端向左侧的地址提交代码。<br/>
|
||||
注意：<br/>
|
||||
请务必在Git客户端填写如下信息：<br/>
|
||||
* 用户名：使用您在本平台绑定的邮箱<br/>
|
||||
* 口令：使用您在本平台的登录口令<br/>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="cl"></div>
|
||||
<%= render :partial => 'latest_commit' %>
|
||||
<div class="cl"></div>
|
||||
<div class="repository_con" style="line-height:1.9;">
|
||||
<ul class="clearfix pro-top-info mb10">
|
||||
<%=link_to "<li style=\"width: 558px;\"><i class=\"icon-time mr5 c_grey02 f16 fb\"></i>#{choise_commit_count(@changesets_all_count, @g_project.commit_count.to_i)}提交</li>".html_safe,
|
||||
{:action => 'commits', :path => to_path_param(@path), :id => @shixun, :repository_id => @repository.identifier_param,
|
||||
:rev => @rev, :page => 1 ,:commit_count =>"#{@changesets_all_count}"}, :class => "linkBlue fb" %>
|
||||
<li style="width: 558px;">
|
||||
<i class="icon-sitemap mr5 c_grey02 f16 fb"></i>
|
||||
<a class="linkBlue fb"><%= @branchs.count %></a>分支
|
||||
</li>
|
||||
</ul>
|
||||
<div class=" clearfix mb10">
|
||||
<div class=" fl clearfix">
|
||||
<%= render :partial => 'shixun_navigation' %>
|
||||
</div>
|
||||
<% if !@entries.blank? %>
|
||||
<a href="<%= @zip_path %>" class="btn_zipdown fl ml10" onclick="">ZIP下载</a>
|
||||
<% end %>
|
||||
|
||||
<% if !@entries.blank? && authorize_for('repositories', 'browse') %>
|
||||
<%= render :partial => 'shixun_dir_list' %>
|
||||
<% else %>
|
||||
<%= render :partial => "projects/no_data" %>
|
||||
<% end %>
|
||||
<div class="fr">
|
||||
<label class="pro-fenzhi-label fl">克隆网址</label>
|
||||
<input type="text" id="copy_rep_content" class="pro-fenzhi-input fl" value="<%= @repos_url.to_s.lstrip %>"/>
|
||||
<a href="javascript:void(0);" alt="点击复制版本库地址" onclick="jsCopy()" title="点击复制版本库地址" class="fl pro-fenzhi-a">
|
||||
<i class="fa fa-copy" style="font-size:12px"></i>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<% memo = Memo.where(:id => 1232).first %>
|
||||
<%# unless memo.nil? %>
|
||||
<!-- <a href="<%#= Setting.protocol + "://" %><%#=Setting.host_name %>/forums/1/memos/1232" class="linkBlue2" target="_blank">如何提交代码</a>-->
|
||||
<%# end %>
|
||||
<div class="cl"></div>
|
||||
<%= render :partial => 'latest_commit' %>
|
||||
<div class="cl"></div>
|
||||
|
||||
<% if !@entries.blank? && authorize_for('repositories', 'browse') %>
|
||||
<%= render :partial => 'shixun_dir_list' %>
|
||||
<% else %>
|
||||
<%= render :partial => "projects/no_data" %>
|
||||
<% end %>
|
||||
|
||||
<% memo = Memo.where(:id => 1232).first %>
|
||||
<%# unless memo.nil? %>
|
||||
<!-- <a href="<%#= Setting.protocol + "://" %><%#=Setting.host_name %>/forums/1/memos/1232" class="linkBlue2" target="_blank">如何提交代码</a>-->
|
||||
<%# end %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<% html_title(l(:label_repository)) -%>
|
||||
<% html_title(l(:label_repository)) -%>
|
||||
</div>
|
||||
|
|
@ -163,7 +163,7 @@ table.list td.checkbox input {padding:0px;}
|
|||
table.list td.buttons { width: 15%; white-space:nowrap; text-align: right; }
|
||||
table.list td.buttons a { padding-right: 0.6em; }
|
||||
table.list caption { text-align: left; padding: 0.5em 0.5em 0.5em 0; }
|
||||
table.list tbody td, table.list tbody tr td, table.list tbody tr td.checkbox { border-bottom: solid 1px #ddd; font-size: 11px; padding: 4px 10px 4px 3px;}
|
||||
table.list tbody td, table.list tbody tr td, table.list tbody tr td.checkbox { border-bottom: solid 1px #ddd; font-size: 11px; padding: 9px 10px 9px 3px;}
|
||||
table.list thead th{ border:none; border-bottom:1px solid #999; font-size:12px;/*by young*/ font-weight:400; padding:0 3px 3px; text-transform:uppercase}
|
||||
table.list th{ background-color:#fff;}
|
||||
table.list thead th{ border:none; border-bottom:1px solid #999; font-size:12px;/*by young*/ font-weight:400; padding:0 3px 3px; text-transform:uppercase}
|
||||
|
|
@ -643,14 +643,14 @@ td.t-r{ text-align:right;}
|
|||
.pro-top-info{border:1px solid #eee; }
|
||||
.pro-top-info li{ width:295px; padding:10px 15px; font-size: 14px; float: left; text-align: center;}
|
||||
.pro-top-info li:hover{ background:#f2f2f2;}
|
||||
a.btn_zipdown{ display:block; height:25px; width:80px; text-align: center; line-height: 25px; border: 1px solid #dddddd; background-image: linear-gradient(#FCFCFC, #EEE);
|
||||
a.btn_zipdown{ display:block; height:30px; width:80px; text-align: center; line-height: 30px; border: 1px solid #dddddd; background-image: linear-gradient(#FCFCFC, #EEE);
|
||||
color: #7f7f7f; -webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; margin-left: 5px;}
|
||||
a:hover.btn_zipdown{color:#3b94d6;}
|
||||
label.pro-fenzhi-label{ height:25px; line-height: 25px; border: 1px solid #dddddd; background-image: linear-gradient(#FCFCFC, #EEE);color: #7f7f7f;border-radius:3px; border-top-right-radius: 0;
|
||||
label.pro-fenzhi-label{ height:30px; line-height: 30px; border: 1px solid #dddddd; background-image: linear-gradient(#FCFCFC, #EEE);color: #7f7f7f;border-radius:3px; border-top-right-radius: 0;
|
||||
border-bottom-right-radius: 0; display: inline-block; text-align: center; padding:0 15px; border-right: none;}
|
||||
select.pro-fenzhi-select{ height: 27px; line-height: 27px; color: #666;}
|
||||
input.pro-fenzhi-input { height: 25px; line-height: 25px; color: #666; width:300px;}
|
||||
a.pro-fenzhi-a{height:25px; line-height: 25px; border: 1px solid #dddddd; background-image: linear-gradient(#FCFCFC, #EEE);color: #7f7f7f;border-radius:3px; border-top-left-radius: 0;
|
||||
select.pro-fenzhi-select{ height: 32px; line-height: 32px; color: #666;}
|
||||
input.pro-fenzhi-input { height: 30px; line-height: 30px; color: #666; width:300px;}
|
||||
a.pro-fenzhi-a{height:30px; line-height: 30px; border: 1px solid #dddddd; background-image: linear-gradient(#FCFCFC, #EEE);color: #7f7f7f;border-radius:3px; border-top-left-radius: 0;
|
||||
border-bottom-right-radius: 0; display: inline-block; text-align: center; padding:0 5px; border-left: none;}
|
||||
a:hover.pro-fenzhi-a{color:#3b94d6;}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
#RSide{ width:670px; background:#fff; padding:10px; margin-left: 10px; margin-bottom:10px;}
|
||||
.courseRSide{ width:983px; background:#fff; padding:10px; margin-left: 15px; margin-bottom:10px;}
|
||||
.wrap-big {width:980px; background:#fff; padding:10px; margin-bottom:10px;}
|
||||
.new_wrap-big {background:#fff; padding:10px; min-height: 600px;}
|
||||
/*资源库*/
|
||||
.resources {width:973px;padding: 15px; background-color:#ffffff;float: right;}
|
||||
.resources.sources-bg:hover{background: #EFF9FD}
|
||||
|
|
@ -186,6 +187,7 @@ a.loginChooseTab {color:#484848; height:30px; display:block;}
|
|||
.resource-list-option {width:980px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;}
|
||||
.resource-check-all {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;}
|
||||
.border-bottom {border-bottom:1px solid #ddd;}
|
||||
.border-arroud {border:1px solid #e6e6e6;}
|
||||
.h34 {height:34px;}
|
||||
.resource-tab {font-size:16px; color:#4d4d4d; width:70px; padding:5px 10px; display:inline-block; text-align:left; border-bottom:1px solid #ddd;}
|
||||
a.resource-tab-active {color:#fff; background-color:#3b94d6; border-bottom:1px solid #3b94d6;}
|
||||
|
|
|
|||
|
|
@ -211,7 +211,7 @@
|
|||
.clone_btn {width:30px; height:21px; border-top:1px solid #dddddd; border-bottom:1px solid #dddddd; border-right:1px solid #dddddd; outline:none; float:left; background-image:linear-gradient(#FCFCFC, #EEE); text-align:center;}
|
||||
.vl_btn {height:21px; padding:0px 5px; vertical-align:middle; border:1px solid #dddddd; float:left; line-height:21px; background-image:linear-gradient(#FCFCFC, #EEE);}
|
||||
.vl_btn_2 {height:21px; padding:0px 5px; vertical-align:middle; border-top:1px solid #dddddd; border-bottom:1px solid #dddddd; border-right:1px solid #dddddd; float:left; line-height:21px;}
|
||||
.recordBanner {width:100%; height:30px; background-color:#f1f1f1; color:#666666; line-height:30px; vertical-align:middle;}
|
||||
.recordBanner {width:100%; height:40px; background-color:#f1f1f1; color:#666666; line-height:40px; vertical-align:middle;}
|
||||
.vl_copy {background:url(../images/vlicon/clone_url.png) 0px 0px no-repeat; padding-left:22px;}
|
||||
.vl_copy2 {background:url(../images/vlicon/clone_url.png) 0px 0px no-repeat; padding-left:22px;}
|
||||
.vl_zip {background:url(../images/vlicon/graph.png) 0px 2px no-repeat; padding-left:22px;}
|
||||
|
|
@ -288,6 +288,6 @@ li.commit .commit-row-info .committed_ago {
|
|||
color: #7F7F7F;
|
||||
}
|
||||
.rep_mail_name{max-width: 150px; overflow: hidden; text-overflow: ellipsis;}
|
||||
a.btn_zipdown{ display:block; height:25px; width:80px; text-align: center; line-height: 25px; border: 1px solid #dddddd; background-image: linear-gradient(#FCFCFC, #EEE);
|
||||
a.btn_zipdown{ display:block; height:30px; width:80px; text-align: center; line-height: 30px; border: 1px solid #dddddd; background-image: linear-gradient(#FCFCFC, #EEE);
|
||||
color: #7f7f7f; -webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; margin-left: 5px;}
|
||||
a:hover.btn_zipdown{color:#269ac9;}
|
||||
Loading…
Reference in New Issue