From 60425256e6e0d19ffbe0432494ad76c8c7dbc697 Mon Sep 17 00:00:00 2001 From: Pavel Forkert Date: Thu, 11 Aug 2011 00:43:08 +0300 Subject: [PATCH] Removed fixed width from error message width, so the table does not exceed wrapper #content block. Unresolved errors link goes to application page (so I see only errors from selected application). Fixed "no errors" message (now it spreads over whole table columns). --- app/views/apps/index.html.haml | 2 +- app/views/errs/_table.html.haml | 4 ++-- public/stylesheets/application.css | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/views/apps/index.html.haml b/app/views/apps/index.html.haml index 4519184..debdb19 100644 --- a/app/views/apps/index.html.haml +++ b/app/views/apps/index.html.haml @@ -15,7 +15,7 @@ %td.deploy= app.last_deploy_at ? link_to( app.last_deploy_at.to_s(:micro), app_deploys_path(app)) : 'n/a' %td.count - if app.errs.count > 0 - = link_to app.errs.unresolved.count, app_errs_path(app) + = link_to app.errs.unresolved.count, app_path(app) - else \- - if @apps.none? diff --git a/app/views/errs/_table.html.haml b/app/views/errs/_table.html.haml index 024aad1..1cff008 100644 --- a/app/views/errs/_table.html.haml +++ b/app/views/errs/_table.html.haml @@ -12,7 +12,7 @@ %tr{:class => err.resolved? ? 'resolved' : 'unresolved'} %td.app = link_to err.app.name, app_path(err.app) - - if(current_page?(:controller => 'errs')) + - if current_page?(:controller => 'errs') %span.environment= link_to err.environment, errs_path(environment: err.environment) - else %span.environment= link_to err.environment, app_path(environment: err.environment) @@ -25,6 +25,6 @@ %td.resolve= link_to image_tag("thumbs-up.png"), resolve_app_err_path(err.app, err), :title => "Resolve", :method => :put, :confirm => err_confirm, :class => 'resolve' if err.unresolved? - if errs.none? %tr - %td{:colspan => (@app ? 5 : 6)} + %td{:colspan => 6} %em No errs here = will_paginate @errs, :previous_label => '« Previous', :next_label => 'Next »' diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index a8cd961..b8ac588 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -582,7 +582,6 @@ table.errs td.app .environment { color: #999; } table.errs td.message a { - width: 420px; display: block; word-wrap: break-word; } -- libgit2 0.21.2