More fixes in the UI

skala
Julio Montoya 14 years ago
parent 84f3b15cfd
commit f20c140e87
  1. 3
      main/admin/user_list.php
  2. 19
      main/inc/introductionSection.inc.php
  3. 5
      main/social/profile.php

@ -11,7 +11,6 @@ $language_file = array ('registration','admin');
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
require_once api_get_path(LIBRARY_PATH).'security.lib.php';
require_once api_get_path(LIBRARY_PATH).'xajax/xajax.inc.php';
global $_configuration;
@ -861,7 +860,7 @@ $form->addElement('style_submit_button', 'submit',get_lang('Search'),'class="sea
echo '<div class="actions" style="width:100%;">';
if (api_is_platform_admin()) {
echo '<span style="float:right; padding-top:7px;">'.
echo '<span style="float:right;">'.
'<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.Display::return_icon('new_user.png',get_lang('AddUsers'),'','32').'</a>'.
'</span>';
}

@ -154,7 +154,7 @@ if ($intro_dispForm) {
echo '</div>';
}
$style_introduction_section = 'style="margin-left:10%;margin-right:10%;"';
$thematic_description_html = '';
if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
@ -177,8 +177,17 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
}
if (!empty($thematic_advance_info)) {
$style_introduction_section = 'style="margin-left:10%;margin-right:10%; margin-bottom:30px;"';
if ($is_allowed_to_edit) {
$style_introduction_section = 'style="margin-left:10%;margin-right:10%; margin-top:30px;" ';
} else {
if (empty($intro_content)) {
$style_introduction_section = 'style="margin-left:10%;margin-right:10%; "';
} else {
$style_introduction_section = 'style="margin-left:10%;margin-right:10%;" margin-top:30px;';
}
}
$thematic_advance = get_lang('CourseThematicAdvance').'&nbsp;'.$thematic->get_total_average_of_thematic_advances().'%';
if (api_is_allowed_to_edit(null, true)) {
//$thematic_advance = '<a href="'.api_get_path(WEB_CODE_PATH).'course_progress/index.php?action=thematic_details&'.api_get_cidreq().'">'.get_lang('CourseThematicAdvance').'&nbsp;'.$thematic->get_total_average_of_thematic_advances().'%</a>';
@ -215,12 +224,12 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
}
}
$style_introduction_section = 'style="margin-left:10%; margin-right:10%;"';
echo '<div '.$style_introduction_section.'>';
if ($intro_dispDefault) {
//$intro_content = make_clickable($intro_content); // make url in text clickable
$intro_content = text_filter($intro_content); // parse [tex] codes
if (!empty($intro_content) || !empty($thematic_description_html)) {
if (!empty($intro_content)) {
echo "<table align=\"center\"><tr><td>$intro_content</td></tr></table>";
}
}

@ -81,9 +81,9 @@ function toogle_course (element_html, course_code){
var content = \'social_content\' + id_elem[1];
if (my_image=="nolines_plus.gif") {
$(id_button).attr("src","../img/nolines_minus.gif"); var action = "load_course";
$("div#"+content).show("slow");
$("div#"+content).show("fast");
} else {
$("div#"+content).hide("slow");
$("div#"+content).hide("fast");
$(id_button).attr("src","../img/nolines_plus.gif"); var action = "unload";
return false;
}
@ -96,7 +96,6 @@ function toogle_course (element_html, course_code){
url: "'.api_get_path(WEB_AJAX_PATH).'social.ajax.php?a=toogle_course",
data: "load_ajax="+id_elem+"&action="+action+"&course_code="+course_code,
success: function(datos) {
//$("div#"+name_div_id).hide("slow");
$("div#"+content).html(datos);
}
});

Loading…
Cancel
Save