Merge pull request #1833 from aragonc/1.11.x

forum toolbar view in mobile
remotes/angel/1.11.x
Alex Aragon Calixto 8 years ago committed by GitHub
commit ae1aa92bca
  1. 43
      app/Resources/public/css/scorm.css
  2. 87
      main/template/default/learnpath/view.tpl

@ -343,7 +343,7 @@ See https://support.chamilo.org/issues/6976
left: 5px; left: 5px;
position: absolute; position: absolute;
right: 5px; right: 5px;
top: 120px; top: 60px;
} }
#learning_path_right_zone .tab-pane{ #learning_path_right_zone .tab-pane{
height: 100%; height: 100%;
@ -373,23 +373,6 @@ See https://support.chamilo.org/issues/6976
padding: 0; padding: 0;
margin: 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{ .icon-toolbar .fa{
width: 35px; width: 35px;
height: 35px; height: 35px;
@ -430,10 +413,13 @@ See https://support.chamilo.org/issues/6976
width: 100%; width: 100%;
text-align: center; text-align: center;
} }
.navegation-bar{ .navegation-bar {
display: inline-block; display: block;
width: 100%;
padding: 10px; padding: 10px;
right: 0;
top: 0;
position: absolute;
z-index: 9999;
} }
/* Small devices (tablets, 768px and up) */ /* Small devices (tablets, 768px and up) */
@media (min-width: 768px) { @media (min-width: 768px) {
@ -466,7 +452,7 @@ See https://support.chamilo.org/issues/6976
#learning_path_right_zone .lp-view-tabs .tab-content { #learning_path_right_zone .lp-view-tabs .tab-content {
bottom: 10px; bottom: 10px;
right: 10px; right: 10px;
top: 120px; top: 60px;
} }
#learning_path_right_zone .tab-pane{ #learning_path_right_zone .tab-pane{
} }
@ -527,6 +513,7 @@ See https://support.chamilo.org/issues/6976
height: 45px; height: 45px;
line-height: 45px; line-height: 45px;
font-size: 25px; font-size: 25px;
margin-bottom: 3px;
} }
.btn-movil { .btn-movil {
width: 130px; width: 130px;
@ -548,4 +535,16 @@ See https://support.chamilo.org/issues/6976
#panel-scorm .image-avatar{ #panel-scorm .image-avatar{
display: none; display: none;
} }
.navegation-bar {
display: block;
padding: 10px;
position: fixed;
top: 0;
right: 0;
width: 60px;
z-index: 999;
}
.nav-tabs-bar{
display: none;
}
} }

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

Loading…
Cancel
Save