修改版本库样式
This commit is contained in:
parent
8803942a02
commit
08fb04aff4
|
|
@ -3,16 +3,16 @@
|
|||
:repository_id => @repository.identifier_param,
|
||||
:path => nil, :rev => @rev) %>
|
||||
<%
|
||||
dirs = path.split('/')
|
||||
if 'file' == kind
|
||||
dirs = path.split('/')
|
||||
if 'file' == kind
|
||||
filename = dirs.pop
|
||||
end
|
||||
link_path = ''
|
||||
dirs.each do |dir|
|
||||
end
|
||||
link_path = ''
|
||||
dirs.each do |dir|
|
||||
next if dir.blank?
|
||||
link_path << '/' unless link_path.empty?
|
||||
link_path << "#{dir}"
|
||||
%>
|
||||
%>
|
||||
/ <%= link_to h(dir), :action => 'show', :id => @project, :repository_id => @repository.identifier_param,
|
||||
:path => to_path_param(link_path), :rev => @rev %>
|
||||
<% end %>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<% content_for :header_tags do %>
|
||||
<%= javascript_include_tag 'repository_navigation' %>
|
||||
<% end %>
|
||||
<a href="javascript:void(0);" class="pic_stats fl ml10 mt5"></a>
|
||||
|
||||
<%= link_to l(:label_statistics),
|
||||
{: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,
|
||||
:id => @project,
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
|
||||
<div class="project_r_h">
|
||||
<h2 class="project_h2">版本库</h2>
|
||||
</div>
|
||||
|
|
@ -26,8 +27,8 @@
|
|||
</p>
|
||||
<p>项目代码请设置好正确的编码方式（utf-8），否则中文会出现乱码</p>
|
||||
<p>建立版本库文件夹，打开命令行执行如下：</p>
|
||||
</div>
|
||||
<div class="repos_explain">
|
||||
</div>
|
||||
<div class="repos_explain">
|
||||
<p>git init</p>
|
||||
<p>git add *</p>
|
||||
<p>git commit -m "first commit"</p>
|
||||
|
|
@ -36,30 +37,30 @@
|
|||
</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">
|
||||
</div><!--repos_explain end-->
|
||||
<div class="c_dark f14">
|
||||
<p>已经有本地库，还没有配置远程地址，打开命令行执行如下：</p>
|
||||
</div>
|
||||
<div class="repos_explain">
|
||||
</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">
|
||||
</div><!--repos_explain end-->
|
||||
<div class="c_dark f14">
|
||||
<p>已有远程地址，创建一个远程分支，并切换到该分支，打开命令行执行如下：</p>
|
||||
</div>
|
||||
<div class="repos_explain">
|
||||
</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">
|
||||
</div><!--repos_explain end-->
|
||||
<div class="c_dark f14">
|
||||
<p>从网上获取别人的开源版本库，转交到trustie网站上，打开命令行执行如下：</p>
|
||||
</div>
|
||||
<div class="repos_explain">
|
||||
</div>
|
||||
<div class="repos_explain">
|
||||
<p>git remote add trustie
|
||||
http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git
|
||||
</p>
|
||||
|
|
@ -68,142 +69,6 @@
|
|||
<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> | <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 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(' | ').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">
|
||||
<p>git remote add trustie
|
||||
<%= @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 trustie master:master</p>
|
||||
<p><%= link_to "李海", user_path(646)%>提供</p>
|
||||
</div>
|
||||
|
||||
<% if !@entries.nil? && authorize_for('repositories', 'browse') %>
|
||||
|
|
@ -220,22 +85,24 @@
|
|||
:locals => {:project => @project, :path => @path,
|
||||
:revisions => @changesets, :entry => nil }%>
|
||||
<% end %>
|
||||
<p>
|
||||
<p style="padding-top: 10px;">
|
||||
<% has_branches = (!@repository.branches.nil? && @repository.branches.length > 0)
|
||||
sep = '' %>
|
||||
<% if @repository.supports_all_revisions? && @path.blank? %>
|
||||
<%= link_to l(:label_view_all_revisions), :action => 'revisions', :id => @project,
|
||||
:repository_id => @repository.identifier_param %>
|
||||
<%= link_to l(:label_view_all_revisions), {:action => 'revisions', :id => @project,
|
||||
:repository_id => @repository.identifier_param},
|
||||
:class => "orange_u_btn" %>
|
||||
<% sep = '|' %>
|
||||
<% end %>
|
||||
<% if @repository.supports_directory_revisions? && ( has_branches || !@path.blank? || !@rev.blank? ) %>
|
||||
<%= sep %>
|
||||
<%= link_to l(:label_view_revisions),
|
||||
:action => 'changes',
|
||||
{:action => 'changes',
|
||||
:path => to_path_param(@path),
|
||||
:id => @project,
|
||||
:repository_id => @repository.identifier_param,
|
||||
:rev => @rev %>
|
||||
:rev => @rev},
|
||||
:class => "orange_u_btn" %>
|
||||
<% end %>
|
||||
</p>
|
||||
<% if @repository.supports_all_revisions? %>
|
||||
|
|
@ -245,29 +112,18 @@
|
|||
{:format => 'atom', :action => 'revisions',
|
||||
: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 %>
|
||||
|
||||
<!-- added by bai -->
|
||||
<strong>
|
||||
<span style="color: #099;">
|
||||
<%= l(:label_how_commit_code) %>
|
||||
</span>
|
||||
</strong>
|
||||
|
||||
<%= link_to(l(:label_how_commit_code_chinese), ch_usage_path, :class => "usage")%>
|
||||
|
|
||||
<%= link_to('English', en_usage_path, :class => "usage")%>
|
||||
<!-- end -->
|
||||
<p class="fb c_dark mt10">查看如何提交代码：
|
||||
<%= link_to(l(:label_how_commit_code_chinese), ch_usage_path, :class => "c_blue") %>
|
||||
<%= link_to('English', en_usage_path, :class => "c_blue") %>
|
||||
<div class="cl"></div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<% content_for :header_tags do %>
|
||||
<%= stylesheet_link_tag "scm" %>
|
||||
<% end %>
|
||||
|
|
|
|||
|
|
@ -481,12 +481,52 @@ p.percent {
|
|||
}
|
||||
|
||||
/*版本库tab*/
|
||||
.contextual {
|
||||
float: right;
|
||||
white-space: nowrap;
|
||||
line-height: 1.4em;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
padding-top: 5px;
|
||||
font-size: 0.9em;
|
||||
}
|
||||
/*div.repos_explain {*/
|
||||
/*word-wrap: normal;*/
|
||||
/*line-height: 8px;*/
|
||||
/*font-size: 13px;*/
|
||||
/*background-color: #F8F8F8;*/
|
||||
/*border: 1px solid #DDD;*/
|
||||
/*overflow: auto;*/
|
||||
/*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;*/
|
||||
/*}*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue