修改版本库样式

This commit is contained in:
huang 2015-04-16 13:40:46 +08:00
parent 8803942a02
commit 08fb04aff4
4 changed files with 152 additions and 256 deletions

View File

@ -1,30 +1,30 @@
<%= link_to(@repository.identifier.present? ? h(@repository.identifier) : 'root', <%= link_to(@repository.identifier.present? ? h(@repository.identifier) : 'root',
:action => 'show', :id => @project, :action => 'show', :id => @project,
:repository_id => @repository.identifier_param, :repository_id => @repository.identifier_param,
:path => nil, :rev => @rev) %> :path => nil, :rev => @rev) %>
<% <%
dirs = path.split('/') dirs = path.split('/')
if 'file' == kind if 'file' == kind
filename = dirs.pop filename = dirs.pop
end end
link_path = '' link_path = ''
dirs.each do |dir| dirs.each do |dir|
next if dir.blank? next if dir.blank?
link_path << '/' unless link_path.empty? link_path << '/' unless link_path.empty?
link_path << "#{dir}" link_path << "#{dir}"
%> %>
/ <%= link_to h(dir), :action => 'show', :id => @project, :repository_id => @repository.identifier_param, / <%= link_to h(dir), :action => 'show', :id => @project, :repository_id => @repository.identifier_param,
:path => to_path_param(link_path), :rev => @rev %> :path => to_path_param(link_path), :rev => @rev %>
<% end %> <% end %>
<% if filename %> <% if filename %>
/ <%= link_to h(filename), / <%= link_to h(filename),
:action => 'changes', :id => @project, :repository_id => @repository.identifier_param, :action => 'changes', :id => @project, :repository_id => @repository.identifier_param,
:path => to_path_param("#{link_path}/#{filename}"), :rev => @rev %> :path => to_path_param("#{link_path}/#{filename}"), :rev => @rev %>
<% end %> <% end %>
<% <%
# @rev is revsion or Git and Mercurial branch or tag. # @rev is revsion or Git and Mercurial branch or tag.
# For Mercurial *tip*, @rev and @changeset are nil. # For Mercurial *tip*, @rev and @changeset are nil.
rev_text = @changeset.nil? ? @rev : format_revision(@changeset) rev_text = @changeset.nil? ? @rev : format_revision(@changeset)
%> %>
<%= "@ #{h rev_text}" unless rev_text.blank? %> <%= "@ #{h rev_text}" unless rev_text.blank? %>

View File

@ -1,34 +1,34 @@
<% content_for :header_tags do %> <% content_for :header_tags do %>
<%= javascript_include_tag 'repository_navigation' %> <%= javascript_include_tag 'repository_navigation' %>
<% end %> <% end %>
<a href="javascript:void(0);" class="pic_stats fl ml10 mt5"></a>
<%= link_to l(:label_statistics), <%= link_to l(:label_statistics),
{:action => 'stats', :id => @project, :repository_id => @repository.identifier_param}, {:action => 'stats', :id => @project, :repository_id => @repository.identifier_param},
:class => 'mt5 c_blue fl' if @repository.supports_all_revisions? %> :class => 'icon icon-stats' if @repository.supports_all_revisions? %>
<%= form_tag({:action => controller.action_name, <%= form_tag({:action => controller.action_name,
:id => @project, :id => @project,
:repository_id => @repository.identifier_param, :repository_id => @repository.identifier_param,
:path => to_path_param(@path), :path => to_path_param(@path),
:rev => nil}, :rev => nil},
{:method => :get, :id => 'revision_selector'}) do -%> {:method => :get, :id => 'revision_selector'}) do -%>
<!-- Branches Dropdown --> <!-- Branches Dropdown -->
<% if !@repository.branches.nil? && @repository.branches.length > 0 -%> <% if !@repository.branches.nil? && @repository.branches.length > 0 -%>
| <%= l(:label_branch) %>: | <%= l(:label_branch) %>:
<%= select_tag :branch, <%= select_tag :branch,
options_for_select([''] + @repository.branches, @rev), options_for_select([''] + @repository.branches, @rev),
:id => 'branch' %> :id => 'branch' %>
<% end -%> <% end -%>
<% if !@repository.tags.nil? && @repository.tags.length > 0 -%> <% if !@repository.tags.nil? && @repository.tags.length > 0 -%>
| <%= l(:label_tag) %>: | <%= l(:label_tag) %>:
<%= select_tag :tag, <%= select_tag :tag,
options_for_select([''] + @repository.tags, @rev), options_for_select([''] + @repository.tags, @rev),
:id => 'tag' %> :id => 'tag' %>
<% end -%> <% end -%>
<% if @repository.supports_all_revisions? %> <% if @repository.supports_all_revisions? %>
| <%= l(:label_revision) %>: | <%= l(:label_revision) %>:
<%= text_field_tag 'rev', @rev, :size => 8 %> <%= text_field_tag 'rev', @rev, :size => 8 %>
<% end %> <% end %>
<% end -%> <% end -%>

