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

UI fixes in login and forms

Browse Source
skala
Julio Montoya 14 years ago
parent f26cc4ea66
commit 1d25f38796
8 changed files with 79 additions and 103 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. 11
      main/auth/lostPassword.php
  2. 106
      main/css/base.css
  3. 11
      main/css/base_chamilo.css
  4. 2
      main/css/chamilo/default.css
  5. 5
      main/inc/global_error_message.inc.php
  6. 18
      main/inc/lib/template.lib.php
  7. 8
      main/inc/lib/userportal.lib.php
  8. 21
      user_portal.php

11
main/auth/lostPassword.php
Unescape View File

@ -91,7 +91,7 @@ if (isset ($_GET['reset']) && isset ($_GET['id'])) {
echo '<br /><br /><div class="actions" >'.$msg1.'</div>';
} else {
$form = new FormValidator('lost_password');
$form->addElement('text', 'user', get_lang('LoginOrEmailAddress'), array('size'=>'40'));
$form->addElement('text', 'user', array(get_lang('LoginOrEmailAddress'), get_lang('EnterEmailUserAndWellSendYouPassword')), array('size'=>'40'));
//$form->applyFilter('email','strtolower');
$form->addElement('style_submit_button', 'submit', get_lang('Send'),'class="save"');
@ -138,14 +138,9 @@ if (isset ($_GET['reset']) && isset ($_GET['id'])) {
}
}
} else {
Display::display_error_message(get_lang('NoUserAccountWithThisEmailAddress'));
Display::display_warning_message(get_lang('NoUserAccountWithThisEmailAddress'));
}
//$msg .= '<a href="'.api_get_path(WEB_CODE_PATH).'auth/lostPassword.php" class="fake_button_back" >'.get_lang('Back').'</a>';
//echo '<br /><br /><div class="actions" >'.$msg.'</div>';
} else {
echo get_lang('EnterEmailUserAndWellSendYouPassword');
echo '<br /><br />';
} else {
$form->display();
}
}

106
main/css/base.css
Unescape View File

