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

Removing header2 CSS id + fixing the profile image using the CSS class thumbnail

Browse Source
skala
Julio Montoya 14 years ago
parent e6bc59c53c
commit 554bd299a2
9 changed files with 22 additions and 154 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. 43
      main/css/base.css
  2. 15
      main/css/base_chamilo.css
  3. 32
      main/css/chamilo/frames.css
  4. 33
      main/css/chamilo_green/frames.css
  5. 6
      main/css/responsive.css
  6. 15
      main/css/tasty_olive/default.css
  7. 3
      main/inc/global_error_message.inc.php
  8. 27
      main/inc/lib/userportal.lib.php
  9. 2
      main/social/home.php

43
main/css/base.css
Unescape View File

@ -46,10 +46,6 @@ legend {
padding:40px 0px 0px 0px;
}
#header2 .nav{
margin-bottom:0px;
}
/* menu dropdown fixes */
.subnav .nav .open > .dropdown-toggle, .subnav .nav .active > .dropdown-toggle, .subnav .nav .open.active > .dropdown-toggle {
background-color: transparent;
@ -1809,11 +1805,6 @@ div.image-social-content center.friend {
margin-bottom:10px;
}
.social_user_information {
width:300px;
float:left;
}
.social-friend-container {
width:100%;
overflow:hidden;
@ -1839,40 +1830,6 @@ div.image-social-content center.friend {
width:76px;
}
/* styles from the my.profile.php file */
#social_widget {
margin: 0 20px;
}
#social_widget_image {
float:left;
margin-bottom:10px;
padding:2px;
}
/* SOCIAL BOX */
.social-box-main1 {
width:100%;
height:auto;
overflow:hidden;
}
.social-box-left {
width:340px;
float:left;
height:auto;
margin:0px;
}
.social-box-right {
width:280px;
float:left;
height:auto;
margin-left:18px;
overflow:hidden;
}
.box_shared_profile_group_title {
border-bottom:1pt dotted #000;
padding:5px;

15
main/css/base_chamilo.css
Unescape View File

@ -303,16 +303,6 @@ input.link_alike:hover {
height:16px;
padding-right:4%;
}
/********************************************************
* HEADER 2: Users online, help, student/teacher view *
********************************************************/
#header2 a {
}
#header2 a:hover {
text-decoration: underline;
}
#current {
color:#FFFFFF;
cursor:pointer;
@ -2191,6 +2181,11 @@ span.form_required {
/* end default subnav background colors */
}
/* fixing gray border next the logout button */
.subnav .nav-tabs .open .dropdown-toggle, .subnav .nav-pills .open .dropdown-toggle, .nav > .open.active > a:hover {
border-color: transparent;
}
.subnav .nav {
margin-bottom: 0;
}

32
main/css/chamilo/frames.css
Unescape View File

@ -55,38 +55,6 @@ img {
float: right;
font-weight: bold;
}
/* Header 2: Containing My Courses, My Profile,... */
#header2 {
font-size: 12px;
padding: 4px;
background-color: #4271B5;
color: #fff;
border-bottom: 1px solid white;
}
#header2 .banner_links {
margin: 0;
}
#header2 a {
text-decoration: none;
color: #fff;
background: transparent;
font-weight:normal;
font-size: 12px;
}
#header2 input.logout {
/* makes an input appear like a link in this header */
margin: 0;
padding: 0;
background-color: transparent;
border: none;
color: #fff;
font-size: 12px;
font-weight:normal;
font-family: verdana, arial, helvetica, sans-serif;
}
#header2 a:hover, #header2 input.logout:hover {
border-bottom: 1px solid #fff;
}
#logout {
float: right;
width:20%;

33
main/css/chamilo_green/frames.css
Unescape View File

@ -55,38 +55,7 @@ img {
float: right;
font-weight: bold;
}
/* Header 2: Containing My Courses, My Profile,... */
#header2 {
font-size: 12px;
padding: 4px;
background-color: #4271B5;
color: #fff;
border-bottom: 1px solid white;
}
#header2 .banner_links {
margin: 0;
}
#header2 a {
text-decoration: none;
color: #fff;
background: transparent;
font-weight:normal;
font-size: 12px;
}
#header2 input.logout {
/* makes an input appear like a link in this header */
margin: 0;
padding: 0;
background-color: transparent;
border: none;
color: #fff;
font-size: 12px;
font-weight:normal;
font-family: verdana, arial, helvetica, sans-serif;
}
#header2 a:hover, #header2 input.logout:hover {
border-bottom: 1px solid #fff;
}
#logout {
float: right;
width:20%;

