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

Fixing jqgrid styles

Browse Source
skala
Julio Montoya 14 years ago
parent 032514525f
commit 1e059faa8e
9 changed files with 64 additions and 47 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. 9
      main/css/base.css
  2. 6
      main/inc/lib/group_portal_manager.lib.php
  3. 7
      main/inc/lib/javascript/jquery-ui/default.css
  4. 4
      main/inc/lib/message.lib.php
  5. 5
      main/inc/lib/social.lib.php
  6. 2
      main/social/friends.php
  7. 4
      main/social/group_members.php
  8. 42
      main/social/group_topics.php
  9. 32
      main/social/groups.php

9
main/css/base.css
Unescape View File

@ -1975,7 +1975,7 @@ div.attendance-calendar-add div.row div.formw,div.attendance-calendar-edit div.r
font-size:120%;
}
.message-group-author {
margin:5px 5px 5px 0px;
margin:0px 5px 5px 0px;
float:left;
}
@ -2427,7 +2427,10 @@ div.image-social-content center.friend {
/* BOX SHARED PROFILE */
.social-menu-groups {
border-top:1px solid #ddd;
margin-top:2px;
}
.social-menu-groups li {
padding:5px;
}
@ -3445,7 +3448,7 @@ div.admin_section h4 {
}
.topics_grid_item {
margin-left:20px;
/* margin-left:20px; */
}
#div_content_table {

6
main/inc/lib/group_portal_manager.lib.php
Unescape View File

@ -957,10 +957,10 @@ class GroupPortalManager {
}
if (!empty($links)) {
//echo '<div align="center" class="social-menu-title"><span class="social-menu-text1">'.cut($group_info['name'], GROUP_TITLE_LENGTH, true).'</span></div>';
//echo Display::div(get_lang('Actions') ,array('class' => 'social_menu_option'));
echo '<ul class="social-menu-groups">';
echo Display::tag('li', Security::remove_XSS($group_info['description'], STUDENT, true), array('class'=>'group_description'));
if (!empty($group_info['description'])) {
echo Display::tag('li', Security::remove_XSS($group_info['description'], STUDENT, true), array('class'=>'group_description'));
}
echo $links;
echo '</ul>';
}

7
main/inc/lib/javascript/jquery-ui/default.css
Unescape View File

@ -65,7 +65,7 @@
/* tabs: removing a lot of padding */
.ui-tabs .ui-tabs-panel {
padding: 10px;
padding: 10px 0px 0px 0px;
}
/* Set the selected tab background to white */
@ -89,11 +89,12 @@
}
#resource_tab.ui-tabs-nav li {
.ui-tabs {
border: none;
}
/* cupertino */

4
main/inc/lib/message.lib.php
Unescape View File

@ -963,7 +963,7 @@ class MessageManager
if (empty($topic['title'])) {
$topic['title'] = get_lang('Untitled');
}
$title = Display::url('<h3>'.Security::remove_XSS($topic['title'], STUDENT, true).'</h3>', 'group_topics.php?id='.$group_id.'&topic_id='.$topic['id']);
$title = Display::tag('h4', Display::url(Security::remove_XSS($topic['title'], STUDENT, true), 'group_topics.php?id='.$group_id.'&topic_id='.$topic['id']));
$date = '';
$link = '';
@ -1025,7 +1025,7 @@ class MessageManager
//$items_page_nr = intval($_GET['items_'.$topic['id'].'_page_nr']);
$items_page_nr = null;
echo Display::tag('h2', Security::remove_XSS($main_message['title'], STUDENT, true));
echo Display::tag('h3', Security::remove_XSS($main_message['title'], STUDENT, true));
$user_sender_info = UserManager::get_user_info_by_id($main_message['user_sender_id']);
$files_attachments = self::get_links_message_attachment_files($main_message['id']);
$name = api_get_person_name($user_sender_info['firstname'], $user_sender_info['lastname']);

5
main/inc/lib/social.lib.php
Unescape View File