View File

@ -1,3 +1,4 @@
<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
<div class="project_r_h"> <div class="project_r_h">
<h2 class="project_h2">版本库</h2> <h2 class="project_h2">版本库</h2>
</div> </div>
@ -12,9 +13,9 @@
<div class=" c_dark f14"> <div class=" c_dark f14">
<p > <%if @repository.type.to_s=="Repository::Git"%> <p > <%if @repository.type.to_s=="Repository::Git"%>
<%= @repos_url%> <%= @repos_url%>
<%else %> <%else %>
<%=h @repository.url %> <%=h @repository.url %>
<% end %> <% end %>
</p> </p>
<p class="mb10 word_break"> <p class="mb10 word_break">
(<%= l(:label_all_revisions) %><%= @repositories.sort.collect {|repo| (<%= l(:label_all_revisions) %><%= @repositories.sort.collect {|repo|
@ -24,186 +25,50 @@
:class => 'repository' + (repo == @repository ? ' selected' : '') , :class => 'repository' + (repo == @repository ? ' selected' : '') ,
:class => "mb10 word_break c_orange"}.join('&nbsp|&nbsp').html_safe %>) :class => "mb10 word_break c_orange"}.join('&nbsp|&nbsp').html_safe %>)
</p> </p>
<p>项目代码请设置好正确的编码方式utf-8否则中文会出现乱码</p> <p>项目代码请设置好正确的编码方式utf-8否则中文会出现乱码</p>
<p>建立版本库文件夹,打开命令行执行如下:</p> <p>建立版本库文件夹,打开命令行执行如下:</p>
</div>
<div class="repos_explain">
<p>git init</p>
<p>git add *</p>
<p>git commit -m "first commit"</p>
<p>git remote add origin
http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git
</p>
<p>git config http.postBuffer 524288000 #设置本地post缓存为500MB</p>
<p>git push -u origin master:master</p>
</div><!--repos_explain end-->
<div class="c_dark f14">
<p>已经有本地库,还没有配置远程地址,打开命令行执行如下:</p>
</div>
<div class="repos_explain">
<p>git remote add origin http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git</p>
<p>git add .</p>
<p>git commit -m "first commit"</p>
<p>git config http.postBuffer 524288000 #设置本地post缓存为500MB</p>
<p>git push -u origin master:master</p>
</div><!--repos_explain end-->
<div class="c_dark f14">
<p>已有远程地址,创建一个远程分支,并切换到该分支,打开命令行执行如下:</p>
</div>
<div class="repos_explain">
<p>git clone http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git</p>
<p>git push</p>
<p>git checkout -b branch_name</p>
<p>git push origin branch_name</p>
</div><!--repos_explain end-->
<div class="c_dark f14">
<p>从网上获取别人的开源版本库转交到trustie网站上打开命令行执行如下</p>
</div>
<div class="repos_explain">
<p>git remote add trustie
http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git
</p>
<p>git add .</p>
<p>git commit -m "first commit"</p>
<p>git config http.postBuffer 524288000 #设置本地post缓存为500MB</p>
<p>git push -u trustie master:master</p>
<p><a href="/users/646" class="c_orange">李海</a>提供</p>
</div><!--repos_explain end-->
<div class="repos_files mt10">
<ul class="repos_files_ul">
<li class="w520">名称</li>
<li class="w128">大小</li>
<div class="cl"></div>
</ul>
<ul>
<li class="w520"><a href="javascript:void(0);" class=" c_blue f14 fl">+</a><a href="javascript:void(0);" class="pic_files fl mt3 ml5"></a><a href="javascript:void(0);" class=" fl c_dblue">com.aptana.core.io</a></li>
<li class="w128"></li>
<div class="cl"></div>
</ul>
<ul>
<li class="w520"><a href="javascript:void(0);" class="pic_text fl mt3 ml40"></a><a href="javascript:void(0);" class=" fl c_dblue">com.aptana.core.io</a></li>
<li class="w128 ">3.232 MB</li>
<div class="cl"></div>
</ul>
<ul>
<li class="w520"><a href="javascript:void(0);" class="pic_text02 fl mt3 ml40"></a><a href="javascript:void(0);" class=" fl c_dblue">com.aptana.core.io</a></li>
<li class="w128 ">3.232 MB</li>
<div class="cl"></div>
</ul>
<ul>
<li class="w520"><a href="javascript:void(0);" class=" c_blue f14 fl">-</a><a href="javascript:void(0);" class="pic_files fl mt3 ml10"></a><a href="javascript:void(0);" class=" fl c_dblue">com.aptana.core.io</a></li>
<li class="w128"></li>
<div class="cl"></div>
</ul>
<ul>
<li class="w520"></li>
<li class="w128"></li>
<div class="cl"></div>
</ul>
</div><!--repos_files end-->
<div class="c_dark f14">
<p>最近的修订版本</p>
</div>
<div class="repos_files">
<ul class="repos_files_ul">
<li class="w90">#</li>
<li class="w128">日期</li>
<li class="w128">作者</li>
<li class="w128">注释</li>
<div class="cl"></div>
</ul>
<ul class="repos_t_c">
<li class="w90"><a href="javascript:void(0);" class=" c_blue fl">87fdecda</a></li>
<li class="w128">2014-04-21 18:13</li>
<li class="w128">alan</li>
<li class="w128" style="text-align:left;">创新竞赛添加删除功能</li>
<div class="cl"></div>
</ul>
</div><!--repos_files end-->
<a href="javascript:void(0);" class="orange_u_btn ">查看修订</a>
<p class="fb c_dark mt10">查看如何提交代码:<a href="javascript:void(0);" class="c_blue">中文</a>&nbsp;|&nbsp;<a href="javascript:void(0);" class="c_blue ">English</a></p>
<div class="cl"></div>
</div><!--repository_con end-->
<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
<div class="project_r_h">
<h2 class="project_h2"><%=l(:project_module_repository)%></h2>
</div> </div>
<!--修订、统计-->
<div class="contextual" style="padding-right: 10px;">
<%= render :partial => 'navigation' %>
</div>
<h3>
<div style="font-size:15px;">
<%if @repository.type.to_s=="Repository::Git"%>
<%= @repos_url%>
<%else %>
<td>
<%=h @repository.url %>
</td>
<% end %>
</div>
<p style=" word-wrap: break-word; word-break: break-all">
(<%= l(:label_all_revisions) %><%= @repositories.sort.collect {|repo|
link_to h(repo.name),
{:controller => 'repositories', :action => 'show',
:id => @project, :repository_id => repo.identifier_param, :rev => nil, :path => nil},
:class => 'repository' + (repo == @repository ? ' selected' : '')
}.join('&nbsp|&nbsp').html_safe %>)
</p>
<h3>项目代码请设置好正确的编码方式utf-8否则中文会出现乱码</h3>
<h3>建立版本库文件夹,打开命令行执行如下:</h3>
<div class="repos_explain">
<p>git init</p>
<p>git add *</p>
<p>git commit -m "first commit"</p>
<p>git remote add origin
<%= @repos_url%>
</p>
<p>git config http.postBuffer 524288000 #设置本地post缓存为500MB</p>
<p>git push -u origin master:master</p>
</div>
<h3>已经有本地库,还没有配置远程地址,打开命令行执行如下:</h3>
<div class="repos_explain">
<p>git remote add origin <%= @repos_url%></p>
<p>git add .</p>
<p>git commit -m "first commit"</p>
<p>git config http.postBuffer 524288000 #设置本地post缓存为500MB</p>
<p>git push -u origin master:master</p>
</div>
<h3>已有远程地址,创建一个远程分支,并切换到该分支,打开命令行执行如下:</h3>
<div class="repos_explain">
<p>git clone <%= @repos_url%></p>
<p>git push</p>
<p>git checkout -b branch_name</p>
<p>git push origin branch_name</p>
</div>
</h3>
<h3>从网上获取别人的开源版本库转交到trustie网站上打开命令行执行如下</h3>
<div class="repos_explain"> <div class="repos_explain">
<p>git remote add trustie <p>git init</p>
<%= @repos_url%> <p>git add *</p>
</p> <p>git commit -m "first commit"</p>
<p>git add .</p> <p>git remote add origin
<p>git commit -m "first commit"</p> http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git
<p>git config http.postBuffer 524288000 #设置本地post缓存为500MB</p> </p>
<p>git push -u trustie master:master</p> <p>git config http.postBuffer 524288000 #设置本地post缓存为500MB</p>
<p><%= link_to "李海", user_path(646)%>提供</p> <p>git push -u origin master:master</p>
</div><!--repos_explain end-->
<div class="c_dark f14">
<p>已经有本地库,还没有配置远程地址,打开命令行执行如下:</p>
</div>
<div class="repos_explain">
<p>git remote add origin http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git</p>
<p>git add .</p>
<p>git commit -m "first commit"</p>
<p>git config http.postBuffer 524288000 #设置本地post缓存为500MB</p>
<p>git push -u origin master:master</p>
</div><!--repos_explain end-->
<div class="c_dark f14">
<p>已有远程地址,创建一个远程分支,并切换到该分支,打开命令行执行如下:</p>
</div>
<div class="repos_explain">
<p>git clone http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git</p>
<p>git push</p>
<p>git checkout -b branch_name</p>
<p>git push origin branch_name</p>
</div><!--repos_explain end-->
<div class="c_dark f14">
<p>从网上获取别人的开源版本库转交到trustie网站上打开命令行执行如下</p>
</div>
<div class="repos_explain">
<p>git remote add trustie
http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git
</p>
<p>git add .</p>
<p>git commit -m "first commit"</p>
<p>git config http.postBuffer 524288000 #设置本地post缓存为500MB</p>
<p>git push -u trustie master:master</p>
<p><a href="/users/646" class="c_orange">李海</a>提供</p>
</div> </div>
<% if !@entries.nil? && authorize_for('repositories', 'browse') %> <% if !@entries.nil? && authorize_for('repositories', 'browse') %>
@ -220,22 +85,24 @@
:locals => {:project => @project, :path => @path, :locals => {:project => @project, :path => @path,
:revisions => @changesets, :entry => nil }%> :revisions => @changesets, :entry => nil }%>
<% end %> <% end %>
<p> <p style="padding-top: 10px;">
<% has_branches = (!@repository.branches.nil? && @repository.branches.length > 0) <% has_branches = (!@repository.branches.nil? && @repository.branches.length > 0)
sep = '' %> sep = '' %>
<% if @repository.supports_all_revisions? && @path.blank? %> <% if @repository.supports_all_revisions? && @path.blank? %>
<%= link_to l(:label_view_all_revisions), :action => 'revisions', :id => @project, <%= link_to l(:label_view_all_revisions), {:action => 'revisions', :id => @project,
:repository_id => @repository.identifier_param %> :repository_id => @repository.identifier_param},
:class => "orange_u_btn" %>
<% sep = '|' %> <% sep = '|' %>
<% end %> <% end %>
<% if @repository.supports_directory_revisions? && ( has_branches || !@path.blank? || !@rev.blank? ) %> <% if @repository.supports_directory_revisions? && ( has_branches || !@path.blank? || !@rev.blank? ) %>
<%= sep %> <%= sep %>
<%= link_to l(:label_view_revisions), <%= link_to l(:label_view_revisions),
:action => 'changes', {:action => 'changes',
:path => to_path_param(@path), :path => to_path_param(@path),
:id => @project, :id => @project,
:repository_id => @repository.identifier_param, :repository_id => @repository.identifier_param,
:rev => @rev %> :rev => @rev},
:class => "orange_u_btn" %>
<% end %> <% end %>
</p> </p>
<% if @repository.supports_all_revisions? %> <% if @repository.supports_all_revisions? %>
@ -244,30 +111,19 @@
:atom, params.merge( :atom, params.merge(
{:format => 'atom', :action => 'revisions', {:format => 'atom', :action => 'revisions',
:id => @project, :page => nil, :key => User.current.rss_key})) %> :id => @project, :page => nil, :key => User.current.rss_key})) %>
<% end %>
<% other_formats_links do |f| %>
<%= f.link_to 'Atom',
:url => {:action => 'revisions', :id => @project,
:repository_id => @repository.identifier_param,
:key => User.current.rss_key} %>
<% end %> <% end %>
<% end %> <% end %>
<% end %> <% end %>
<!-- added by bai --> <!-- added by bai -->
<strong> <p class="fb c_dark mt10">查看如何提交代码:
<span style="color: #099;"> <%= link_to(l(:label_how_commit_code_chinese), ch_usage_path, :class => "c_blue") %>
<%= l(:label_how_commit_code) %> <%= link_to('English', en_usage_path, :class => "c_blue") %>
</span> <div class="cl"></div>
</strong>
&nbsp;
<%= link_to(l(:label_how_commit_code_chinese), ch_usage_path, :class => "usage")%>
&nbsp;|&nbsp;
<%= link_to('English', en_usage_path, :class => "usage")%>
<!-- end -->
</div>
<% content_for :header_tags do %> <% content_for :header_tags do %>
<%= stylesheet_link_tag "scm" %> <%= stylesheet_link_tag "scm" %>
<% end %> <% end %>

