diff --git a/app/views/repositories/_breadcrumbs.html.erb b/app/views/repositories/_breadcrumbs.html.erb index 86fe28cb5..b4ffa4d87 100644 --- a/app/views/repositories/_breadcrumbs.html.erb +++ b/app/views/repositories/_breadcrumbs.html.erb @@ -1,30 +1,30 @@ -<%= link_to(@repository.identifier.present? ? h(@repository.identifier) : 'root', - :action => 'show', :id => @project, - :repository_id => @repository.identifier_param, - :path => nil, :rev => @rev) %> +<%= link_to(@repository.identifier.present? ? h(@repository.identifier) : 'root', + :action => 'show', :id => @project, + :repository_id => @repository.identifier_param, + :path => nil, :rev => @rev) %> <% -dirs = path.split('/') -if 'file' == kind - filename = dirs.pop -end -link_path = '' -dirs.each do |dir| - next if dir.blank? - link_path << '/' unless link_path.empty? - link_path << "#{dir}" - %> + dirs = path.split('/') + if 'file' == kind + filename = dirs.pop + 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 %> + :path => to_path_param(link_path), :rev => @rev %> <% end %> <% if filename %> / <%= link_to h(filename), - :action => 'changes', :id => @project, :repository_id => @repository.identifier_param, - :path => to_path_param("#{link_path}/#{filename}"), :rev => @rev %> + :action => 'changes', :id => @project, :repository_id => @repository.identifier_param, + :path => to_path_param("#{link_path}/#{filename}"), :rev => @rev %> <% end %> <% - # @rev is revsion or Git and Mercurial branch or tag. - # For Mercurial *tip*, @rev and @changeset are nil. - rev_text = @changeset.nil? ? @rev : format_revision(@changeset) + # @rev is revsion or Git and Mercurial branch or tag. + # For Mercurial *tip*, @rev and @changeset are nil. + rev_text = @changeset.nil? ? @rev : format_revision(@changeset) %> <%= "@ #{h rev_text}" unless rev_text.blank? %> diff --git a/app/views/repositories/_navigation.html.erb b/app/views/repositories/_navigation.html.erb index f0f2a77fe..d288cbe19 100644 --- a/app/views/repositories/_navigation.html.erb +++ b/app/views/repositories/_navigation.html.erb @@ -1,34 +1,34 @@ <% content_for :header_tags do %> - <%= javascript_include_tag 'repository_navigation' %> + <%= javascript_include_tag 'repository_navigation' %> <% end %> - + <%= 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, - :repository_id => @repository.identifier_param, - :path => to_path_param(@path), - :rev => nil}, - {:method => :get, :id => 'revision_selector'}) do -%> - - <% if !@repository.branches.nil? && @repository.branches.length > 0 -%> - | <%= l(:label_branch) %>: - <%= select_tag :branch, - options_for_select([''] + @repository.branches, @rev), - :id => 'branch' %> - <% end -%> + :id => @project, + :repository_id => @repository.identifier_param, + :path => to_path_param(@path), + :rev => nil}, + {:method => :get, :id => 'revision_selector'}) do -%> + + <% if !@repository.branches.nil? && @repository.branches.length > 0 -%> + | <%= l(:label_branch) %>: + <%= select_tag :branch, + options_for_select([''] + @repository.branches, @rev), + :id => 'branch' %> + <% end -%> - <% if !@repository.tags.nil? && @repository.tags.length > 0 -%> - | <%= l(:label_tag) %>: - <%= select_tag :tag, - options_for_select([''] + @repository.tags, @rev), - :id => 'tag' %> - <% end -%> + <% if !@repository.tags.nil? && @repository.tags.length > 0 -%> + | <%= l(:label_tag) %>: + <%= select_tag :tag, + options_for_select([''] + @repository.tags, @rev), + :id => 'tag' %> + <% end -%> - <% if @repository.supports_all_revisions? %> - | <%= l(:label_revision) %>: - <%= text_field_tag 'rev', @rev, :size => 8 %> - <% end %> + <% if @repository.supports_all_revisions? %> + | <%= l(:label_revision) %>: + <%= text_field_tag 'rev', @rev, :size => 8 %> + <% end %> <% end -%> diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 4d65e505d..e15820d96 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -1,3 +1,4 @@ +<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
<%if @repository.type.to_s=="Repository::Git"%> <%= @repos_url%> - <%else %> + <%else %> <%=h @repository.url %> - <% end %> + <% end %>
(<%= l(:label_all_revisions) %><%= @repositories.sort.collect {|repo| @@ -24,186 +25,50 @@ :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
-李海提供
-最近的修订版本
-项目代码请设置好正确的编码方式(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
+已经有本地库,还没有配置远程地址,打开命令行执行如下:
- (<%= 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 %>) -
-git init
-git add *
-git commit -m "first commit"
-git remote add origin - <%= @repos_url%> -
-git config http.postBuffer 524288000 #设置本地post缓存为500MB
-git push -u origin master:master
-git remote add origin <%= @repos_url%>
-git add .
-git commit -m "first commit"
-git config http.postBuffer 524288000 #设置本地post缓存为500MB
-git push -u origin master:master
-git clone <%= @repos_url%>
-git push
-git checkout -b branch_name
-git push origin branch_name
-git remote add trustie - <%= @repos_url%> -
-git add .
-git commit -m "first commit"
-git config http.postBuffer 524288000 #设置本地post缓存为500MB
-git push -u trustie master:master
-<%= link_to "李海", user_path(646)%>提供
+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
+李海提供
+
<% 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 %>
<% if @repository.supports_all_revisions? %> @@ -244,30 +111,19 @@ :atom, params.merge( {: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 %> - - - <%= l(:label_how_commit_code) %> - - - -<%= link_to(l(:label_how_commit_code_chinese), ch_usage_path, :class => "usage")%> - | -<%= link_to('English', en_usage_path, :class => "usage")%> - +查看如何提交代码: + <%= link_to(l(:label_how_commit_code_chinese), ch_usage_path, :class => "c_blue") %> + <%= link_to('English', en_usage_path, :class => "c_blue") %> +
+