diff --git a/app/views/challenges/_single_or_multiple_question.html.erb b/app/views/challenges/_single_or_multiple_question.html.erb index 04496dd2d..9ce3fb2eb 100644 --- a/app/views/challenges/_single_or_multiple_question.html.erb +++ b/app/views/challenges/_single_or_multiple_question.html.erb @@ -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| %>
diff --git a/app/views/repositories/_latest_commit.html.erb b/app/views/repositories/_latest_commit.html.erb index b828aee73..768966623 100644 --- a/app/views/repositories/_latest_commit.html.erb +++ b/app/views/repositories/_latest_commit.html.erb @@ -1,11 +1,11 @@ <% if @changesets_latest_coimmit && @changesets_latest_coimmit.try(:time) %> -
- <%= image_tag(url_to_avatar(user_commit_rep(@changesets_latest_coimmit.try(:author_email))), :width => "25", :height => "25", :class => "fl portraitRadius mt2 ml4 mr5") %> +
+ <%= 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") %>
提交于 <%= time_tag(@changesets_latest_coimmit.try(:time)) %> 前：
<%= @changesets_latest_coimmit.message %>
-
+
<%= render :partial => 'link_to_functions' %>
<% end %> \ No newline at end of file diff --git a/app/views/repositories/_shixun_dir_list_content.html.erb b/app/views/repositories/_shixun_dir_list_content.html.erb index 76986c8df..d966d4616 100644 --- a/app/views/repositories/_shixun_dir_list_content.html.erb +++ b/app/views/repositories/_shixun_dir_list_content.html.erb @@ -7,7 +7,7 @@ <%# latest_changes = get_trees_last_changes(@project.gpid, @rev, ent_path, @g) %> - + <%= 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}, diff --git a/app/views/repositories/shixun_show.html.erb b/app/views/repositories/shixun_show.html.erb index 78b04fec7..969ecde34 100644 --- a/app/views/repositories/shixun_show.html.erb +++ b/app/views/repositories/shixun_show.html.erb @@ -1,59 +1,66 @@ -
-
- - -

- 提交代码的方法：
- 1、在你自己的电脑安装Git tortoise客户端，
- 或者其他你熟悉的Git客户端；
- 2、在Git客户端向左侧的地址提交代码。
- 注意：
- 请务必在Git客户端填写如下信息：
- * 用户名：使用您在本平台绑定的邮箱
- * 口令：使用您在本平台的登录口令
-

+
+
+

版本库

-
-
    - <%=link_to "
  • #{choise_commit_count(@changesets_all_count, @g_project.commit_count.to_i)}提交
    • ".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" %> -
  • - <%= @branchs.count %>分支 -
    • -
-
-
- <%= render :partial => 'shixun_navigation' %> -
- <% if !@entries.blank? %> - ZIP下载 - <% end %> - -
- - - - - -
+
+
+ + +

+ 提交代码的方法：
+ 1、在你自己的电脑安装Git tortoise客户端，
+ 或者其他你熟悉的Git客户端；
+ 2、在Git客户端向左侧的地址提交代码。
+ 注意：
+ 请务必在Git客户端填写如下信息：
+ * 用户名：使用您在本平台绑定的邮箱
+ * 口令：使用您在本平台的登录口令
+

-
- <%= render :partial => 'latest_commit' %> -
+
+
    + <%=link_to "
  • #{choise_commit_count(@changesets_all_count, @g_project.commit_count.to_i)}提交
    • ".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" %> +
  • + + <%= @branchs.count %>分支 +
    • +
+
+
+ <%= render :partial => 'shixun_navigation' %> +
+ <% if !@entries.blank? %> + ZIP下载 + <% end %> - <% 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? %> - - <%# end %> +
+ <%= render :partial => 'latest_commit' %> +
+ + <% 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? %> + + <%# end %> +
-
-<% html_title(l(:label_repository)) -%> + <% html_title(l(:label_repository)) -%> +
\ No newline at end of file diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index d3a13c612..04982d9bf 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -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;} diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css index dee78b329..fed0563e5 100644 --- a/public/stylesheets/css/public.css +++ b/public/stylesheets/css/public.css @@ -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;} diff --git a/public/stylesheets/repository.css b/public/stylesheets/repository.css index 2e45a5905..ff48cae83 100644 --- a/public/stylesheets/repository.css +++ b/public/stylesheets/repository.css @@ -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;} \ No newline at end of file