TPLs fixing and adding new classes 3 to TPLs bootstrap index and userportal.php CT#7539

1.10.x
aragonc 11 years ago
parent 074d200272
commit f26fb9c45a
  1. 26
      main/css/base.css
  2. 7442
      main/css/chamilo/default.css
  3. 12
      main/inc/lib/course.lib.php
  4. 4
      main/inc/lib/formvalidator/FormValidator.class.php
  5. 1
      main/inc/lib/template.lib.php
  6. 44
      main/inc/lib/userportal.lib.php
  7. 6
      main/template/default/layout/footer.tpl
  8. 10
      main/template/default/layout/layout_1_col.tpl
  9. 43
      main/template/default/layout/layout_2_col.tpl
  10. 4
      main/template/default/layout/login_form.tpl
  11. 21
      main/template/default/layout/main_header.tpl

@ -600,32 +600,6 @@ footer {
height: 9em; /* Very important */
}
footer .container .row {
padding-top: 50px;
}
footer #footer_left {
overflow-y : auto;
max-height:50px;
padding: 5px;
}
footer #footer_right {
float: right;
}
#footer_right #admin_name, #footer_right #software_name{
text-align:right;
}
.page-header {
padding-bottom: 10px;
border-bottom: 1px solid #ddd;
-webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
}
#topbar_push {
height: 55px;
}

File diff suppressed because it is too large Load Diff

