From de8f3e532d857ec64a9ba17bf9e5a4de272a6cbd Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sat, 26 Mar 2016 17:36:37 +0100
Subject: upgrade: use bootstrap3 row and col-md-*
---
engines/support/app/views/tickets/_edit_form.html.haml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'engines/support/app/views')
diff --git a/engines/support/app/views/tickets/_edit_form.html.haml b/engines/support/app/views/tickets/_edit_form.html.haml
index cd1dbe4..8d64256 100644
--- a/engines/support/app/views/tickets/_edit_form.html.haml
+++ b/engines/support/app/views/tickets/_edit_form.html.haml
@@ -34,12 +34,12 @@
= simple_form_for @ticket do |f|
= hidden_ticket_fields
= f.input :subject, input_html: {:class => 'large full-width'}
- .row-fluid
- .span4
+ .row
+ .col-md-4
= f.input :is_open, as: :select, collection: [:true, :false], include_blank: false
- .span4
+ .col-md-4
= f.input :email
- .span4
+ .col-md-4
= f.input :regarding_user, label: (Ticket.human_attribute_name(:regarding_user) + " " + regarding_user_link).html_safe
= f.button :loading
- if admin?
--
cgit v1.2.3
From a1b494e334406660a1f49fb7de9b043493809640 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 13 May 2016 16:23:10 +0200
Subject: ensure invalid user ids still render the ticket form
We still have strange urls requested like
/pt/users/AnonymousUser.../tickets/new
Not sure where they are coming from - but this should make sure we
respond with sth. meaningful instead of erroring out.
Conflicts:
app/views/layouts/_content.html.haml
---
engines/support/app/views/tickets/edit.html.haml | 1 -
engines/support/app/views/tickets/index.html.haml | 2 --
engines/support/app/views/tickets/new.html.haml | 5 -----
engines/support/app/views/tickets/show.html.haml | 2 --
4 files changed, 10 deletions(-)
(limited to 'engines/support/app/views')
diff --git a/engines/support/app/views/tickets/edit.html.haml b/engines/support/app/views/tickets/edit.html.haml
index 03bda7d..cdc5e16 100644
--- a/engines/support/app/views/tickets/edit.html.haml
+++ b/engines/support/app/views/tickets/edit.html.haml
@@ -1,4 +1,3 @@
-- @show_navigation = params[:user_id].present?
- @comment = TicketComment.new
.ticket
diff --git a/engines/support/app/views/tickets/index.html.haml b/engines/support/app/views/tickets/index.html.haml
index d107ce2..56c7012 100644
--- a/engines/support/app/views/tickets/index.html.haml
+++ b/engines/support/app/views/tickets/index.html.haml
@@ -1,5 +1,3 @@
-- @show_navigation = params[:user_id].present?
-
= render 'tickets/tabs'
= table @tickets, %w(subject created updated voices)
= paginate @tickets
diff --git a/engines/support/app/views/tickets/new.html.haml b/engines/support/app/views/tickets/new.html.haml
index d3580f9..d0b0f89 100644
--- a/engines/support/app/views/tickets/new.html.haml
+++ b/engines/support/app/views/tickets/new.html.haml
@@ -1,10 +1,5 @@
-- @show_navigation = params[:user_id].present?
-
= render 'tickets/tabs'
-- user = @user if admin?
-- user ||= current_user
-
= simple_form_for @ticket, :validate => true, :html => {:class => 'form-horizontal'} do |f|
= hidden_ticket_fields
= f.input :subject
diff --git a/engines/support/app/views/tickets/show.html.haml b/engines/support/app/views/tickets/show.html.haml
index 99afa2a..a625870 100644
--- a/engines/support/app/views/tickets/show.html.haml
+++ b/engines/support/app/views/tickets/show.html.haml
@@ -1,5 +1,3 @@
-- @show_navigation = params[:user_id].present?
-
.ticket
= render 'tickets/edit_form'
= render 'tickets/comments'
--
cgit v1.2.3