diff --git a/.haml-lint_todo.yml b/.haml-lint_todo.yml index 02f1ac56..b861bbe2 100644 --- a/.haml-lint_todo.yml +++ b/.haml-lint_todo.yml @@ -250,8 +250,9 @@ linters: ConsecutiveComments: exclude: - # This one seems like a bug in haml-lint. + # These seems like a bug in haml-lint. - "app/views/admin/conferences/show.html.haml" + - "app/views/proposals/index.html.haml" # Offense count: 24 ConsecutiveSilentScripts: diff --git a/app/views/admin/tickets/show.html.haml b/app/views/admin/tickets/show.html.haml index a6b31ea4..dba94810 100644 --- a/app/views/admin/tickets/show.html.haml +++ b/app/views/admin/tickets/show.html.haml @@ -20,7 +20,7 @@ .col-md-12 %table.datatable %thead - %th # + %th ID %th Name %th Quantity %th E-Mail @@ -32,7 +32,7 @@ - purchases = buyer.ticket_purchases.where(ticket_id: @ticket.id) %tr %td - = index + 1 + = purchases.length == 1 ? purchases.first.id : purchases.map(&:id) %td = buyer.name %td diff --git a/app/views/proposals/index.html.haml b/app/views/proposals/index.html.haml index 2cc41860..638c9cd6 100644 --- a/app/views/proposals/index.html.haml +++ b/app/views/proposals/index.html.haml @@ -33,10 +33,10 @@ .row .col-md-12 - %p.text-right - = link_to '#status-help', class: 'btn btn-default', "data-toggle"=>"collapse" do + -# %p.text-right + = link_to '#status-help', class: 'btn btn-default', "data-toggle": "collapse" do Help? - .collapse#status-help + -# .collapse#status-help %p %strong What happens next with my proposal? @@ -80,8 +80,11 @@ %br = link_to registered_text(event), registrations_conference_program_proposal_path(@conference.short_title, event), class: 'btn btn-xs btn-danger' - %td.col-md-2{style: "padding:20px 8px 20px 8px;"} - = link_to 'Complete your proposal', 'javascript: void(0)', "type"=>"button", "data-trigger"=>"focus", "data-toggle"=>"popover", "title"=>"Your todo list", "data-content"=>"#{render partial: 'tooltip', locals: { event: event} }" + -# %td.col-md-2{style: "padding:20px 8px 20px 8px;"} + %a{href: '#', type: "button", "data-trigger": "click focus", "data-toggle": "popover", + title: "Your todo list", + "data-content": "#{render 'tooltip', event: event}" } + Complete your proposal - if can? :create, @conference.registrations.new - progress_percentage = event.calculate_progress .progress