diff --git a/main/auth/lostPassword.php b/main/auth/lostPassword.php index 11820b2979..2686ba9533 100644 --- a/main/auth/lostPassword.php +++ b/main/auth/lostPassword.php @@ -91,7 +91,7 @@ if (isset ($_GET['reset']) && isset ($_GET['id'])) { echo '

'.$msg1.'
'; } 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 .= ''.get_lang('Back').''; - //echo '

'.$msg.'
'; - - } else { - echo get_lang('EnterEmailUserAndWellSendYouPassword'); - echo '

'; + } else { $form->display(); } } diff --git a/main/css/base.css b/main/css/base.css index 90b0765c12..6f4e1bc217 100644 --- a/main/css/base.css +++ b/main/css/base.css @@ -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; +} \ No newline at end of file diff --git a/main/css/base_chamilo.css b/main/css/base_chamilo.css index 13602755da..f34b114f19 100644 --- a/main/css/base_chamilo.css +++ b/main/css/base_chamilo.css @@ -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; diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css old mode 100755 new mode 100644 index 6d8cea0085..13bec54ed0 --- a/main/css/chamilo/default.css +++ b/main/css/chamilo/default.css @@ -262,4 +262,4 @@ input.arrowl { .portal { background-image:url(images/portal.png); -} \ No newline at end of file +} diff --git a/main/inc/global_error_message.inc.php b/main/inc/global_error_message.inc.php old mode 100755 new mode 100644 index 4ff9b381ca..f2a371bce7 --- a/main/inc/global_error_message.inc.php +++ b/main/inc/global_error_message.inc.php @@ -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 = '

+ $InstallationDescription = '
+ +

'.$read_installation_guide.''; $global_error_message['description'] = $InstallationDescription; break; diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php index 88e3a88c88..3d170d9ed2 100644 --- a/main/inc/lib/template.lib.php +++ b/main/inc/lib/template.lib.php @@ -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 diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php index c795606c61..5bd67aa547 100644 --- a/main/inc/lib/userportal.lib.php +++ b/main/inc/lib/userportal.lib.php @@ -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('
{element}
'); + $renderer->setElementTemplate('
{label}
{element}
'); $html = $form->return_form(); if (api_get_setting('openid_authentication') == 'true') { include_once 'main/auth/openid/login.php'; diff --git a/user_portal.php b/user_portal.php index 051f6fd433..06543101ca 100644 --- a/user_portal.php +++ b/user_portal.php @@ -150,10 +150,8 @@ if ($load_dirs) { $htmlHeadXtra[] = '