diff --git a/main/auth/lostPassword.php b/main/auth/lostPassword.php index 1022c35eaf..8e3884490d 100644 --- a/main/auth/lostPassword.php +++ b/main/auth/lostPassword.php @@ -93,8 +93,7 @@ if (api_get_setting('allow_lostpassword') == 'false') { api_not_allowed(); } -if (isset ($_GET['reset']) && isset ($_GET['id'])) { - //$msg = Login::reset_password($_GET["reset"], $_GET["id"], true); +if (isset ($_GET['reset']) && isset ($_GET['id'])) { $msg1= ''.get_lang('Back').''; echo '

'.$msg1.'
'; } else { diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php index 0d104126ed..32c6d87f91 100644 --- a/main/calendar/agenda.inc.php +++ b/main/calendar/agenda.inc.php @@ -1572,7 +1572,7 @@ function display_student_links() { } $day_url = '&month='.date('m').'&year='.date('Y').'&view='.Security::remove_XSS($_GET['view']); $today_url = api_get_self()."?action=view".$day_url."&toolgroup=".api_get_group_id(); - echo Display::url(get_lang('Today'), $today_url, array('class'=>'a_button white medium')); + echo Display::url(get_lang('Today'), $today_url, array('class'=>'btn')); //@todo Add next events and all events? ... diff --git a/main/install/install.lib.php b/main/install/install.lib.php index b9a3666862..df50a7cde5 100755 --- a/main/install/install.lib.php +++ b/main/install/install.lib.php @@ -2028,7 +2028,7 @@ function display_after_install_message($installType, $nbr_courses) { echo ''; ?>

- + '; - - $return .= Display::div(Display::url(get_lang('Save'), '#', array('id'=>'listSubmit', 'class'=>'a_button white medium')), array('style'=>'float:left; margin-top:15px;width:100%')); + $return .=''; + $return .= Display::div(Display::url(get_lang('Save'), '#', array('id'=>'listSubmit', 'class'=>'btn')), array('style'=>'float:left; margin-top:15px;width:100%')); } else { $return .= $return_audio.''; } diff --git a/main/newscorm/lp_list.php b/main/newscorm/lp_list.php index c9f1f6e0b4..00762bf019 100644 --- a/main/newscorm/lp_list.php +++ b/main/newscorm/lp_list.php @@ -527,7 +527,7 @@ if (!empty($flat_list)) { echo '

'.get_lang('LearningPaths').'

'; echo Display::return_icon('scorms.png', '', array(), 64); echo '
'; - echo Display::url(get_lang('_add_learnpath'), api_get_self().'?'.api_get_cidreq().'&action=add_lp' , array('class' => 'a_button white')); + echo Display::url(get_lang('_add_learnpath'), api_get_self().'?'.api_get_cidreq().'&action=add_lp' , array('class' => 'btn')); echo '
'; echo ''; } diff --git a/main/social/groups.php b/main/social/groups.php index cb64c29323..94943b3aac 100644 --- a/main/social/groups.php +++ b/main/social/groups.php @@ -255,9 +255,9 @@ if ($group_id != 0 ) { if ($is_group_member || $group_info['visibility'] == GROUP_PERMISSION_OPEN) { if (!$is_group_member) { if (!in_array($my_group_role, array(GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER, GROUP_USER_PERMISSION_PENDING_INVITATION))) { - $social_right_content .= ''.get_lang('JoinGroup').''; + $social_right_content .= ''.get_lang('JoinGroup').''; } elseif ($my_group_role == GROUP_USER_PERMISSION_PENDING_INVITATION) { - $social_right_content .= ''.get_lang('YouHaveBeenInvitedJoinNow').''; + $social_right_content .= ''.get_lang('YouHaveBeenInvitedJoinNow').''; } $social_right_content .= '

'; } @@ -311,9 +311,9 @@ if ($group_id != 0 ) { } else { // if I already sent an invitation message if (!in_array($my_group_role, array(GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER, GROUP_USER_PERMISSION_PENDING_INVITATION))) { - $social_right_content .= ''.get_lang('JoinGroup').''; + $social_right_content .= ''.get_lang('JoinGroup').''; } elseif ($my_group_role == GROUP_USER_PERMISSION_PENDING_INVITATION) { - $social_right_content .= ''.get_lang('YouHaveBeenInvitedJoinNow').''; + $social_right_content .= ''.get_lang('YouHaveBeenInvitedJoinNow').''; } } $social_right_content .= ''; // end layout messages @@ -398,7 +398,7 @@ if ($group_id != 0 ) { //Avoiding my groups $join_url = ''; if (!in_array($id,$my_group_list)) { - $join_url = ''.get_lang('JoinGroup').' '; + $join_url = ''.get_lang('JoinGroup').' '; } $item_4 = '
'.$join_url.'
'; @@ -443,7 +443,7 @@ if ($group_id != 0 ) { $join_url = ''; if (!in_array($id,$my_group_list)) { - $join_url = ''.get_lang('JoinGroup').' '; + $join_url = ''.get_lang('JoinGroup').' '; } $item_4 = '
'.$join_url.'
'; @@ -464,12 +464,11 @@ if ($group_id != 0 ) { $my_group_content = Display::return_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false)); } if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') { - $create_group_item = ''.get_lang('CreateASocialGroup').''; + $create_group_item = ''.get_lang('CreateASocialGroup').''; //$my_group_content = $create_group_item. $my_group_content; } else { if (api_is_allowed_to_edit(null,true)) { - $create_group_item = ''.get_lang('CreateASocialGroup').''; - //$my_group_content = $create_group_item. $my_group_content; + $create_group_item = ''.get_lang('CreateASocialGroup').''; } } break; @@ -500,12 +499,11 @@ if ($group_id != 0 ) { $my_group_content = Display::return_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false)); } if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') { - $create_group_item = ''.get_lang('CreateASocialGroup').''; + $create_group_item = ''.get_lang('CreateASocialGroup').''; //$my_group_content = $create_group_item. $my_group_content; } else { if (api_is_allowed_to_edit(null,true)) { - $create_group_item = ''.get_lang('CreateASocialGroup').''; - //$my_group_content = $create_group_item. $my_group_content; + $create_group_item = ''.get_lang('CreateASocialGroup').''; } } if (count($grid_newest_groups) > 0) { diff --git a/main/template/default/create_course/add_course.tpl b/main/template/default/create_course/add_course.tpl index 84bf08cc35..1f516597ff 100644 --- a/main/template/default/create_course/add_course.tpl +++ b/main/template/default/create_course/add_course.tpl @@ -5,25 +5,25 @@