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

版本库调整：未完成

This commit is contained in:
huang 2015-04-16 05:01:09 +08:00
parent fec751608a
commit c11fdc7273
4 changed files with 174 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/repositories/_navigation.html.erb
View File

@ -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 => 'icon icon-stats' if @repository.supports_all_revisions? %>
:class => 'mt5 c_blue fl' if @repository.supports_all_revisions? %>
<%= form_tag({:action => controller.action_name,
:id => @project,

145
app/views/repositories/show.html.erb
View File

@ -1,13 +1,154 @@
<div class="project_r_h">
<h2 class="project_h2">版本库</h2>
</div>
<div class="repository_con" style="line-height:1.9;">
<div class="contextual" >
<%= render :partial => 'breadcrumbs',
:locals => { :path => @path, :kind => 'dir', :revision => @rev } %>
<%= render :partial => 'navigation' %>
</div><!--contextual end-->
<div class="cl"></div>
<div class=" c_dark f14">
<p > <%if @repository.type.to_s=="Repository::Git"%>
<%= @repos_url%>
<%else %>
<%=h @repository.url %>
<% end %>
</p>
<p class="mb10 word_break">
(<%= 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' : '') ,
:class => "mb10 word_break c_orange"}.join('&nbsp|&nbsp').html_safe %>)
</p>
<p>项目代码请设置好正确的编码方式（utf-8），否则中文会出现乱码</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">版本库</h2>
</div>
<!--修订、统计-->
<div class="contextual" style="padding-right: 10px;">
<%= render :partial => 'navigation' %>
</div>
<h3>
<%= render :partial => 'breadcrumbs',
:locals => { :path => @path, :kind => 'dir', :revision => @rev } %>
<div style="font-size:15px;">
<%if @repository.type.to_s=="Repository::Git"%>
<%= @repos_url%>

29
public/stylesheets/project.css
View File

@ -461,3 +461,32 @@ img.ui-datepicker-trigger {
.wiki_con_box{ line-height:1.9; color:#2d2d2d;}
.wiki_page_con{ border-bottom:1px dashed #CCC; margin-bottom:10px; padding-bottom:10px;}
#wiki_new_box{ display:none;}
/*里程碑进度条*/
table.progress {
border-collapse: collapse;
border-spacing: 0pt;
empty-cells: show;
text-align: center;
float: left;
margin: 1px 6px 1px 0px;}
p.progress-info {
clear: left;
font-size: 80%;
margin-top: -4px;
color: #777;
color: #777;}
p.percent {
font-size: 80%;
}
/*版本库tab*/
.contextual {
float: right;
white-space: nowrap;
line-height: 1.4em;
padding-left: 10px;
padding-right: 10px;
padding-top: 5px;
font-size: 0.9em;
}

17
public/stylesheets/public.css
View File

@ -391,20 +391,3 @@ div.flash.warning, .conflict {
a.box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;}
a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
/*里程碑进度条*/
table.progress {
border-collapse: collapse;
border-spacing: 0pt;
empty-cells: show;
text-align: center;
float: left;
margin: 1px 6px 1px 0px;}
p.progress-info {
clear: left;
font-size: 80%;
margin-top: -4px;
color: #777;
color: #777;}
p.percent {
font-size: 80%;
}