فهرست منبع

Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

Angel Fernando Quiroz Campos 8 سال پیش
والد
کامیت
3033f59862
2فایلهای تغییر یافته به همراه85 افزوده شده و 75 حذف شده
  1. 43 30
      app/Resources/public/css/scorm.css
  2. 42 45
      main/template/default/learnpath/view.tpl

+ 43 - 30
app/Resources/public/css/scorm.css

@@ -343,7 +343,7 @@ See https://support.chamilo.org/issues/6976
     left: 5px;
     position: absolute;
     right: 5px;
-    top: 120px;
+    top: 60px;
 }
 #learning_path_right_zone .tab-pane{
     height: 100%;
@@ -373,23 +373,6 @@ See https://support.chamilo.org/issues/6976
     padding: 0;
     margin: 0;
 }
-.movil-toolbar{
-    width: 100%;
-    height: 40px;
-    padding-top: 5px;
-}
-.btn-movil{
-    list-style: none;
-    margin: 0;
-    padding: 0;
-    width: 100%;
-}
-.btn-movil li{
-    display: block;
-    float: left;
-    margin-left: 5px;
-    margin-right: 5px;
-}
 .icon-toolbar .fa{
     width: 35px;
     height: 35px;
@@ -430,10 +413,13 @@ See https://support.chamilo.org/issues/6976
     width: 100%;
     text-align: center;
 }
-.navegation-bar{
-    display: inline-block;
-    width: 100%;
-    padding: 10px;
+.navegation-bar {
+    display: block;
+    padding: 5px 10px 5px 5px;
+    right: 0;
+    top: 0;
+    position: absolute;
+    z-index: 9999;
 }
 /* Small devices (tablets, 768px and up) */
 @media (min-width: 768px) {
@@ -466,7 +452,7 @@ See https://support.chamilo.org/issues/6976
     #learning_path_right_zone .lp-view-tabs .tab-content {
         bottom: 10px;
         right: 10px;
-        top: 120px;
+        top: 60px;
     }
     #learning_path_right_zone .tab-pane{
     }
@@ -505,6 +491,17 @@ See https://support.chamilo.org/issues/6976
 	padding: 0;
 	margin: 0;
     }
+    #learning_path_left_zone .lp-view-zone-container,
+    #learning_path_right_zone .lp-view-zone-container{
+        padding: 0;
+    }
+    #scorm-info {
+	padding: 30px 0 0 0;
+	margin: 0;
+    }
+    .nav-tabs-bar{
+        display: none;
+    }
 }
 /* Landscape phones and down */
 @media (max-width: 480px) {
@@ -523,22 +520,23 @@ See https://support.chamilo.org/issues/6976
         padding: 10px;
     }
     .icon-toolbar .fa {
-	width: 45px;
-	height: 45px;
-	line-height: 45px;
-	font-size: 25px;
+	width: 35px;
+	height: 35px;
+	line-height: 35px;
+	font-size: 22px;
     }
     .btn-movil {
 	width: 130px;
 	margin: auto;
     }
     #scorm-info {
-	padding: 0;
+	padding: 30px 0 0 0;
 	margin: 0;
     }
     #learning_path_toc {
-        left: 5px;
-	padding: 0px;
+        left: 0;
+        right: 0;
+	padding: 0;
 	border-radius: 5px;
     }
     #learning_path_right_zone {
@@ -548,4 +546,19 @@ See https://support.chamilo.org/issues/6976
     #panel-scorm .image-avatar{
         display: none;
     }
+    .navegation-bar {
+	display: block;
+	padding: 2px;
+	position: fixed;
+	top: 0;
+	right: 15px;
+	z-index: 999;
+    }
+    .nav-tabs-bar{
+        display: none;
+    }
+    #learning_path_left_zone .lp-view-zone-container,
+    #learning_path_right_zone .lp-view-zone-container{
+        padding: 0;
+    }
 }

+ 42 - 45
main/template/default/learnpath/view.tpl