View File

@ -481,12 +481,52 @@ p.percent {
} }
/*版本库tab*/ /*版本库tab*/
.contextual { /*div.repos_explain {*/
float: right; /*word-wrap: normal;*/
white-space: nowrap; /*line-height: 8px;*/
line-height: 1.4em; /*font-size: 13px;*/
padding-left: 10px; /*background-color: #F8F8F8;*/
padding-right: 10px; /*border: 1px solid #DDD;*/
padding-top: 5px; /*overflow: auto;*/
font-size: 0.9em; /*border-radius: 3px;*/
} /*padding: 6px 10px;*/
/*font-family: Consolas,"Liberation Mono",Courier,monospace;*/
/*color: #333;*/
/*}*/
/*div.autoscroll {*/
/*overflow-x: visible;*/
/*padding: 1px;*/
/*margin-bottom: 1.2em;*/
/*}*/
/*div.revision-graph {*/
/*position: absolute;*/
/*min-width: 1px;*/
/*}*/
/*table.list {*/
/*border: medium none;*/
/*}*/
/*tr.entry {*/
/*border: 1px solid #F8F8F8;*/
/*}*/
/*tr.entry td {*/
/*white-space: nowrap;*/
/*}*/
/*tr.entry td.size {*/
/*text-align: right;*/
/*font-size: 90%;*/
/*}*/
/*table.list thead th {*/
/*border-width: medium medium 1px;*/
/*border-style: none none solid;*/
/*border-color: -moz-use-text-color -moz-use-text-color #999;*/
/*-moz-border-top-colors: none;*/
/*-moz-border-right-colors: none;*/
/*-moz-border-bottom-colors: none;*/
/*-moz-border-left-colors: none;*/
/*border-image: none;*/
/*font-size: 12px;*/
/*font-weight: 400;*/
/*padding: 0px 3px 3px;*/
/*text-transform: uppercase;*/
/*}*/