From d7a52355c7fc7dd8900a8af1d3aeffdb9b1b76be Mon Sep 17 00:00:00 2001 From: Arthur Portugal Date: Wed, 12 Aug 2009 15:54:33 -0500 Subject: [PATCH] Fixed layout on administrator section - see DT#5099 --- main/css/academica/default.css | 17 +++++++++++++++++ main/css/baby_orange/default.css | 15 +++++++++++++++ main/css/blue_lagoon/default.css | 13 +++++++++++++ main/css/cool_blue/default.css | 13 +++++++++++++ main/css/corporate/default.css | 17 +++++++++++++++++ main/css/cosmic_campus/default.css | 15 +++++++++++++++ main/css/delicious_bordeaux/default.css | 13 +++++++++++++ main/css/dokeos_blue/default.css | 13 +++++++++++++ main/css/dokeos_classic/default.css | 13 +++++++++++++ main/css/dokeos_classic_2D/default.css | 13 +++++++++++++ main/css/empire_green/default.css | 13 +++++++++++++ main/css/fruity_orange/default.css | 13 +++++++++++++ main/css/medical/default.css | 13 +++++++++++++ main/css/public_admin/default.css | 15 +++++++++++++++ main/css/royal_purple/default.css | 13 +++++++++++++ main/css/silver_line/default.css | 23 +++++++++++++++++++++++ main/css/sober_brown/default.css | 13 +++++++++++++ main/css/steel_grey/default.css | 13 +++++++++++++ main/css/tasty_olive/default.css | 13 +++++++++++++ main/mySpace/index.php | 4 ++-- main/tracking/courseLog.php | 14 +++++++------- 21 files changed, 280 insertions(+), 9 deletions(-) diff --git a/main/css/academica/default.css b/main/css/academica/default.css index 73345fa12d..e7d0e408d3 100644 --- a/main/css/academica/default.css +++ b/main/css/academica/default.css @@ -799,6 +799,7 @@ div.admin_section { float: left; padding: 5px; margin: 10px 20px; + min-height:210px; } div.admin_section h4 { background-color: #EFEFEF; @@ -809,6 +810,22 @@ div.admin_section h4 { margin: 5px; padding: 5px; } +/* Report section */ +div.report_section { + width: 40%; + float: left; + padding: 5px; + margin: 10px 20px; +} +div.report_section h4 { + background-color: #EFEFEF; + border: 1px solid #4171b5; + font-weight: bold; + color: #4171b5; + list-style-type: none; + margin: 5px; + padding: 5px; +} /* course homepage */ .courseadminview, .platformadminview { position: relative; diff --git a/main/css/baby_orange/default.css b/main/css/baby_orange/default.css index 01fbc8a055..fe3ddc8dca 100644 --- a/main/css/baby_orange/default.css +++ b/main/css/baby_orange/default.css @@ -797,8 +797,23 @@ div.admin_section { float: left; margin: 10px 20px; border: 1px solid #EE4C03; + min-height:200px; } div.admin_section h4 { + background-color: #FDDEAA; + font-weight: bold; + list-style-type: none; + margin: 0px; + padding: 5px; +} +/* Report section */ +div.report_section { + width: 40%; + float: left; + margin: 10px 20px; + border: 1px solid #EE4C03; +} +div.report_section h4 { background-color: #FDDEAA; font-weight: bold; list-style-type: none; diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css index 6f81b75651..7c675c3a35 100644 --- a/main/css/blue_lagoon/default.css +++ b/main/css/blue_lagoon/default.css @@ -1258,12 +1258,25 @@ div.admin_section { float: left; padding: 5px; margin: 10px 20px; + min-height:200px; } div.admin_section h4 { margin: 0; border-bottom: 1px solid gray; width: 100%; } +/* Report section */ +div.report_section { + width: 40%; + float: left; + padding: 5px; + margin: 10px 20px; +} +div.report_section h4 { + margin: 0; + border-bottom: 1px solid gray; + width: 100%; +} .user_course_category { background-color: #efefef; border: 1px solid #666; diff --git a/main/css/cool_blue/default.css b/main/css/cool_blue/default.css index 737ad5e097..162a950fb0 100644 --- a/main/css/cool_blue/default.css +++ b/main/css/cool_blue/default.css @@ -1252,12 +1252,25 @@ div.admin_section { float: left; padding: 5px; margin: 10px 20px; + min-height:200px; } div.admin_section h4 { margin: 0; border-bottom: 1px solid gray; width: 100%; } +/* Report section */ +div.report_section { + width: 40%; + float: left; + padding: 5px; + margin: 10px 20px; +} +div.report_section h4 { + margin: 0; + border-bottom: 1px solid gray; + width: 100%; +} .user_course_category { background-color: #efefef; border: 1px solid #666; diff --git a/main/css/corporate/default.css b/main/css/corporate/default.css index d7a02c2513..2934ec163e 100644 --- a/main/css/corporate/default.css +++ b/main/css/corporate/default.css @@ -824,6 +824,7 @@ div.admin_section { float: left; padding: 5px; margin: 10px 20px; + min-height:210px; } div.admin_section h4 { background-color: #EFEFEF; @@ -834,6 +835,22 @@ div.admin_section h4 { margin: 5px; padding: 5px; } +/* Report section */ +div.report_section { + width: 40%; + float: left; + padding: 5px; + margin: 10px 20px; +} +div.report_section h4 { + background-color: #EFEFEF; + border: 1px solid #cccccc; + font-weight: bold; + color: #666666; + list-style-type: none; + margin: 5px; + padding: 5px; +} /* course homepage */ .courseadminview, .platformadminview { position: relative; diff --git a/main/css/cosmic_campus/default.css b/main/css/cosmic_campus/default.css index 97ee2fbf9f..1d179e07b3 100644 --- a/main/css/cosmic_campus/default.css +++ b/main/css/cosmic_campus/default.css @@ -837,6 +837,7 @@ div.admin_section { float: left; margin: 10px 20px; border: 1px solid #EE4C03; + min-height:210px; } div.admin_section h4 { background-color: #FDDEAA; @@ -845,6 +846,20 @@ div.admin_section h4 { margin: 0px; padding: 5px; } +/* Report section */ +div.report_section { + width: 40%; + float: left; + margin: 10px 20px; + border: 1px solid #EE4C03; +} +div.report_section h4 { + background-color: #FDDEAA; + font-weight: bold; + list-style-type: none; + margin: 0px; + padding: 5px; +} /* course homepage */ .courseadminview, .platformadminview { position: relative; diff --git a/main/css/delicious_bordeaux/default.css b/main/css/delicious_bordeaux/default.css index cc7e362809..21cdb9c967 100644 --- a/main/css/delicious_bordeaux/default.css +++ b/main/css/delicious_bordeaux/default.css @@ -1268,12 +1268,25 @@ div.admin_section { float: left; padding: 5px; margin: 10px 20px; + min-height:200px; } div.admin_section h4 { margin: 0; border-bottom: 1px solid gray; width: 100%; } +/* Report section */ +div.report_section { + width: 40%; + float: left; + padding: 5px; + margin: 10px 20px; +} +div.report_section h4 { + margin: 0; + border-bottom: 1px solid gray; + width: 100%; +} .user_course_category { background-color: #efefef; border: 1px solid #666; diff --git a/main/css/dokeos_blue/default.css b/main/css/dokeos_blue/default.css index 97841e3ca8..72dec9861a 100644 --- a/main/css/dokeos_blue/default.css +++ b/main/css/dokeos_blue/default.css @@ -1255,12 +1255,25 @@ div.admin_section { float: left; padding: 5px; margin: 10px 20px; + min-height:200px; } div.admin_section h4 { margin: 0; border-bottom: 1px solid gray; width: 100%; } +/* Report section */ +div.report_section { + width: 40%; + float: left; + padding: 5px; + margin: 10px 20px; +} +div.report_section h4 { + margin: 0; + border-bottom: 1px solid gray; + width: 100%; +} .user_course_category { background-color: #efefef; border: 1px solid #666; diff --git a/main/css/dokeos_classic/default.css b/main/css/dokeos_classic/default.css index 084977404d..067bddf566 100644 --- a/main/css/dokeos_classic/default.css +++ b/main/css/dokeos_classic/default.css @@ -1328,12 +1328,25 @@ div.admin_section { float: left; padding: 5px; margin: 10px 20px; + min-height:200px; } div.admin_section h4 { margin: 0; border-bottom: 1px solid gray; width: 100%; } +/* Report section */ +div.report_section { + width: 40%; + float: left; + padding: 5px; + margin: 10px 20px; +} +div.report_section h4 { + margin: 0; + border-bottom: 1px solid gray; + width: 100%; +} .user_course_category { background-color: #efefef; border: 1px solid #666; diff --git a/main/css/dokeos_classic_2D/default.css b/main/css/dokeos_classic_2D/default.css index 587255fc26..d70707c7ea 100644 --- a/main/css/dokeos_classic_2D/default.css +++ b/main/css/dokeos_classic_2D/default.css @@ -1310,12 +1310,25 @@ div.admin_section { margin: 10px 20px; padding: 5px; width: 40%; + min-height:200px; } div.admin_section h4 { border-bottom: 1px solid gray; margin: 0; width: 100%; } +/* Report Section */ +div.report_section { + float: left; + margin: 10px 20px; + padding: 5px; + width: 40%; +} +div.report_section h4 { + border-bottom: 1px solid gray; + margin: 0; + width: 100%; +} .user_course_category { background-color: #efefef; border: 1px solid #666; diff --git a/main/css/empire_green/default.css b/main/css/empire_green/default.css index 1ce688dee3..8c884942e1 100644 --- a/main/css/empire_green/default.css +++ b/main/css/empire_green/default.css @@ -1267,12 +1267,25 @@ div.admin_section { float: left; padding: 5px; margin: 10px 20px; + min-height:200px; } div.admin_section h4 { margin: 0; border-bottom: 1px solid gray; width: 100%; } +/* Report section */ +div.report_section { + width: 40%; + float: left; + padding: 5px; + margin: 10px 20px; +} +div.report_section h4 { + margin: 0; + border-bottom: 1px solid gray; + width: 100%; +} .user_course_category { background-color: #efefef; border: 1px solid #666; diff --git a/main/css/fruity_orange/default.css b/main/css/fruity_orange/default.css index 7efb09535f..3dec3e38f9 100644 --- a/main/css/fruity_orange/default.css +++ b/main/css/fruity_orange/default.css @@ -1267,12 +1267,25 @@ div.admin_section { float: left; padding: 5px; margin: 10px 20px; + min-height:200px; } div.admin_section h4 { margin: 0; border-bottom: 1px solid gray; width: 100%; } +/* Report section */ +div.report_section { + width: 40%; + float: left; + padding: 5px; + margin: 10px 20px; +} +div.report_section h4 { + margin: 0; + border-bottom: 1px solid gray; + width: 100%; +} .user_course_category { background-color: #efefef; border: 1px solid #666; diff --git a/main/css/medical/default.css b/main/css/medical/default.css index c6c7122b2c..3d54d43d08 100644 --- a/main/css/medical/default.css +++ b/main/css/medical/default.css @@ -1308,12 +1308,25 @@ div.admin_section { float: left; padding: 5px; margin: 10px 20px; + min-height:200px; } div.admin_section h4 { margin: 0; border-bottom: 1px solid gray; width: 100%; } +/* Report section */ +div.report_section { + width: 40%; + float: left; + padding: 5px; + margin: 10px 20px; +} +div.report_section h4 { + margin: 0; + border-bottom: 1px solid gray; + width: 100%; +} .user_course_category { background-color: #efefef; border: 1px solid #666; diff --git a/main/css/public_admin/default.css b/main/css/public_admin/default.css index 3000ccf6b9..7f97d6d875 100644 --- a/main/css/public_admin/default.css +++ b/main/css/public_admin/default.css @@ -1325,12 +1325,27 @@ div.admin_section { float: left; padding: 5px; margin: 10px 20px; + min-height:200px; } div.admin_section h4 { margin: 0; border-bottom: 1px solid gray; width: 100%; } + +/* Report section */ +div.report_section { + width: 40%; + float: left; + padding: 5px; + margin: 10px 20px; +} +div.report_section h4 { + margin: 0; + border-bottom: 1px solid gray; + width: 100%; +} + .user_course_category { background-color: #efefef; border: 1px solid #666; diff --git a/main/css/royal_purple/default.css b/main/css/royal_purple/default.css index 2b8839db7a..24ad2eb58e 100644 --- a/main/css/royal_purple/default.css +++ b/main/css/royal_purple/default.css @@ -1262,12 +1262,25 @@ div.admin_section { float: left; padding: 5px; margin: 10px 20px; + min-height:200px; } div.admin_section h4 { margin: 0; border-bottom: 1px solid gray; width: 100%; } +/* Report section */ +div.report_section { + width: 40%; + float: left; + padding: 5px; + margin: 10px 20px; +} +div.report_section h4 { + margin: 0; + border-bottom: 1px solid gray; + width: 100%; +} .user_course_category { background-color: #efefef; border: 1px solid #666; diff --git a/main/css/silver_line/default.css b/main/css/silver_line/default.css index 1efc73fb12..edaa4222ce 100644 --- a/main/css/silver_line/default.css +++ b/main/css/silver_line/default.css @@ -760,6 +760,7 @@ div.row div.label { border: 1px solid #999; padding: .5em .7em .5em .7em; line-height: 120%; + min-height:200px; } .admin_section h4 { margin: 0; @@ -771,6 +772,28 @@ div.row div.label { .admin_section input { margin: .5em; } + +/* Report section */ + +.report_section { + float: left; + margin: 1em 1em; + width: 40%; + border: 1px solid #999; + padding: .5em .7em .5em .7em; + line-height: 120%; +} +.report_section h4 { + margin: 0; + width: 100%; + font-size: 120%; + font-family: Arial, sans, sans-serif; + font-weight: bold; +} +.report_section input { + margin: .5em; +} + /* ============================================================================== COURSE ADMIN diff --git a/main/css/sober_brown/default.css b/main/css/sober_brown/default.css index 5c3f34a391..ba1491b865 100644 --- a/main/css/sober_brown/default.css +++ b/main/css/sober_brown/default.css @@ -1287,12 +1287,25 @@ form br { color: #f00; font-weight: bold; } +/* Report section */ +div.report_section { + width: 40%; + float: left; + padding: 5px; + margin: 10px 20px; +} +div.report_section h4 { + margin: 0; + border-bottom: 1px solid gray; + width: 100%; +} /* Admin section */ div.admin_section { width: 40%; float: left; padding: 5px; margin: 10px 20px; + min-height:200px; } div.admin_section h4 { margin: 0; diff --git a/main/css/steel_grey/default.css b/main/css/steel_grey/default.css index 565114ef3a..f256e0ded0 100644 --- a/main/css/steel_grey/default.css +++ b/main/css/steel_grey/default.css @@ -1264,12 +1264,25 @@ form br { color: #f00; font-weight: bold; } +/* Report section */ +div.report_section { + width: 40%; + float: left; + padding: 5px; + margin: 10px 20px; +} +div.report_section h4 { + margin: 0; + border-bottom: 1px solid gray; + width: 100%; +} /* Admin section */ div.admin_section { width: 40%; float: left; padding: 5px; margin: 10px 20px; + min-height:200px; } div.admin_section h4 { margin: 0; diff --git a/main/css/tasty_olive/default.css b/main/css/tasty_olive/default.css index 800ba9b460..31d10eb70f 100644 --- a/main/css/tasty_olive/default.css +++ b/main/css/tasty_olive/default.css @@ -1262,12 +1262,25 @@ form br { color: #f00; font-weight: bold; } +/* Report section */ +div.report_section { + width: 40%; + float: left; + padding: 5px; + margin: 10px 20px; +} +div.report_section h4 { + margin: 0; + border-bottom: 1px solid gray; + width: 100%; +} /* Admin section */ div.admin_section { width: 40%; float: left; padding: 5px; margin: 10px 20px; + min-height:200px; } div.admin_section h4 { margin: 0; diff --git a/main/mySpace/index.php b/main/mySpace/index.php index 963f12c002..820a212cfa 100644 --- a/main/mySpace/index.php +++ b/main/mySpace/index.php @@ -332,7 +332,7 @@ if($view=='coach' || $view=='drh') else { echo ' -
+

 '.get_lang('Probationers').' ('.$nbStudents.')'.'