@ -455,15 +455,16 @@ class SocialManager extends UserManager {
//display course entry
$result .= '<div id="div_'.$count.'">';
$result .= '<h2><img src="../img/nolines_plus.gif" id="btn_'.$count.'" onclick="toogle_course(this,\''.$course_database.'\' )">';
$result .= '<h3><img src="../img/nolines_plus.gif" id="btn_'.$count.'" onclick="toogle_course(this,\''.$course_database.'\' )">';
$result .= $s_htlm_status_icon;
//show a hyperlink to the course, unless the course is closed and user is not course admin
if ($course_visibility != COURSE_VISIBILITY_CLOSED || $user_in_course_status == COURSEMANAGER) {
$result .= '<a href="javascript:void(0)" id="ln_'.$count.'" onclick=toogle_course(this,\''.$course_database.'\');>&nbsp;'.$course_title.'</a></h2>';
$result .= '<a href="javascript:void(0)" id="ln_'.$count.'" onclick=toogle_course(this,\''.$course_database.'\');>&nbsp;'.$course_title.'</a>';
} else {
$result .= $course_display_title." "." ".get_lang('CourseClosed')."";
}
$result .= '</h3>';
$current_course_settings = CourseManager :: get_access_settings($my_course['k']);
// display the what's new icons
if ($nbDigestEntries > 0) {

2
main/social/friends.php
Unescape View File

@ -123,7 +123,7 @@ if (count($friends) == 0 ) {
$number_friends = count($friends);
$j=0;
$friend_html.= '<table id="friend_table" class="rounded_div" width="95%" border="0" cellpadding="0" cellspacing="0" bgcolor="" >';
$friend_html.= '<table id="friend_table" width="95%" border="0" cellpadding="0" cellspacing="0" bgcolor="" >';
for ($k=0;$k<$number_friends;$k++) {
$friend_html.='<tr><td valign="top">';

4
main/social/group_members.php
Unescape View File

@ -98,9 +98,9 @@ echo '<div id="social-content">';
echo '</div>';
echo '<div id="social-content-right">';
echo '<h1><a href="groups.php?id='.$group_id.'">'.$group_info['name'].'</a></h1>';
echo '<h2>'.$group_info['name'].'</h2>';
echo '<div class="rounded_div" style="width:90%">';
echo '<div style="width:90%">';
if (! empty($show_message)){
Display :: display_confirmation_message($show_message);

42
main/social/group_topics.php
Unescape View File

@ -13,17 +13,34 @@ api_block_anonymous_users();
if (api_get_setting('allow_social_tool') !='true') {
api_not_allowed();
}
require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
$group_id = intval($_GET['id']);
$group_id = intval($_GET['id']);
$topic_id = intval($_GET['topic_id']);
$message_id = intval($_GET['msg_id']);
$message_id = intval($_GET['msg_id']);
//todo @this validation could be in a function in group_portal_manager
if (empty($group_id)) {
api_not_allowed(true);
} else {
$group_info = GroupPortalManager::get_group_data($group_id);
if (empty($group_info)) {
api_not_allowed(true);
}
$is_member = GroupPortalManager::is_group_member($group_id);
if ($group_info['visibility'] == GROUP_PERMISSION_CLOSED && !$is_member ) {
api_not_allowed(true);
}
}
// save message group
if (isset($_POST['token']) && $_POST['token'] === $_SESSION['sec_token']) {
if (isset($_POST['action'])) {
$title = isset($_POST['title']) ? $_POST['title'] : null;
$content = $_POST['content'];
@ -156,30 +173,13 @@ $interbreadcrumb[] = array('url' => '#','name' => get_lang('Thread'));
Display::display_header($tool_name, 'Groups');
//todo @this validation could be in a function in group_portal_manager
if (empty($group_id)) {
api_not_allowed(true);
} else {
$group_info = GroupPortalManager::get_group_data($group_id);
if (empty($group_info)) {
api_not_allowed(true);
}
$is_member = GroupPortalManager::is_group_member($group_id);
if ($group_info['visibility'] == GROUP_PERMISSION_CLOSED && !$is_member ) {
api_not_allowed(true);
}
}
echo '<div id="social-content">';
echo '<div id="social-content-left">';
//this include the social menu div
SocialManager::show_social_menu('member_list', $group_id);
echo '</div>';
echo '<div id="social-content-right">';
echo '<h1><a href="groups.php?id='.$group_id.'">'.Security::remove_XSS($group_info['name'], STUDENT, true).'</a> &raquo; '.get_lang('Messages').'</h1>';
echo '<h2><a href="groups.php?id='.$group_id.'">'.Security::remove_XSS($group_info['name'], STUDENT, true).'</a> &raquo; <a href="groups.php?id='.$group_id.'#tabs_2">'.get_lang('Discussions').'</a></h2>';
if (!empty($show_message)){
Display::display_confirmation_message($show_message);

32
main/social/groups.php
Unescape View File

@ -175,6 +175,7 @@ if ($group_id != 0 ) {
}
}
}
$create_thread_link = '';
echo '<div id="social-content">';
echo '<div id="social-content-left">';
@ -219,7 +220,7 @@ if ($group_id != 0 ) {
echo '<div class="head_group">';
echo '<div id="social-group-details">';
//Group's title
echo '<h1><a href="groups.php?id='.$group_id.'">'.Security::remove_XSS($group_info['name'], STUDENT, true).'</a></h1>';
echo Display::tag('h2', Security::remove_XSS($group_info['name'], STUDENT, true));
//echo '<div class="social-group-details-info"><a target="_blank" href="'.$group_info['url'].'">'.$group_info['url'].'</a></div>';
@ -273,10 +274,10 @@ if ($group_id != 0 ) {
$content = MessageManager::display_messages_for_group($group_id);
if ($is_group_member) {
if (empty($content)) {
$content = '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).get_lang('YouShouldCreateATopic').'</a></li>';
$create_thread_link = '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="a_button orange medium thickbox" title="'.get_lang('ComposeMessage').'">'.get_lang('YouShouldCreateATopic').'</a></li>';
} else {
$create_thread_link = '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).get_lang('NewTopic').'</a>';
$content = $create_thread_link.$content;
$create_thread_link = '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="a_button orange medium thickbox" title="'.get_lang('ComposeMessage').'">'.get_lang('NewTopic').'</a>';
}
}
$members = GroupPortalManager::get_users_by_group($group_id);
@ -309,8 +310,15 @@ if ($group_id != 0 ) {
}
}
}
$headers = array(get_lang('Messages'), get_lang('Members'));
echo Display::tabs($headers, array($content, $member_content),'tabs');
if (!empty($create_thread_link)) {
$create_thread_link = Display::div($create_thread_link, array('style'=>'padding-top:2px;height:40px'));
}
//api_get_item_property_by_tool('group', $course_info, $group_id);
//$updates =
//get_lang('Updates'),
$headers = array(get_lang('Discussions'), get_lang('Members'));
echo Display::tabs($headers, array($create_thread_link.$content, $member_content),'tabs');
} else {
// if I already sent an invitation message
if (!in_array($my_group_role, array(GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER, GROUP_USER_PERMISSION_PENDING_INVITATION))) {
@ -471,11 +479,11 @@ if ($group_id != 0 ) {
}
if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
$create_group_item = '<a class="a_button orange medium" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.get_lang('CreateASocialGroup').'</a>';
$my_group_content = $create_group_item. $my_group_content;
//$my_group_content = $create_group_item. $my_group_content;
} else {
if (api_is_allowed_to_edit(null,true)) {
$create_group_item = '<a class="a_button orange medium" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.get_lang('CreateASocialGroup').'</a>';
$my_group_content = $create_group_item. $my_group_content;
//$my_group_content = $create_group_item. $my_group_content;
}
}
break;
@ -507,11 +515,11 @@ if ($group_id != 0 ) {
}
if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
$create_group_item = '<a class="a_button orange medium" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.get_lang('CreateASocialGroup').'</a>';
$my_group_content = $create_group_item. $my_group_content;
//$my_group_content = $create_group_item. $my_group_content;
} else {
if (api_is_allowed_to_edit(null,true)) {
$create_group_item = '<a class="a_button orange medium" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.get_lang('CreateASocialGroup').'</a>';
$my_group_content = $create_group_item. $my_group_content;
//$my_group_content = $create_group_item. $my_group_content;
}
}
if (count($grid_newest_groups) > 0) {
@ -520,6 +528,10 @@ if ($group_id != 0 ) {
if (count($grid_pop_groups) > 0) {
$popular_content = Display::return_sortable_grid('mygroups', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
}
}
if (!empty($create_group_item)) {
echo Display::div($create_group_item, array('style'=>'padding-top:12px;height:30px'));
}
$headers = array(get_lang('MyGroups'), get_lang('Newest'), get_lang('Popular'));
echo Display::tabs($headers, array($my_group_content, $newest_content, $popular_content),'tab_browse');

Write Preview
Loading…
Cancel
Save