From 3496cbeed3dd8daecde2aa4ae5a00ecd895ffc41 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 3 Jul 2012 15:36:42 +0200 Subject: [PATCH] Exericses: Changing timer color see #5043 --- main/css/academica/default.css | 35 --------------------- main/css/baby_orange/default.css | 34 -------------------- main/css/base.css | 20 ++++++++++++ main/css/base_chamilo.css | 42 ++----------------------- main/css/blue_lagoon/default.css | 22 ------------- main/css/cool_blue/default.css | 22 ------------- main/css/corporate/default.css | 15 --------- main/css/cosmic_campus/default.css | 35 +-------------------- main/css/delicious_bordeaux/default.css | 22 ------------- main/css/dokeos_blue/default.css | 22 ------------- main/css/dokeos_classic/default.css | 28 ----------------- main/css/dokeos_classic_2D/default.css | 34 +------------------- main/css/empire_green/default.css | 22 ------------- main/css/fruity_orange/default.css | 22 ------------- main/css/public_admin/default.css | 34 -------------------- main/css/royal_purple/default.css | 21 ------------- main/css/silver_line/default.css | 35 +-------------------- main/css/sober_brown/default.css | 36 +-------------------- main/css/steel_grey/default.css | 21 ------------- main/css/tasty_olive/default.css | 21 ------------- main/exercice/exercise.class.php | 4 +++ main/exercice/exercise_reminder.php | 4 +-- main/exercice/exercise_submit.php | 2 +- main/exercice/overview.php | 4 +-- 24 files changed, 34 insertions(+), 523 deletions(-) diff --git a/main/css/academica/default.css b/main/css/academica/default.css index 8804670a73..0b98b5e3ab 100644 --- a/main/css/academica/default.css +++ b/main/css/academica/default.css @@ -1301,21 +1301,6 @@ ul#navigation .help a{ font-weight:bold; color:#666; } -.rounded { - border: 3px solid #CCCCCC; - padding: 3px; - width: 200px; - /*margin-left:10px;*/ -} -.rounded_inner { - background:#FFF; - padding-top: 10px; - padding-bottom: 10px; -} -.rounded_inner:hover { - color:#C802A5; - background:#F0F0F0; -} .exercise_scenario_label { } .exercise_scenario_element { @@ -1372,26 +1357,6 @@ span.radio { .quiz_export_link { float: right; } -/*Exercice timer*/ -#square{ - padding:5px; - background-color:#EEEEEE; - border:1px solid #CCCCCC; - margin-right : 24px; - width : 155px; - margin-bottom:20px; -} -#wrapper-clock{ - width:100%; - margin:0; -} -.count_down{ - padding: 3px; - font-size:22px; - font-weight:bold; - color:#222; -} - /***************************************************** * BUTTONS * *****************************************************/ diff --git a/main/css/baby_orange/default.css b/main/css/baby_orange/default.css index 3afaba2667..e9425d7160 100644 --- a/main/css/baby_orange/default.css +++ b/main/css/baby_orange/default.css @@ -1269,21 +1269,6 @@ ul#navigation .help a{ font-weight:bold; color:#666; } -.rounded { - border: 3px solid #CCCCCC; - padding: 3px; - width: 200px; - /*margin-left:10px;*/ -} -.rounded_inner { - background:#FFF; - padding-top: 10px; - padding-bottom: 10px; -} -.rounded_inner:hover { - color:#C802A5; - background:#F0F0F0; -} .exercise_scenario_label { } .exercise_scenario_element { @@ -1340,25 +1325,6 @@ span.radio { .quiz_export_link { float: right; } -/*Exercice timer*/ -#square{ - padding:5px; - background-color:#EEEEEE; - border:1px solid #CCCCCC; - margin-right : 24px; - width : 155px; - margin-bottom:20px; -} -#wrapper-clock{ - width:100%; - margin:0; -} -.count_down{ - padding: 3px; - font-size:22px; - font-weight:bold; - color:#222; -} /***************************************************** * BUTTONS * *****************************************************/ diff --git a/main/css/base.css b/main/css/base.css index 9883afb9d2..01b18c3530 100644 --- a/main/css/base.css +++ b/main/css/base.css @@ -2471,6 +2471,26 @@ div.admin_section h4 { /* padding:5px; */ } +/*Exercice timer */ +#wrapper-clock { + width:100%; + margin:0; +} +#time_container { + padding:5px; + background-color:#FFD700; + border:1px solid #B8860B; + margin-right : 24px; + width: 155px; + margin-bottom:20px; +} +.count_down { + padding: 3px; + font-size:22px; + font-weight:bold; + color:#222; +} + .red_alert { color:red; font-weight: bold; diff --git a/main/css/base_chamilo.css b/main/css/base_chamilo.css index 999ffdec53..c54530f516 100755 --- a/main/css/base_chamilo.css +++ b/main/css/base_chamilo.css @@ -1101,36 +1101,12 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0p } */ - /* Quizzes tool */ .quiz_export_link { float: right; } -/*Exercice timer*/ -#square{ - padding:5px; - background-color:#EEEEEE; - border:1px solid #CCCCCC; - margin-right : 24px; - width : 155px; - margin-bottom:20px; -} -#wrapper-clock{ - width:100%; - margin:0; -} -.count_down{ - padding: 3px; - font-size:22px; - font-weight:bold; - color:#222; -} -/* ------------------------------------------------------------------------------- - Learning path ------------------------------------------------------------------------------- -*/ +/* Learning path */ #show_audiorecorder_div { background:#F0F0F0; border:1px solid #999999; @@ -1357,21 +1333,7 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0p font-weight:bold; color:#666; } -.rounded { - border: 3px solid #CCCCCC; - padding: 3px; - width: 200px; - /*margin-left:10px;*/ -} -.rounded_inner { - background:#FFF; - padding-top: 10px; - padding-bottom: 10px; -} -.rounded_inner:hover { - color:#C802A5; - background:#F0F0F0; -} + .exercise_scenario_label { } .exercise_scenario_element { diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css index bd182afc00..6a73a9e18d 100644 --- a/main/css/blue_lagoon/default.css +++ b/main/css/blue_lagoon/default.css @@ -1884,30 +1884,8 @@ div.comments { .quiz_export_link { float: right; } -/*Exercice timer*/ -#square{ - padding:5px; - background-color:#EEEEEE; - border:1px solid #CCCCCC; - margin-right : 24px; - width : 155px; - margin-bottom:20px; -} -#wrapper-clock{ - width:100%; - margin:0; -} -.count_down{ - padding: 3px; - font-size:22px; - font-weight:bold; - color:#222; -} - /* ------------------------------------------------------------------------------- Learning path ------------------------------------------------------------------------------- */ #show_audiorecorder_div { background:#F0F0F0; diff --git a/main/css/cool_blue/default.css b/main/css/cool_blue/default.css index 751e135746..d14e6e49c6 100644 --- a/main/css/cool_blue/default.css +++ b/main/css/cool_blue/default.css @@ -1832,30 +1832,8 @@ div.comments { .quiz_export_link { float: right; } -/*Exercice timer*/ -#square{ - padding:5px; - background-color:#EEEEEE; - border:1px solid #CCCCCC; - margin-right : 24px; - width : 155px; - margin-bottom:20px; -} -#wrapper-clock{ - width:100%; - margin:0; -} -.count_down{ - padding: 3px; - font-size:22px; - font-weight:bold; - color:#222; -} - /* ------------------------------------------------------------------------------- Learning path ------------------------------------------------------------------------------- */ #show_audiorecorder_div { background:#F0F0F0; diff --git a/main/css/corporate/default.css b/main/css/corporate/default.css index 0b5ba8f4e7..b13fd63959 100644 --- a/main/css/corporate/default.css +++ b/main/css/corporate/default.css @@ -1305,21 +1305,6 @@ span.radio { font-weight:bold; color:#666; } -.rounded { - border: 3px solid #CCCCCC; - padding: 3px; - width: 200px; - /*margin-left:10px;*/ -} -.rounded_inner { - background:#FFF; - padding-top: 10px; - padding-bottom: 10px; -} -.rounded_inner:hover { - color:#C802A5; - background:#F0F0F0; -} .exercise_scenario_label { } .exercise_scenario_element { diff --git a/main/css/cosmic_campus/default.css b/main/css/cosmic_campus/default.css index 38da7d1ed1..85dddf2b4c 100644 --- a/main/css/cosmic_campus/default.css +++ b/main/css/cosmic_campus/default.css @@ -1292,21 +1292,6 @@ div.system_announcement_content { font-weight:bold; color:#666; } -.rounded { - border: 3px solid #CCCCCC; - padding: 3px; - width: 200px; - /*margin-left:10px;*/ -} -.rounded_inner { - background:#FFF; - padding-top: 10px; - padding-bottom: 10px; -} -.rounded_inner:hover { - color:#C802A5; - background:#F0F0F0; -} .exercise_scenario_label { } .exercise_scenario_element { @@ -1363,25 +1348,7 @@ span.radio { .quiz_export_link { float: right; } -/*Exercice timer*/ -#square{ - padding:5px; - background-color:#EEEEEE; - border:1px solid #CCCCCC; - margin-right : 24px; - width : 155px; - margin-bottom:20px; -} -#wrapper-clock{ - width:100%; - margin:0; -} -.count_down{ - padding: 3px; - font-size:22px; - font-weight:bold; - color:#222; -} + /***************************************************** * BUTTONS * *****************************************************/ diff --git a/main/css/delicious_bordeaux/default.css b/main/css/delicious_bordeaux/default.css index 672546ce07..26512b01ef 100644 --- a/main/css/delicious_bordeaux/default.css +++ b/main/css/delicious_bordeaux/default.css @@ -1844,30 +1844,8 @@ div.comments { .quiz_export_link { float: right; } -/*Exercice timer*/ -#square{ - padding:5px; - background-color:#EEEEEE; - border:1px solid #CCCCCC; - margin-right : 24px; - width : 155px; - margin-bottom:20px; -} -#wrapper-clock{ - width:100%; - margin:0; -} -.count_down{ - padding: 3px; - font-size:22px; - font-weight:bold; - color:#222; -} - /* ------------------------------------------------------------------------------- Learning path ------------------------------------------------------------------------------- */ #show_audiorecorder_div { background:#F0F0F0; diff --git a/main/css/dokeos_blue/default.css b/main/css/dokeos_blue/default.css index eb93ff8d96..3019e06942 100644 --- a/main/css/dokeos_blue/default.css +++ b/main/css/dokeos_blue/default.css @@ -1854,30 +1854,8 @@ div.comments { .quiz_export_link { float: right; } -/*Exercice timer*/ -#square{ - padding:5px; - background-color:#EEEEEE; - border:1px solid #CCCCCC; - margin-right : 24px; - width : 155px; - margin-bottom:20px; -} -#wrapper-clock{ - width:100%; - margin:0; -} -.count_down{ - padding: 3px; - font-size:22px; - font-weight:bold; - color:#222; -} - /* ------------------------------------------------------------------------------- Learning path ------------------------------------------------------------------------------- */ #show_audiorecorder_div { background:#F0F0F0; diff --git a/main/css/dokeos_classic/default.css b/main/css/dokeos_classic/default.css index c9a05f07ef..b02e8351f7 100644 --- a/main/css/dokeos_classic/default.css +++ b/main/css/dokeos_classic/default.css @@ -2015,15 +2015,6 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} width: 200px; /*margin-left:10px;*/ } -.rounded_inner { - background:#FFF; - padding-top: 10px; - padding-bottom: 10px; -} -.rounded_inner:hover { - color:#C802A5; - background:#F0F0F0; -} .exercise_scenario_label { } .exercise_scenario_element { @@ -2080,25 +2071,6 @@ span.radio { .quiz_export_link { float: right; } -/*Exercice timer*/ -#square{ - padding:5px; - background-color:#EEEEEE; - border:1px solid #CCCCCC; - margin-right : 24px; - width : 155px; - margin-bottom:20px; -} -#wrapper-clock{ - width:100%; - margin:0; -} -.count_down{ - padding: 3px; - font-size:22px; - font-weight:bold; - color:#222; -} /***************************************************** * BUTTONS * diff --git a/main/css/dokeos_classic_2D/default.css b/main/css/dokeos_classic_2D/default.css index 15dfcb1372..c2e179c563 100644 --- a/main/css/dokeos_classic_2D/default.css +++ b/main/css/dokeos_classic_2D/default.css @@ -2127,21 +2127,6 @@ input.forms { font-weight:bold; color:#666; } -.rounded { - border: 3px solid #CCCCCC; - padding: 3px; - width: 200px; - /*margin-left:10px;*/ -} -.rounded_inner { - background:#FFF; - padding-top: 10px; - padding-bottom: 10px; -} -.rounded_inner:hover { - color:#C802A5; - background:#F0F0F0; -} .exercise_scenario_label { } .exercise_scenario_element { @@ -2198,24 +2183,7 @@ span.radio { .quiz_export_link { float: right; } -/*Exercice timer*/ -#square{ - padding:5px; - background-color:#EEEEEE; - border:1px solid #CCCCCC; - margin-right : 24px; - width : 155px;margin-bottom:5px; -} -#wrapper-clock{ - width:100%; - margin:0; -} -.count_down{ - padding: 3px; - font-size:22px; - font-weight:bold; - color:#222; -} + /***************************************************** * BUTTONS * *****************************************************/ diff --git a/main/css/empire_green/default.css b/main/css/empire_green/default.css index 8574ab3b86..d3a373738f 100644 --- a/main/css/empire_green/default.css +++ b/main/css/empire_green/default.css @@ -1842,30 +1842,8 @@ div.comments { .quiz_export_link { float: right; } -/*Exercice timer*/ -#square{ - padding:5px; - background-color:#EEEEEE; - border:1px solid #CCCCCC; - margin-right : 24px; - width : 155px; - margin-bottom:20px; -} -#wrapper-clock{ - width:100%; - margin:0; -} -.count_down{ - padding: 3px; - font-size:22px; - font-weight:bold; - color:#222; -} - /* ------------------------------------------------------------------------------- Learning path ------------------------------------------------------------------------------- */ #show_audiorecorder_div { background:#F0F0F0; diff --git a/main/css/fruity_orange/default.css b/main/css/fruity_orange/default.css index 2d0c354563..6197ee717f 100644 --- a/main/css/fruity_orange/default.css +++ b/main/css/fruity_orange/default.css @@ -1850,30 +1850,8 @@ div.comments { .quiz_export_link { float: right; } -/*Exercice timer*/ -#square{ - padding:5px; - background-color:#EEEEEE; - border:1px solid #CCCCCC; - margin-right : 24px; - width : 155px; - margin-bottom:20px; -} -#wrapper-clock{ - width:100%; - margin:0; -} -.count_down{ - padding: 3px; - font-size:22px; - font-weight:bold; - color:#222; -} - /* ------------------------------------------------------------------------------- Learning path ------------------------------------------------------------------------------- */ #show_audiorecorder_div { background:#F0F0F0; diff --git a/main/css/public_admin/default.css b/main/css/public_admin/default.css index c420a5aa10..4a6e2c8940 100644 --- a/main/css/public_admin/default.css +++ b/main/css/public_admin/default.css @@ -1857,21 +1857,6 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} font-weight:bold; color:#666; } -.rounded { - border: 3px solid #CCCCCC; - padding: 3px; - width: 200px; - /*margin-left:10px;*/ -} -.rounded_inner { - background:#FFF; - padding-top: 10px; - padding-bottom: 10px; -} -.rounded_inner:hover { - color:#C802A5; - background:#F0F0F0; -} .exercise_scenario_label { } .exercise_scenario_element { @@ -1924,25 +1909,6 @@ span.radio { background: url(images/close_highlight.gif) no-repeat; padding-left: 20px; } -/*Exercice timer*/ -#square{ - padding:5px; - background-color:#EEEEEE; - border:1px solid #CCCCCC; - margin-right : 24px; - width : 155px; - margin-bottom:20px; -} -#wrapper-clock{ - width:100%; - margin:0; -} -.count_down{ - padding: 3px; - font-size:22px; - font-weight:bold; - color:#222; -} /***************************************************** * BUTTONS * diff --git a/main/css/royal_purple/default.css b/main/css/royal_purple/default.css index a80b503b15..9423eb6e51 100644 --- a/main/css/royal_purple/default.css +++ b/main/css/royal_purple/default.css @@ -1803,29 +1803,8 @@ div.comments { .quiz_export_link { float: right; } -/*Exercice timer*/ -#square{ - padding:5px; - background-color:#EEEEEE; - border:1px solid #CCCCCC; - margin-right : 24px; - width : 155px; - margin-bottom:20px; -} -#wrapper-clock{ - width:100%; - margin:0; -} -.count_down{ - padding: 3px; - font-size:22px; - font-weight:bold; - color:#222; -} /* ------------------------------------------------------------------------------- Learning path ------------------------------------------------------------------------------- */ #show_audiorecorder_div { background:#F0F0F0; diff --git a/main/css/silver_line/default.css b/main/css/silver_line/default.css index b9a571f915..929b3a630d 100644 --- a/main/css/silver_line/default.css +++ b/main/css/silver_line/default.css @@ -1578,21 +1578,7 @@ div.system_announcement { font-weight:bold; color:#666; } -.rounded { - border: 3px solid #CCCCCC; - padding: 3px; - width: 200px; - /*margin-left:10px;*/ -} -.rounded_inner { - background:#FFF; - padding-top: 10px; - padding-bottom: 10px; -} -.rounded_inner:hover { - color:#C802A5; - background:#F0F0F0; -} + .exercise_scenario_label { } .exercise_scenario_element { @@ -1649,25 +1635,6 @@ span.radio { .quiz_export_link { float: right; } -/*Exercice timer*/ -#square{ - padding:5px; - background-color:#EEEEEE; - border:1px solid #CCCCCC; - margin-right : 24px; - width : 155px; - margin-bottom:20px; -} -#wrapper-clock{ - width:100%; - margin:0; -} -.count_down{ - padding: 3px; - font-size:22px; - font-weight:bold; - color:#222; -} /***************************************************** * BUTTONS * diff --git a/main/css/sober_brown/default.css b/main/css/sober_brown/default.css index d49da6df44..16f4782abd 100644 --- a/main/css/sober_brown/default.css +++ b/main/css/sober_brown/default.css @@ -1796,21 +1796,7 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} font-weight:bold; color:#666; } -.rounded { - border: 3px solid #CCCCCC; - padding: 3px; - width: 200px; - /*margin-left:10px; */ -} -.rounded_inner { - background:#FFF; - padding-top: 10px; - padding-bottom: 10px; -} -.rounded_inner:hover { - color:#C802A5; - background:#F0F0F0; -} + .exercise_scenario_label { } .exercise_scenario_element { @@ -1867,26 +1853,6 @@ span.radio { .quiz_export_link { float: right; } -/*Exercice timer*/ -#square{ - padding:5px; - background-color:#EEEEEE; - border:1px solid #CCCCCC; - margin-right : 24px; - width : 155px; - margin-bottom:20px; -} -#wrapper-clock{ - width:100%; - margin:0; -} -.count_down{ - padding: 3px; - font-size:22px; - font-weight:bold; - color:#222; -} - /***************************************************** * BUTTONS * *****************************************************/ diff --git a/main/css/steel_grey/default.css b/main/css/steel_grey/default.css index c08d6735c3..02eb30e9d9 100644 --- a/main/css/steel_grey/default.css +++ b/main/css/steel_grey/default.css @@ -1834,30 +1834,9 @@ div.comments { .quiz_export_link { float: right; } -/*Exercice timer*/ -#square{ - padding:5px; - background-color:#EEEEEE; - border:1px solid #CCCCCC; - margin-right : 24px; - width : 155px; - margin-bottom:20px; -} -#wrapper-clock{ - width:100%; - margin:0; -} -.count_down{ - padding: 3px; - font-size:22px; - font-weight:bold; - color:#222; -} /* ------------------------------------------------------------------------------- Learning path ------------------------------------------------------------------------------- */ #show_audiorecorder_div { background:#F0F0F0; diff --git a/main/css/tasty_olive/default.css b/main/css/tasty_olive/default.css index adba6bc627..b327e9efe6 100644 --- a/main/css/tasty_olive/default.css +++ b/main/css/tasty_olive/default.css @@ -1775,30 +1775,9 @@ div.comments { .quiz_export_link { float: right; } -/*Exercice timer*/ -#square{ - padding:5px; - background-color:#EEEEEE; - border:1px solid #CCCCCC; - margin-right : 24px; - width : 155px; - margin-bottom:20px; -} -#wrapper-clock{ - width:100%; - margin:0; -} -.count_down{ - padding: 3px; - font-size:22px; - font-weight:bold; - color:#222; -} /* ------------------------------------------------------------------------------- Learning path ------------------------------------------------------------------------------- */ #show_audiorecorder_div { background:#F0F0F0; diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php index 5bb4edad9d..7e8274236e 100644 --- a/main/exercice/exercise.class.php +++ b/main/exercice/exercise.class.php @@ -3592,5 +3592,9 @@ class Exercise { } return $result; } + + function return_time_left_div() { + return '
'; + } } endif; \ No newline at end of file diff --git a/main/exercice/exercise_reminder.php b/main/exercice/exercise_reminder.php index 978cb06add..17afa62b66 100644 --- a/main/exercice/exercise_reminder.php +++ b/main/exercice/exercise_reminder.php @@ -109,11 +109,9 @@ if (api_is_course_admin() && $origin != 'learnpath') { echo Display::div(get_lang('QuestionsToReview'), array('class'=>'question_title')); if ($time_control) { - echo '
'; + echo $objExercise->return_time_left_div(); } - - echo Display::div('', array('id'=>'message')); echo '