diff --git a/app/views/repositories/_navigation.html.erb b/app/views/repositories/_navigation.html.erb index a42daa8f5..f0f2a77fe 100644 --- a/app/views/repositories/_navigation.html.erb +++ b/app/views/repositories/_navigation.html.erb @@ -1,10 +1,10 @@ <% content_for :header_tags do %> <%= javascript_include_tag 'repository_navigation' %> <% end %> - + <%= 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, diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 427ecddc1..c0c6df303 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -1,13 +1,154 @@ +
+

版本库

+
+
+
+ <%= render :partial => 'breadcrumbs', + :locals => { :path => @path, :kind => 'dir', :revision => @rev } %> + <%= render :partial => 'navigation' %> + +
+
+
+

<%if @repository.type.to_s=="Repository::Git"%> + <%= @repos_url%> + <%else %> + <%=h @repository.url %> + <% end %> +

+

+ (<%= 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(' | ').html_safe %>) +

+

项目代码请设置好正确的编码方式(utf-8),否则中文会出现乱码

+

建立版本库文件夹,打开命令行执行如下:

+
+
+

git init

+

git add *

+

git commit -m "first commit"

+

git remote add origin + http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git +

+

git config http.postBuffer 524288000 #设置本地post缓存为500MB

+

git push -u origin master:master

+
+
+

已经有本地库,还没有配置远程地址,打开命令行执行如下:

+
+
+

git remote add origin http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git

+

git add .

+

git commit -m "first commit"

+

git config http.postBuffer 524288000 #设置本地post缓存为500MB

+

git push -u origin master:master

+
+
+

已有远程地址,创建一个远程分支,并切换到该分支,打开命令行执行如下:

+
+
+

git clone http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git

+

git push

+

git checkout -b branch_name

+

git push origin branch_name

+
+
+

从网上获取别人的开源版本库,转交到trustie网站上,打开命令行执行如下:

+
+
+

git remote add trustie + http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git +

+

git add .

+

git commit -m "first commit"

+

git config http.postBuffer 524288000 #设置本地post缓存为500MB

+

git push -u trustie master:master

+

李海提供

+
+
+ + + + + + + + +
+
+

最近的修订版本

+
+
+ + + + +
+ 查看修订 +

查看如何提交代码:中文 | English

+
+ + +
+ + + + + + + + <%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>

版本库

+
<%= render :partial => 'navigation' %>
+

- <%= render :partial => 'breadcrumbs', - :locals => { :path => @path, :kind => 'dir', :revision => @rev } %> +
<%if @repository.type.to_s=="Repository::Git"%> <%= @repos_url%> diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 9d6e00c6f..c82ba553e 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -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; +} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index f53e7f9d5..fbaaab66f 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -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%; -} \ No newline at end of file