fix navigation bar lesson - refs BT#16237

app/Resources/public/css/scorm.css

@@ -515,15 +515,22 @@ See https://support.chamilo.org/issues/6976
 
 /** MENU FLOAT **/
 
-.circular-menu {
+.c-menu-left {
     height: auto;
     left: 0;
     top: 0;
     position: fixed;
     z-index: 5;
 }
-
+.c-menu-right {
-.circle {
+    display: inline-flex;
+    width: 100%;
+    position: relative;
+    top: 0;
+    left: 0;
+    z-index: 5;
+}
+.c-menu-left .circle {
     opacity: 0;
     margin-left: 50px;
     margin-top: 4px;
@@ -531,25 +538,34 @@ See https://support.chamilo.org/issues/6976
     border-radius: 20px;
     background-color: #ffffff;
     border: 1px solid #8dcbf3;
-
     -webkit-transform: translate(-100%);
     -moz-transform:  translate(-100%);
     -transform:  translate(-100%);
-
     -webkit-transition: all 0.4s ease-out;
     -moz-transition: all 0.4s ease-out;
     transition: all 0.4s ease-out;
 }
+.c-menu-right .circle {
+    opacity: 0;
+    margin-left: 50px;
+    margin-top: 4px;
+    padding: 2px;
+    border-radius: 20px;
+    background-color: #ffffff;
+    border: 1px solid #8dcbf3;
+}
 
-.open.circle {
+.c-menu-left .open.circle {
     opacity: 1;
-
     -webkit-transform:  translate(0%);
     -moz-transform: translate(0%);
     -transform: translate(0%);
 }
+.c-menu-right .open.circle {
+    opacity: 1;
+}
 
-.circle a {
+.c-menu-left .circle a, .c-menu-right .circle a {
     text-decoration: none;
     color: #fff;
     display: inline-block;
@@ -560,7 +576,7 @@ See https://support.chamilo.org/issues/6976
     border-radius: 100%;
 }
 
-.circle a:hover {
+.c-menu-left .circle a:hover {
     color: #eef;
 }
 

main/gradebook/lib/GradebookUtils.php

@@ -1473,6 +1473,7 @@ class GradebookUtils
                 'score' => $certificateInfo['score_certificate'],
                 'date' => api_format_date($certificateInfo['created_at'], DATE_FORMAT_SHORT),
                 'link' => api_get_path(WEB_PATH)."certificates/index.php?id={$certificateInfo['id']}",
+                'pdf' => api_get_path(WEB_PATH)."certificates/index.php?id={$certificateInfo['id']}&user_id={$userId}&action=export"
             ];
         }
 

main/template/default/gradebook/my_certificates.tpl

@@ -7,7 +7,8 @@
                     <th>{{ "Course"|get_lang }}</th>
                     <th class="text-right">{{ "Score"|get_lang }}</th>
                     <th class="text-center">{{ "Date"|get_lang }}</th>
-                    <th class="text-right">&nbsp;</th>
+                    <th width="10%" class="text-right">&nbsp;</th>
+                    <th width="10%" class="text-right">&nbsp;</th>
                 </tr>
             </thead>
             <tbody>
@@ -17,7 +18,13 @@
                         <td class="text-right">{{ row.score }}</td>
                         <td class="text-center">{{ row.date }}</td>
                         <td class="text-right">
-                            <a href="{{ row.link }}" target="_blank" class="btn btn-default">
+                            <a href="{{ row.pdf }}" target="_blank" class="btn btn-primary btn-block">
+                                <i class="fa fa-file-pdf-o" aria-hidden="true"></i>
+                                {{ 'DownloadCertificatePdf'|get_lang }}
+                            </a>
+                        </td>
+                        <td class="text-right">
+                            <a href="{{ row.link }}" target="_blank" class="btn btn-default btn-block">
                                 <em class="fa fa-external-link"></em> {{ 'Certificate'|get_lang }}
                             </a>
                         </td>
@@ -38,7 +45,8 @@
                     <th>{{ "Course"|get_lang }}</th>
                     <th class="text-right">{{ "Score"|get_lang }}</th>
                     <th class="text-center">{{ "Date"|get_lang }}</th>
-                    <th class="text-right">&nbsp;</th>
+                    <th width="10%" class="text-right">&nbsp;</th>
+                    <th width="10%" class="text-right">&nbsp;</th>
                 </tr>
             </thead>
             <tbody>
@@ -49,7 +57,13 @@
                         <td class="text-right">{{ row.score }}</td>
                         <td class="text-center">{{ row.date }}</td>
                         <td class="text-right">
-                            <a href="{{ row.link }}" target="_blank" class="btn btn-default">
+                            <a href="{{ row.pdf }}" target="_blank" class="btn btn-primary btn-block">
+                                <i class="fa fa-file-pdf-o" aria-hidden="true"></i>
+                                 {{ 'DownloadCertificatePdf'|get_lang }}
+                            </a>
+                        </td>
+                        <td class="text-right">
+                            <a href="{{ row.link }}" target="_blank" class="btn btn-default btn-block">
                                 <em class="fa fa-external-link"></em> {{ 'Certificate'|get_lang }}
                             </a>
                         </td>

main/template/default/learnpath/menubar.tpl

@@ -0,0 +1,32 @@
+{% set ubication = false %}
+
+{% if ubication %}
+    <nav id="btn-menu-float" class="c-menu-left">
+{% else %}
+    <nav id="btn-menu-float" class="c-menu-right">
+{% endif %}
+
+    <div class="circle {{ show_toolbar_by_default == 1 ? 'open' : '' }}">
+        {% if show_left_column == 1 %}
+            <a href="#" title = "{{ 'Expand'|get_lang }}" id="lp-view-expand-toggle"
+               class="icon-toolbar expand" role="button">
+                {% if lp_mode == 'embedframe' %}
+                    <span class="fa fa-compress" aria-hidden="true"></span>
+                    <span class="sr-only">{{ 'Expand'|get_lang }}</span>
+                {% else %}
+                    <span class="fa fa-expand" aria-hidden="true"></span>
+                    <span class="sr-only">{{ 'Expand'|get_lang }}</span>
+                {% endif %}
+            </a>
+        {% endif %}
+        <a id="home-course"
+           title = "{{ 'Home'|get_lang }}"
+           href="{{ button_home_url }}"
+           class="icon-toolbar" target="_self"
+           onclick="javascript: window.parent.API.save_asset();">
+            <em class="fa fa-home"></em> <span class="hidden-xs hidden-sm"></span>
+        </a>
+        {{ navigation_bar }}
+    </div>
+    <a class="menu-button fa fa-bars icons" href="#"></a>
+</nav>

main/template/default/learnpath/view.tpl

@@ -169,33 +169,11 @@
                         </li>
                     </ul>
                 </div>
-                <nav id="btn-menu-float" class="circular-menu">
+
-                    <div class="circle {{ show_toolbar_by_default == 1 ? 'open' : '' }}">
+                {% include 'learnpath/menubar.tpl'|get_template %}
-                        {% if show_left_column == 1 %}
-                            <a href="#" title = "{{ 'Expand'|get_lang }}" id="lp-view-expand-toggle"
-                               class="icon-toolbar expand" role="button">
-                                {% if lp_mode == 'embedframe' %}
-                                    <span class="fa fa-compress" aria-hidden="true"></span>
-                                    <span class="sr-only">{{ 'Expand'|get_lang }}</span>
-                                {% else %}
-                                    <span class="fa fa-expand" aria-hidden="true"></span>
-                                    <span class="sr-only">{{ 'Expand'|get_lang }}</span>
-                                {% endif %}
-                            </a>
-                        {% endif %}
-                        <a id="home-course"
-                           title = "{{ 'Home'|get_lang }}"
-                           href="{{ button_home_url }}"
-                           class="icon-toolbar" target="_self"
-                           onclick="javascript: window.parent.API.save_asset();">
-                            <em class="fa fa-home"></em> <span class="hidden-xs hidden-sm"></span>
-                        </a>
-                        {{ navigation_bar }}
-                    </div>
-                    <a class="menu-button fa fa-bars icons" href="#"></a>
-                </nav>
 
                 <div id="tab-iframe" class="tab-content">
+
                     <div role="tabpanel" class="tab-pane active" id="lp-view-content">
                         <div id="wrapper-iframe">
                         {% if lp_mode == 'fullscreen' %}