From 215c02be2135739f691a6dc8bf05d5c7437941f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Arag=C3=B3n?= <aragcar@gmail.com>
Date: Mon, 24 Sep 2018 15:10:54 -0500
Subject: [PATCH] platform announcements new structure - refs #2681

---
 assets/css/base.css                           | 59 ---------------
 assets/css/scss/_sidebar.scss                 |  2 +-
 .../Resources/views/News/slider.html.twig     | 72 +++++++++----------
 .../default/layout/hot_course_item.html.twig  |  1 +
 .../views/Layout/base-layout.html.twig        | 10 +--
 5 files changed, 37 insertions(+), 107 deletions(-)

diff --git a/assets/css/base.css b/assets/css/base.css
index 872115b4fc..6b9eb4c835 100644
--- a/assets/css/base.css
+++ b/assets/css/base.css
@@ -149,65 +149,6 @@
     margin-top: 5px;
 }
 
-#carousel-announcement {
-    min-height: 300px;
-}
-
-#carousel-announcement .carousel-caption {
-    left: 0;
-    right: 0;
-    bottom: auto;
-    padding: 5px;
-    background-color: #fff;
-    position: relative;
-    text-align: left;
-    text-shadow: none;
-    color: #666;
-}
-
-#carousel-announcement img {
-    max-width: 100%;
-    height: auto;
-}
-
-#carousel-announcement .carousel-control.right, #carousel-announcement .carousel-control.left {
-    background-image: none;
-}
-
-#carousel-announcement .left {
-    left: 0;
-}
-
-#carousel-announcement .right {
-    right: 0;
-}
-
-#carousel-announcement .carousel-indicators li {
-    width: 20px;
-    height: 20px;
-    background-color: #ddd;
-    margin-right: 15px;
-    position: relative;
-}
-
-#carousel-announcement .carousel-indicators .active {
-    background: #2C5B8E;
-}
-
-.carousel-control {
-    width: 5%;
-}
-
-.carousel-content .block-text {
-    padding-left: 7%;
-    padding-right: 7%;
-    min-height: 300px;
-}
-
-.carousel-indicators {
-    bottom: 0;
-}
-
 .form-group .freeze {
     display: inline-block;
     padding-top: 8px;
diff --git a/assets/css/scss/_sidebar.scss b/assets/css/scss/_sidebar.scss
index 706b90d09d..b198786bcd 100644
--- a/assets/css/scss/_sidebar.scss
+++ b/assets/css/scss/_sidebar.scss
@@ -274,7 +274,7 @@
         position: relative;
         text-align: center;
         transition: all 0.3s ease;
-        width: 35px;
+        width: 40px;
       }
 
       &.active {
diff --git a/src/CoreBundle/Resources/views/News/slider.html.twig b/src/CoreBundle/Resources/views/News/slider.html.twig
index 5a441a2dde..5a4d9a30f2 100644
--- a/src/CoreBundle/Resources/views/News/slider.html.twig
+++ b/src/CoreBundle/Resources/views/News/slider.html.twig
@@ -1,46 +1,38 @@
 {% autoescape false %}
-<div class="page-header">
-    <h4>{{ "SystemAnnouncements" | get_lang }}</h4>
-</div>
-<div id="carousel-announcement" class="carousel slide" data-ride="carousel">
-    <!-- Indicators -->
-    <ol class="carousel-indicators">
-      {% for announcement in announcements %}
-        <li data-target="#carousel-announcement" data-slide-to="{{ loop.index0 }}" {% if loop.index0 == 0 %} class="active" {% endif %}></li>
-      {% endfor %}
-    </ol>
-
-    <!-- Wrapper for slides -->
-    <div class="carousel-inner" role="listbox">
-    {% for announcement in announcements %}
-        <div class="item {% if loop.index0 == 0 %} active {% endif %}">
-            <div class="carousel-caption">
-                {{ announcement.title }}
-            </div>
-            <div class="carousel-content">
-                {% if announcement.readMore %}
-                <div class="block-text">
-                    {{ announcement.content }}
-                    <a href="{{ _p.web }}news_list.php?id={{ announcement.id }}">{{ "More" | get_lang }}</a>
-                </div>
-                {% else %}
-                    <div class="block-image">
+    <div class="page-header">
+        <h4>{{ "SystemAnnouncements" | get_lang }}</h4>
+    </div>
+    <div id="carousel-announcement" class="carousel slide" data-ride="carousel">
+        <ol class="carousel-indicators">
+            {% for announcement in announcements %}
+                <li data-target="#carousel-announcement"
+                    data-slide-to="{{ loop.index0 }}" {% if loop.index0 == 0 %} class="active" {% endif %}></li>
+            {% endfor %}
+        </ol>
+        <div class="carousel-inner">
+            {% for announcement in announcements %}
+                <div class="carousel-item {% if loop.index0 == 0 %} active {% endif %}">
+                    {% if announcement.readMore %}
+                        <div class="block-text">
+                            {{ announcement.content }}
+                            <a href="{{ _p.web }}news_list.php?id={{ announcement.id }}">{{ "More" | get_lang }}</a>
+                        </div>
+                    {% else %}
                         {{ announcement.content }}
+                    {% endif %}
+                    <div class="carousel-caption d-none d-md-block">
+                        <h5>{{ announcement.title }}</h5>
                     </div>
-              {% endif %}
-            </div>
+                </div>
+            {% endfor %}
         </div>
-    {% endfor %}
+        <a class="carousel-control-prev" href="#carousel-announcement" role="button" data-slide="prev">
+            <span class="carousel-control-prev-icon" aria-hidden="true"></span>
+            <span class="sr-only">Previous</span>
+        </a>
+        <a class="carousel-control-next" href="#carousel-announcement" role="button" data-slide="next">
+            <span class="carousel-control-next-icon" aria-hidden="true"></span>
+            <span class="sr-only">Next</span>
+        </a>
     </div>
-
-    <!-- Controls -->
-    <a class="left carousel-control" href="#carousel-announcement" role="button" data-slide="prev">
-        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
-        <span class="sr-only">Previous</span>
-    </a>
-    <a class="right carousel-control" href="#carousel-announcement" role="button" data-slide="next">
-        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
-        <span class="sr-only">Next</span>
-    </a>
-</div>
 {% endautoescape %}
\ No newline at end of file
diff --git a/src/CoreBundle/Resources/views/default/layout/hot_course_item.html.twig b/src/CoreBundle/Resources/views/default/layout/hot_course_item.html.twig
index 2e252148f3..ddc6b99750 100644
--- a/src/CoreBundle/Resources/views/default/layout/hot_course_item.html.twig
+++ b/src/CoreBundle/Resources/views/default/layout/hot_course_item.html.twig
@@ -1,6 +1,7 @@
 {% import "ChamiloThemeBundle:Macros:box.html.twig" as macro %}
 
 {% autoescape false %}
+
 {% for item in hot_courses %}
     {% if item.title %}
         <div class="col-xs-12 col-sm-6 col-md-4">
diff --git a/src/ThemeBundle/Resources/views/Layout/base-layout.html.twig b/src/ThemeBundle/Resources/views/Layout/base-layout.html.twig
index e151cac9ab..f29206a8f5 100644
--- a/src/ThemeBundle/Resources/views/Layout/base-layout.html.twig
+++ b/src/ThemeBundle/Resources/views/Layout/base-layout.html.twig
@@ -95,14 +95,10 @@
         <!-- MAIN CONTENT -->
         {% autoescape false %}
         <main class='main-content bg-content'>
-            <div id='mainContent'>
-                <div class="gap-20 masonry pos-r">
-                    <div class="container">
-                        {% block page_content %}
+            <div class="container">
+                {% block page_content %}
 
-                        {% endblock %}
-                    </div>
-                </div>
+                {% endblock %}
             </div>
         </main>
         {% endautoescape %}