chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

update bootstrap js and jquery

Browse Source
1.10.x
Alex Aragon 11 years ago
parent 661c8ff235
commit f00337dac1
6 changed files with 1865 additions and 1423 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 23
      main/inc/lib/banner.lib.php
  2. 3053
      main/inc/lib/javascript/bootstrap/bootstrap.js
  3. 8
      main/inc/lib/javascript/jquery.min.js
  4. 6
      main/inc/lib/template.lib.php
  5. 102
      main/template/default/layout/main_header.tpl
  6. 96
      main/template/default/layout/menu.tpl

23
main/inc/lib/banner.lib.php
Unescape View File

@ -166,11 +166,11 @@ function return_logo($theme) {
$site_name = api_get_setting('siteName');
if (file_exists($logo)) {
$site_name = api_get_setting('Institution').' - '.$site_name;
$html .= '<div id="logo">';
$image_url = api_get_path(WEB_CSS_PATH).$theme.'/images/header-logo.png';
$logo = Display::img($image_url, $site_name, array('title'=>$site_name));
$logo = Display::img($image_url, $site_name, array('title'=>$site_name,'class'=>'img-responsive'));
$html .= Display::url($logo, api_get_path(WEB_PATH).'index.php');
$html .= '</div>';
} else {
$html .= '<a href="'.api_get_path(WEB_PATH).'index.php" target="_top">'.$site_name.'</a>';
$iurl = api_get_setting('InstitutionUrl');
@ -519,21 +519,22 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools)
$_course['name'] = api_htmlentities($_course['name']);
$course_title = cut($_course['name'], MAX_LENGTH_BREADCRUMB);
switch (api_get_setting('breadcrumbs_course_homepage')) {
case 'get_lang':
$navigation_item['title'] = Display::img(api_get_path(WEB_CSS_PATH).'home.png', get_lang('CourseHomepageLink')).' '.get_lang('CourseHomepageLink');
$navigation_item['title'] = Display::img(api_get_path(WEB_IMG_PATH).'home.png', get_lang('CourseHomepageLink')).' '.get_lang('CourseHomepageLink');
break;
case 'course_code':
$navigation_item['title'] = Display::img(api_get_path(WEB_CSS_PATH).'home.png', $_course['official_code']).' '.$_course['official_code'];
$navigation_item['title'] = Display::img(api_get_path(WEB_IMG_PATH).'home.png', $_course['official_code']).' '.$_course['official_code'];
break;
case 'session_name_and_course_title':
$navigation_item['title'] = Display::img(api_get_path(WEB_CSS_PATH).'home.png', $_course['name'].$my_session_name).' '.$course_title.$my_session_name;
$navigation_item['title'] = Display::img(api_get_path(WEB_IMG_PATH).'home.png', $_course['name'].$my_session_name).' '.$course_title.$my_session_name;
break;
default:
if (api_get_session_id() != -1 ) {
$navigation_item['title'] = Display::img(api_get_path(WEB_CSS_PATH).'home.png', $_course['name'].$my_session_name).' '.$course_title.$my_session_name;
$navigation_item['title'] = Display::img(api_get_path(WEB_IMG_PATH).'home.png', $_course['name'].$my_session_name).' '.$course_title.$my_session_name;
} else {
$navigation_item['title'] = Display::img(api_get_path(WEB_CSS_PATH).'home.png', $_course['name']).' '.$course_title;
$navigation_item['title'] = Display::img(api_get_path(WEB_IMG_PATH).'home.png', $_course['name']).' '.$course_title;
}
break;
}
@ -652,7 +653,7 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools)
$bread_check = trim(strip_tags($bread));
if (!empty($bread_check)) {
if ($final_navigation_count-1 > $i) {
$bread .= '<span class="divider">/</span>';
$bread .= '';
}
$lis.= Display::tag('li', $bread);
$i++;
@ -666,7 +667,7 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools)
// View as student/teacher link
if (!empty($view_as_student_link)) {
$lis.= Display::tag('li', $view_as_student_link, array('id' => 'view_as_link','class' => 'pull-right'));
$lis.= Display::tag('span', $view_as_student_link, array('id' => 'view_as_link','class' => 'pull-right'));
}
if (!empty($navigation_right)) {
@ -677,7 +678,7 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools)
}
if (!empty($lis)) {
$html .= Display::tag('ul', $lis, array('class'=>'breadcrumb','style'=>'margin-top: 0'));
$html .= Display::tag('ul', $lis, array('class'=>'breadcrumb'));
}
}
return $html ;

3053
main/inc/lib/javascript/bootstrap/bootstrap.js vendored
View File

File diff suppressed because it is too large Load Diff

8
main/inc/lib/javascript/jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
main/inc/lib/template.lib.php
Unescape View File

@ -474,8 +474,8 @@ class Template
// Base CSS
$css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'base.css');
// Default CSS responsive design
//$css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'bootstrap-responsive.css');
// Default CSS Bootstrap
$css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'bootstrap.css');
//Extra CSS files
$css[] = api_get_path(WEB_LIBRARY_PATH).'javascript/thickbox.css';
@ -816,7 +816,7 @@ class Template
$this->assign('user_notifications', $total_invitations);
//Breadcrumb
//Block Breadcrumb
$breadcrumb = return_breadcrumb($interbreadcrumb, $language_file, $nameTools);
$this->assign('breadcrumb', $breadcrumb);

102
main/template/default/layout/main_header.tpl
Unescape View File

