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-*

---
 app/views/layouts/_content.html.haml    | 6 +++---
 app/views/layouts/application.html.haml | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'app/views/layouts')

diff --git a/app/views/layouts/_content.html.haml b/app/views/layouts/_content.html.haml
index d5c2fa3..21d2e12 100644
--- a/app/views/layouts/_content.html.haml
+++ b/app/views/layouts/_content.html.haml
@@ -8,12 +8,12 @@
   - content = yield
 
 - if @show_navigation
-  .span2
+  .col-md-2
     = render 'layouts/navigation'
-  .span10
+  .col-md-10
     = render 'layouts/messages'
     = content
 - else
-  .span12
+  .col-md-12
     = render 'layouts/messages'
     = content
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 0aeda8b..e242a5f 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -15,13 +15,13 @@
       #main
         .container-fluid
           - if @show_navigation && !admin?
-            .row-fluid
+            .row
               %h1= t(:user_control_panel)
           - if logged_in?
-            .row-fluid
-              .span12
+            .row
+              .col-md-12
                 = render 'layouts/header'
-          .row-fluid
+          .row
             = render 'layouts/content'
       #push
         -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3
-- 
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
---
 app/views/layouts/_content.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views/layouts')

diff --git a/app/views/layouts/_content.html.haml b/app/views/layouts/_content.html.haml
index 21d2e12..8e0bfbc 100644
--- a/app/views/layouts/_content.html.haml
+++ b/app/views/layouts/_content.html.haml
@@ -7,7 +7,7 @@
 - else
   - content = yield
 
-- if @show_navigation
+- if @show_navigation && @user
   .col-md-2
     = render 'layouts/navigation'
   .col-md-10
-- 
cgit v1.2.3