add macro box-hader - refs #2681

assets/css/scss/_base.scss

@@ -251,8 +251,15 @@ footer {
 .box-header{
   color: $grey-900;
   display: block;
-  padding: 10px;
+  padding: 0;
   position: relative;
+  .box-title{
+    font-weight: 500;
+    color: #404852;
+    margin-bottom: 22px;
+    font-size: 14px;
+    text-transform: capitalize;
+  }
 }
 .carousel-item img{
   max-width: 100%;

src/ThemeBundle/Resources/views/Index/page.html.twig

@@ -1,18 +1,18 @@
 {% import '@ChamiloTheme/Macros/box.html.twig' as macro %}
 
+{% 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>
+        </a>
+    {% endif %}
+{% endset %}
+
 {% set content %}
-{% if is_granted('ROLE_ADMIN') and show_edit_page_link %}
-    <div class="box-header">
-        <div class="float-right">
-            <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>
-            </a>
-        </div>
-        <h5>{{ "IntroductionOfPlatform"|trans }}</h5>
-    </div>
-{% endif %}
 
-{{ sonata_page_render_container('content', page) }}
+    {{ macro.box_header("IntroductionOfPlatform" | get_lang, buttons) }}
+    {{ sonata_page_render_container('content', page) }}
 
 {% endset %}
+
 {{ macro.panel('', '', content, '', '', '', '') }}

src/ThemeBundle/Resources/views/Macros/box.html.twig

@@ -18,10 +18,14 @@
     {% endif %}
 {% endblock %}
 
-{% macro box_header(title, collapse, remove, type) %}
+{% macro box_header(title, buttons) %}
     <div class="box-header">
-        <h3 class="box-title">{{ title }}</h3>
-        {{ block('box_header_buttons') }}
+        {% if buttons %}
+        <div class="float-right">
+            {{ buttons }}
+        </div>
+        {% endif %}
+        <h5 class="box-title">{{ title }}</h5>
     </div>
 {% endmacro %}
 

src/ThemeBundle/Resources/views/News/slider.html.twig

@@ -1,17 +1,15 @@
 {% import '@ChamiloTheme/Macros/box.html.twig' as macro %}
 
 {% autoescape false %}
-    {% set content %}
-    <div class="box-header">
+    {% set buttons %}
         {% if is_granted('ROLE_ADMIN') %}
-            <div class="float-right">
-                <a  href="{{ url('legacy_index') }}main/admin/system_announcements.php" class="btn btn-light btn-sm" >
-                    <i class="fas fa-pencil-alt"></i>
-                </a>
-            </div>
+            <a  href="{{ url('legacy_index') }}main/admin/system_announcements.php" class="btn btn-light btn-sm" >
+                <i class="fas fa-pencil-alt"></i>
+            </a>
         {% endif %}
-        <h5>{{ "SystemAnnouncements" | get_lang }}</h5>
-    </div>
+    {% endset %}
+    {% set content %}
+   {{ macro.box_header("SystemAnnouncements" | get_lang, buttons) }}
     <div id="carousel-announcement" class="carousel slide" data-ride="carousel">
         <ol class="carousel-indicators">
             {% for announcement in announcements %}

src/ThemeBundle/Resources/views/default/layout/hot_courses.html.twig

@@ -22,24 +22,23 @@
                 });
             });
         </script>
+
+        {% set buttons %}
+            {% if is_granted('ROLE_ADMIN') %}
+                <a title="{{ "Hide"|get_lang }}"
+                   class="btn btn-light btn-sm"
+                   href="{{ url('admin_settings') }}/search_settings?keyword=show_hot_courses&submit_button=&_qf__search_settings=&category=search_setting"
+                >
+                    <i class="fas fa-pencil-alt"></i>
+                </a>
+            {% endif %}
+        {% endset %}
+
         {% set content %}
-        <div class="box-header">
-            <h5>
-                {% if is_granted('ROLE_ADMIN') %}
-                    <div class="float-right">
-                        <a title="{{ "Hide"|get_lang }}" class="btn btn-light btn-sm"
-                           href="{{ url('admin_settings') }}/search_settings?keyword=show_hot_courses&submit_button=&_qf__search_settings=&category=search_setting"
-                        >
-                            <i class="fas fa-pencil-alt"></i>
-                        </a>
-                    </div>
-                {% endif %}
-                {{ "HottestCourses"|get_lang }}
-            </h5>
-        </div>
-        <div class="row">
-            {% include '@ChamiloTheme/default/layout/hot_course_item.html.twig' %}
-        </div>
+            {{ macro.box_header("HottestCourses" | get_lang, buttons) }}
+            <div class="row">
+                {% include '@ChamiloTheme/default/layout/hot_course_item.html.twig' %}
+            </div>
         {% endset %}
         {{ macro.panel('', '', content, '', '', '', '') }}
     {% endif %}