Minor fixing select see #1791

skala
Julio Montoya 13 years ago
parent 6b24ba7a45
commit 0a24a50f26
  1. 12
      main/template/default/skill/skill_wheel.js.tpl
  2. 1
      main/template/default/skill/skill_wheel.tpl
  3. 2
      main/template/default/skill/skill_wheel_student.tpl

@ -1,3 +1,5 @@
{# topbar #}
{% include "default/layout/topbar.tpl" %}
<script> <script>
/* Skill wheel settings */ /* Skill wheel settings */
@ -17,9 +19,13 @@ var my_domain = [1,2,3,4,5,6,7,8,9];
var col = 9; var col = 9;
var color_patterns = []; var color_patterns = [];
/*
See colorbrewer documentation
color_patterns[1] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.Blues[col]); color_patterns[1] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.Blues[col]);
color_patterns[2] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.Purples[col]); color_patterns[2] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.Purples[col]);
//color_patterns[2] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.Blues[6]); color_patterns[2] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.Blues[6]);
color_patterns[3] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.Greens[col]); color_patterns[3] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.Greens[col]);
color_patterns[4] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.Reds[col]); color_patterns[4] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.Reds[col]);
color_patterns[5] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.Oranges[col]); color_patterns[5] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.Oranges[col]);
@ -35,7 +41,7 @@ color_patterns[13] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.BuPu
color_patterns[14] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.RdPu[col]); color_patterns[14] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.RdPu[col]);
color_patterns[15] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.PuRd[col]); color_patterns[15] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.PuRd[col]);
color_patterns[16] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.OrRd[col]); color_patterns[16] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.OrRd[col]);
color_patterns[17] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.YlOrRd[col]); color_patterns[17] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.YlOrRd[col]);*/
//Too make the gray tones lighter //Too make the gray tones lighter
col = 3; col = 3;
@ -62,6 +68,7 @@ for (i= 0; i < color_loops; i++) {
colors = $.merge(colors, temp_color_array); colors = $.merge(colors, temp_color_array);
} }
/* The partiton name will have 1 or 2 lines? */
function is_multiline(word) { function is_multiline(word) {
if (word) { if (word) {
if (word.length > max_size_text_length) { if (word.length > max_size_text_length) {
@ -340,7 +347,6 @@ for (i= 0; i < color_loops; i++) {
},*/ },*/
"{{ "CreateChildSkill"|get_lang }}" : function() { "{{ "CreateChildSkill"|get_lang }}" : function() {
open_popup(0, skill.id); open_popup(0, skill.id);
}, },
"{{ "AddSkillToProfileSearch"|get_lang }}" : function() { "{{ "AddSkillToProfileSearch"|get_lang }}" : function() {
add_skill_in_profile_list(skill.id, skill.name); add_skill_in_profile_list(skill.id, skill.name);

@ -205,7 +205,6 @@ function submit_profile_search_form() {
//return skill; //return skill;
} }
function add_skill_in_profile_list(skill_id, skill_name) { function add_skill_in_profile_list(skill_id, skill_name) {
if ($('#profile_match_item_'+skill_id).length == 0 ) { if ($('#profile_match_item_'+skill_id).length == 0 ) {
$('#profile_search').append('<li class="bit-box" id="profile_match_item_'+skill_id+'">'+skill_name+' <a rel="'+skill_id+'" class="closebutton" href="#"></a> </li>'); $('#profile_search').append('<li class="bit-box" id="profile_match_item_'+skill_id+'">'+skill_name+' <a rel="'+skill_id+'" class="closebutton" href="#"></a> </li>');

@ -53,7 +53,7 @@ function fill_skill_search_li(skill_id, skill_name, checked) {
if (checked == 1) { if (checked == 1) {
checked_condition = 'checked=checked'; checked_condition = 'checked=checked';
} }
return '<li><a href="#" class="load_wheel" rel="'+skill_id+'">'+skill_name+'</a></li>'; return '<li><a id="skill_to_select_id_'+skill_id+'" href="#" class="load_wheel" rel="'+skill_id+'">'+skill_name+'</a></li>';
} }
function load_skill_info(skill_id) { function load_skill_info(skill_id) {

Loading…
Cancel
Save