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 Groups UI

Browse Source
skala
Julio Montoya 14 years ago
parent 978efa0055
commit 40baf661f1
4 changed files with 156 additions and 158 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. 134
      main/css/base.css
  2. 113
      main/css/base_chamilo.css
  3. 65
      main/inc/lib/message.lib.php
  4. 2
      main/social/groups.php

134
main/css/base.css
Unescape View File

@ -50,6 +50,11 @@ h5{
h6 {
}
h1,h2,h3,h4,h5,h6 {
margin:0px;
padding:0px;
}
/* User portal */
@ -463,7 +468,6 @@ a.personal_agenda:hover, a.personal_agenda:hover {
/* Message and Social */
.menulist li {
@ -503,12 +507,6 @@ a.personal_agenda:hover, a.personal_agenda:hover {
width:100%;
}
.message-group-author {
float:left;
width:30px;
margin:5px;
}
.message-group-content {
float:right;
width:90%;
@ -556,6 +554,10 @@ a.personal_agenda:hover, a.personal_agenda:hover {
font-size: 2em;
}
.group_discussions_info {
width:100%;
}
.group_social_grid {
float:left;
width:100%;
@ -1047,11 +1049,12 @@ div.attendance-calendar-add div.row div.formw,div.attendance-calendar-edit div.r
.message-group-title {
font-size:120%;
}
.message-group-author {
margin:5px 0px 5px 0px;
.message-group-author {
margin:5px 5px 5px 0px;
float:left;
}
.message-group-content {
line-height:150%;
margin: 5px 0px 8px 0px;
}
.message-group-date {
@ -1569,7 +1572,7 @@ div.image-social-content center.friend {
color:#666666;
}
.social-groups-image {
border: 2px solid #cac9c9;
/* border: 2px solid #cac9c9; */
}
.social-groups-home-title {
border-bottom:1pt dotted #000;
@ -1624,12 +1627,10 @@ div.image-social-content center.friend {
/* text-decoration: underline; */
}
#social-forum-main-title {
font-size:130%;
font-weight:bold;
padding: 0px 8px 0px 8px;
}
#social-forum-title {
@ -1651,7 +1652,6 @@ div.image-social-content center.friend {
font-weight:bold;
}
#social-post {
-moz-border-radius-bottomleft:5px;
-moz-border-radius-bottomright:5px;
@ -1663,7 +1663,113 @@ div.image-social-content center.friend {
}
/* GROUP TOOL */
#group_description {
margin: 10px 0px 10px 0px;
}
#group_privacy {
margin: 10px 0px 10px 0px;
}
#group_permissions {
-moz-background-clip:border;
-moz-background-inline-policy:continuous;
-moz-background-origin:padding;
-moz-border-radius-bottomleft:8px;
-moz-border-radius-bottomright:8px;
-moz-border-radius-topleft:8px;
-moz-border-radius-topright:8px;
background:#EEE none repeat scroll 0 0;
margin: 20px 0px 20px 0px;
}
#group_permissions ul {
list-style-image:none;
list-style-position:outside;
list-style-type:none;
margin:0;
padding:0;
}
#group_permissions ul li {
margin: 10px 0px 10px 5px;
}
/* Groups boxes */
.groups_grid_container {
width:100%;
}
.groups_grid_item {
width:80px;
float:left;
margin:5px;
}
.groups_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;}
.groups_grid_element_1 { width:100px; float:left; text-align:left; margin-bottom:5px;}
.groups_grid_element_2 { width:150px; float:left;}
/*MY GROUPS*/
.mygroups_grid_item {
background: none repeat scroll 0 0 #FFFFFF;
border: 1px solid #E5E5E5;
border-radius: 11px 11px 11px 11px;
-webkit-border-radius: 11px 11px 11px 11px;
-opera-border-radius: 11px 11px 11px 11px;
-moz-border-radius: 11px 11px 11px 11px;
box-shadow: 0 4px 18px #C8C8C8;
-webkit-box-shadow: 0 4px 18px #C8C8C8;
-opera-box-shadow: 0 4px 18px #C8C8C8;
-moz-box-shadow: 0 4px 18px #C8C8C8;
float: left;
height: 120px;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:600px;
}
.box_description_group_member {
color: #999999;
font-size: 10px;
}
.mygroups_grid_element_1 {
width:600px;
height:100px;
overflow:hidden;
}
.box_description_group_title h2 {
margin-bottom:4px;
margin-top: 0px;
}
.box_description_group_title {
float:right;
width:530px;
}
.box_description_group_content {
float:right;
width:530px;
margin-top:5px;
/* height:45px;*/
font-family:Verdana, Geneva, sans-serif;
font-size:12px;
color:#666666;
}
.box_description_group_actions {
float:right;
width:530px;
text-align:right;
margin-top:4px;
margin-right:4px;
}
input {
-moz-border-radius:5px;

113
main/css/base_chamilo.css
Unescape View File

@ -2448,112 +2448,6 @@ a.read {
vertical-align:middle;
}
/* GROUP TOOL */
#group_description {
margin: 10px 0px 10px 0px;
}
#group_privacy {
margin: 10px 0px 10px 0px;
}
#group_permissions {
-moz-background-clip:border;
-moz-background-inline-policy:continuous;
-moz-background-origin:padding;
-moz-border-radius-bottomleft:8px;
-moz-border-radius-bottomright:8px;
-moz-border-radius-topleft:8px;
-moz-border-radius-topright:8px;
background:#EEE none repeat scroll 0 0;
margin: 20px 0px 20px 0px;
}
#group_permissions ul {
list-style-image:none;
list-style-position:outside;
list-style-type:none;
margin:0;
padding:0;
}
#group_permissions ul li {
margin: 10px 0px 10px 5px;
}
/* Groups boxes */
.groups_grid_container {
width:100%;
}
.groups_grid_item {
width:80px;
float:left;
margin:5px;
}
.groups_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;}
.groups_grid_element_1 { width:100px; float:left; text-align:left; margin-bottom:5px;}
.groups_grid_element_2 { width:150px; float:left;}
/*MY GROUPS*/
.mygroups_grid_item {
background: none repeat scroll 0 0 #FFFFFF;
border: 1px solid #E5E5E5;
border-radius: 11px 11px 11px 11px;
-webkit-border-radius: 11px 11px 11px 11px;
-opera-border-radius: 11px 11px 11px 11px;
-moz-border-radius: 11px 11px 11px 11px;
box-shadow: 0 4px 18px #C8C8C8;
-webkit-box-shadow: 0 4px 18px #C8C8C8;
-opera-box-shadow: 0 4px 18px #C8C8C8;
-moz-box-shadow: 0 4px 18px #C8C8C8;
float: left;
height: 88px;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:600px;
}
.box_description_group_member {
color: #999999;
font-size: 10px;
}
.mygroups_grid_element_1 {
width:600px;
height:100px;
overflow:hidden;
}
.box_description_group_title h3 {
margin-bottom:4px;
}
.box_description_group_title {
float:right;
width:530px;
}
.box_description_group_content {
float:right;
width:530px;
margin-top:5px;
/* height:45px;*/
font-family:Verdana, Geneva, sans-serif;
font-size:12px;
color:#666666;
}
.box_description_group_actions {
float:right;
width:530px;
text-align:right;
margin-top:4px;
margin-right:4px;
}
/*PROFILE*/
@ -2977,6 +2871,13 @@ span.form_required {
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.social-home-users-online {
width: 200px;
margin: -28px 0 0 -50px;

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

@ -921,46 +921,35 @@ class MessageManager
$html .= '<div class="rounded_div" style="width:620px">';
$items = count($topic['items']);
$reply_label = ($items == 1) ? get_lang('Reply'): get_lang('Replies');
$reply_label = ($items == 1) ? get_lang('Reply'): get_lang('Replies');
$html .= '<table width="100%"><tr><td width="20px" valign="top">';
$html .= Display::div(Display::tag('span', $items).$reply_label, array('class' =>'group_discussions_replies'));
$topic['title'] = trim($topic['title']);
if (empty($topic['title'])) {
$topic['title'] = get_lang('Untitled');
}
$title = Display::url('<h2>'.Security::remove_XSS($topic['title']).'</h2>', 'group_topics.php?id='.$group_id.'&topic_id='.$topic['id']);
$date = '';
$link = '';
if ($topic['send_date']!=$topic['update_date']) {
if (!empty($topic['update_date']) && $topic['update_date'] != '0000-00-00 00:00:00' ) {
$date .= '<div class="message-group-date" > <i>'.get_lang('LastUpdate').' '.date_to_str_ago($topic['update_date']).'</i></div>';
}
} else {
$date .= '<div class="message-group-date"> <i>'.get_lang('Created').' '.date_to_str_ago($topic['send_date']).'</i></div>';
$html .= '</td><td valign="top">';
$topic['title'] = trim($topic['title']);
if (empty($topic['title'])) {
$topic['title'] = get_lang('Untitled');
}
$title = Display::url('<h2>'.Security::remove_XSS($topic['title']).'</h2>', 'group_topics.php?id='.$group_id.'&topic_id='.$topic['id']);
$date = '';
$link = '';
if ($topic['send_date']!=$topic['update_date']) {
if (!empty($topic['update_date']) && $topic['update_date'] != '0000-00-00 00:00:00' ) {
$date .= '<div class="message-group-date" > <i>'.get_lang('LastUpdate').' '.date_to_str_ago($topic['update_date']).'</i></div>';
}
/*$link = '<div id="message-reply-link" style="margin-right:10px">
<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($_GET['items_page_nr']).'" class="thickbox" title="'.get_lang('Reply').'">'.Display :: return_icon('talk.png', get_lang('Reply')).'</a>';
if (($my_group_role == GROUP_USER_PERMISSION_ADMIN || $my_group_role == GROUP_USER_PERMISSION_MODERATOR) || $topic['user_sender_id'] == $current_user_id) {
$link.= '&nbsp;&nbsp;<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=edit_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($_GET['items_page_nr']).'" class="thickbox" title="'.get_lang('Edit').'">'.Display :: return_icon('edit.gif', get_lang('Edit')).'</a>';
}
$link.= '</div>';
*/
$image_path = UserManager::get_user_picture_path_by_id($topic['user_sender_id'], 'web', false, true);
$image_repository = $image_path['dir'];
$existing_image = $image_path['file'];
$user_image = '<div class="message-group-author"><img src="'.$image_repository.$existing_image.'" alt="'.$name.'" width="32" height="32" title="'.$name.'" /></div>';
$user = '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$topic['user_sender_id'].'">'.$name.'&nbsp;</a>';
//$html.= '<div class="message-group-content">'.$user.$date.$topic['content'].$link.'</div>';
$html .= Display::div($title.cut($topic['content'], 350).$user_image.$user.$date.$link, array('class'=>'group_discussions_info'));
//$html.= '<div class="message-attach">'.(!empty($files_attachments)?implode('&nbsp;|&nbsp;',$files_attachments):'').'</div>';
} else {
$date .= '<div class="message-group-date"> <i>'.get_lang('Created').' '.date_to_str_ago($topic['send_date']).'</i></div>';
}
$image_path = UserManager::get_user_picture_path_by_id($topic['user_sender_id'], 'web', false, true);
$image_repository = $image_path['dir'];
$existing_image = $image_path['file'];
$user = '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$topic['user_sender_id'].'">'.$name.'&nbsp;</a>';
$user_image = '<div class="clear"></div><div class="message-group-author"><img src="'.$image_repository.$existing_image.'" alt="'.$name.'" width="32" height="32" title="'.$name.'" /></div>';
$user = '<div class="message-group-author">'.$user.'</div>';
$html .= Display::div($title.cut($topic['content'], 350).$user_image.$user.$date.$link, array('class'=>'group_discussions_info')).'</td></table>';
$html .= '</div>'; //rounded_div
$array_html[] = array($html);

2
main/social/groups.php
Unescape View File

@ -137,6 +137,8 @@ if (isset($_GET['view']) && in_array($_GET['view'],$allowed_views)) {
$interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
if (!isset($_GET['id'])) {
$interbreadcrumb[]= array ('url' =>'#','name' => get_lang('GroupList'));
} else {
//$interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Group'));
}
}

Write Preview
Loading…
Cancel
Save