More fixes in the skills managemet #1791, now we use the label_tag skill and label_tag notice see #1791

skala
Julio Montoya 14 years ago
parent b43ee64783
commit 322e3d4293
  1. 2
      main/admin/skills_profile.php
  2. 2
      main/inc/ajax/model.ajax.php
  3. 2
      main/inc/lib/skill.lib.php
  4. 2
      main/inc/lib/skill.visualizer.lib.php
  5. 2
      main/social/home.php
  6. 2
      main/template/default/skill/profile.tpl
  7. 2
      main/template/default/skill/skill_tree_student.tpl
  8. 4
      user_portal.php

@ -13,7 +13,7 @@ require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'skill.lib.php'; require_once api_get_path(LIBRARY_PATH).'skill.lib.php';
$this_section = SECTION_PLATFORM_ADMIN; $this_section = SECTION_PLATFORM_ADMIN;
//api_protect_admin_script(); api_protect_admin_script();
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/tag/jquery.fcbkcomplete.js" type="text/javascript" language="javascript"></script>'; $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/tag/jquery.fcbkcomplete.js" type="text/javascript" language="javascript"></script>';
$htmlHeadXtra[] = '<link href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/tag/style.css" rel="stylesheet" type="text/css" />'; $htmlHeadXtra[] = '<link href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/tag/style.css" rel="stylesheet" type="text/css" />';

@ -93,7 +93,7 @@ switch ($action) {
$skills_string = ''; $skills_string = '';
if (!empty($skills)) { if (!empty($skills)) {
foreach($skills as $skill) { 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; $new_result[] = $item;

@ -133,7 +133,7 @@ class SkillRelSkill extends Model {
foreach ($skills as &$skill) { foreach ($skills as &$skill) {
$skill['data'] = $skill_obj->get($skill['skill_id']); $skill['data'] = $skill_obj->get($skill['skill_id']);
if (isset($skill['data'] )) { if (isset($skill['data']) && !empty($skill['data'])) {
if (!empty($done_skills)) { if (!empty($done_skills)) {
$skill['data']['passed'] = 0; $skill['data']['passed'] = 0;
if (in_array($skill['skill_id'], $done_skills)) { if (in_array($skill['skill_id'], $done_skills)) {

@ -42,7 +42,7 @@
if (!empty($skill['gradebooks'])) { if (!empty($skill['gradebooks'])) {
foreach ($skill['gradebooks'] as $gradebook) { foreach ($skill['gradebooks'] as $gradebook) {
//uncomment this to show the gradebook tags //uncomment this to show the gradebook tags
$gradebook_string .= Display::span($gradebook['name'], array('class'=>'label_tag notice','style'=>'width:50px')).'<br />'; $gradebook_string .= Display::span($gradebook['name'], array('class'=>'label_tag gradebook','style'=>'width:50px')).'<br />';
} }
} }
$skill['name'] = Display::url($skill['name'], '#', array('id'=>'edit_block_'.$block_id, 'class'=>'edit_block')); $skill['name'] = Display::url($skill['name'], '#', array('id'=>'edit_block_'.$block_id, 'class'=>'edit_block'));

@ -109,7 +109,7 @@ echo '<div id="social-content">';
$lis = ''; $lis = '';
if (!empty($skills)) { if (!empty($skills)) {
foreach($skills as $skill) { 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); echo Display::tag('ul', $lis);
} }

@ -164,7 +164,7 @@ function checkLength( o, n, min, max ) {
{$user.total_found_skills} / {$total_search_skills} {$user.total_found_skills} / {$total_search_skills}
{foreach $user['skills'] as $skill_data} {foreach $user['skills'] as $skill_data}
<li> <li>
<span class="label_tag notice">{$skill_list[$skill_data.skill_id].name}</span> <span class="label_tag skill">{$skill_list[$skill_data.skill_id].name}</span>
{if $skill_data.found} {if $skill_data.found}
* I have this skill * * I have this skill *
{/if} {/if}

@ -105,7 +105,7 @@ jsPlumb.bind("ready", function() {
//filling the gradebook_id //filling the gradebook_id
$("#gradebook_id").html(''); $("#gradebook_id").html('');
jQuery.each(skill.gradebooks, function(index, data) { jQuery.each(skill.gradebooks, function(index, data) {
$("#gradebook_id").append('<span class="label_tag notice">'+data.name+'</div>'); $("#gradebook_id").append('<span class="label_tag gradebook">'+data.name+'</div>');
}); });
}, },
}); });

@ -235,9 +235,9 @@ $controller->tpl->assign('reservation_block', $controller->return_reservation
$controller->tpl->assign('search_block', $controller->return_search_block()); $controller->tpl->assign('search_block', $controller->return_search_block());
$controller->tpl->assign('classes_block', $controller->return_classes_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->assign('skills_block', $controller->return_skills_links());
} //}
$controller->tpl->display_two_col_template(); $controller->tpl->display_two_col_template();

Loading…
Cancel
Save