@@ -60,20 +60,6 @@
                                 {{ progress_bar }}
                             </div>
                         {% endif %}
-                        <div class="visible-xs-block movil-toolbar">
-                            <ul class="btn-movil">
-                                <li>
-                                    <a 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>
-                                </li>
-                                <li>
-                                    <button type="button" id="lp-view-expand-button" class="icon-toolbar expand visible-xs-block">
-                                        <span class="fa fa-expand" aria-hidden="true"></span>
-                                    </button>
-                                </li>
-                            </ul>
-                        </div>
                         {{ teacher_toc_buttons }}
                     </div>
                 </div>
@@ -88,41 +74,40 @@
             </div>
         </div>
         {# end left zone #}
-
+        <div id="lp_navigation_elem" class="navegation-bar">
+            <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>
+            <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>
         {# <div id="hide_bar" class="scorm-toggle" style="display:inline-block; width: 25px; height: 1000px;"></div> #}
         {# right zone #}
         <div id="learning_path_right_zone" class="content-scorm">
             <div class="lp-view-zone-container">
-                <div id="lp_navigation_elem" class="navegation-bar">
-                    <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>
-                    <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>
-
                 <div class="lp-view-tabs">
-                    <ul id="navTabs" class="nav nav-tabs" role="tablist">
-                        <li role="presentation" class="active">
-                            <a href="#lp-view-content" title="{{ 'Lesson'|get_lang }}" aria-controls="lp-view-content" role="tab" data-toggle="tab">
-                                <span class="fa fa-book fa-2x fa-fw" aria-hidden="true"></span><span class="sr-only">{{ 'Lesson'|get_lang }}</span>
-                            </a>
-                        </li>
-                        <li role="presentation">
-                            <a href="#lp-view-forum" title="{{ 'Forum'|get_lang }}" aria-controls="lp-view-forum" role="tab" data-toggle="tab">
-                                <span class="fa fa-commenting-o fa-2x fa-fw" aria-hidden="true"></span><span class="sr-only">{{ 'Forum'|get_lang }}</span>
-                            </a>
-                        </li>
-                    </ul>
-
+                    <div id="navTabsbar" class="nav-tabs-bar">
+                        <ul id="navTabs" class="nav nav-tabs" role="tablist">
+                            <li role="presentation" class="active">
+                                <a href="#lp-view-content" title="{{ 'Lesson'|get_lang }}" aria-controls="lp-view-content" role="tab" data-toggle="tab">
+                                    <span class="fa fa-book fa-2x fa-fw" aria-hidden="true"></span><span class="sr-only">{{ 'Lesson'|get_lang }}</span>
+                                </a>
+                            </li>
+                            <li role="presentation">
+                                <a href="#lp-view-forum" title="{{ 'Forum'|get_lang }}" aria-controls="lp-view-forum" role="tab" data-toggle="tab">
+                                    <span class="fa fa-commenting-o fa-2x fa-fw" aria-hidden="true"></span><span class="sr-only">{{ 'Forum'|get_lang }}</span>
+                                </a>
+                            </li>
+                        </ul>
+                    </div>
                     <div class="tab-content">
                         <div role="tabpanel" class="tab-pane active" id="lp-view-content">
                             <div id="wrapper-iframe" style="width:100%; height:100%">
@@ -178,6 +163,13 @@
             } else {
                 $(this).attr('title', '{{ "Collapse" | get_lang }}');
             }
+            
+            if($('#navTabsbar').is(':hidden')){
+                $('#navTabsbar').show();
+            } else {
+                $('#navTabsbar').hide();
+            }
+            
         });
         {% else %}
         $('#lp-view-expand-button, #lp-view-expand-toggle').on('click', function (e) {
@@ -194,7 +186,12 @@
             } else {
                 $(this).attr('title', '{{ "Collapse" | get_lang }}');
             }
-
+            
+            if($('#navTabsbar').is(':hidden')){
+                $('#navTabsbar').show();
+            } else {
+                $('#navTabsbar').hide();
+            }
 
         });