Browse Source

Fixing skill profile bug when selecting a skill profile

Julio Montoya 13 năm trước cách đây
mục cha
commit
a8822a24c3

+ 11 - 9
main/admin/skills_profile.php

@@ -30,8 +30,10 @@ $tpl = new Template(get_lang('Skills'));
 
 $form = new FormValidator('profile_search');
 
+
+$form->addElement('header', get_lang('SearchSkills'));
 $form->addElement('select', 'skills', null, null, array('id'=>'skills'));
-$form->addElement('style_submit_button', 'submit', get_lang('Search'), 'class="a_button blue "');
+$form->addElement('style_submit_button', 'submit', get_lang('Search'), 'class="btn"');
 
 $profiles = $skill_profile->get_all();
 
@@ -66,7 +68,7 @@ $count_skills = count($skills);
 $users  = $skill_rel_user->get_user_by_skills($skills);
 
 if (!empty($users)) {
-    foreach($users as $user) {            
+    foreach ($users as $user) {            
         $user_info = api_get_user_info($user['user_id']);
         $user_list[$user['user_id']]['user'] = $user_info;
         $my_user_skills = $skill_rel_user->get_user_skills($user['user_id']);
@@ -115,10 +117,7 @@ if (!empty($skills)) {
 }
 
 $total_skills_to_search = $skill->get_skills_info($total_skills_to_search);
-$skill_list = array();
-foreach($total_skills_to_search as $skill_info) {
-    $skill_list[$skill_info['id']] = $skill_info;        
-}
+
 
 $action = isset($_REQUEST['a']) ? $_REQUEST['a'] : null;
 $id     = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : null;
@@ -132,15 +131,18 @@ switch ($action) {
             }            
         }  
         $skills = $_SESSION['skills'] = $new_skill;
-        break;
-    
+        break;    
     case 'load_profile':
         $skill_profile = new SkillRelProfile();
         $skills = $skill_profile->get_skills_by_profile($id);        
-        
+        $total_skills_to_search = $skill->get_skills_info($skills);        
         break;
 }
 
+$skill_list = array();
+foreach ($total_skills_to_search as $skill_info) {
+    $skill_list[$skill_info['id']] = $skill_info;        
+}
 
 $tpl->assign('skill_list', $skill_list);   
 $tpl->assign('search_skill_list', $skills);

+ 17 - 22
main/template/default/skill/profile.tpl

@@ -95,15 +95,12 @@ function checkLength( o, n, min, max ) {
     }
 }    
 </script>
-<h2>{"SearchSkills"|get_lang}</h2>
-
 {$form}
 
-
 {if !empty($search_skill_list) }
     <div class="skills-skills">
         <h3>{"Skills"|get_lang}</h3>
-        <ul class="holder">
+        <ul class="holder">             
             {foreach $search_skill_list as $search_skill_id}        
                 <li class="bit-box">
                     {$skill_list[$search_skill_id].name}
