chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - format code

Browse Source
1.10.x
Julio Montoya 11 years ago
parent e54706f469
commit 8bc3b9a38e
3 changed files with 254 additions and 258 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      main/admin/skills_wheel.php
  2. 4
      main/template/default/skill/skill_wheel.js.tpl
  3. 71
      main/template/default/skill/skill_wheel.tpl

1
main/admin/skills_wheel.php
Unescape View File

@ -40,7 +40,6 @@ if (isset($_GET['skill_id'])) {
$url = api_get_path(WEB_AJAX_PATH)."skill.ajax.php?a=get_skills_tree_json&load_user=$load_user"; $url = api_get_path(WEB_AJAX_PATH)."skill.ajax.php?a=get_skills_tree_json&load_user=$load_user";
$tpl->assign('wheel_url', $url); $tpl->assign('wheel_url', $url);
$url = api_get_path(WEB_AJAX_PATH).'skill.ajax.php?1=1'; $url = api_get_path(WEB_AJAX_PATH).'skill.ajax.php?1=1';
$tpl->assign('url', $url); $tpl->assign('url', $url);
$tpl->assign('isAdministration', true); $tpl->assign('isAdministration', true);

4
main/template/default/skill/skill_wheel.js.tpl
Unescape View File

@ -304,7 +304,7 @@ function click_partition(d, path, text, icon, arc, x, y, r, p, vis) {
Open a popup in order to modify the skill Open a popup in order to modify the skill
*/ */
function open_popup(skill_id, parent_id) { function open_popup(skill_id, parent_id) {
//Cleaning selects // Cleaning selects
$("#gradebook_id").find('option').remove(); $("#gradebook_id").find('option').remove();
$("#parent_id").find('option').remove(); $("#parent_id").find('option').remove();
//Cleaning lists //Cleaning lists
@ -335,7 +335,7 @@ function open_popup(skill_id, parent_id) {
$("#description").text(skill.description); $("#description").text(skill.description);
} }
//Filling parent_id // Filling parent_id
$("#parent_id").append('<option class="selected" value="'+skill.extra.parent_id+'" selected="selected" >'); $("#parent_id").append('<option class="selected" value="'+skill.extra.parent_id+'" selected="selected" >');
$("#skill_edit_holder").append('<li class="bit-box">'+parent_info.name+'</li>'); $("#skill_edit_holder").append('<li class="bit-box">'+parent_info.name+'</li>');

71
main/template/default/skill/skill_wheel.tpl
Unescape View File

@ -52,9 +52,8 @@ function check_skills_sidebar() {
li = fill_skill_search_li(skill_id, skill_info.name); li = fill_skill_search_li(skill_id, skill_info.name);
$("#skill_holder").append(li); $("#skill_holder").append(li);
} }
} }
}, }
}); });
} }
}); });
@ -105,7 +104,7 @@ function check_skills_edit_form() {
$("#skill_edit_holder").append('<li class="bit-box" id="skill_option_'+skill_id+'"> '+skill.name+'</li>'); $("#skill_edit_holder").append('<li class="bit-box" id="skill_option_'+skill_id+'"> '+skill.name+'</li>');
$("#parent_id").append('<option class="selected" selected="selected" value="'+skill_id+'"></option>'); $("#parent_id").append('<option class="selected" selected="selected" value="'+skill_id+'"></option>');
} }
}, }
}); });
} }
}); });
@ -146,7 +145,7 @@ function check_gradebook() {
} }
} }
} }
}, }
}); });
} }
}); });
@ -253,11 +252,6 @@ $(document).ready(function() {
load_nodes(skill_id, main_depth); load_nodes(skill_id, main_depth);
}); });
/*$("#skill_search").on("click", "a#clear_selection", function() {
});*/
/* Profile matcher */ /* Profile matcher */
/* Submit button */ /* Submit button */
@ -280,7 +274,7 @@ $(document).ready(function() {
toogle_save_profile_form(); toogle_save_profile_form();
}); });
//Fill saved profiles list // Fill saved profiles list
update_my_saved_profiles(); update_my_saved_profiles();
/* Click in profile */ /* Click in profile */
@ -304,6 +298,7 @@ $(document).ready(function() {
} }
}); });
}); });
$("#saved_profiles").on('click', 'li.load_profile button.close', function () { $("#saved_profiles").on('click', 'li.load_profile button.close', function () {
var $parent = $(this).parent(); var $parent = $(this).parent();
var profileId = $parent.attr('rel'); var profileId = $parent.attr('rel');
@ -440,7 +435,8 @@ $(document).ready(function() {
} }
}); });
} }
/* change background color */
/* change background color */
$(document).ready(function () { $(document).ready(function () {
$("#celestial").click(function () { $("#celestial").click(function () {
$("#page-back").css("background","#A9E2F3"); $("#page-back").css("background","#A9E2F3");
@ -458,6 +454,7 @@ $(document).ready(function() {
$("#page-back").css("background","#F7F8E0"); $("#page-back").css("background","#F7F8E0");
}); });
}); });
/* Generated random colour */ /* Generated random colour */
/* /*
function colour(d) { function colour(d) {
@ -483,7 +480,6 @@ $(document).ready(function() {
<a class="btn btn-large btn-block btn-success" href="{{ _p.web }}user_portal.php">{{ "ReturnToCourseList"|get_lang }}</a> <a class="btn btn-large btn-block btn-success" href="{{ _p.web }}user_portal.php">{{ "ReturnToCourseList"|get_lang }}</a>
</div> </div>
<!-- ACCORDION --> <!-- ACCORDION -->
<div class="panel-group" id="accordion2"> <div class="panel-group" id="accordion2">
@ -585,23 +581,23 @@ $(document).ready(function() {
<form id="add_item" class="form-horizontal" name="form"> <form id="add_item" class="form-horizontal" name="form">
<fieldset> <fieldset>
<input type="hidden" name="id" id="id"/> <input type="hidden" name="id" id="id"/>
<div class="control-group"> <div class="form-group">
<label class="control-label" for="name">{{ 'Name' | get_lang }}</label> <label class="col-sm-2 control-label" for="name">{{ 'Name' | get_lang }}</label>
<div class="controls"> <div class="col-sm-8">
<input type="text" name="name" id="name" class="col-md-4" /> <input type="text" name="name" id="name" />
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label">{{ 'ShortCode' | get_lang }}</label> <label class="col-sm-2 control-label">{{ 'ShortCode' | get_lang }}</label>
<div class="controls"> <div class="col-sm-8">
<input type="text" name="short_code" id="short_code" class="span2" /> <input type="text" name="short_code" id="short_code" />
</div> </div>
</div> </div>
<div id="skill_row" class="control-group"> <div id="skill_row" class="form-group">
<label class="control-label" for="name">{{'Parent'|get_lang}}</label> <label class="col-sm-2 control-label" for="name">{{'Parent'|get_lang}}</label>
<div class="controls"> <div class="col-sm-8">
<select id="parent_id" name="parent_id" /> <select id="parent_id" name="parent_id" />
</select> </select>
<ul id="skill_edit_holder" class="holder holder_simple"> <ul id="skill_edit_holder" class="holder holder_simple">
@ -609,9 +605,9 @@ $(document).ready(function() {
</div> </div>
</div> </div>
<div id="gradebook_row" class="control-group"> <div id="gradebook_row" class="form-group">
<label class="control-label" for="name">{{'Gradebook'|get_lang}}</label> <label class="col-sm-2 control-label" for="name">{{'Gradebook'|get_lang}}</label>
<div class="controls"> <div class="col-sm-8">
<select id="gradebook_id" name="gradebook_id" multiple="multiple"/> <select id="gradebook_id" name="gradebook_id" multiple="multiple"/>
</select> </select>
@ -624,29 +620,30 @@ $(document).ready(function() {
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label" for="name">{{ 'Description'|get_lang }}</label> <label class="col-sm-2 control-label" for="name">{{ 'Description'|get_lang }}</label>
<div class="controls"> <div class="col-sm-8">
<textarea name="description" id="description" class="col-md-4" rows="7"></textarea> <textarea name="description" id="description" rows="7"></textarea>
</div> </div>
</div> </div>
</fieldset> </fieldset>
</form> </form>
</div> </div>
<div id="dialog-form-profile" style="display:none;"> <div id="dialog-form-profile" style="display:none;">
<form id="save_profile_form" class="form-horizontal" name="form"> <form id="save_profile_form" class="form-horizontal" name="form">
<input type="hidden" id="profile_id" name="profile_id"/> <input type="hidden" id="profile_id" name="profile_id"/>
<fieldset> <fieldset>
<div class="control-group"> <div class="form-group">
<label class="control-label" for="name">{{"Name"|get_lang}}</label> <label class="col-sm-2 control-label" for="name">{{"Name"|get_lang}}</label>
<div class="controls"> <div class="col-sm-8">
<input type="text" name="name" id="name_profile" size="40" /> <input type="text" name="name" id="name_profile" size="40" />
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label" for="name">{{"Description"|get_lang}}</label> <label class="col-sm-2 control-label" for="name">{{"Description"|get_lang}}</label>
<div class="controls"> <div class="col-sm-8">
<textarea name="description" id="description_profile" class="span2" rows="7"></textarea> <textarea name="description" id="description_profile" rows="7"></textarea>
</div> </div>
</div> </div>
</fieldset> </fieldset>

Write Preview
Loading…
Cancel
Save