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
Julio Montoya 15 years ago
parent 44db1bc395 c0298313e1
commit ce1613ef3b
21 changed files with 486 additions and 161 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. 7
      documentation/changelog.html
  2. 40
      main/css/blue_lagoon/default.css
  3. 19
      main/css/chamilo/default.css
  4. 19
      main/css/chamilo_green/default.css
  5. 19
      main/css/chamilo_red/default.css
  6. 40
      main/css/cool_blue/default.css
  7. 40
      main/css/dokeos_blue/default.css
  8. 40
      main/css/dokeos_classic/default.css
  9. 41
      main/css/dokeos_classic_2D/default.css
  10. 40
      main/css/empire_green/default.css
  11. 40
      main/css/fruity_orange/default.css
  12. 40
      main/css/medical/default.css
  13. 19
      main/css/public_admin/default.css
  14. 40
      main/css/royal_purple/default.css
  15. 28
      main/css/silver_line/default.css
  16. 40
      main/css/sober_brown/default.css
  17. 40
      main/css/steel_grey/default.css
  18. 40
      main/css/tasty_olive/default.css
  19. 40
      main/inc/lib/system_announcements.lib.php
  20. 13
      news_list.php
  21. 2
      user_portal.php

7
documentation/changelog.html
Unescape View File