@@ -111,7 +108,7 @@ function checkLength( o, n, min, max ) {
                 </li>        
             {/foreach}
         </ul>
-        <a id="add_profile" class="a_button gray small" href="#"> {"SaveThisSearch"|get_lang}</a>
+        <a id="add_profile" class="btn" href="#"> {"SaveThisSearch"|get_lang}</a>
     </div>
 {/if}
 
@@ -167,22 +164,20 @@ function checkLength( o, n, min, max ) {
 {/if}
 
 <div id="dialog-form" style="display:none;">    
-    <form id="save_profile_form" name="form">        
-        <div class="row">
-            <div class="label">
-                <label for="name">{"Name"|get_lang}</label>
-            </div>      
-            <div class="formw">
-                <input type="text" name="name" id="name" size="40" />             
-            </div>
-        </div>        
-        <div class="row">
-            <div class="label">
-                <label for="name">{"Description"|get_lang}</label>
-            </div>      
-            <div class="formw">
-                <textarea name="description" id="description" cols="40" rows="7"></textarea>
-            </div>
-        </div>  
+    <form id="save_profile_form" class="form-horizontal" name="form">       
+        <fieldset>
+            <div class="control-group">            
+                <label class="control-label" for="name">{"Name"|get_lang}</label>            
+                <div class="controls">
+                    <input type="text" name="name" id="name" size="40" />             
+                </div>
+            </div>        
+            <div class="control-group">            
+                <label class="control-label" for="name">{"Description"|get_lang}</label>            
+                <div class="controls">
+                    <textarea name="description" id="description" class="span2"  rows="7"></textarea>
+                </div>
+            </div>  
+        </fieldset>
     </form>    
 </div>

+ 32 - 38
main/template/default/skill/skill_tree.tpl

@@ -359,44 +359,38 @@ $(document).ready( function() {
 
 <div id="dialog-form" style="display:none; z-index:6000;">    
     <p class="validateTips"></p>
-    <form id="add_item" name="form">
-        <input type="hidden" name="id" id="id"/>
-        <div class="row">
-            <div class="label">
-                <label for="name">{'Name'|get_lang}</label>
-            </div>      
-            <div class="formw">
-                <input type="text" name="name" id="name" size="40" />             
+    <form class="form-horizontal" id="add_item" name="form">
+        <fieldset>
+            <input type="hidden" name="id" id="id"/>
+            <div class="control-group">            
+                <label class="control-label" for="name">{'Name'|get_lang}</label>            
+                <div class="controls">
+                    <input type="text" name="name" id="name" size="40" />             
+                </div>
+            </div>        
+            <div class="control-group">            
+                <label class="control-label" for="name">{'Parent'|get_lang}</label>            
+                <div class="controls">
+                    <select id="parent_id" name="parent_id" />
+                    </select>                  
+                </div>
+            </div>                
+            <div class="control-group">            
+                <label class="control-label" for="name">{'Gradebook'|get_lang}</label>            
+                <div class="controls">
+                    <select id="gradebook_id" name="gradebook_id[]" multiple="multiple"/>
+                    </select>             
+                    <span class="help-block">
+                    {'WithCertificate'|get_lang}
+                    </span>           
+                </div>
             </div>
-        </div>        
-        <div class="row">
-            <div class="label">
-                <label for="name">{'Parent'|get_lang}</label>
-            </div>      
-            <div class="formw">
-                <select id="parent_id" name="parent_id" />
-                </select>                  
-            </div>
-        </div>                
-        <div class="row">
-            <div class="label">
-                <label for="name">{'Gradebook'|get_lang}</label>
-            </div>      
-            <div class="formw">
-                <select id="gradebook_id" name="gradebook_id[]" multiple="multiple"/>
-                </select>             
-                <span class="help-block">
-                {'WithCertificate'|get_lang}
-                </span>           
-            </div>
-        </div>
-        <div class="row">
-            <div class="label">
-                <label for="name">{'Description'|get_lang}</label>
-            </div>      
-            <div class="formw">
-                <textarea name="description" id="description" cols="40" rows="7"></textarea>
-            </div>
-        </div>  
+            <div class="control-group">            
+                <label class="control-label" for="name">{'Description'|get_lang}</label>            
+                <div class="controls">
+                    <textarea name="description" id="description" class="span3" rows="7"></textarea>
+                </div>
+            </div>  
+        </fieldset>
     </form>    
 </div>

+ 14 - 20
main/template/default/skill/skill_tree_student.tpl

@@ -256,34 +256,28 @@ $(document).ready( function() {
 
 {$html}
 
-<div id="dialog-form" style="display:none;">
-    
-    <form id="add_item" name="form">
+<div id="dialog-form" style="display:none;">    
+    <form id="add_item" class="form-horizontal"  name="form">
+        <fieldset>
         <input type="hidden" name="id" id="id"/>
-        <div class="row">
-            <div class="label">
-                <label for="name">Name</label>
-            </div>      
-            <div class="formw">                
+        <div class="control-group">            
+            <label class="control-label" for="name">Name</label>            
+            <div class="controls">                
                 <span id="name"></span>             
             </div>
         </div>
-         <div class="row">
-            <div class="label">
-                <label for="name">Description</label>
-            </div>      
-            <div class="formw">
+         <div class="control-group">            
+            <label class="control-label" for="name">Description</label>            
+            <div class="controls">
                 <span id="description"></span>                
             </div>
         </div>  
-        <div class="row">
-            <div class="label">
-                <label for="name">Gradebook</label>
-            </div>      
-            <div class="formw">
+        <div class="control-group">            
+            <label class="control-label" for="name">Gradebook</label>            
+            <div class="controls">
                 <div id="gradebook_id"></div>                
             </div>
-        </div>
-       
+        </div>      
+        </fieldset>
     </form>    
 </div>