Permalink
Browse files

Merge branch 'master' of github.com:fac/errbit

  • Loading branch information...
2 parents 4854f89 + d1ea9f2 commit 97ef8f133a319f6e71900778c0d86931157883c6 @elandesign elandesign committed Aug 16, 2012
@@ -36,7 +36,6 @@ $(function() {
$('button.app-err-button').on('click', function() {
$('form#app-errors').attr('action', $(this).attr('data-action'));
- $('form#app-errors').submit();
});
$('.notice-pagination').each(function() {
@@ -56,7 +56,7 @@
- if current_user.admin?
%tr
%td{:colspan => 5}
- %a{ :class => 'btn btn-primary', :href => new_app_path }
+ = link_to(new_app_path, { :class => 'btn btn-primary' }) do
%i{ :class => 'icon-plus-sign icon-white' }
Add New App
@@ -3,13 +3,14 @@
.btn-toolbar
.btn-group
= link_to_copy_attributes_from_other_app
- %a{ :class => 'btn btn-primary copy_config' }
+ = link_to('#', { :class => 'btn btn-primary copy_config' })
%i{ :class => 'icon-share icon-white' }
Copy Configuration From Another App
- %a{ :class => 'btn btn-inverse pull-right', :href => apps_path }
- %i{ :class => 'icon-chevron-left icon-white'}
- Back To Apps
+ .btn-group.pull-right
+ = link_to(apps_path, { :class => 'btn btn-inverse pull-right' })
+ %i{ :class => 'icon-chevron-left icon-white'}
+ Back To Apps
= form_for @app do |f|
@@ -64,7 +64,6 @@
%h3.clear.alert.alert-warning No errs have been caught yet, make sure you setup your app
= render 'configuration_instructions', :app => @app
-
.span2
%table.watchers.table.table-striped.table-bordered
%caption
@@ -43,23 +43,26 @@
- if Errbit::Config.allow_comments_with_issue_tracker || !@app.issue_tracker_configured? || @problem.comments.any?
- content_for :comments do
- .well
- %h3 Comments
- - @problem.comments.each do |comment|
- .window
- %table.comment.table.table-striped
- %tr
- %th
- %span= link_to '✘'.html_safe, app_err_comment_path(@app, @problem, comment), :method => :delete, :data => { :confirm => "Are sure you don't need this comment?" }, :class => "destroy-comment"
- = time_ago_in_words(comment.created_at, true) << " ago by "
- = link_to comment.user.email, user_path(comment.user)
- %tr
- %td= comment.body.gsub("\n", "<br>").html_safe
+ .row-fluid
+ .well
+ %h3 Comments
+ - @problem.comments.each do |comment|
+ .window
+ %table.comment.table.table-bordered
+ %tr
+ %th
+ %span= link_to '&#10008;'.html_safe, app_err_comment_path(@app, @problem, comment), :method => :delete, :data => { :confirm => "Are sure you don't need this comment?" }, :class => "destroy-comment"
+ = time_ago_in_words(comment.created_at, true) << " ago by "
+ = link_to comment.user.email, user_path(comment.user)
+ %tr
+ %td= comment.body.gsub("\n", "<br>").html_safe
- if Errbit::Config.allow_comments_with_issue_tracker || !@app.issue_tracker_configured?
- = form_for @comment, :url => app_err_comments_path(@app, @problem) do |comment_form|
- %p Add a comment
- = comment_form.text_area :body, :style => "width: 100%; height: 80px;"
- = comment_form.submit "Save Comment", :class => 'btn btn-primary'
+ .row-fluid
+ .well
+ = form_for @comment, :url => app_err_comments_path(@app, @problem) do |comment_form|
+ %p Add a comment
+ = comment_form.text_area :body, :style => "width: 100%; height: 80px;"
+ = comment_form.submit "Save Comment", :class => 'btn btn-primary'
.alert.alert-block
@@ -68,28 +71,28 @@
.btn-toolbar
.btn-group.tab-bar
- %a{ :class => 'button btn btn-info', :rel => 'summary', :href => '#summary' }
+ = link_to('#summary', { :class => 'button btn btn-info', :rel => 'summary' }) do
%i{ :class => 'icon-file icon-white'}
Summary
- %a{ :class => 'button btn btn-info', :rel => 'backtrace', :href => '#backtrace' }
+ = link_to('#backtrace', { :class => 'button btn btn-info', :rel => 'backtrace' }) do
%i{ :class => 'icon-fire icon-white'}
Backtrace
- if @notice && @notice.user_attributes.present?
- %a{ :class => 'button btn btn-info', :rel => 'user_attributes', :href => '#user_attributes' }
+ = link_to('#user_attributes', { :class => 'button btn btn-info', :rel => 'user_attributes' }) do
%i{ :class => 'icon-user icon-white'}
User Details
- %a{ :class => 'button btn btn-info', :rel => 'environment', :href => '#environment' }
+ = link_to('#environment', { :class => 'button btn btn-info', :rel => 'environment' }) do
%i{ :class => 'icon-globe icon-white'}
Environment
- %a{ :class => 'button btn btn-info', :rel => 'params', :href => '#params' }
+ = link_to('#params', { :class => 'button btn btn-info', :rel => 'params' }) do
%i{ :class => 'icon-tags icon-white'}
Parameters
- %a{ :class => 'button btn btn-info', :rel => 'session', :href => '#session' }
+ = link_to('#session', { :class => 'button btn btn-info', :rel => 'session' }) do
%i{ :class => 'icon-road icon-white'}
Session
@@ -2,8 +2,10 @@
.modal-header
%a{ :class => 'close', :data => { :dismiss => 'modal' } }
%h2= "Confirm Unlink Github Account?"
+
.modal-body
%p= "Are you sure you wish to unlink this users github account?"
+
.modal-footer
= link_to(unlink_github_user_path(user), { :method => :delete, :class => 'btn btn-danger' }) do
%icon{ :class => 'icon-thumbs-up icon-white'}
@@ -2,7 +2,7 @@
.nav-collapse
%ul{:id => 'session-links', :class => 'nav pull-right'}
%li.dropdown.session
- %a{ :href => '#', :class => 'dropdown-toggle', :data => { :toggle => 'dropdown' } }
+ = link_to('#', { :class => 'dropdown-toggle', :data => { :toggle => 'dropdown' } }) do
= current_user.email
%b.caret
%ul.dropdown-menu

0 comments on commit 97ef8f1

Please sign in to comment.