Improving tabs layout + fixing groups layout

skala
Julio Montoya 14 years ago
parent 32869aaa9e
commit 447c6e0c7a
  1. 12
      main/css/academica/default.css
  2. 12
      main/css/baby_orange/default.css
  3. 12
      main/css/blue_lagoon/default.css
  4. 15
      main/css/chamilo/default.css
  5. 6
      main/css/chamilo_electric_blue/default.css
  6. 12
      main/css/chamilo_green/default.css
  7. 12
      main/css/chamilo_orange/default.css
  8. 12
      main/css/chamilo_red/default.css
  9. 12
      main/css/cool_blue/default.css
  10. 12
      main/css/corporate/default.css
  11. 12
      main/css/dokeos_blue/default.css
  12. 12
      main/css/dokeos_classic/default.css
  13. 12
      main/css/dokeos_classic_2D/default.css
  14. 12
      main/css/public_admin/default.css
  15. 12
      main/css/steel_grey/default.css
  16. 5
      main/inc/lib/javascript/jquery-ui/default.css
  17. 54
      main/social/groups.php

@ -2321,11 +2321,11 @@ a.read {
-opera-box-shadow: 0 4px 18px #C8C8C8;
-moz-box-shadow: 0 4px 18px #C8C8C8;
float: left;
height: auto;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:90%;
float: left;
height: 88px;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:600px;
}
.box_description_group_member {
@ -2336,8 +2336,6 @@ a.read {
.mygroups_grid_element_1 {
width:600px;
height:100px;
padding-left:10px;
padding-right:10px;
overflow:hidden;
}

@ -2294,11 +2294,11 @@ a.read {
-opera-box-shadow: 0 4px 18px #C8C8C8;
-moz-box-shadow: 0 4px 18px #C8C8C8;
float: left;
height: auto;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:90%;
float: left;
height: 88px;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:600px;
}
.box_description_group_member {
@ -2309,8 +2309,6 @@ a.read {
.mygroups_grid_element_1 {
width:600px;
height:100px;
padding-left:10px;
padding-right:10px;
overflow:hidden;
}

@ -2929,11 +2929,11 @@ a.read {
-opera-box-shadow: 0 4px 18px #C8C8C8;
-moz-box-shadow: 0 4px 18px #C8C8C8;
float: left;
height: auto;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:90%;
float: left;
height: 88px;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:600px;
}
.box_description_group_member {
@ -2944,8 +2944,6 @@ a.read {
.mygroups_grid_element_1 {
width:600px;
height:100px;
padding-left:10px;
padding-right:10px;
overflow:hidden;
}

@ -3281,10 +3281,10 @@ a.read {
-moz-box-shadow: 0 4px 18px #C8C8C8;
float: left;
height: auto;
height: 88px;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:90%;
width:600px;
}
.box_description_group_member {
@ -3294,9 +3294,7 @@ a.read {
.mygroups_grid_element_1 {
width:600px;
height:100px;
padding-left:10px;
padding-right:10px;
height:100px;
overflow:hidden;
}
@ -3305,11 +3303,12 @@ a.read {
}
.box_description_group_title {
float:right;width:80%;
float:right;
width:530px;
}
.box_description_group_content {
float:right;
width:80%;
width:530px;
margin-top:5px;
/* height:45px;*/
font-family:Verdana, Geneva, sans-serif;
@ -3318,7 +3317,7 @@ a.read {
}
.box_description_group_actions {
float:right;
width:80%;
width:530px;
text-align:right;
margin-top:4px;
margin-right:4px;

@ -3290,10 +3290,10 @@ a.read {
-moz-box-shadow: 0 4px 18px #C8C8C8;
float: left;
height: auto;
height: 88px;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:90%;
width:600px;
}
.box_description_group_member {
@ -3304,8 +3304,6 @@ a.read {
.mygroups_grid_element_1 {
width:600px;
height:100px;
padding-left:10px;
padding-right:10px;
overflow:hidden;
}

@ -3302,11 +3302,11 @@ a.read {
-opera-box-shadow: 0 4px 18px #C8C8C8;
-moz-box-shadow: 0 4px 18px #C8C8C8;
float: left;
height: auto;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:90%;
float: left;
height: 88px;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:600px;
}
.box_description_group_member {
@ -3317,8 +3317,6 @@ a.read {
.mygroups_grid_element_1 {
width:600px;
height:100px;
padding-left:10px;
padding-right:10px;
overflow:hidden;
}

@ -3277,11 +3277,11 @@ a.read {
-opera-box-shadow: 0 4px 18px #C8C8C8;
-moz-box-shadow: 0 4px 18px #C8C8C8;
float: left;
height: auto;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:90%;
float: left;
height: 88px;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:600px;
}
.box_description_group_member {
@ -3292,8 +3292,6 @@ a.read {
.mygroups_grid_element_1 {
width:600px;
height:100px;
padding-left:10px;
padding-right:10px;
overflow:hidden;
}

@ -3288,11 +3288,11 @@ a.read {
-opera-box-shadow: 0 4px 18px #C8C8C8;
-moz-box-shadow: 0 4px 18px #C8C8C8;
float: left;
height: auto;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:90%;
float: left;
height: 88px;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:600px;
}
.box_description_group_member {
@ -3303,8 +3303,6 @@ a.read {
.mygroups_grid_element_1 {
width:600px;
height:100px;
padding-left:10px;
padding-right:10px;
overflow:hidden;
}

@ -2805,11 +2805,11 @@ a.read {
-opera-box-shadow: 0 4px 18px #C8C8C8;
-moz-box-shadow: 0 4px 18px #C8C8C8;
float: left;
height: auto;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:90%;
float: left;
height: 88px;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:600px;
}
.box_description_group_member {
@ -2820,8 +2820,6 @@ a.read {
.mygroups_grid_element_1 {
width:600px;
height:100px;
padding-left:10px;
padding-right:10px;
overflow:hidden;
}

@ -2273,11 +2273,11 @@ a.read {
-opera-box-shadow: 0 4px 18px #C8C8C8;
-moz-box-shadow: 0 4px 18px #C8C8C8;
float: left;
height: auto;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:90%;
float: left;
height: 88px;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:600px;
}
.box_description_group_member {
@ -2288,8 +2288,6 @@ a.read {
.mygroups_grid_element_1 {
width:600px;
height:100px;
padding-left:10px;
padding-right:10px;
overflow:hidden;
}

@ -2819,11 +2819,11 @@ a.read {
-opera-box-shadow: 0 4px 18px #C8C8C8;
-moz-box-shadow: 0 4px 18px #C8C8C8;
float: left;
height: auto;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:90%;
float: left;
height: 88px;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:600px;
}
.box_description_group_member {
@ -2834,8 +2834,6 @@ a.read {
.mygroups_grid_element_1 {
width:600px;
height:100px;
padding-left:10px;
padding-right:10px;
overflow:hidden;
}

@ -3100,11 +3100,11 @@ a.read {
-opera-box-shadow: 0 4px 18px #C8C8C8;
-moz-box-shadow: 0 4px 18px #C8C8C8;
float: left;
height: auto;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:90%;
float: left;
height: 88px;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:600px;
}
.box_description_group_member {
@ -3115,8 +3115,6 @@ a.read {
.mygroups_grid_element_1 {
width:600px;
height:100px;
padding-left:10px;
padding-right:10px;
overflow:hidden;
}

@ -3114,11 +3114,11 @@ a.read {
-opera-box-shadow: 0 4px 18px #C8C8C8;
-moz-box-shadow: 0 4px 18px #C8C8C8;
float: left;
height: auto;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:90%;
float: left;
height: 88px;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:600px;
}
.box_description_group_member {
@ -3129,8 +3129,6 @@ a.read {
.mygroups_grid_element_1 {
width:600px;
height:100px;
padding-left:10px;
padding-right:10px;
overflow:hidden;
}

@ -3008,11 +3008,11 @@ a.read {
-opera-box-shadow: 0 4px 18px #C8C8C8;
-moz-box-shadow: 0 4px 18px #C8C8C8;
float: left;
height: auto;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:90%;
float: left;
height: 88px;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:600px;
}
.box_description_group_member {
@ -3023,8 +3023,6 @@ a.read {
.mygroups_grid_element_1 {
width:600px;
height:100px;
padding-left:10px;
padding-right:10px;
overflow:hidden;
}

@ -2826,11 +2826,11 @@ a.read {
-opera-box-shadow: 0 4px 18px #C8C8C8;
-moz-box-shadow: 0 4px 18px #C8C8C8;
float: left;
height: auto;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:90%;
float: left;
height: 88px;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:600px;
}
.box_description_group_member {
@ -2841,8 +2841,6 @@ a.read {
.mygroups_grid_element_1 {
width:600px;
height:100px;
padding-left:10px;
padding-right:10px;
overflow:hidden;
}

@ -51,7 +51,10 @@
/* Removes the gray background in the jqgrid main/session/index.php */
.ui-widget-header {
background: #FFF;
background: #FFF;
border: none;
border-bottom: 1px solid #ccc;
border-radius:0px;
}
/* tabs: anchor size otherwise anchors will have a bigger font size */

@ -270,12 +270,10 @@ if ($group_id != 0 ) {
}
// details about the current group
echo '<div class="head_group">';
echo '<div class="head_group">';
echo '<div id="social-group-details">';
//Group's title
echo '<h2><a href="groups.php?id='.$group_id.'">'.$group_info['name'].'</a></h2>';
//Group's description
echo '<div class="social-group-details-info">'.$group_info['description'].'</div>';
echo '<div class="social-group-details-info"><a target="_blank" href="'.$group_info['url'].'">'.$group_info['url'].'</a></div>';
@ -288,14 +286,12 @@ if ($group_id != 0 ) {
echo get_lang('ThisIsACloseGroup');
}
echo '</div>';
if (!empty($relation_group_title)) {
echo '<div class="social-group-details-info">';
echo '<span>'.get_lang('StatusInThisGroup').' : </span>';
echo $relation_group_title;
echo '</div>';
}
//Group's tags
if (!empty($tags)) {
echo '<div id="social-group-details-info"><span>'.get_lang('Tags').' : </span>'.$tags.'</div>';
@ -306,8 +302,7 @@ if ($group_id != 0 ) {
//-- Show message groups
echo '<div class="messages" style="width:700px">';
if (GroupPortalManager::is_group_member($group_id)) {
//echo '<h3>'.get_lang('Topics').'</h3>';
if (GroupPortalManager::is_group_member($group_id)) {
$content = MessageManager::display_messages_for_group($group_id);
if (empty($content)) {
@ -500,7 +495,8 @@ if ($group_id != 0 ) {
}
// Display groups (newest, mygroups, pop)
echo '<div class="social-box-container2">';
if (isset($_GET['view']) && in_array($_GET['view'],$allowed_views)) {
$view_group = $_GET['view'];
@ -518,7 +514,6 @@ if ($group_id != 0 ) {
$my_group_content = $create_group_item. $my_group_content;
}
}
break;
case 'newest' :
if (count($grid_newest_groups) > 0) {
@ -532,7 +527,6 @@ if ($group_id != 0 ) {
break;
default :
if (count($grid_pop_groups) > 0) {
//echo '<h2>'.get_lang('Popular').'</h2>';
$popular_content = Display::return_sortable_grid('popular', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
}
if (api_is_platform_admin() || api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
@ -542,41 +536,29 @@ if ($group_id != 0 ) {
}
break;
}
} else {
if (count($grid_my_groups) > 0) {
//echo '<h2>'.get_lang('MyGroups').'</h2>';
} else {
if (count($grid_my_groups) > 0) {
$my_group_content = Display::return_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
}
if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
$create_group_item = '<a href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.Display::return_icon('group_add.png',get_lang('CreateASocialGroup'),array('hspace'=>'6','style'=>'float:left')).get_lang('CreateASocialGroup').'</a>';
$my_group_content = $create_group_item. $my_group_content;
} else {
if (api_is_allowed_to_edit(null,true)) {
$create_group_item = '<a href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.Display::return_icon('group_add.png',get_lang('CreateASocialGroup'),array('hspace'=>'6','style'=>'float:left')).get_lang('CreateASocialGroup').'</a>';
$my_group_content = $create_group_item. $my_group_content;
} else {
if (api_is_allowed_to_edit(null,true)) {
$create_group_item = '<a href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.Display::return_icon('group_add.png',get_lang('CreateASocialGroup'),array('hspace'=>'6','style'=>'float:left')).get_lang('CreateASocialGroup').'</a>';
$my_group_content = $create_group_item. $my_group_content;
}
}
}
if (count($grid_newest_groups) > 0) {
//echo '<h2>'.get_lang('Newest').'</h2>';
$newest_content = Display::return_sortable_grid('newest', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
if (count($grid_newest_groups) > 0) {
$newest_content = Display::return_sortable_grid('mygroups', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
}
if (count($grid_pop_groups) > 0) {
//echo '<div class="social-groups-text3">'.get_lang('Popular').'</div>';
//echo '<h2>'.get_lang('Popular').'</h2>';
$popular_content = Display::return_sortable_grid('popular', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
}
if (api_is_platform_admin() || api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
if (empty($grid_my_groups) && empty($grid_newest_groups) && empty($grid_pop_groups) ) {
//echo '<a href="group_add.php">'.get_lang('YouShouldCreateAGroup').'</a>';
}
$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));
}
}
$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');
echo '</div>';
}
}
$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');
}
echo '</div>';
echo '</div>';
Display :: display_footer();
Loading…
Cancel
Save