Rework repo sidebar

Author: root

Diff for: app/helpers/extend_repositories_helper.rb

@@ -10,6 +10,11 @@ def encoding_field(form, repository)
   end
 
 
+  def available_download_format(repository, rev = nil)
+    %w(zip tar tar.gz).map { |f| [f, download_git_revision_repository_path(repository, rev: rev, download_format: f)] }
+  end
+
+
   def create_readme_field(form, repository)
     content_tag(:p) do
       hidden_field_tag('repository[create_readme]', 'false', id: '') +

Diff for: app/views/repositories/_download_revision.html.haml

@@ -1,24 +1,8 @@
-- if @repository.is_a?(Repository::Xitolite) && RedmineGitHosting::Config.download_revision_enabled?
-  - if @repository.downloadable?
-
-    %div{ style: 'clear: both;' }
-
-    #git_hosting_download_buttons
-      %ul
-        %li
-          = link_to label_with_icon(l(:label_download_format, :archive_format => '.tar'), 'fa-download'),
-                    download_git_revision_repository_path(@repository, :rev => @rev, :download_format => 'tar'),
-                    :class => 'button'
-
-        %li
-          = link_to label_with_icon(l(:label_download_format, :archive_format => '.tar.gz'), 'fa-download'),
-                    download_git_revision_repository_path(@repository, :rev => @rev, :download_format => 'tar.gz'),
-                    :class => 'button'
-
-        %li
-          = link_to label_with_icon(l(:label_download_format, :archive_format => '.zip'), 'fa-download'),
-                    download_git_revision_repository_path(@repository, :rev => @rev, :download_format => 'zip'),
-                    :class => 'button'
-
-    - content_for :header_tags do
-      = bootstrap_load_module(:font_awesome)
+- if repository.downloadable?
+  - content_for :header_tags do
+    = bootstrap_load_module(:font_awesome)
+
+  = label_with_icon(l(:label_download_format), 'fa-download')
+  = select_tag  :download, options_for_select(available_download_format(repository, @rev)),
+                prompt: l(:label_download_select_format),
+                onchange: "if (this.value != '') { window.location = this.value; }"

Diff for: app/views/repositories/_show_top.html.haml

@@ -0,0 +1,8 @@
+- if @repository.is_a?(Repository::Xitolite)
+  .git_hosting_urls.box
+    .container
+      .row
+        .col-md-8{ style: 'vertical-align: middle;' }
+          = render 'common/git_urls', repository: @repository if RedmineGitHosting::Config.show_repositories_url?
+        .col-md-4{ style: 'text-align: right; vertical-align: middle;' }
+          = render 'repositories/download_revision', repository: @repository if RedmineGitHosting::Config.download_revision_enabled?

Diff for: app/views/repositories/_sidebar.html.haml

@@ -4,12 +4,5 @@
       = link_to_repository(repo, @repository)
       = link_to "(#{l(:label_settings)})", edit_repository_path(repo) if User.current.allowed_to?(:manage_repository, @project)
 
-- if @repository.is_a?(Repository::Xitolite) && RedmineGitHosting::Config.show_repositories_url?
-  .git_hosting_urls
-    %h3= l(:label_repository_access_url)
-    = render 'common/git_urls', repository: @repository
-
-= render 'repositories/download_revision'
-
 :javascript
   $(document).ready(function() { $('#sidebar p').remove(); });

Diff for: assets/stylesheets/application.css

@@ -97,8 +97,12 @@ REPOSITORY VIEW
 
 .git_hosting_urls {
   display: block;
-  height: 90px;
-  margin-bottom: 20px;
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+
+.git_hosting_urls .repository-urls {
+  margin-top: 0;
 }
 
 #git_hosting_download_buttons i {

Diff for: config/locales/models/repository_xitolite/en.yml

@@ -49,7 +49,8 @@ en:
   label_git_annex: GitAnnex
 
   # Repository code browser
-  label_download_format: Download as %{archive_format}
+  label_download_format: Download as
+  label_download_select_format: Select format
   error_download_revision_no_such_commit: "No such commit %{commit}"
 
   # Repositories URL (labels)

Diff for: config/locales/models/repository_xitolite/fr.yml

@@ -49,7 +49,8 @@ fr:
   label_git_annex: GitAnnex
 
   # Repository code browser
-  label_download_format: Télécharger au format %{archive_format}
+  label_download_format: Télécharger au format
+  label_download_select_format: Sélectionnez un format
   error_download_revision_no_such_commit: "Le commit %{commit} n'a pas été trouvé"
 
   # Repositories URL (labels)

Diff for: lib/redmine_git_hosting.rb

@@ -19,6 +19,7 @@
 require 'redmine_git_hosting/hooks/add_public_keys_link'
 require 'redmine_git_hosting/hooks/display_git_urls_on_project'
 require 'redmine_git_hosting/hooks/display_git_urls_on_repository_edit'
+require 'redmine_git_hosting/hooks/display_git_urls_on_repository_show'
 require 'redmine_git_hosting/hooks/display_repository_extras'
 require 'redmine_git_hosting/hooks/display_repository_readme'
 require 'redmine_git_hosting/hooks/display_repository_sidebar'

Diff for: lib/redmine_git_hosting/hooks/display_git_urls_on_repository_show.rb

@@ -0,0 +1,7 @@
+module RedmineGitHosting
+  module Hooks
+    class DisplayGitUrlsOnRepositoryShow < Redmine::Hook::ViewListener
+      render_on :view_repositories_show_contextual, partial: 'repositories/show_top'
+    end
+  end
+end