@ -2997,13 +2997,9 @@ div.system_announcement {
.RequirementHeading, .RequirementText, .RequirementContent {
margin-top:12px;
line-height: 18px;
}
#formLogin {
height:160px;
}
#toolshortcuts_horizontal {
padding: 8px 20px 2px 0px;
clear: right;
@ -3524,6 +3520,7 @@ div.row div.form_header {
font-size:20px;
}
/*
[dir=ltr] div.row div.label, [dir=ltl] div.row div.formw {
float: left;
text-align: right;
@ -3531,7 +3528,8 @@ div.row div.form_header {
[dir=rtl] div.row div.label, [dir=rtr] div.row div.formw {
float: right;
text-align: left;
}
}*/
span.form_required {
color: #f00;header2
}
@ -3541,30 +3539,23 @@ span.form_error {
margin: 2px;
}
div.row {
clear: both;
form .row {
margin-bottom: 18px;
}
div.row div.label {
color: #404040;
form .label {
color: #404040;
float: left;
font-size: 13px;
line-height: 18px;
padding-top: 6px;
text-align: right;
width: 130px !important;
width: 130px;
}
div.row div.formw {
margin-left: 150px;
form .formw {
margin-left: 150px;
}
.formw {
/* width:85%; */
}
.formw iframe {
text-align: left;
}
@ -3799,56 +3790,41 @@ form div.error input, form div.error textarea {
}
/************************************************************************************
REFLECTION
*************************************************************************************/
.image-wrap {
margin-right: 10px;
position: relative;
display: inline-block;
width: 64px;
height: 64px;'
}
.box-image {
margin: 0 0 50px;
border-top: solid 1px #ccc;
.requirements td {
padding:5px;
}
.data_table_no_border {
border-collapse: collapse;
border-spacing: 0;
font-size: 12px;
margin-bottom: 15px;
margin-top: 8px;
text-align: left;
width: 100%;
}
.data_table_no_border td {
line-height: normal;
padding: 6px;
text-align: left;
vertical-align: middle;
}
.reflection .image-wrap {
-webkit-box-shadow: inset 0 0 1px rgba(0,0,0,.5), inset 0 2px 0 rgba(255,255,255,.5), inset 0 -1px 0 rgba(0,0,0,.5);
-moz-box-shadow: inset 0 0 1px rgba(0,0,0,.5), inset 0 2px 0 rgba(255,255,255,.5), inset 0 -1px 0 rgba(0,0,0,.5);
box-shadow: inset 0 0 1px rgba(0,0,0,.5), inset 0 2px 0 rgba(255,255,255,.5), inset 0 -1px 0 rgba(0,0,0,.5);
-webkit-transition: .5s;
-moz-transition: .5s;
transition: .5s;
-webkit-border-radius: 20px;
-moz-border-radius: 20px;
border-radius: 20px;
.form-stacked .label {
display: block;
float: none;
font-weight: bold;
line-height: 20px;
padding-top: 0;
text-align: left;
width: auto;
}
.reflection .image-wrap:after {
position: absolute;
content: ' ';
width: 100%;
height: 30px;
bottom: -31px;
left: 0;
-webkit-border-top-left-radius: 20px;
-webkit-border-top-right-radius: 20px;
-moz-border-radius-topleft: 20px;
-moz-border-radius-topright: 20px;
border-top-left-radius: 20px;
border-top-right-radius: 20px;
background: -moz-linear-gradient(top, rgba(0,0,0,.3) 0%, rgba(255,255,255,0) 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(0,0,0,.3)), color-stop(100%,rgba(255,255,255,0)));
background: linear-gradient(top, rgba(0,0,0,.3) 0%,rgba(255,255,255,0) 100%);
}
.reflection .image-wrap:hover {
position: relative;
top: -8px;
.form-stacked .row div.formw {
margin-left: 0;
}
.form-stacked .row {
margin-bottom: 9px;
}

11
main/css/base_chamilo.css
Unescape View File

@ -753,25 +753,18 @@ input.link_alike:hover {
}
#formLogin label {
font-size: 12px;
margin: 4px 6px;
font-family:Tahoma, Geneva, sans-serif;
color:#666666;
}
#formLogin input {
font-size: 13px;
margin: 4px 6px;
padding:6px;
}
#login_fail {
margin: 0 6px 6px 6px;
/* margin: 0 6px 6px 6px; */
padding: 4px;
border: 1px solid #f00;
background-color: #fff;
font-size: 12px;
color: #f00;
width:185px;
}
input.mainoption {
font-weight : bold;

2
main/css/chamilo/default.css
Unescape View File

@ -262,4 +262,4 @@ input.arrowl {
.portal {
background-image:url(images/portal.png);
}
}

5
main/inc/global_error_message.inc.php
Unescape View File

@ -126,7 +126,10 @@ if (is_int($global_error_code) && $global_error_code > 0) {
}
$click_to_install = substr($InstallationDescription, 0, $pos);
$read_installation_guide = substr($InstallationDescription, $pos + 2);
$InstallationDescription = '<form action="'.$root_rel.'main/install/index.php" method="get"><button class="save" type="submit" value="&nbsp;&nbsp; '.$click_to_install.' &nbsp;&nbsp;" >'.$click_to_install.'</button></form><br />
$InstallationDescription = '<form action="'.$root_rel.'main/install/index.php" method="get">
<button class="a_button blue" type="submit" value="&nbsp;&nbsp; '.$click_to_install.' &nbsp;&nbsp;" >
'.$click_to_install.'</button>
</form><br />
<a href="'.$installation_guide_url.'" target="_blank">'.$read_installation_guide.'</a>';
$global_error_message['description'] = $InstallationDescription;
break;

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

@ -45,12 +45,28 @@ class Template extends Smarty {
//To load a smarty plugin
//$this->loadPlugin('smarty_function_get_lang');
$this->assign('style', $this->style);
//$this->testInstall();
}
/**
* Shortcut to display a 1 col layout
* */
function display_one_col_template() {
$tpl = $this->get_template('layout/layout_1_col.tpl');
$this->display($tpl);
}
/**
* Shortcut to display a 2 col layout
* */
function display_two_col_template() {
$tpl = $this->get_template('layout/layout_2_col.tpl');
$this->display($tpl);
}
/**
* Sets the footer visibility
* @param bool true if we show the footer

8
main/inc/lib/userportal.lib.php
Unescape View File

@ -18,8 +18,6 @@ class IndexManager {
if ($load_template) {
$this->tpl = new Template($title);
}
$this->home = api_get_home_path();
$this->user_id = api_get_user_id();
$this->load_directories_preview = false;
@ -734,12 +732,12 @@ class IndexManager {
* @version 1.1
*/
function display_login_form() {
$form = new FormValidator('formLogin');
$form = new FormValidator('formLogin', 'POST', null, null, array('class'=>'form-stacked'));
$form->addElement('text', 'login', get_lang('UserName'), array('size' => 17));
$form->addElement('password', 'password', get_lang('Pass'), array('size' => 17));
$form->addElement('style_submit_button','submitAuth', get_lang('LoginEnter'), array('class' => 'login'));
$form->addElement('style_submit_button','submitAuth', get_lang('LoginEnter'), array('class' => 'a_button blue '));
$renderer =& $form->defaultRenderer();
$renderer->setElementTemplate('<div><label>{label}</label></div><div>{element}</div>');
$renderer->setElementTemplate('<div class="row"><div class="label">{label}</div><div class="formw">{element}</div></div>');
$html = $form->return_form();
if (api_get_setting('openid_authentication') == 'true') {
include_once 'main/auth/openid/login.php';

21
user_portal.php
Unescape View File

@ -150,10 +150,8 @@ if ($load_dirs) {
$htmlHeadXtra[] = '<script type="text/javascript">
$(document).ready( function() {
$(".document_preview_container").hide();
$(document).ready( function() {
$(".document_preview_container").hide();
$(".document_preview").click(function() {
var my_id = this.id;
var course_id = my_id.split("_")[2];
@ -201,9 +199,6 @@ $_SESSION['sniff_java_sun_ver']=Security::remove_XSS($_POST['sniff_navigator_jav
$controller = new IndexManager(get_lang('MyCourses'));
$tpl = $controller->tpl->get_template('layout/layout_2_col.tpl');
//if (!$$controllerl->tpl->isCached($tpl, api_get_user_id())) {
//@todo all this could be moved in the IndexManager
@ -227,7 +222,9 @@ $sniff_notification = '';
//check for flash and message
if (stripos("flash_yes", $_SESSION['sniff_check_some_activex'])===0 || stripos("flash_yes", $_SESSION['sniff_check_some_plugins'])===0){
$sniff_notification = Display::return_message(get_lang('NoFlash'), 'warning', false);
//$controller->tpl->assign('sniff_notification', $sniff_notification);
//js verification - To annoying of redirecting every time the page
//$controller->tpl->assign('sniff_notification', $sniff_notification);
}
$controller->tpl->assign('plugin_courses_block', $controller->return_courses_main_plugin());
@ -238,10 +235,8 @@ $controller->tpl->assign('plugin_courses_right_block', $controller->return_plug
$controller->tpl->assign('reservation_block', $controller->return_reservation_block());
$controller->tpl->assign('search_block', $controller->return_search_block());
$controller->tpl->assign('classes_block', $controller->return_classes_block());
/*} else {
}*/
$controller->tpl->display($tpl);
// Deleting the session_id.
api_session_unregister('session_id');
$controller->tpl->display_two_col_template();
// Deleting the session_id.
api_session_unregister('session_id');
Write Preview
Loading…
Cancel
Save