Commit 60425256e6e0d19ffbe0432494ad76c8c7dbc697
1 parent
a844dead
Exists in
master
and in
1 other branch
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).
Showing
3 changed files
with
3 additions
and
4 deletions
Show diff stats
app/views/apps/index.html.haml
@@ -15,7 +15,7 @@ | @@ -15,7 +15,7 @@ | ||
15 | %td.deploy= app.last_deploy_at ? link_to( app.last_deploy_at.to_s(:micro), app_deploys_path(app)) : 'n/a' | 15 | %td.deploy= app.last_deploy_at ? link_to( app.last_deploy_at.to_s(:micro), app_deploys_path(app)) : 'n/a' |
16 | %td.count | 16 | %td.count |
17 | - if app.errs.count > 0 | 17 | - if app.errs.count > 0 |
18 | - = link_to app.errs.unresolved.count, app_errs_path(app) | 18 | + = link_to app.errs.unresolved.count, app_path(app) |
19 | - else | 19 | - else |
20 | \- | 20 | \- |
21 | - if @apps.none? | 21 | - if @apps.none? |
app/views/errs/_table.html.haml
@@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
12 | %tr{:class => err.resolved? ? 'resolved' : 'unresolved'} | 12 | %tr{:class => err.resolved? ? 'resolved' : 'unresolved'} |
13 | %td.app | 13 | %td.app |
14 | = link_to err.app.name, app_path(err.app) | 14 | = link_to err.app.name, app_path(err.app) |
15 | - - if(current_page?(:controller => 'errs')) | 15 | + - if current_page?(:controller => 'errs') |
16 | %span.environment= link_to err.environment, errs_path(environment: err.environment) | 16 | %span.environment= link_to err.environment, errs_path(environment: err.environment) |
17 | - else | 17 | - else |
18 | %span.environment= link_to err.environment, app_path(environment: err.environment) | 18 | %span.environment= link_to err.environment, app_path(environment: err.environment) |
@@ -25,6 +25,6 @@ | @@ -25,6 +25,6 @@ | ||
25 | %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? | 25 | %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? |
26 | - if errs.none? | 26 | - if errs.none? |
27 | %tr | 27 | %tr |
28 | - %td{:colspan => (@app ? 5 : 6)} | 28 | + %td{:colspan => 6} |
29 | %em No errs here | 29 | %em No errs here |
30 | = will_paginate @errs, :previous_label => '« Previous', :next_label => 'Next »' | 30 | = will_paginate @errs, :previous_label => '« Previous', :next_label => 'Next »' |
public/stylesheets/application.css
@@ -582,7 +582,6 @@ table.errs td.app .environment { | @@ -582,7 +582,6 @@ table.errs td.app .environment { | ||
582 | color: #999; | 582 | color: #999; |
583 | } | 583 | } |
584 | table.errs td.message a { | 584 | table.errs td.message a { |
585 | - width: 420px; | ||
586 | display: block; | 585 | display: block; |
587 | word-wrap: break-word; | 586 | word-wrap: break-word; |
588 | } | 587 | } |