diff --git a/main/admin/index.php b/main/admin/index.php index 79cf4b7e9a..0e01f0e2c0 100644 --- a/main/admin/index.php +++ b/main/admin/index.php @@ -304,8 +304,6 @@ function version_check() { $row = Database::fetch_array($result, 'ASSOC'); // The site has not been registered yet. - //if (api_get_setting('registered') == 'false') - $return = ''; if ($row['selected_value'] == 'false') { $return .= '
'; @@ -314,18 +312,8 @@ function version_check() { $return .= ''; $return .= '
'; } else { - // The site has been registered already but is seriously out of date (registration date + 15552000 seconds). - /* - if ((api_get_setting('registered') + 15552000) > mktime()) { - $return = 'It has been a long time since about your campus has been updated on chamilo.org'; - $return .= '
'; - $return .= ''; - $return .= '
'; - } else { - */ $return = 'site registered. '; $return .= check_system_version(); - //} } return $return; } diff --git a/main/admin/user_export.php b/main/admin/user_export.php index b9a4553334..6835ced91b 100644 --- a/main/admin/user_export.php +++ b/main/admin/user_export.php @@ -136,12 +136,5 @@ if ($form->validate()) } } Display :: display_header($tool_name); -//api_display_tool_title($tool_name); $form->display(); -/* -============================================================================== - FOOTER -============================================================================== -*/ -Display :: display_footer(); -?> +Display :: display_footer(); \ No newline at end of file diff --git a/main/css/base.css b/main/css/base.css index 88c2f044bf..d0d53cf430 100644 --- a/main/css/base.css +++ b/main/css/base.css @@ -4196,11 +4196,17 @@ a:active{ } .skills-profiles, .skills-users, .skills-skills { - margin-top: 10px; - margin-bottom: 10px; + margin-top: 10px; + margin-bottom: 10px; + padding:10px; + border: 1px solid #ccc; } -.skills-skills ul.holder { - margin-bottom: 8px; +.skills-skills ul.holder, +.skills-users ul.holder, +.skills-profiles ul.holder +{ + margin-bottom: 8px; + border: 0px; } diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php index dac282c7d3..20446a8ee7 100644 --- a/main/inc/lib/template.lib.php +++ b/main/inc/lib/template.lib.php @@ -205,14 +205,16 @@ class Template extends Smarty { } } - $this->assign('online_button', Security::remove_XSS(Display::return_icon('online.png'))); - $this->assign('offline_button', Security::remove_XSS(Display::return_icon('offline.png'))); - - // Get language iso-code for this page - ignore errors + $this->assign('online_button', Security::remove_XSS(Display::return_icon('online.png'))); + $this->assign('offline_button', Security::remove_XSS(Display::return_icon('offline.png'))); + // Get language iso-code for this page - ignore errors $this->assign('document_language', api_get_language_isocode()); $course_title = $_course['name']; + + $title_list = array(); + $title_list[] = api_get_setting('Institution'); $title_list[] = api_get_setting('siteName'); if (!empty($course_title)) { @@ -306,7 +308,7 @@ class Template extends Smarty { $css_file_to_string .= api_get_css($css_file); } - global $this_section, $nameTools; + global $this_section; $this->assign('css_file_to_string', $css_file_to_string); $this->assign('js_file_to_string', $js_file_to_string); $this->assign('text_direction', api_get_text_direction()); @@ -339,8 +341,7 @@ class Template extends Smarty { } $this->assign('favico', $favico); - //old banner.inc.php - + //old banner.inc.php require_once api_get_path(LIBRARY_PATH).'banner.lib.php'; global $my_session_id; diff --git a/main/template/default/skill/profile.tpl b/main/template/default/skill/profile.tpl index e8d7fb9bc9..0efaa8f72d 100644 --- a/main/template/default/skill/profile.tpl +++ b/main/template/default/skill/profile.tpl @@ -38,7 +38,8 @@ $(document).ready( function() { $.ajax({ url: '{$url}?a=save_profile&'+params, success:function(data) { - $("#dialog-form").dialog("close"); + $("#dialog-form").dialog("close"); + alert("{"Saved"|get_lang}"); } }); },