From 318dc72d2995fe8ce49575cb73bcc92943105a7a Mon Sep 17 00:00:00 2001 From: George Vinogradov Date: Fri, 2 Mar 2012 02:23:53 +0400 Subject: [PATCH] [issue #195] Fixes. * Added border to gutter in file preview * Added "empty repo" message * Fixed one of bugs with tree/branch selector --- app/assets/stylesheets/custom.scss | 8 +++++- app/controllers/git/trees_controller.rb | 1 + app/views/git/repositories/empty.html.haml | 30 ++++++++++++++++++++- app/views/projects/_branch_select.html.haml | 6 ++--- 4 files changed, 40 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/custom.scss b/app/assets/stylesheets/custom.scss index 45896beb7..9df5d5e3d 100644 --- a/app/assets/stylesheets/custom.scss +++ b/app/assets/stylesheets/custom.scss @@ -299,7 +299,7 @@ table.tablesorter tbody td a .issue_title { #output.formatted { width: auto; font-family: "Consolas","Bitstream Vera Sans Mono","Courier New",Courier,monospace; - padding: 10px; + padding: 10px 5px; margin-left: 45px; } @@ -309,4 +309,10 @@ table.tablesorter tbody td a .issue_title { margin: 0; } +div.gutter { + border-right: 1px solid #CCCCCC !important; +} +table.tablesorter tr td.centered { + text-align: center; +} diff --git a/app/controllers/git/trees_controller.rb b/app/controllers/git/trees_controller.rb index bedede1d9..5e43a52e6 100644 --- a/app/controllers/git/trees_controller.rb +++ b/app/controllers/git/trees_controller.rb @@ -14,6 +14,7 @@ class Git::TreesController < Git::BaseController # @commit = @git_repository.commits(@treeish, 1).first # Raises Grit::Git::GitTimeout @commit = @branch.present? ? @branch.commit() : @git_repository.log(@treeish, @path, :max_count => 1).first + render :template => "git/repositories/empty" and return unless @commit if @path @path.force_encoding(Encoding::ASCII_8BIT) diff --git a/app/views/git/repositories/empty.html.haml b/app/views/git/repositories/empty.html.haml index 39bb5f9fe..678dc18e9 100644 --- a/app/views/git/repositories/empty.html.haml +++ b/app/views/git/repositories/empty.html.haml @@ -1 +1,29 @@ -%h3= I18n.t("layout.git.repositories.empty") \ No newline at end of file += render :partial => 'projects/submenu' += render :partial => 'projects/repo_block', :locals => {:project => @project} + +.description + %h3= t("layout.projects.about_subheader") + %p + = @project.description + = link_to t('layout.read_more'), '#' +.both + +#repo-wrapper + + %h3= t("layout.projects.files_in_project") + .files + .l + = render :partial => 'git/shared/whereami' + .both + + %table#myTable.tablesorter.project{:cellpadding => "0", :cellspacing => "0"} + %thead + %tr + %th.th1= t("layout.projects.filename") + %th.th2= t("layout.projects.age") + %th.th3= t("layout.projects.message") + %th.th4= t("layout.projects.author") + %tbody + %tr + %td.centered{:colspan => 4} + %h3= I18n.t("layout.git.repositories.empty") diff --git a/app/views/projects/_branch_select.html.haml b/app/views/projects/_branch_select.html.haml index b4ca3b8ef..78d8f6a33 100644 --- a/app/views/projects/_branch_select.html.haml +++ b/app/views/projects/_branch_select.html.haml @@ -1,7 +1,7 @@ .lineForm.fork - = form_tag '', :id => 'branch_changer', :'data-action' => controller_name do - = select_tag :branch, branch_selector_options(project), - :class => 'sel80', :id => 'branch_selector' + = select_tag :branch, branch_selector_options(project), + :class => 'sel80', :id => 'branch_selector' + %form{ :action => '', :method => :get, :id => 'branch_changer', :'data-action' => "#{controller_name}"} .fork %p= t('layout.projects.current_branch')+':' .both