@ -3413,15 +3413,15 @@ class CourseManager
*/
public static function course_item_html($params, $is_sub_content = false) {
$html = '';
$class = "well course-box";
$class = "panel panel-default";
if ($is_sub_content) {
$class = "course_item";
}
$html .= '<div class="'.$class.'">';
$html .= '<div class="row">';
$html .= '<div class="span7">';
$html .= '<div class="col-md-12">';
$html .= ' <div class="row">';
$html .= '<div class="span1 course-box-thumbnail-box">';
$html .= '<div class="col-md-2 course-box-thumbnail-box">';
if (!empty($params['link'])) {
$html .= '<a class="thumbnail" href="'.$params['link'].'">';
$html .= $params['icon'];
@ -3436,7 +3436,7 @@ class CourseManager
$notifications = isset($params['notifications']) ? $params['notifications'] : null;
$param_class = isset($params['class']) ? $params['class'] : null;
$html .= '<div class="span6 '.$param_class.'">';
$html .= '<div class="col-md-10 '.$param_class.'">';
$html .='<h3>'.$params['title'].$notifications.'</h3> ';
if (isset($params['show_description'], $params['description']) && $params['show_description'] == 1) {
@ -3457,7 +3457,7 @@ class CourseManager
$html .= '</div>';
$params['right_actions'] = isset($params['right_actions']) ? $params['right_actions'] : null;
$html .= '<div class="span1 pull-right course-box-actions">'.$params['right_actions'].'</div>';
$html .= '<div class="col-md-2 pull-right course-box-actions">'.$params['right_actions'].'</div>';
$html .= '</div>';
$html .= '</div>';
return $html;
@ -3471,7 +3471,7 @@ class CourseManager
*/
public static function course_item_parent($main_content, $sub_content, $sub_sub_content = null)
{
return '<div class="well">'.$main_content.$sub_content.$sub_sub_content.'</div>';
return '<div class="panel panel-default">'.$main_content.$sub_content.$sub_sub_content.'</div>';
}
/**

@ -119,8 +119,8 @@ EOT;
public function getElementTemplate()
{
return '
<div class="control-group {error_class}">
<label class="control-label" {label-for}>
<div class="form-group {error_class}">
<label {label-for}>
<!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
{label}
</label>

@ -330,6 +330,7 @@ class Template
*/
public function set_header($status)
{
$status = false;
$this->show_header = $status;
$this->assign('show_header', $status);

@ -51,7 +51,7 @@ class IndexManager
}
if (api_get_setting('allow_lostpassword') == 'true' || api_get_setting('allow_registration') == 'true') {
$login_form .= '<ul class="nav nav-list">';
$login_form .= '<ul class="nav nav-pills nav-stacked">';
if (api_get_setting('allow_registration') != 'false') {
$login_form .= '<li><a href="main/auth/inscription.php">'.get_lang('Reg').'</a></li>';
}
@ -198,7 +198,7 @@ class IndexManager
// My Account section
if ($show_menu) {
$html .= '<ul class="nav nav-list">';
$html .= '<ul class="nav nav-pills nav-stacked">';
if ($show_create_link) {
$html .= '<li class="add-course"><a href="' . api_get_path(WEB_CODE_PATH) . 'create_course/add_course.php">'.(api_get_setting('course_validation') == 'true' ? get_lang('CreateCourseRequest') : get_lang('CourseCreate')).'</a></li>';
}
@ -312,7 +312,7 @@ class IndexManager
$html = null;
$home_menu = @(string)file_get_contents($sys_path.$this->home.'home_menu_'.$user_selected_language.'.html');
if (!empty($home_menu)) {
$home_menu_content = '<ul class="nav nav-list">';
$home_menu_content = '<ul class="nav nav-pills nav-stacked">';
$home_menu_content .= api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
$home_menu_content .= '</ul>';
$html .= self::show_right_block(get_lang('MenuGeneral'), $home_menu_content, 'help_block');
@ -323,7 +323,7 @@ class IndexManager
function return_skills_links() {
$html = '';
if (api_get_setting('allow_skills_tool') == 'true') {
$content = '<ul class="nav nav-list">';
$content = '<ul class="nav nav-pills nav-stacked">';
$content .= Display::tag('li', Display::url(get_lang('MySkills'), api_get_path(WEB_CODE_PATH).'social/my_skills_report.php'));
@ -680,12 +680,12 @@ class IndexManager
if (!empty($id)) {
$params['id'] = $id;
}
$params['class'] = 'well sidebar-nav';
$params['class'] = 'panel panel-default';
$html = null;
if (!empty($title)) {
$html.= '<h4>'.$title.'</h4>';
$html.= '<div class="panel-heading">'.$title.'</div>';
}
$html.= $content;
$html.= '<div class="panel-body">'.$content.'</div>';
$html = Display::div($html, $params);
return $html;
}
@ -696,9 +696,10 @@ class IndexManager
*/
function display_login_form()
{
$form = new FormValidator('formLogin', 'POST', null, null, array('class'=>'form-vertical'));
$form->addElement('text', 'login', get_lang('UserName'), array('id' => 'login', 'class' => 'span2 user_login_icon autocapitalize_off', 'autofocus' => 'autofocus'));
$form->addElement('password', 'password', get_lang('Pass'), array('id' => 'password', 'class' => 'span2 user_password_icon'));
$form = new FormValidator('formLogin', 'POST', null, null, array('class'=>'form-inline'));
$form->addElement('text', 'login', get_lang('UserName'), array('id' => 'login', 'class' => 'form-control autocapitalize_off', 'autofocus' => 'autofocus'));
$form->addElement('password', 'password', get_lang('Pass'), array('id' => 'password', 'class' => 'form-control'));
global $_configuration;
// Captcha
@ -738,7 +739,7 @@ class IndexManager
}
}
$form->addElement('style_submit_button','submitAuth', get_lang('LoginEnter'), array('class' => 'btn'));
$form->addElement('style_submit_button','submitAuth', get_lang('LoginEnter'), array('class' => 'btn btn-default'));
$html = $form->return_form();
// The validation is located in the local.inc
@ -757,13 +758,12 @@ class IndexManager
function return_search_block() {
$html = '';
if (api_get_setting('search_enabled') == 'true') {
$html .= '<div class="searchbox">';
$search_btn = get_lang('Search');
$search_content = '<br />
<form action="main/search/" method="post">
<input type="text" id="query" class="span2" name="query" value="" />
<button class="save" type="submit" name="submit" value="'.$search_btn.'" />'.$search_btn.' </button>
</form></div>';
$search_content = '<form action="main/search/" method="post">
<div class="form-group">
<input type="text" id="query" class="form-control" name="query" value="" />
<button class="btn btn-default" type="submit" name="submit" value="'.$search_btn.'" />'.$search_btn.' </button>
</div></form>';
$html .= self::show_right_block(get_lang('Search'), $search_content, 'search_block');
}
return $html;
@ -786,7 +786,7 @@ class IndexManager
$classes .= Display::tag('li', Display::url(get_lang('AddClasses') ,api_get_path(WEB_CODE_PATH).'admin/usergroups.php?action=add'));
}
if (!empty($classes)) {
$classes = Display::tag('ul', $classes, array('class'=>'nav nav-list'));
$classes = Display::tag('ul', $classes, array('class'=>'nav nav-pills nav-stacked'));
$html .= self::show_right_block(get_lang('Classes'), $classes, 'classes_block');
}
}
@ -797,7 +797,7 @@ class IndexManager
$html = '';
$booking_content = null;
if (api_get_setting('allow_reservation') == 'true' && api_is_allowed_to_create_course()) {
$booking_content .='<ul class="nav nav-list">';
$booking_content .='<ul class="nav nav-pills nav-stacked">';
$booking_content .='<a href="main/reservation/reservation.php">'.get_lang('ManageReservations').'</a><br />';
$booking_content .='</ul>';
$html .= self::show_right_block(get_lang('Booking'), $booking_content, 'reservation_block');
@ -848,7 +848,7 @@ class IndexManager
return;
}
$profile_content = '<ul class="nav nav-list">';
$profile_content = '<ul class="nav nav-pills nav-stacked">';
// @todo Add a platform setting to add the user image.
if (api_get_setting('allow_message_tool') == 'true') {
@ -916,7 +916,7 @@ class IndexManager
// Main navigation section.
// Tabs that are deactivated are added here.
if (!empty($this->tpl->menu_navigation)) {
$content = '<ul class="nav nav-list">';
$content = '<ul class="nav nav-pills nav-stacked">';
foreach ($this->tpl->menu_navigation as $section => $navigation_info) {
$current = $section == $GLOBALS['this_section'] ? ' id="current"' : '';
$content .= '<li'.$current.'>';
@ -955,7 +955,7 @@ class IndexManager
}
// My account section
$my_account_content = '<ul class="nav nav-list">';
$my_account_content = '<ul class="nav nav-pills nav-stacked">';
if ($show_create_link) {
$my_account_content .= '<li class="add-course"><a href="main/create_course/add_course.php">';

@ -1,7 +1,7 @@
<footer> <!-- start of #footer section -->
<div class="container">
<div class="row">
<div id="footer_left" class="span4">
<div id="footer_left" class="col-md-4">
{% if session_teachers is not null %}
<div id="session_teachers">
{{ session_teachers }}
@ -23,7 +23,7 @@
&nbsp;
</div>
<div id="footer_center" class="span4">
<div id="footer_center" class="col-md-4">
{# Plugins for footer section #}
{% if plugin_footer_center is not null %}
<div id="plugin_footer_center">
@ -33,7 +33,7 @@
&nbsp;
</div>
<div id="footer_right" class="span4">
<div id="footer_right" class="col-md-4">
{% if administrator_name is not null %}
<div id="admin_name">
{{ administrator_name }}

@ -4,19 +4,19 @@
{% block body %}
{# Plugin main top #}
{% if plugin_main_top %}
<div id="plugin_main_top" class="span12">
<div id="plugin_main_top" class="col-md-12">
{{ plugin_main_top }}
</div>
{% endif %}
{# Plugin top #}
{% if plugin_content_top %}
<div id="plugin_content_top" class="span12">
<div id="plugin_content_top" class="col-md-12">
{{ plugin_content_top }}
</div>
{% endif %}
<div class="span12">
<div class="col-md-12">
{% include template ~ "/layout/page_body.tpl" %}
{% block content %}
{% if content is not null %}
@ -30,14 +30,14 @@
{# Plugin bottom #}
{% if plugin_content_bottom %}
<div id="plugin_content_bottom" class="span12">
<div id="plugin_content_bottom" class="col-md-12">
{{ plugin_content_bottom }}
</div>
{% endif %}
{# Plugin main bottom #}
{% if plugin_main_bottom %}
<div id="plugin_main_bottom" class="span12">
<div id="plugin_main_bottom" class="col-md-12">
{{ plugin_main_bottom }}
</div>
{% endif %}

@ -5,13 +5,13 @@
{# Plugin main top #}
{% if plugin_main_top %}
<div id="plugin_main_top" class="span12">
<div id="plugin_main_top" class="col-md-12">
{{ plugin_main_top }}
</div>
{% endif %}
{# Right column #}
<div class="span3 menu-column">
<div class="col-md-3 menu-column">
{% if plugin_menu_top %}
<div id="plugin_menu_top">
{{plugin_menu_top}}
@ -25,21 +25,22 @@
{% endif %}
{% endblock %}
<div class="block_user_info">
{# User picture #}
{{ user_image_block }}
{# User Profile links #}
{{ profile_block }}
</div>
<div class="block_tools_info">
{# Course block - admin #}
{{ course_block }}
{# Course block - teacher #}
{{ teacher_block }}
</div>
<div class="user_notification">
{# Notice #}
{{ notice_block }}
@ -54,7 +55,7 @@
{# Search (xapian) #}
{{ search_block }}
</div>
{# Classes #}
{{ classes_block }}
@ -71,7 +72,7 @@
{% endif %}
</div>
<div class="span9 content-column">
<div class="col-md-9">
{# Plugin bottom #}
{% if plugin_content_top %}
<div id="plugin_content_top">
@ -81,12 +82,8 @@
{# Portal homepage #}
{% if home_page_block %}
<section id="homepage">
<div class="row">
<div class="span9">
{{ home_page_block }}
</div>
</div>
<section id="homepage-home">
{{ home_page_block }}
</section>
{% endif %}
@ -99,14 +96,14 @@
{# Welcome to course block #}
{% if welcome_to_course_block %}
<section id="welcome_to_course">
<section id="homepage-course">
{{ welcome_to_course_block }}
</section>
{% endif %}
{% block content %}
{% if content is not null %}
<section id="main_content">
<section id="page-content">
{{ content }}
</section>
{% endif %}
@ -114,19 +111,15 @@
{# Announcements #}
{% if announcements_block %}
<section id="announcements">
<section id="homepage-announcements">
{{ announcements_block }}
</section>
{% endif %}
{# Course categories (must be turned on in the admin settings) #}
{% if course_category_block %}
<section id="course_category">
<div class="row">
<div class="span9">
{{ course_category_block }}
</div>
</div>
<section id="homepage-course-category">
{{ course_category_block }}
</section>
{% endif %}
@ -144,7 +137,7 @@
{# Plugin main bottom #}
{% if plugin_main_bottom %}
<div id="plugin_main_bottom" class="span12">
<div id="plugin_main_bottom" class="col-md-12">
{{ plugin_main_bottom }}
</div>
{% endif %}

@ -1,5 +1,6 @@
{% if login_form %}
<div id="login_block" class="well sidebar-nav">
<div id="login_block" class="panel panel-default">
<div class="panel-body">
{{ login_language_form }}
{% if plugin_login_top is not null %}
@ -19,5 +20,6 @@
{{ plugin_login_bottom }}
</div>
{% endif %}
</div>
</div>
{% endif %}

@ -99,16 +99,19 @@
</div>
</div>
</header>
<section id="menu-bar">
{# menu #}
{% block menu %}
{% include template ~ "/layout/menu.tpl" %}
{% endblock %}
</section>
<section id="breadcrumb-bar">
{# breadcrumb #}
{% block breadcrumb %}
{{ breadcrumb }}
{% endblock %}
</section>
{# menu #}
{% block menu %}
{% include template ~ "/layout/menu.tpl" %}
{% endblock %}
{# breadcrumb #}
{% block breadcrumb %}
{{ breadcrumb }}
{% endblock %}
<div id="top_main_content">

Loading…
Cancel
Save