Adding my skills + fixing titles see #1791

main/css/base.css

@@ -271,7 +271,9 @@ form .formw input {
     padding:  8px 0px;
 }
 
-
+.sidebar-nav-skill-wheel {
+    padding-top:  0px;
+}
 
 .well_border {
     /* border: 1px solid rgba(0, 0, 0, 0.05);*/

main/inc/ajax/skill.ajax.php

@@ -126,7 +126,13 @@ switch ($action) {
         $depth      = isset($_REQUEST['main_depth']) ? $_REQUEST['main_depth'] : 2;        
         $all = $skill->get_skills_tree_json($user_id, $skill_id, false, $depth);
         echo $all;
-        break;             
+        break;
+    case 'get_user_skills':
+        $skills = $skill->get_user_skills($user_id, true);        
+        Display::display_no_header();        
+        Display::$global_template->assign('skills', $skills);
+        echo Display::$global_template->fetch('default/skill/user_skills.tpl');
+        break;
     case 'get_gradebook_info':
         $id = isset($_REQUEST['id']) ? $_REQUEST['id'] : null;
         $info = $gradebook->get($id);                    

main/template/default/skill/profile_item.tpl

@@ -1,10 +1,11 @@
-{% if profiles is not null %}    
+{% if profiles is not null %}
-    <h3>{{"SkillProfiles"|get_lang}}</h3>
+    <div class="page-header">
-    <hr>
+        <h3>{{ "SkillProfiles"|get_lang }}</h3>
+    </div>
     <ul class="holder">
         {%for profile in profiles %}        
             <li class="bit-box">
-                <a class="load_profile" rel="{{profile.id}}" href="#">{{ profile.name }}</a>
+                <a class="load_profile" rel="{{ profile.id }}" href="#">{{ profile.name }}</a>
             </li>        
         {% endfor %}
     </ul>    

main/template/default/skill/skill_wheel.tpl

@@ -429,9 +429,10 @@ $(document).ready(function() {
     <div class="row-fluid">
         
         <div class="span3">
-            <div class="well">
+            <div class="well sidebar-nav-skill-wheel">
-                <h3>{{ 'Skills'|get_lang }}</h3>
+                <div class="page-header">
-                <hr>
+                    <h3>{{ 'Skills'|get_lang }}</h3>
+                </div>
                 
                 <form id="skill_search" class="form-search">
                     <select id="skill_id" name="skill_id" />
@@ -445,8 +446,9 @@ $(document).ready(function() {
                     </ul>
                 </form>
                 
-                <h3>{{ 'ProfileSearch'|get_lang }}</h3>
+                <div class="page-header">
-                <hr>
+                    <h3>{{ 'ProfileSearch'|get_lang }}</h3>
+                </div>
                 {{ 'WhatSkillsAreYouLookingFor'|get_lang }}
                 
                 <ul id="profile_search" class="holder holder_simple">
@@ -466,8 +468,9 @@ $(document).ready(function() {
                 <div id="saved_profiles">
                 </div>
                 
-                <br />                
+                <div class="page-header">            
-                <h3>{{ "Legend"|get_lang }}</h3>                
+                    <h3>{{ "Legend"|get_lang }}</h3>                
+                </div>
                 <span class="label label-warning">{{ "SkillsYouCanLearn"|get_lang }}</span><br /><br />
                 <span class="label label-important">{{ "SkillsSearchedFor"|get_lang }}</span><br />                
             </div>                

main/template/default/skill/skill_wheel_student.tpl

@@ -39,8 +39,7 @@ function check_skills_sidebar() {
                             skill_info = get_skill_info(skill_id);                        
                             li = fill_skill_search_li(skill_id, skill_info.name);
                             $("#skill_holder").append(li); 
-                        }                        
+                        }
-
                     }
                 },            
             });                
@@ -67,6 +66,17 @@ function load_skill_info(skill_id) {
     });
 }
 
+function load_my_skills() {
+    $.ajax({
+        url: url+'&a=get_user_skills&user_id='+{{ _u.user_id}},
+        //async: false,        
+        success: function(data) {            
+            $('#my_skills').html(data);                
+        }
+    });        
+}
+
+
 $(document).ready(function() {
     /* Skill search */ 
     
@@ -175,8 +185,10 @@ $(document).ready(function() {
         height  : 250
     });    
         
-    load_nodes(0, main_depth);    
+    load_nodes(0, main_depth);
     
+    load_my_skills();
+
     function open_popup(skill_id, parent_id) {
         //Cleaning selected        
         $("#gradebook_id").find('option').remove();        
@@ -249,15 +261,19 @@ $(document).ready(function() {
     <div class="row-fluid">
         
         <div class="span3">
-            <div class="well">
+            <div class="well sidebar-nav-skill-wheel ">
-                <h3>{{ 'MySkills'|get_lang }}</h3>
+                
-                <hr>
+                <div class="page-header">
+                    <h3>{{ 'MySkills'|get_lang }}</h3>                
+                </div>
                 
-                <div id="my_skills">                    
+                <div id="my_skills">
                 </div>
                 
-                <h3>{{ 'GetNewSkills'|get_lang }}</h3>
+                
-                <hr>
+                <div class="page-header">
+                    <h3>{{ 'GetNewSkills'|get_lang }}</h3>
+                </div>
                 
                 <form id="skill_search" class="form-search">
                     <select id="skill_id" name="skill_id" />
@@ -270,14 +286,15 @@ $(document).ready(function() {
                     </ul>
                 </form>
                 
-                
+                <div class="page-header">
-                <h3>{{ 'SkillInfo'|get_lang }}</h3>
+                    <h3>{{ 'SkillInfo'|get_lang }}</h3>
-                <hr>                
+                </div>                
                 <div id="skill_info">
                 </div>
                 
-                <br />
+                <div class="page-header">
-                <h3>{{ "Legend"|get_lang }}</h3>                
+                <h3>{{ "Legend"|get_lang }}</h3>
+                </div>
                 <span class="label label-info">{{ "SkillsYouAcquired"|get_lang }}</span><br />
                 <span class="label label-warning">{{ "SkillsYouCanLearn"|get_lang }}</span><br />
                 <span class="label label-important">{{ "SkillsSearchedFor"|get_lang }}</span><br />

main/template/default/skill/user_skills.tpl

@@ -0,0 +1,13 @@
+{% if skills is not null %}
+<ul class="nav nav-list">
+    {%for skill in skills %}        
+        <li>
+            <a rel="{{ skill.id}}" href="#">
+                <span class="label label-info">
+            {{ skill.name }}
+                </span>
+                </a>
+        </li>        
+    {% endfor %}
+</ul>    
+{% endif %}