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

merge

Browse Source
skala
jmontoya 16 years ago
parent a1aa00a0d2 cb11922f62
commit 0557e825eb
19 changed files with 42 additions and 2 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. 1
      main/css/academica/jquery.tabs.css
  2. 2
      main/css/baby_orange/jquery.tabs.css
  3. 3
      main/css/blue_lagoon/jquery.tabs.css
  4. 3
      main/css/cool_blue/jquery.tabs.css
  5. 1
      main/css/corporate/jquery.tabs.css
  6. 1
      main/css/cosmic_campus/jquery.tabs.css
  7. 3
      main/css/delicious_bordeaux/jquery.tabs.css
  8. 3
      main/css/dokeos_blue/jquery.tabs.css
  9. 1
      main/css/dokeos_classic/jquery.tabs.css
  10. 1
      main/css/dokeos_classic_2D/jquery.tabs.css
  11. 3
      main/css/empire_green/jquery.tabs.css
  12. 3
      main/css/fruity_orange/jquery.tabs.css
  13. 1
      main/css/medical/jquery.tabs.css
  14. 3
      main/css/royal_purple/jquery.tabs.css
  15. 1
      main/css/silver_line/jquery.tabs.css
  16. 1
      main/css/sober_brown/jquery.tabs.css
  17. 3
      main/css/steel_grey/jquery.tabs.css
  18. 3
      main/css/tasty_olive/jquery.tabs.css
  19. 5
      main/social/profile.php

1
main/css/academica/jquery.tabs.css
Unescape View File

@ -16,6 +16,7 @@
list-style: none;
margin: 0;
padding: 0 0 0 4px;
border-bottom:0px;
}
.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
display: block;

2
main/css/baby_orange/jquery.tabs.css
Unescape View File

@ -16,6 +16,8 @@
list-style: none;
margin: 0;
padding: 0 0 0 4px;
background:#FDDEAA;
border-bottom:0px;
}
.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
display: block;

3
main/css/blue_lagoon/jquery.tabs.css
Unescape View File

@ -16,6 +16,9 @@
list-style: none;
margin: 0;
padding: 0 0 0 4px;
background:#ffffff;
border-bottom:1px dotted #ffffff;
border-top:1px dotted #ffffff;
}
.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
display: block;

3
main/css/cool_blue/jquery.tabs.css
Unescape View File

@ -16,6 +16,9 @@
list-style: none;
margin: 0;
padding: 0 0 0 4px;
background:#ffffff;
border-bottom:1px dotted #ffffff;
border-top:1px dotted #ffffff;
}
.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
display: block;

1
main/css/corporate/jquery.tabs.css
Unescape View File

@ -16,6 +16,7 @@
list-style: none;
margin: 0;
padding: 0 0 0 4px;
border-bottom:0px;
}
.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
display: block;

1
main/css/cosmic_campus/jquery.tabs.css
Unescape View File

@ -16,6 +16,7 @@
list-style: none;
margin: 0;
padding: 0 0 0 4px;
border-bottom:0px ;
}
.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
display: block;

3
main/css/delicious_bordeaux/jquery.tabs.css
Unescape View File

@ -16,6 +16,9 @@
list-style: none;
margin: 0;
padding: 0 0 0 4px;
background:#ffffff;
border-bottom:1px dotted #ffffff;
border-top:1px dotted #ffffff;
}
.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
display: block;

3
main/css/dokeos_blue/jquery.tabs.css
Unescape View File

@ -16,6 +16,9 @@
list-style: none;
margin: 0;
padding: 0 0 0 4px;
background:#ffffff;
border-bottom:1px dotted #ffffff;
border-top:1px dotted #ffffff;
}
.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
display: block;

1
main/css/dokeos_classic/jquery.tabs.css
Unescape View File

@ -16,6 +16,7 @@
list-style: none;
margin: 0;
padding: 0 0 0 4px;
border-bottom:0px;
}
.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
display: block;

1
main/css/dokeos_classic_2D/jquery.tabs.css
Unescape View File

@ -16,6 +16,7 @@
list-style: none;
margin: 0;
padding: 0 0 0 4px;
border-bottom:0px;
}
.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
display: block;

3
main/css/empire_green/jquery.tabs.css
Unescape View File

@ -16,6 +16,9 @@
list-style: none;
margin: 0;
padding: 0 0 0 4px;
background:#ffffff;
border-bottom:1px dotted #ffffff;
border-top:1px dotted #ffffff;
}
.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
display: block;

3
main/css/fruity_orange/jquery.tabs.css
Unescape View File

@ -16,6 +16,9 @@
list-style: none;
margin: 0;
padding: 0 0 0 4px;
background:#ffffff;
border-bottom:1px dotted #ffffff;
border-top:1px dotted #ffffff;
}
.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
display: block;

1
main/css/medical/jquery.tabs.css
Unescape View File

@ -16,6 +16,7 @@
list-style: none;
margin: 0;
padding: 0 0 0 4px;
border-bottom:0px;
}
.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
display: block;

3
main/css/royal_purple/jquery.tabs.css
Unescape View File

@ -16,6 +16,9 @@
list-style: none;
margin: 0;
padding: 0 0 0 4px;
background:#ffffff;
border-bottom:1px dotted #ffffff;
border-top:1px dotted #ffffff;
}
.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
display: block;

1
main/css/silver_line/jquery.tabs.css
Unescape View File

@ -17,6 +17,7 @@
list-style: none;
margin: 0;
padding: 0 0 0 4px;
border-bottom:0px;
}
.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
display: block;

1
main/css/sober_brown/jquery.tabs.css
Unescape View File

@ -17,6 +17,7 @@
list-style: none;
margin: 0;
padding: 0 0 0 4px;
border-bottom:0px;
}
.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
display: block;

3
main/css/steel_grey/jquery.tabs.css
Unescape View File

@ -16,6 +16,9 @@
list-style: none;
margin: 0;
padding: 0 0 0 4px;
background:#ffffff;
border-bottom:1px dotted #ffffff;
border-top:1px dotted #ffffff;
}
.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
display: block;

3
main/css/tasty_olive/jquery.tabs.css
Unescape View File

@ -16,6 +16,9 @@
list-style: none;
margin: 0;
padding: 0 0 0 4px;
background:#ffffff;
border-bottom:1px dotted #ffffff;
border-top:1px dotted #ffffff;
}
.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
display: block;

5
main/social/profile.php
Unescape View File

@ -788,15 +788,18 @@ echo '<div id="social-profile-container">';
//-----Announcements
$announcement_content = '';
$my_announcement_by_user_id=isset($_GET['u']) ? Security::remove_XSS($_GET['u']) : api_get_user_id();
foreach ($course_list_code as $course) {
$content = get_all_annoucement_by_user_course($course['dbName'],$my_announcement_by_user_id);
$course_info=api_get_course_info($course['code']);
if (!empty($content)) {
$announcement_content.= '<div class="social-background-content" style="width:100%">';
$announcement_content.= '<div class="actions">'.$course['title'].'</div>';
$announcement_content.= '<div class="actions">'.$course_info['name'].'</div>';
$announcement_content.= $content;
$announcement_content.= '</div>';
$announcement_content.= '<br/>';
}
}
if(!empty($announcement_content)) {

Write Preview
Loading…
Cancel
Save