@ -46,6 +46,13 @@
<li>Fixed Added an option to cancel prerequisites in a course (Learning path). Fixed by aboivin in <a href="http://www.chamilo.org/node/146" target="_blank">http://www.chamilo.org/node/146</a> </li>
<li>Empty extra user fields are now deleted from the database</li>
<li>Quiz tool: Answer list fixed when using "matching" question type (BT#801). Reported by Noa Orizales</li>
<li>Quiz tool + LP : Fixed bug when adding a exercise twice in the same LP with multiple attempts or not.</li>
<li>Quiz tool + LP + Multiple attempts : Pre requisites will work the first time a student pass the LP.
If an student finished all steps correctly he will view all steps, prerequisites will not work here.</li>
<li>Learning Path (Courses): PHP sessions of a LP are destroyed when visiting the main course page.</li>
</ul>
<br />
<h3>CSS changes</h3>

40
main/css/blue_lagoon/default.css
Unescape View File

@ -1321,19 +1321,41 @@ div.report_section h4 {
/*****************************************************
* SYSTEM ANNOUNCEMENTS *
*****************************************************/
div.system_announcements {
div.system_announcement {
padding: 10px;
border: 1px solid #ddd;
-moz-border-radius-topright : 5px;
-moz-border-radius-topleft : 5px;
-moz-border-radius-bottomright : 5px;
-moz-border-radius-bottomleft : 5px;
}
.system_announcement {
background: #eee url('images/headertables.jpg') repeat-x top center;
font: bold 100% arial, sans-serif, sans;
}
div.system_announcements h3 {
.system_announcement_content {
font: normal 100% 'Lucida Grande', verdana, Arial, sans-serif, sans;
}
div.system_announcement {
margin: 5px;
.system_announcements {
background: transparent url('images/systemenouvelles.jpg') no-repeat top left;
padding-top: 10px;
padding-bottom: 10px;
width: 90%;
}
div.system_announcement_title {
.system_announcements h3 {
}
div.system_announcement_content {
margin-left: 20px;
border-left: 1px solid gray;
padding-left: 5px;
.system_announcement_title {
font-weight: bold;
font-size: 120%;
float:left;
}
.system_announcement_date {
font-color: #ccc;
float:right;
}
/*****************************************************
* THE NEW FORUM *

19
main/css/chamilo/default.css
Unescape View File

@ -1606,7 +1606,7 @@ div.admin_section h4 {
* SYSTEM ANNOUNCEMENTS *
*****************************************************/
div.system_announcement {
padding: .2em;
padding: 10px;
border: 1px solid #ddd;
-moz-border-radius-topright : 5px;
-moz-border-radius-topleft : 5px;
@ -1614,8 +1614,9 @@ div.system_announcement {
-moz-border-radius-bottomleft : 5px;
}
.system_announcement {
background: #ddd url('images/headertables.jpg') repeat-x top center;
background: #eee url('images/headertables.jpg') repeat-x top center;
font: bold 100% arial, sans-serif, sans;
}
.system_announcement_content {
font: normal 100% 'Lucida Grande', verdana, Arial, sans-serif, sans;
@ -1623,12 +1624,24 @@ div.system_announcement {
.system_announcements {
background: transparent url('images/systemenouvelles.jpg') no-repeat top left;
padding-top: 10px;
width: 50%;
padding-bottom: 10px;
width: 90%;
}
.system_announcements h3 {
padding-left:70px;
padding-top: 30px;
}
.system_announcement_title {
font-weight: bold;
font-size: 120%;
float:left;
}
.system_announcement_date {
font-color: #ccc;
float:right;
}
/*****************************************************
* THE NEW FORUM *
*****************************************************/

19
main/css/chamilo_green/default.css
Unescape View File

@ -1610,7 +1610,7 @@ div.admin_section h4 {
* SYSTEM ANNOUNCEMENTS *
*****************************************************/
div.system_announcement {
padding: .2em;
padding: 10px;
border: 1px solid #ddd;
-moz-border-radius-topright : 5px;
-moz-border-radius-topleft : 5px;
@ -1618,8 +1618,9 @@ div.system_announcement {
-moz-border-radius-bottomleft : 5px;
}
.system_announcement {
background: #ddd url('images/headertables.jpg') repeat-x top center;
background: #eee url('images/headertables.jpg') repeat-x top center;
font: bold 100% arial, sans-serif, sans;
}
.system_announcement_content {
font: normal 100% 'Lucida Grande', verdana, Arial, sans-serif, sans;
@ -1627,12 +1628,24 @@ div.system_announcement {
.system_announcements {
background: transparent url('images/systemenouvelles.jpg') no-repeat top left;
padding-top: 10px;
width: 50%;
padding-bottom: 10px;
width: 90%;
}
.system_announcements h3 {
padding-left:70px;
padding-top: 30px;
}
.system_announcement_title {
font-weight: bold;
font-size: 120%;
float:left;
}
.system_announcement_date {
font-color: #ccc;
float:right;
}
/*****************************************************
* THE NEW FORUM *
*****************************************************/

19
main/css/chamilo_red/default.css
Unescape View File

@ -1612,7 +1612,7 @@ div.admin_section h4 {
* SYSTEM ANNOUNCEMENTS *
*****************************************************/
div.system_announcement {
padding: .2em;
padding: 10px;
border: 1px solid #ddd;
-moz-border-radius-topright : 5px;
-moz-border-radius-topleft : 5px;
@ -1620,8 +1620,9 @@ div.system_announcement {
-moz-border-radius-bottomleft : 5px;
}
.system_announcement {
background: #ddd url('images/headertables.jpg') repeat-x top center;
background: #eee url('images/headertables.jpg') repeat-x top center;
font: bold 100% arial, sans-serif, sans;
}
.system_announcement_content {
font: normal 100% 'Lucida Grande', verdana, Arial, sans-serif, sans;
@ -1629,12 +1630,24 @@ div.system_announcement {
.system_announcements {
background: transparent url('images/systemenouvelles.jpg') no-repeat top left;
padding-top: 10px;
width: 50%;
padding-bottom: 10px;
width: 90%;
}
.system_announcements h3 {
padding-left:70px;
padding-top: 30px;
}
.system_announcement_title {
font-weight: bold;
font-size: 120%;
float:left;
}
.system_announcement_date {
font-color: #ccc;
float:right;
}
/*****************************************************
* THE NEW FORUM *
*****************************************************/

40
main/css/cool_blue/default.css
Unescape View File

@ -1296,19 +1296,41 @@ div.report_section h4 {
/*****************************************************
* SYSTEM ANNOUNCEMENTS *
*****************************************************/
div.system_announcements {
div.system_announcement {
padding: 10px;
border: 1px solid #ddd;
-moz-border-radius-topright : 5px;
-moz-border-radius-topleft : 5px;
-moz-border-radius-bottomright : 5px;
-moz-border-radius-bottomleft : 5px;
}
div.system_announcements h3 {
.system_announcement {
background: #eee url('images/headertables.jpg') repeat-x top center;
font: bold 100% arial, sans-serif, sans;
}
div.system_announcement {
margin: 5px;
.system_announcement_content {
font: normal 100% 'Lucida Grande', verdana, Arial, sans-serif, sans;
}
div.system_announcement_title {
.system_announcements {
background: transparent url('images/systemenouvelles.jpg') no-repeat top left;
padding-top: 10px;
padding-bottom: 10px;
width: 90%;
}
div.system_announcement_content {
margin-left: 20px;
border-left: 1px solid gray;
padding-left: 5px;
.system_announcements h3 {
}
.system_announcement_title {
font-weight: bold;
font-size: 120%;
float:left;
}
.system_announcement_date {
font-color: #ccc;
float:right;
}
/*****************************************************
* THE NEW FORUM *

40
main/css/dokeos_blue/default.css
Unescape View File

@ -1302,19 +1302,41 @@ div.report_section h4 {
/*****************************************************
* SYSTEM ANNOUNCEMENTS *
*****************************************************/
div.system_announcements {
div.system_announcement {
padding: 10px;
border: 1px solid #ddd;
-moz-border-radius-topright : 5px;
-moz-border-radius-topleft : 5px;
-moz-border-radius-bottomright : 5px;
-moz-border-radius-bottomleft : 5px;
}
div.system_announcements h3 {
.system_announcement {
background: #eee url('images/headertables.jpg') repeat-x top center;
font: bold 100% arial, sans-serif, sans;
}
div.system_announcement {
margin: 5px;
.system_announcement_content {
font: normal 100% 'Lucida Grande', verdana, Arial, sans-serif, sans;
}
div.system_announcement_title {
.system_announcements {
background: transparent url('images/systemenouvelles.jpg') no-repeat top left;
padding-top: 10px;
padding-bottom: 10px;
width: 90%;
}
div.system_announcement_content {
margin-left: 20px;
border-left: 1px solid gray;
padding-left: 5px;
.system_announcements h3 {
}
.system_announcement_title {
font-weight: bold;
font-size: 120%;
float:left;
}
.system_announcement_date {
font-color: #ccc;
float:right;
}
/*****************************************************
* THE NEW FORUM *

40
main/css/dokeos_classic/default.css
Unescape View File

@ -1373,19 +1373,41 @@ div.report_section h4 {
/*****************************************************
* SYSTEM ANNOUNCEMENTS *
*****************************************************/
div.system_announcements {
div.system_announcement {
padding: 10px;
border: 1px solid #ddd;
-moz-border-radius-topright : 5px;
-moz-border-radius-topleft : 5px;
-moz-border-radius-bottomright : 5px;
-moz-border-radius-bottomleft : 5px;
}
div.system_announcements h3 {
.system_announcement {
background: #eee url('images/headertables.jpg') repeat-x top center;
font: bold 100% arial, sans-serif, sans;
}
div.system_announcement {
margin: 5px;
.system_announcement_content {
font: normal 100% 'Lucida Grande', verdana, Arial, sans-serif, sans;
}
.system_announcements {
background: transparent url('images/systemenouvelles.jpg') no-repeat top left;
padding-top: 10px;
padding-bottom: 10px;
width: 90%;
}
div.system_announcement_title {
.system_announcements h3 {
}
div.system_announcement_content {
margin-left: 20px;
border-left: 1px solid gray;
padding-left: 5px;
.system_announcement_title {
font-weight: bold;
font-size: 120%;
float:left;
}
.system_announcement_date {
font-color: #ccc;
float:right;
}
/*****************************************************
* THE NEW FORUM *

41
main/css/dokeos_classic_2D/default.css
Unescape View File

@ -1363,20 +1363,41 @@ div.report_section h4 {
SYSTEM ANNOUNCEMENTS
==============================================================================
*/
div.system_announcements {
div.system_announcement {
padding: 10px;
border: 1px solid #ddd;
-moz-border-radius-topright : 5px;
-moz-border-radius-topleft : 5px;
-moz-border-radius-bottomright : 5px;
-moz-border-radius-bottomleft : 5px;
}
div.system_announcements h3 {
.system_announcement {
background: #eee url('images/headertables.jpg') repeat-x top center;
font: bold 100% arial, sans-serif, sans;
}
div.system_announcement {
margin: 5px;
.system_announcement_content {
font: normal 100% 'Lucida Grande', verdana, Arial, sans-serif, sans;
}
div.system_announcement_title {
.system_announcements {
background: transparent url('images/systemenouvelles.jpg') no-repeat top left;
padding-top: 10px;
padding-bottom: 10px;
width: 90%;
}
div.system_announcement_content {
margin-left: 20px;
border-left: 1px solid gray;
padding-left: 5px;
.system_announcements h3 {
}
.system_announcement_title {
font-weight: bold;
font-size: 120%;
float:left;
}
.system_announcement_date {
font-color: #ccc;
float:right;
}
/*
==============================================================================

40
main/css/empire_green/default.css
Unescape View File

@ -1313,19 +1313,41 @@ div.report_section h4 {
/*****************************************************
* SYSTEM ANNOUNCEMENTS *
*****************************************************/
div.system_announcements {
div.system_announcement {
padding: 10px;
border: 1px solid #ddd;
-moz-border-radius-topright : 5px;
-moz-border-radius-topleft : 5px;
-moz-border-radius-bottomright : 5px;
-moz-border-radius-bottomleft : 5px;
}
div.system_announcements h3 {
.system_announcement {
background: #eee url('images/headertables.jpg') repeat-x top center;
font: bold 100% arial, sans-serif, sans;
}
div.system_announcement {
margin: 5px;
.system_announcement_content {
font: normal 100% 'Lucida Grande', verdana, Arial, sans-serif, sans;
}
div.system_announcement_title {
.system_announcements {
background: transparent url('images/systemenouvelles.jpg') no-repeat top left;
padding-top: 10px;
padding-bottom: 10px;
width: 90%;
}
div.system_announcement_content {
margin-left: 20px;
border-left: 1px solid gray;
padding-left: 5px;
.system_announcements h3 {
}
.system_announcement_title {
font-weight: bold;
font-size: 120%;
float:left;
}
.system_announcement_date {
font-color: #ccc;
float:right;
}
/*****************************************************
* THE NEW FORUM *

40
main/css/fruity_orange/default.css
Unescape View File

@ -1313,19 +1313,41 @@ div.report_section h4 {
/*****************************************************
* SYSTEM ANNOUNCEMENTS *
*****************************************************/
div.system_announcements {
div.system_announcement {
padding: 10px;
border: 1px solid #ddd;
-moz-border-radius-topright : 5px;
-moz-border-radius-topleft : 5px;
-moz-border-radius-bottomright : 5px;
-moz-border-radius-bottomleft : 5px;
}
div.system_announcements h3 {
.system_announcement {
background: #eee url('images/headertables.jpg') repeat-x top center;
font: bold 100% arial, sans-serif, sans;
}
div.system_announcement {
margin: 5px;
.system_announcement_content {
font: normal 100% 'Lucida Grande', verdana, Arial, sans-serif, sans;
}
div.system_announcement_title {
.system_announcements {
background: transparent url('images/systemenouvelles.jpg') no-repeat top left;
padding-top: 10px;
padding-bottom: 10px;
width: 90%;
}
div.system_announcement_content {
margin-left: 20px;
border-left: 1px solid gray;
padding-left: 5px;
.system_announcements h3 {
}
.system_announcement_title {
font-weight: bold;
font-size: 120%;
float:left;
}
.system_announcement_date {
font-color: #ccc;
float:right;
}
/*****************************************************
* THE NEW FORUM *

40
main/css/medical/default.css
Unescape View File

@ -1360,19 +1360,41 @@ div.report_section h4 {
/*****************************************************
* SYSTEM ANNOUNCEMENTS *
*****************************************************/
div.system_announcements {
div.system_announcement {
padding: 10px;
border: 1px solid #ddd;
-moz-border-radius-topright : 5px;
-moz-border-radius-topleft : 5px;
-moz-border-radius-bottomright : 5px;
-moz-border-radius-bottomleft : 5px;
}
div.system_announcements h3 {
.system_announcement {
background: #eee url('images/headertables.jpg') repeat-x top center;
font: bold 100% arial, sans-serif, sans;
}
div.system_announcement {
margin: 5px;
.system_announcement_content {
font: normal 100% 'Lucida Grande', verdana, Arial, sans-serif, sans;
}
.system_announcements {
background: transparent url('images/systemenouvelles.jpg') no-repeat top left;
padding-top: 10px;
padding-bottom: 10px;
width: 90%;
}
div.system_announcement_title {
.system_announcements h3 {
}
div.system_announcement_content {
margin-left: 20px;
border-left: 1px solid gray;
padding-left: 5px;
.system_announcement_title {
font-weight: bold;
font-size: 120%;
float:left;
}
.system_announcement_date {
font-color: #ccc;
float:right;
}
/*****************************************************
* THE NEW FORUM *

19
main/css/public_admin/default.css
Unescape View File

@ -1363,7 +1363,7 @@ div.report_section h4 {
* SYSTEM ANNOUNCEMENTS *
*****************************************************/
div.system_announcement {
padding: .2em;
padding: 10px;
border: 1px solid #ddd;
-moz-border-radius-topright : 5px;
-moz-border-radius-topleft : 5px;
@ -1371,8 +1371,9 @@ div.system_announcement {
-moz-border-radius-bottomleft : 5px;
}
.system_announcement {
background: #ddd url('images/headertables.jpg') repeat-x top center;
background: #eee url('images/headertables.jpg') repeat-x top center;
font: bold 100% arial, sans-serif, sans;
}
.system_announcement_content {
font: normal 100% 'Lucida Grande', verdana, Arial, sans-serif, sans;
@ -1380,12 +1381,24 @@ div.system_announcement {
.system_announcements {
background: transparent url('images/systemenouvelles.jpg') no-repeat top left;
padding-top: 10px;
width: 50%;
padding-bottom: 10px;
width: 90%;
}
.system_announcements h3 {
padding-left:70px;
padding-top: 30px;
}
.system_announcement_title {
font-weight: bold;
font-size: 120%;
float:left;
}
.system_announcement_date {
font-color: #ccc;
float:right;
}
/*****************************************************
* THE NEW FORUM *
*****************************************************/

40
main/css/royal_purple/default.css
Unescape View File

@ -1311,19 +1311,41 @@ div.report_section h4 {
/*****************************************************
* SYSTEM ANNOUNCEMENTS *
*****************************************************/
div.system_announcements {
div.system_announcement {
padding: 10px;
border: 1px solid #ddd;
-moz-border-radius-topright : 5px;
-moz-border-radius-topleft : 5px;
-moz-border-radius-bottomright : 5px;
-moz-border-radius-bottomleft : 5px;
}
div.system_announcements h3 {
.system_announcement {
background: #eee url('images/headertables.jpg') repeat-x top center;
font: bold 100% arial, sans-serif, sans;
}
div.system_announcement {
margin: 5px;
.system_announcement_content {
font: normal 100% 'Lucida Grande', verdana, Arial, sans-serif, sans;
}
div.system_announcement_title {
.system_announcements {
background: transparent url('images/systemenouvelles.jpg') no-repeat top left;
padding-top: 10px;
padding-bottom: 10px;
width: 90%;
}
div.system_announcement_content {
margin-left: 20px;
border-left: 1px solid gray;
padding-left: 5px;
.system_announcements h3 {
}
.system_announcement_title {
font-weight: bold;
font-size: 120%;
float:left;
}
.system_announcement_date {
font-color: #ccc;
float:right;
}
/*****************************************************
* THE NEW FORUM *

28
main/css/silver_line/default.css
Unescape View File

@ -1288,23 +1288,41 @@ a.specialLink:hover, a.specialLink:focus {
*/
div.system_announcement {
padding: .2em;
padding: 10px;
border: 1px solid #ddd;
-moz-border-radius-topright : 5px;
-moz-border-radius-topleft : 5px;
-moz-border-radius-bottomright : 5px;
-moz-border-radius-bottomleft : 5px;
}
.system_announcement {
background: #ddd url('images/headertables.jpg') repeat-x top center;
background: #eee url('images/headertables.jpg') repeat-x top center;
font: bold 100% arial, sans-serif, sans;
}
.system_announcement_content {
font: normal 100% 'Lucida Grande', verdana, Arial, sans-serif, sans;
}
.system_announcements {
background: transparent url('images/systemenouvelles.jpg') no-repeat top left;
padding-top: 30px;
width: 50%;
padding-top: 10px;
padding-bottom: 10px;
width: 90%;
}
.system_announcements h3 {
text-align: center;
padding-left:70px;
padding-top: 30px;
}
.system_announcement_title {
font-weight: bold;
font-size: 120%;
float:left;
}
.system_announcement_date {
font-color: #ccc;
float:right;
}
/*
==============================================================================

40
main/css/sober_brown/default.css
Unescape View File

@ -1342,19 +1342,41 @@ div.admin_section h4 {
/*****************************************************
* SYSTEM ANNOUNCEMENTS *
*****************************************************/
div.system_announcements {
div.system_announcement {
padding: 10px;
border: 1px solid #ddd;
-moz-border-radius-topright : 5px;
-moz-border-radius-topleft : 5px;
-moz-border-radius-bottomright : 5px;
-moz-border-radius-bottomleft : 5px;
}
div.system_announcements h3 {
.system_announcement {
background: #eee url('images/headertables.jpg') repeat-x top center;
font: bold 100% arial, sans-serif, sans;
}
div.system_announcement {
margin: 5px;
.system_announcement_content {
font: normal 100% 'Lucida Grande', verdana, Arial, sans-serif, sans;
}
.system_announcements {
background: transparent url('images/systemenouvelles.jpg') no-repeat top left;
padding-top: 10px;
padding-bottom: 10px;
width: 90%;
}
div.system_announcement_title {
.system_announcements h3 {
}
div.system_announcement_content {
margin-left: 20px;
border-left: 1px solid gray;
padding-left: 5px;
.system_announcement_title {
font-weight: bold;
font-size: 120%;
float:left;
}
.system_announcement_date {
font-color: #ccc;
float:right;
}
/*****************************************************
* THE NEW FORUM *

40
main/css/steel_grey/default.css
Unescape View File

@ -1314,19 +1314,41 @@ div.admin_section h4 {
/*****************************************************
* SYSTEM ANNOUNCEMENTS *
*****************************************************/
div.system_announcements {
div.system_announcement {
padding: 10px;
border: 1px solid #ddd;
-moz-border-radius-topright : 5px;
-moz-border-radius-topleft : 5px;
-moz-border-radius-bottomright : 5px;
-moz-border-radius-bottomleft : 5px;
}
div.system_announcements h3 {
.system_announcement {
background: #eee url('images/headertables.jpg') repeat-x top center;
font: bold 100% arial, sans-serif, sans;
}
div.system_announcement {
margin: 5px;
.system_announcement_content {
font: normal 100% 'Lucida Grande', verdana, Arial, sans-serif, sans;
}
div.system_announcement_title {
.system_announcements {
background: transparent url('images/systemenouvelles.jpg') no-repeat top left;
padding-top: 10px;
padding-bottom: 10px;
width: 90%;
}
div.system_announcement_content {
margin-left: 20px;
border-left: 1px solid gray;
padding-left: 5px;
.system_announcements h3 {
}
.system_announcement_title {
font-weight: bold;
font-size: 120%;
float:left;
}
.system_announcement_date {
font-color: #ccc;
float:right;
}
/*****************************************************
* THE NEW FORUM *

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

@ -1314,19 +1314,41 @@ div.admin_section h4 {
/*****************************************************
* SYSTEM ANNOUNCEMENTS *
*****************************************************/
div.system_announcements {
div.system_announcement {
padding: 10px;
border: 1px solid #ddd;
-moz-border-radius-topright : 5px;
-moz-border-radius-topleft : 5px;
-moz-border-radius-bottomright : 5px;
-moz-border-radius-bottomleft : 5px;
}
div.system_announcements h3 {
.system_announcement {
background: #eee url('images/headertables.jpg') repeat-x top center;
font: bold 100% arial, sans-serif, sans;
}
div.system_announcement {
margin: 5px;
.system_announcement_content {
font: normal 100% 'Lucida Grande', verdana, Arial, sans-serif, sans;
}
div.system_announcement_title {
.system_announcements {
background: transparent url('images/systemenouvelles.jpg') no-repeat top left;
padding-top: 10px;
padding-bottom: 10px;
width: 90%;
}
div.system_announcement_content {
margin-left: 20px;
border-left: 1px solid gray;
padding-left: 5px;
.system_announcements h3 {
}
.system_announcement_title {
font-weight: bold;
font-size: 120%;
float:left;
}
.system_announcement_date {
font-color: #ccc;
float:right;
}
/*****************************************************
* THE NEW FORUM *

40
main/inc/lib/system_announcements.lib.php
Unescape View File

@ -22,8 +22,7 @@ class SystemAnnouncementManager
$user_selected_language = api_get_interface_language();
$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$sql = "SELECT *, DATE_FORMAT(date_start,'%d-%m-%Y') AS display_date FROM ".$db_table." WHERE (lang='$user_selected_language' OR lang IS NULL) AND ((NOW() BETWEEN date_start AND date_end) OR date_end='0000-00-00') ";
switch ($visible)
{
switch ($visible) {
case VISIBLE_GUEST :
$sql .= " AND visible_guest = 1 ";
break;
@ -36,40 +35,32 @@ class SystemAnnouncementManager
}
$sql .= " ORDER BY date_start DESC LIMIT 0,7";
$announcements = Database::query($sql);
if (Database::num_rows($announcements))
{
if (Database::num_rows($announcements) > 0) {
$query_string = ereg_replace('announcement=[1-9]+', '', $_SERVER['QUERY_STRING']);
$query_string = ereg_replace('&$', '', $query_string);
$url = api_get_self();
echo '<div class="system_announcements">';
echo '<h3>'.get_lang('SystemAnnouncements').'</h3>';
echo '<table border="0">';
while ($announcement = Database::fetch_object($announcements))
{
while ($announcement = Database::fetch_object($announcements)) {
if ($id != $announcement->id)
{
if (strlen($query_string) > 0)
{
if ($id != $announcement->id) {
if (strlen($query_string) > 0) {
$show_url = 'news_list.php#'.$announcement->id;
//$show_url = $url.'?'.$query_string.'&announcement='.$announcement->id;
}
else
{
} else {
$show_url = 'news_list.php#'.$announcement->id;
//$show_url = $url.'?announcement='.$announcement->id;
}
echo '<tr class="system_announcement">
<td width="80px" valign="top" class="system_announcement_title">'
.$announcement->display_date.'
<td valign="top" class="system_announcement_title">
<a name="ann'.$announcement->id.'" href="'.$show_url.'">'.$announcement->title.'</a>
</td>
<td valign="top">
<a name="ann'.$announcement->id.'" href="'.$show_url.'">'.$announcement->title.'</a>
'.$announcement->display_date.'
</td>
</tr>';
}
else
{
} else {
echo '<div class="system_announcement">
<div class="system_announcement_title">'
.$announcement->display_date.'
@ -84,7 +75,7 @@ class SystemAnnouncementManager
/*echo '<tr><td height="15px"></td></tr>';*/
echo '<tr><td colspan="2">';
echo '<a href="news_list.php">'.get_lang("More").'</a>';
echo '<a href="news_list.php">'.get_lang('More').'</a>';
echo '</td></tr>';
echo '</table>';
echo '</div>';
@ -120,7 +111,7 @@ class SystemAnnouncementManager
}
$announcements = Database::query($sql);
if (Database::num_rows($announcements)) {
if (Database::num_rows($announcements) > 0) {
$query_string = ereg_replace('announcement=[1-9]+', '', $_SERVER['QUERY_STRING']);
$query_string = ereg_replace('&$', '', $query_string);
$url = api_get_self();
@ -138,9 +129,7 @@ class SystemAnnouncementManager
echo '<tr><td>';
echo '<a name="'.$announcement->id.'"></a>
<div class="system_announcement">
<div class="system_announcement_title">'
.$announcement->display_date.' <strong>'.$announcement->title.'</strong>
</div>
<div class="system_announcement_title">'.$announcement->title.'</div><div class="system_announcement_date">'.$announcement->display_date.'</div>
<br />
<div class="system_announcement_content">'
.$announcement->content.'
@ -159,8 +148,7 @@ class SystemAnnouncementManager
echo '</tr>';
echo '</table>';
echo '</div>';
}
return;
}
}
public static function display_fleche($user_id)

13
news_list.php
Unescape View File

@ -1,17 +1,14 @@
<?php
// @todo Add dokeos header here
/*
* Created on 30 mai 2006 by Elixir Interactive http://www.elixir-interactive.com
*/
/* For licensing terms, see /license.txt */
// name of the language file that needs to be included
$language_file = array ('courses', 'index');
// including necessary files
include_once 'main/inc/global.inc.php';
include_once api_get_path(LIBRARY_PATH).'system_announcements.lib.php';
require_once 'main/inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'system_announcements.lib.php';
$tool_name = get_lang("SystemAnnouncements");
$tool_name = get_lang('SystemAnnouncements');
Display::display_header($tool_name);
$start = isset($_GET['start']) ? (int)$_GET['start'] : $start = 0;
@ -23,4 +20,4 @@ if (isset($_user['user_id'])) {
SystemAnnouncementManager :: display_all_announcements(VISIBLE_GUEST, $announcement, $start);
}
Display::display_footer();
Display::display_footer();

2
user_portal.php
Unescape View File

@ -1,6 +1,6 @@
<?php // $Id: user_portal.php 22375 2009-07-26 18:54:59Z herodoto $
/* For licensing terms, see /dokeos_license.txt */
/* For licensing terms, see /license.txt */
/**
==============================================================================
* This is the index file displayed when a user is logged in on Dokeos.

Write Preview
Loading…
Cancel
Save