HTML changes

1.10.x
aragonc 11 years ago committed by Julio Montoya
parent f0553b4abe
commit 162126b197
  1. 32
      main/admin/index.php
  2. 5
      main/auth/openid/login.php
  3. 23
      main/inc/lib/banner.lib.php
  4. 6
      main/inc/lib/formvalidator/FormValidator.class.php
  5. 8
      main/inc/lib/pear/HTML/QuickForm/label.php
  6. 55
      main/inc/lib/userportal.lib.php

@ -103,9 +103,11 @@ if (api_is_platform_admin()) {
$blocks['users']['editable'] = true;
$search_form = '
<form method="get" class="form-search" action="user_list.php">
<input class="span3" type="text" name="keyword" value="">
<button class="btn" type="submit">'.get_lang('Search').'</button>
<form method="get" class="form-inline" action="user_list.php">
<div class="form-group">
<input class="form-control" type="text" name="keyword" value="">
<button class="btn btn-default" type="submit">'.get_lang('Search').'</button>
</div>
</form>';
$blocks['users']['search_form'] = $search_form;
$items = array(
@ -148,9 +150,11 @@ if (api_is_platform_admin()) {
$blocks['courses']['extraContent'] = file_get_contents($coursesBlockExtraFile);
}
$search_form = ' <form method="get" class="form-search" action="course_list.php">
<input class="span3" type="text" name="keyword" value="">
<button class="btn" type="submit">'.get_lang('Search').'</button>
$search_form = ' <form method="get" class="form-inline" action="course_list.php">
<div class="form-group">
<input class="form-control" type="text" name="keyword" value="">
<button class="btn btn-default" type="submit">'.get_lang('Search').'</button>
</div>
</form>';
$blocks['courses']['search_form'] = $search_form;
@ -197,10 +201,12 @@ if (api_is_platform_admin()) {
$blocks['platform']['extraContent'] = file_get_contents($platformBlockExtraFile);
}
$search_form = ' <form method="get" action="settings.php" class="form-search">
<input class="span3" type="text" name="search_field" value="" >
$search_form = ' <form method="get" action="settings.php" class="form-inline">
<div class="form-group">
<input class="form-control" type="text" name="search_field" value="" >
<input type="hidden" value="search_setting" name="category">
<button class="btn" type="submit">'.get_lang('Search').'</button>
<button class="btn btn-default" type="submit">'.get_lang('Search').'</button>
</div>
</form>';
$blocks['platform']['search_form'] = $search_form;
@ -256,9 +262,11 @@ if (api_is_platform_admin()) {
$blocks['sessions']['editable'] = true;
}
$search_form = ' <form method="GET" class="form-search" action="session_list.php">
<input class="span3" type="text" name="keyword" value="">
<button class="btn" type="submit">'.get_lang('Search').'</button>
$search_form = ' <form method="GET" class="form-inline" action="session_list.php">
<div class="form-group">
<input class="form-control" type="text" name="keyword" value="">
<button class="btn btn-default" type="submit">'.get_lang('Search').'</button>
</div>
</form>';
$blocks['sessions']['search_form'] = $search_form;
$items = array();

@ -20,9 +20,10 @@ require_once 'xrds.lib.php';
function openid_form() {
//get_lang('OpenIdAuthentication')
$form = new FormValidator('openid_login', 'post', null, null, array('class' => 'form-vertical form_login'));
$form->addElement('text', 'openid_url', array(get_lang('OpenIDURL'), Display::url(get_lang('OpenIDWhatIs'), 'main/auth/openid/whatis.php')), array('class' => 'openid_input'));
$form->addElement('button', 'submit', get_lang('Login'));
$form -> addElement('text', 'openid_url', array(get_lang('OpenIDURL'), Display::url(get_lang('OpenIDWhatIs'), 'main/auth/openid/whatis.php')), array('class' => 'openid_input'));
$form -> addElement('button', 'submit', get_lang('Login'));
return $form->return_form();
/*
return '<label for="openid_url">'.get_lang('OpenIDURL').' <a href="main/auth/openid/whatis.php" title="'.get_lang('OpenIDWhatIs').'">'.Display::return_icon('info3.gif',get_lang('Info')).'</a></label>

@ -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 ;

@ -57,7 +57,7 @@ class FormValidator extends HTML_QuickForm
$renderer->setFormTemplate($formTemplate);
// Element template
if (isset($attributes['class']) && $attributes['class'] == 'well form-inline') {
if (isset($attributes['class']) && $attributes['class'] == 'form-inline') {
$elementTemplate = ' {label} {element} ';
$renderer->setElementTemplate($elementTemplate);
} elseif (isset($attributes['class']) && $attributes['class'] == 'form-search') {
@ -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>

@ -55,12 +55,6 @@ class HTML_QuickForm_label extends HTML_QuickForm_static
public function toHtml()
{
$for = $this->getLabelFor();
return '<div class="control-group ">
<label class="control-label"' . (empty($for) ? '' : ' for="' . $for . '"') . '>' . $this->getLabel() . '</label>
<div class="controls">
' . HTML_QuickForm_static::toHtml() . '
</div>
</div>
';
return '<label class="control-label"' . (empty($for) ? '' : ' for="' . $for . '"') . '>' . $this->getLabel() . '</label>' . HTML_QuickForm_static::toHtml();
}
}

@ -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,18 @@ 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('label',get_lang('UserName'));
$form->addHtml('<div class="input-group">');
$form->addHtml('<span class="input-group-addon"><i class="fa fa-user"></i></span>');
$form->addElement('text', 'login','', array('id' => 'login', 'class' => 'form-control autocapitalize_off', 'autofocus' => 'autofocus'));
$form->addHtml('</div>');
$form->addElement('label',get_lang('Pass'));
$form->addHtml('<div class="input-group">');
$form->addHtml('<span class="input-group-addon"><i class="fa fa-lock"></i></span>');
$form->addElement('password', 'password','', array('id' => 'password', 'class' => 'form-control'));
$form->addHtml('</div>');
global $_configuration;
// Captcha
@ -737,8 +746,9 @@ class IndexManager
$form->addRule('captcha', get_lang('TheTextYouEnteredDoesNotMatchThePicture'), 'CAPTCHA', $captcha_question);
}
}
$form->addElement('style_submit_button','submitAuth', get_lang('LoginEnter'), array('class' => 'btn'));
$form->addHtml('<div class="form-button-login">');
$form->addElement('style_submit_button','submitAuth', get_lang('LoginEnter'), array('class' => 'btn-primary btn-block'));
$form->addHtml('</div>');
$html = $form->return_form();
// The validation is located in the local.inc
@ -757,13 +767,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;
@ -787,7 +796,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');
}
}
@ -798,7 +807,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');
@ -849,7 +858,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') {
@ -917,7 +926,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.'>';
@ -956,7 +965,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">';

Loading…
Cancel
Save