@ -41,8 +41,8 @@
<li><a href="#content" accesskey="2">{{ "WCAGGoContent"|get_lang }}</a></li>
</ul>
</div>
<div id="wrapper">
<div id="page" class="page-section"> <!-- page section -->
{% endif %}
<div id="page" class="container"> <!-- page section -->
{# Bug and help notifications #}
{% block help_notifications %}
<ul id="navigation" class="notification-panel">
@ -55,58 +55,50 @@
{% block topbar %}
{% include template ~ "/layout/topbar.tpl" %}
{% endblock %}
<header>
<div class="container">
{% if plugin_header_main %}
<div class="row">
<div id="header_left" class="span4">
{# logo #}
{% block logo %}
<div class="col-lg-12">
{{ plugin_header_main }}
</div>
</div>
{% endif %}
<div class="row">
<div class="col-lg-3">
{{ logo }}
{% endblock %}
{# plugin_header left #}
{% if plugin_header_left is not null %}
<div id="plugin_header_left">
{{ plugin_header_left }}
</div>
{% endif %}
</div>
<div id="header_center" class="span3">
{# plugin_header center #}
{% if plugin_header_center is not null %}
<div id="plugin_header_center">
{{ plugin_header_center }}
<div class="col-lg-9">
<div class="col-4">
{% if plugin_header_left is not null %}
<div id="plugin_header_left">
{{ plugin_header_left }}
</div>
{% endif %}
</div>
{% endif %}
&nbsp;
</div>
<div id="header_right" class="span5">
{# plugin_header right #}
{% if plugin_header_right is not null %}
<div id="plugin_header_right">
{{ plugin_header_right }}
<div class="col-4">
{% if plugin_header_center is not null %}
<div id="plugin_header_center">
{{ plugin_header_center }}
</div>
{% endif %}
</div>
{% endif %}
<div class="section-notifications">
<ul id="notifications" class="nav nav-pills pull-right">
{{ notification_menu }}
</ul>
<div class="col-4">
{% if plugin_header_right is not null %}
<div id="plugin_header_right">
{{ plugin_header_right }}
</div>
{% endif %}
<div class="section-notifications">
<ul id="notifications" class="nav nav-pills pull-right">
{{ notification_menu }}
</ul>
</div>
</div>
</div>
</div>
{% if plugin_header_main %}
<div class="row">
<div class="span12">
<div id="plugin_header_main">
{{ plugin_header_main }}
</div>
</div>
</div>
{% endif %}
</div>
<<<<<<< HEAD
=======
</header>
{% endif %}
{# menu #}
@ -118,25 +110,9 @@
{% block breadcrumb %}
{{ breadcrumb }}
{% endblock %}
>>>>>>> 060fb00f2f3adb9b96b86304fbd9a7a20bac8401
</header>
<div class="menu-bar">
<div class="container">
{# menu #}
{% block menu %}
{% include "default/layout/menu.tpl" %}
{% endblock %}
</div>
</div>
<div id="main" class="container">
<div class="bar-bread">
{# breadcrumb #}
{% block breadcrumb %}
{{ breadcrumb }}
{% endblock %}
</div>
<div id="top_main_content" class="row">
<div id="top_main_content">
{# course navigation links/shortcuts need to be activated by the admin #}
{% include template ~ "/layout/course_navigation.tpl" %}
{% endif %}
{% include template ~ "/layout/course_navigation.tpl" %}

96
main/template/default/layout/menu.tpl
Unescape View File

@ -1,60 +1,44 @@
<div class="navbar subnav">
<div class="navbar-inner">
<div class="container">
<a data-toggle="collapse" data-target=".nav-collapse" class="btn btn-navbar">
<nav class="navbar navbar-default">
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="{{ _p.web }}">{{ portal_name }}</a>
<div class="nav-collapse">
<ul class="nav">
{{ menu }}
</ul>
{% if _u.logged == 1 %}
<ul class="nav pull-right">
{% if user_notifications is not null %}
<li class="notification-marker">
<a href="{{ message_url }}">{{ user_notifications }}</a>
</li>
{% endif %}
<li class="dropdown">
{% if _u.status != 6 %}
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
<img src="{{ _u.avatar_small }}"/>
{{ _u.complete_name }}
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li>
{{ profile_link }}
{{ message_link }}
</li>
</ul>
{% endif %}
{% if logout_link is not null %}
<li>
<a id="logout_button" class="logout" title="{{ "Logout"|get_lang }}" href="{{ logout_link }}" >
<img src="{{ "exit.png"|icon(22) }}">
</a>
</li>
{% endif %}
</ul>
{% else %}
{# Direct login to course - no visible if logged and on the index page #}
{% if course_code != "" and hide_login_link is null %}
<ul class="nav pull-right">
<li class="dropdown" style="color:white;">
<a href='{{ _p.web }}main/auth/gotocourse.php?firstpage={{ course_code }}'>
{{ "LoginEnter" | get_lang }}
</a>
</li>
</ul>
{% endif %}
{% endif %}
</div>
</button>
</div>
</div>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
{{ menu }}
</ul>
{% if _u.logged == 1 %}
<ul class="nav navbar-nav navbar-right">
{% if user_notifications is not null %}
<li><a href="{{ message_url }}">{{ user_notifications }}</a></li>
{% endif %}
{% if _u.status != 6 %}
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">{{ _u.complete_name }} <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li>
{{ profile_link }}
{{ message_link }}
</li>
</ul>
</li>
{% if logout_link is not null %}
<li>
<a id="logout_button" title="{{ "Logout"|get_lang }}" href="{{ logout_link }}" >
{{ "Logout"|get_lang }}
</a>
</li>
{% endif %}
{% endif %}
</ul>
{% endif %}
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>
Write Preview
Loading…
Cancel
Save