6
main/css/responsive.css
Unescape View File

@ -27,11 +27,7 @@
.notification-panel {
display:none;
}
#header2 .nav-pills {
display:none;
}
}
}
@media (max-width: 767px) {

15
main/css/tasty_olive/default.css
Unescape View File

@ -356,20 +356,7 @@ a:active {
#my_courses {
float: right;
}
/********************************************************
* HEADER 2: Users online, help, student/teacher view *
********************************************************/
#header2 {
color: #636363;/*border: 1px solid red;*/
}
#header2 a {
color: #636363;
text-decoration: none;
font-weight:normal;
}
#header2 a:hover {
text-decoration: underline;
}
/*****************************************************
* HEADER 3: TABS OF THE HEADER *
*****************************************************/

3
main/inc/global_error_message.inc.php
Unescape View File

@ -183,8 +183,7 @@ if (is_int($global_error_code) && $global_error_code > 0) {
<img vspace="10" hspace="10" alt="Chamilo" src="{CHAMILO_LOGO}">
</div>
</div>
<div class="clear"></div>
<div id="header2"></div>
<div class="clear"></div>
<div class="subnav">
<ul>
<li id="current"><a href="#"><span id="tab_active">{SECTION}</span></a></li>

27
main/inc/lib/userportal.lib.php
Unescape View File

@ -798,18 +798,16 @@ class IndexManager {
}
$img_array = UserManager::get_picture_user(api_get_user_id(), $img_array['file'], 50, USER_IMAGE_SIZE_MEDIUM, ' width="90" height="90" ');
$profile_content = '<div id="social_widget">';
$profile_content .= '<div id="social_widget_image">';
if (api_get_setting('allow_social_tool') == 'true') {
if (!$no_image) {
$profile_content .='<a href="'.api_get_path(WEB_PATH).'main/social/home.php"><img src="'.$img_array['file'].'" '.$img_array['style'].' border="1"></a>';
$profile_content .= '<ul class="menulist">';
if (api_get_setting('allow_social_tool') == 'true') {
if (!$no_image) {
$profile_content .='<li><a class="thumbnail" href="'.api_get_path(WEB_PATH).'main/social/home.php"><img src="'.$img_array['file'].'" '.$img_array['style'].' border="1"></a></li>';
} else {
$profile_content .='<a href="'.api_get_path(WEB_PATH).'main/auth/profile.php"><img title="'.get_lang('EditProfile').'" src="'.$img_array['file'].'" '.$img_array['style'].' border="1"></a>';
$profile_content .='<li><a class="thumbnail" href="'.api_get_path(WEB_PATH).'main/auth/profile.php"><img title="'.get_lang('EditProfile').'" src="'.$img_array['file'].'" '.$img_array['style'].' border="1"></a></li>';
}
}
$profile_content .= ' </div></div>';
$profile_content .= ' <div class="clear"></div>';
}
// @todo Add a platform setting to add the user image.
if (api_get_setting('allow_message_tool') == 'true') {
@ -828,9 +826,8 @@ class IndexManager {
$cant_msg = '';
if ($number_of_new_messages > 0) {
$cant_msg = ' ('.$number_of_new_messages.')';
}
$profile_content .= '<ul class="menulist">';
}
$link = '';
if (api_get_setting('allow_social_tool') == 'true') {
$link = '?f=social';
@ -846,9 +843,9 @@ class IndexManager {
}
$profile_content .= '<li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.get_lang('PendingInvitations').' '.$total_invitations.' </a></li>';
}
$profile_content .= '<li><a href="'.api_get_path(WEB_PATH).'main/auth/profile.php">'.get_lang('EditProfile').'</a></li>';
$profile_content .= '</ul>';
$profile_content .= '<li><a href="'.api_get_path(WEB_PATH).'main/auth/profile.php">'.get_lang('EditProfile').'</a></li>';
}
$profile_content .= '</ul>';
$html = self::show_right_block(get_lang('Profile'), $profile_content);
return $html;
}

2
main/social/home.php
Unescape View File

@ -68,7 +68,7 @@ if (api_get_setting('profile', 'picture') == 'true') {
$user_info = UserManager :: get_user_info_by_id(api_get_user_id());
$social_left_content = SocialManager::show_social_menu('home');
$social_right_content .= '<div class="social_user_information span4">';
$social_right_content .= '<div class="span5">';
$social_right_content .= '<div class="social-groups-home-title">'.get_lang('ContactInformation').'</div>';
// information current user

Write Preview
Loading…
Cancel
Save