From 322e3d4293609f92cff6892b737b13b67ae4b8f7 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 14 Nov 2011 14:43:49 +0100 Subject: [PATCH] More fixes in the skills managemet #1791, now we use the label_tag skill and label_tag notice see #1791 --- main/admin/skills_profile.php | 2 +- main/inc/ajax/model.ajax.php | 2 +- main/inc/lib/skill.lib.php | 2 +- main/inc/lib/skill.visualizer.lib.php | 2 +- main/social/home.php | 2 +- main/template/default/skill/profile.tpl | 2 +- main/template/default/skill/skill_tree_student.tpl | 2 +- user_portal.php | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/main/admin/skills_profile.php b/main/admin/skills_profile.php index 27f82eeec9..573b94dd7d 100644 --- a/main/admin/skills_profile.php +++ b/main/admin/skills_profile.php @@ -13,7 +13,7 @@ require_once '../inc/global.inc.php'; require_once api_get_path(LIBRARY_PATH).'skill.lib.php'; $this_section = SECTION_PLATFORM_ADMIN; -//api_protect_admin_script(); +api_protect_admin_script(); $htmlHeadXtra[] = ''; $htmlHeadXtra[] = ''; diff --git a/main/inc/ajax/model.ajax.php b/main/inc/ajax/model.ajax.php index 11f9e7259e..6a298aafb2 100644 --- a/main/inc/ajax/model.ajax.php +++ b/main/inc/ajax/model.ajax.php @@ -93,7 +93,7 @@ switch ($action) { $skills_string = ''; if (!empty($skills)) { foreach($skills as $skill) { - $item['skills'] .= Display::span($skill['name'], array('class' => 'label_tag success')); + $item['skills'] .= Display::span($skill['name'], array('class' => 'label_tag skill')); } } $new_result[] = $item; diff --git a/main/inc/lib/skill.lib.php b/main/inc/lib/skill.lib.php index e5fb983d35..5415a0f920 100644 --- a/main/inc/lib/skill.lib.php +++ b/main/inc/lib/skill.lib.php @@ -133,7 +133,7 @@ class SkillRelSkill extends Model { foreach ($skills as &$skill) { $skill['data'] = $skill_obj->get($skill['skill_id']); - if (isset($skill['data'] )) { + if (isset($skill['data']) && !empty($skill['data'])) { if (!empty($done_skills)) { $skill['data']['passed'] = 0; if (in_array($skill['skill_id'], $done_skills)) { diff --git a/main/inc/lib/skill.visualizer.lib.php b/main/inc/lib/skill.visualizer.lib.php index 4c9aa1c25b..9ec2235deb 100644 --- a/main/inc/lib/skill.visualizer.lib.php +++ b/main/inc/lib/skill.visualizer.lib.php @@ -42,7 +42,7 @@ if (!empty($skill['gradebooks'])) { foreach ($skill['gradebooks'] as $gradebook) { //uncomment this to show the gradebook tags - $gradebook_string .= Display::span($gradebook['name'], array('class'=>'label_tag notice','style'=>'width:50px')).'
'; + $gradebook_string .= Display::span($gradebook['name'], array('class'=>'label_tag gradebook','style'=>'width:50px')).'
'; } } $skill['name'] = Display::url($skill['name'], '#', array('id'=>'edit_block_'.$block_id, 'class'=>'edit_block')); diff --git a/main/social/home.php b/main/social/home.php index b0c80fd96c..4ba942d0f1 100644 --- a/main/social/home.php +++ b/main/social/home.php @@ -109,7 +109,7 @@ echo '
'; $lis = ''; if (!empty($skills)) { foreach($skills as $skill) { - $lis .= Display::tag('li', Display::span($skill['name'], array('class'=>'label_tag success'))); + $lis .= Display::tag('li', Display::span($skill['name'], array('class'=>'label_tag skill'))); } echo Display::tag('ul', $lis); } diff --git a/main/template/default/skill/profile.tpl b/main/template/default/skill/profile.tpl index 8a29008c7d..b1c177a99b 100644 --- a/main/template/default/skill/profile.tpl +++ b/main/template/default/skill/profile.tpl @@ -164,7 +164,7 @@ function checkLength( o, n, min, max ) { {$user.total_found_skills} / {$total_search_skills} {foreach $user['skills'] as $skill_data}
  • - {$skill_list[$skill_data.skill_id].name} + {$skill_list[$skill_data.skill_id].name} {if $skill_data.found} * I have this skill * {/if} diff --git a/main/template/default/skill/skill_tree_student.tpl b/main/template/default/skill/skill_tree_student.tpl index 95b8e150ae..c0f65e93d0 100644 --- a/main/template/default/skill/skill_tree_student.tpl +++ b/main/template/default/skill/skill_tree_student.tpl @@ -105,7 +105,7 @@ jsPlumb.bind("ready", function() { //filling the gradebook_id $("#gradebook_id").html(''); jQuery.each(skill.gradebooks, function(index, data) { - $("#gradebook_id").append(''+data.name+'
    • '); + $("#gradebook_id").append(''+data.name+''); }); }, }); diff --git a/user_portal.php b/user_portal.php index 0ced6655aa..53be74acc2 100644 --- a/user_portal.php +++ b/user_portal.php @@ -235,9 +235,9 @@ $controller->tpl->assign('reservation_block', $controller->return_reservation $controller->tpl->assign('search_block', $controller->return_search_block()); $controller->tpl->assign('classes_block', $controller->return_classes_block()); -if (api_is_platform_admin() || api_is_drh()) { +//if (api_is_platform_admin() || api_is_drh()) { $controller->tpl->assign('skills_block', $controller->return_skills_links()); -} +//} $controller->tpl->display_two_col_template();