From 796c31eaa61b37c1dc55e49a99b35722ceed3fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Arag=C3=B3n?= <aragcar@gmail.com>
Date: Wed, 30 Jan 2019 17:27:16 -0500
Subject: [PATCH] fix home template - refs #2681

---
 assets/css/scss/_base.scss                    |  5 ---
 .../Resources/views/Index/page.html.twig      |  6 ++--
 .../views/Layout/base-layout.html.twig        |  4 +--
 .../Resources/views/Layout/header.html.twig   |  2 +-
 .../views/Layout/layout_one_col.html.twig     | 36 +++++++++----------
 .../Resources/views/News/slider.html.twig     |  8 +++++
 6 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/assets/css/scss/_base.scss b/assets/css/scss/_base.scss
index 1233f9a4b6..f88d4fa436 100644
--- a/assets/css/scss/_base.scss
+++ b/assets/css/scss/_base.scss
@@ -11,11 +11,6 @@ a {
 }
 
 body {
-  font-family: $font-primary;
-  font-size: 14px;
-  color: $default-text-color;
-  line-height: 1.5;
-  letter-spacing: 0.2px;
   background: $page-background;
 }
 
diff --git a/src/ThemeBundle/Resources/views/Index/page.html.twig b/src/ThemeBundle/Resources/views/Index/page.html.twig
index 8ba3fe87c3..e894a12727 100644
--- a/src/ThemeBundle/Resources/views/Index/page.html.twig
+++ b/src/ThemeBundle/Resources/views/Index/page.html.twig
@@ -3,9 +3,11 @@
 {% autoescape false %}
 {% set buttons %}
     {% if is_granted('ROLE_ADMIN') and show_edit_page_link %}
-        <a title="{{ "header.edit_page"|trans({}, 'SonataPageBundle') }}" href="{{ _p.web_public ~ 'internal_page/edit/' ~ slug }}" class="btn btn-light btn-sm" >
-            <i class="fas fa-pencil-alt"></i>
+    <div class="d-block text-right">
+        <a title="{{ "header.edit_page"|trans({}, 'SonataPageBundle') }}" href="{{ _p.web_public ~ 'internal_page/edit/' ~ slug }}" class="btn btn-primary btn-sm" >
+            <i class="fas fa-pencil-alt"></i> {{ "Edit this section"|trans }}
         </a>
+    </div>
     {% endif %}
 {% endset %}
 
diff --git a/src/ThemeBundle/Resources/views/Layout/base-layout.html.twig b/src/ThemeBundle/Resources/views/Layout/base-layout.html.twig
index f2ff914946..5f6f6650b6 100644
--- a/src/ThemeBundle/Resources/views/Layout/base-layout.html.twig
+++ b/src/ThemeBundle/Resources/views/Layout/base-layout.html.twig
@@ -41,7 +41,7 @@
     {% endblock %}
     <!-- END SIDEBAR -->
 
-    <div class="main">
+    <main class="main">
         <!-- BREADCRUMB -->
         {% block chamilo_breadcrumb %}
             {% include '@ChamiloTheme/Layout/breadcrumb.html.twig' %}
@@ -52,7 +52,7 @@
 
         {% endblock %}
         <!-- END CONTENT -->
-    </div>
+    </main>
 
 </div>
 {% endblock %}
diff --git a/src/ThemeBundle/Resources/views/Layout/header.html.twig b/src/ThemeBundle/Resources/views/Layout/header.html.twig
index 4c2423c664..4534fec85d 100644
--- a/src/ThemeBundle/Resources/views/Layout/header.html.twig
+++ b/src/ThemeBundle/Resources/views/Layout/header.html.twig
@@ -81,7 +81,7 @@
     <ul class="nav navbar-nav d-md-down-none">
         <li class="nav-item px-3 dropdown">
             <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Catálogo de cursos
+                {{ "Course catalog"|trans }}
             </a>
             <div class="dropdown-menu" aria-labelledby="navbarDropdown">
                 <a class="dropdown-item" href="#">Action</a>
diff --git a/src/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig b/src/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig
index c55bd15aa6..61d4ca32de 100644
--- a/src/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig
+++ b/src/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig
@@ -27,28 +27,26 @@
         </div>
     {% endif %}
 
-    <section id="content-section">
-        <div class="row">
-            <div class="col-xs-12 col-md-12">
-                {% autoescape false %}
+    <section class="section-content">
 
-                {% if actions != '' %}
-                    {{ actions }}
-                {% endif %}
+        {% autoescape false %}
 
-                {% block chamilo_messages %}
-                {% include '@ChamiloTheme/FlashMessage/render.html.twig' %}
-                {% endblock %}
+        {% if actions != '' %}
+            {{ actions }}
+        {% endif %}
+
+        {% block chamilo_messages %}
+        {% include '@ChamiloTheme/FlashMessage/render.html.twig' %}
+        {% endblock %}
+
+        {# Content #}
+        {% block content %}
+        <section class="container">
+            {{ content }}
+        </section>
+        {% endblock %}
+        {% endautoescape %}
 
-                {# Content #}
-                {% block content %}
-                <section id="main_content">
-                    {{ content }}
-                </section>
-                {% endblock %}
-                {% endautoescape %}
-            </div>
-        </div>
     </section>
 
      {% if plugin_content_bottom %}
diff --git a/src/ThemeBundle/Resources/views/News/slider.html.twig b/src/ThemeBundle/Resources/views/News/slider.html.twig
index 772bf41047..be5aacc66c 100644
--- a/src/ThemeBundle/Resources/views/News/slider.html.twig
+++ b/src/ThemeBundle/Resources/views/News/slider.html.twig
@@ -38,8 +38,16 @@
         </a>
     </div>
     {% else %}
+        {% if is_granted('ROLE_ADMIN') %}
+            <div class="d-block text-right">
+                <a  href="{{ url('legacy_index') }}main/admin/system_announcements.php" class="btn btn-primary btn-sm" >
+                    <i class="fas fa-pencil-alt"></i> {{ "Edit this section"|trans }}
+                </a>
+            </div>
+        {% endif %}
         <div class="row">
             <div class="col-md-6">
+
                 <div class="block-platform d-none d-block">
                     <h1>{{ "Accelerate your future. Learn where you want and when you want"|trans }}</h1>
                     <h5>{{ "Develop your skills with Chamilo 2.0"|trans }}</h5>