From 162126b197bdd62affb6f6896a3534c8c215c408 Mon Sep 17 00:00:00 2001 From: aragonc Date: Wed, 4 Mar 2015 11:17:09 +0100 Subject: [PATCH] HTML changes --- main/admin/index.php | 32 +++++++---- main/auth/openid/login.php | 5 +- main/inc/lib/banner.lib.php | 23 ++++---- .../lib/formvalidator/FormValidator.class.php | 6 +- main/inc/lib/pear/HTML/QuickForm/label.php | 8 +-- main/inc/lib/userportal.lib.php | 55 +++++++++++-------- 6 files changed, 71 insertions(+), 58 deletions(-) diff --git a/main/admin/index.php b/main/admin/index.php index c2beddee7f..4724b01269 100644 --- a/main/admin/index.php +++ b/main/admin/index.php @@ -103,9 +103,11 @@ if (api_is_platform_admin()) { $blocks['users']['editable'] = true; $search_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 = '
- - + $search_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 = '
- + $search_form = ' +
+ - + +
'; $blocks['platform']['search_form'] = $search_form; @@ -256,9 +262,11 @@ if (api_is_platform_admin()) { $blocks['sessions']['editable'] = true; } -$search_form = '
- - +$search_form = ' +
+ + +
'; $blocks['sessions']['search_form'] = $search_form; $items = array(); diff --git a/main/auth/openid/login.php b/main/auth/openid/login.php index 7725ce88aa..cbb0d82cd0 100755 --- a/main/auth/openid/login.php +++ b/main/auth/openid/login.php @@ -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 ' diff --git a/main/inc/lib/banner.lib.php b/main/inc/lib/banner.lib.php index 37a1e38b5b..19e8675631 100755 --- a/main/inc/lib/banner.lib.php +++ b/main/inc/lib/banner.lib.php @@ -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 .= ''; + } else { $html .= ''.$site_name.''; $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 .= '/'; + $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 ; diff --git a/main/inc/lib/formvalidator/FormValidator.class.php b/main/inc/lib/formvalidator/FormValidator.class.php index 704ddb151e..6c14ed3679 100755 --- a/main/inc/lib/formvalidator/FormValidator.class.php +++ b/main/inc/lib/formvalidator/FormValidator.class.php @@ -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 ' -
-