From 4f4dc4c67c51c000f6d9bcdeb8cc7a14f8491442 Mon Sep 17 00:00:00 2001
From: Caio Almeida <caiosba@gmail.com>
Date: Fri, 9 Nov 2018 14:13:35 -0300
Subject: [PATCH 1/2] Implement desktop layout

---
 lib/scss/6_components/_conversations.scss     |  1 +
 .../6_components/generic/_page-header.scss    |  7 +++
 lib/scss/6_components/generic/_page.scss      | 20 ++++++++
 src/ej/templates/jinja2/base.jinja2           | 50 +++++++++++--------
 4 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/lib/scss/6_components/_conversations.scss b/lib/scss/6_components/_conversations.scss
index ee3fbe523..308a270d6 100644
--- a/lib/scss/6_components/_conversations.scss
+++ b/lib/scss/6_components/_conversations.scss
@@ -11,6 +11,7 @@ $profile-label-clear-color: #30BFD3 !default;
 
 .ConversationList {
     @extend .Container;
+    max-width: 100%;
 
     p {
         padding: 0 $spacing-unit / 3;
diff --git a/lib/scss/6_components/generic/_page-header.scss b/lib/scss/6_components/generic/_page-header.scss
index 4b39e8e84..eacdc8e32 100644
--- a/lib/scss/6_components/generic/_page-header.scss
+++ b/lib/scss/6_components/generic/_page-header.scss
@@ -41,6 +41,13 @@ $header-box-shadow-lower: 0 -2px 4px 0 rgba(0, 0, 0, 0.2) !default;
 
     &-topIcon {
         cursor: pointer;
+        display: none;
+    }
+
+    @media only screen and (max-width: 960px) {
+        &-topIcon {
+            display: block;
+        }
     }
 
     // Elements
diff --git a/lib/scss/6_components/generic/_page.scss b/lib/scss/6_components/generic/_page.scss
index 3e8b9fbb3..b437239d9 100644
--- a/lib/scss/6_components/generic/_page.scss
+++ b/lib/scss/6_components/generic/_page.scss
@@ -23,6 +23,26 @@ $page-title-font-size: 1.1 * $font-size-h1 !default;
         }
     }
 
+    &-content-container {
+        display: flex;
+
+        .NavMenu {
+            position: fixed;
+        }
+    }
+    
+    @media only screen and (min-width: 960px) {
+        &-content, #docs {
+            padding-left: 400px !important;
+        }
+    }
+    
+    @media only screen and (max-width: 960px) {
+        .NavMenu-fixed {
+            display: none;
+        }
+    }
+
     &-mainContainer {
         background: $page-background-image;
         background-size: contain;
diff --git a/src/ej/templates/jinja2/base.jinja2 b/src/ej/templates/jinja2/base.jinja2
index d10c30ae5..04c8e8b49 100644
--- a/src/ej/templates/jinja2/base.jinja2
+++ b/src/ej/templates/jinja2/base.jinja2
@@ -1,6 +1,6 @@
 {% from 'components/generic/page_header.jinja2' import page_header %}
 {% from 'components/generic/page_top-header.jinja2' import page_top_header %}
-{% from 'components/generic/page_menu.jinja2' import sidebar %}
+{% from 'components/generic/page_menu.jinja2' import menu with context %}
 
 {% set javascript_enabled = request.COOKIES.get('javascriptEnabled', 'No Cookie') if request else True %}
 {% set target_context = request.GET.target|default('all') if request else 'all' %}
@@ -116,27 +116,35 @@
         <div class="Page-mainContainer">
     {% endif %}
 
-    {# MAIN BLOCK #}
-    {% block main %}
-
-        <main class="Page-content" {{ salt_attr()|safe }}>
-            {% if content_title %}
-                <div class="Page-title"><h1>{{ content_title }}</h1></div>{% endif %}
-            {% if content is defined %}
-                {{ content }}
-            {% else %}
-                {% block content %}
-                    {% if content_html %}
-                        <div class="Container">
-                            {{ content_html|safe }}
-                        </div>
-                    {% else %}
-                        <p>{{ _('Please override the "content" block of your template!') }}</p>
-                    {% endif %}
-                {% endblock %}
+    <div class="Page-content-container">
+        <div class="NavMenu-fixed">
+            {% if request and request.user and request.user.is_authenticated and request.path != '/home/' %}
+                {{ menu(request.user) }}
             {% endif %}
-        </main>
-    {% endblock %}
+        </div>
+
+        {# MAIN BLOCK #}
+        {% block main %}
+
+            <main class="Page-content" {{ salt_attr()|safe }}>
+                {% if content_title %}
+                    <div class="Page-title"><h1>{{ content_title }}</h1></div>{% endif %}
+                {% if content is defined %}
+                    {{ content }}
+                {% else %}
+                    {% block content %}
+                        {% if content_html %}
+                            <div class="Container">
+                                {{ content_html|safe }}
+                            </div>
+                        {% else %}
+                            <p>{{ _('Please override the "content" block of your template!') }}</p>
+                        {% endif %}
+                    {% endblock %}
+                {% endif %}
+            </main>
+        {% endblock %}
+    </div>
 
 
 {% endblock %}

From 286d60873e32909c6f15f1a1f2f9a8cb3412bbcd Mon Sep 17 00:00:00 2001
From: Caio Almeida <caiosba@gmail.com>
Date: Fri, 9 Nov 2018 14:31:49 -0300
Subject: [PATCH 2/2] Fix desktop layout on login page

---
 lib/scss/6_components/generic/_page.scss | 2 +-
 src/ej/templates/jinja2/base.jinja2      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/scss/6_components/generic/_page.scss b/lib/scss/6_components/generic/_page.scss
index b437239d9..eca2e0526 100644
--- a/lib/scss/6_components/generic/_page.scss
+++ b/lib/scss/6_components/generic/_page.scss
@@ -32,7 +32,7 @@ $page-title-font-size: 1.1 * $font-size-h1 !default;
     }
     
     @media only screen and (min-width: 960px) {
-        &-content, #docs {
+        &-content.logged-in, #docs {
             padding-left: 400px !important;
         }
     }
diff --git a/src/ej/templates/jinja2/base.jinja2 b/src/ej/templates/jinja2/base.jinja2
index 04c8e8b49..f98f886cd 100644
--- a/src/ej/templates/jinja2/base.jinja2
+++ b/src/ej/templates/jinja2/base.jinja2
@@ -9,6 +9,7 @@
 {% set page_title = page_title|default(content_title or settings.EJ_PAGE_TITLE) %}
 {% set hide_footer = hide_footer|default(False) %}
 {% set enable_navbar = enable_navbar|default(True) %}
+{% set logged_in = request and request.user and request.user.is_authenticated %}
 
 {% if target == 'all' %}
     <!DOCTYPE html>
@@ -118,7 +119,7 @@
 
     <div class="Page-content-container">
         <div class="NavMenu-fixed">
-            {% if request and request.user and request.user.is_authenticated and request.path != '/home/' %}
+            {% if logged_in and request.path != '/home/' %}
                 {{ menu(request.user) }}
             {% endif %}
         </div>
@@ -126,7 +127,7 @@
         {# MAIN BLOCK #}
         {% block main %}
 
-            <main class="Page-content" {{ salt_attr()|safe }}>
+            <main class="Page-content {{ 'logged-in' if logged_in else '' }}" {{ salt_attr()|safe }}>
                 {% if content_title %}
                     <div class="Page-title"><h1>{{ content_title }}</h1></div>{% endif %}
                 {% if content is defined %}