@@ -454,7 +454,7 @@ if($view == 'coach') { echo ' -
+

 '.get_lang('Sessions').' ('.$nbSessions.')'.'

diff --git a/main/tracking/courseLog.php b/main/tracking/courseLog.php index 524d92693c..32ea1aa4ae 100644 --- a/main/tracking/courseLog.php +++ b/main/tracking/courseLog.php @@ -162,7 +162,7 @@ if($_GET['studentlist'] == 'false') { * LEARNING PATHS ***************************/ - echo '
+ echo '

 '.get_lang('AverageProgressInLearnpath').'

@@ -208,7 +208,7 @@ if($_GET['studentlist'] == 'false') { /*************************** * EXERCICES ***************************/ - echo '
+ echo '

 '.get_lang('AverageResultsToTheExercices').'  - '.get_lang('SeeDetail').'

@@ -292,7 +292,7 @@ if($_GET['studentlist'] == 'false') { * FORUMS **********************/ - echo '
+ echo '

 '.get_lang('Forum').' - '.get_lang('SeeDetail').'

@@ -316,7 +316,7 @@ if($_GET['studentlist'] == 'false') { * CHAT **********************/ - echo '
+ echo '

 '.get_lang('Chat').'

@@ -335,7 +335,7 @@ if($_GET['studentlist'] == 'false') { /********************** * TOOLS **********************/ - echo '
+ echo '

 '.get_lang('ToolsMostUsed').'

@@ -384,7 +384,7 @@ if($_GET['studentlist'] == 'false') { } - echo '
+ echo '

 '.get_lang('DocumentsMostDownloaded').$link.'

@@ -433,7 +433,7 @@ if($_GET['studentlist'] == 'false') { * LINKS ***************************/ - echo '
+ echo '

 '.get_lang('LinksMostClicked').'