diff --git a/home/home_top.html b/home/home_top.html index 0a4566c03d..e364fdbf0d 100755 --- a/home/home_top.html +++ b/home/home_top.html @@ -1,2 +1,2 @@
-Dokeos logo \ No newline at end of file + \ No newline at end of file diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css index 5182abd726..5f7a61959a 100755 --- a/main/css/blue_lagoon/default.css +++ b/main/css/blue_lagoon/default.css @@ -387,7 +387,7 @@ default.css (lĂ­nea 362) } .menusection { width: auto; - margin: 24px 6px 0 6px; + margin: 24px 2px 0 0px; padding-left: 10px; border: 1px dotted #ddd; background-color: #FFF; @@ -1898,6 +1898,93 @@ div.comments { .quiz_export_link { float: right; } + +/********************************************** + * EXERCISE TOOL * + **********************************************/ +.exercice_form { + width: 300px; +} +#validationButton { + text-decoration: none; + margin: 5px; + /*border:1px solid #999999;*/ + /*background:#F0F0F0; */ + padding: 3px; + padding-left:10px; + padding-right:10px; + font-weight:bold; + color:#666; +} +.rounded { + background:#ccc; + 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 { +} +span.checkbox { + width: 19px; + height: 25px; + padding: 0 5px 0 0; + background: url(images/checkbox.gif) no-repeat; + display: block; + clear: left; + float: left; +} +span.radio { + width: 19px; + height: 25px; + padding: 0 5px 0 0; + background: url(images/radio.gif) no-repeat; + display: block; + clear: left; + float: left; +} +#question_title { +} +#question_description { + padding-left:5px; + padding-top:10px; +} +#question_score { + padding-left:5px; + padding-top:10px; + padding-bottom:10px; + font-weight:bold; + font-size:130%; +} +#question_feedback { + background-color:#FCF7BA; + border:1px solid #CCCCCC; + color:#666666; + font-size:11px; + font-weight:bold; + list-style-type:none; + margin-top:5px; + padding:5px; +} +#exercise_close_link { + background: url(images/close.gif) no-repeat; + padding-left: 20px; +} +#exercise_close_link:hover { + background: url(images/close_highlight.gif) no-repeat; + padding-left: 20px; +} + /*Exercice timer*/ #square{ padding:5px; @@ -2196,13 +2283,26 @@ div.comments { margin-left:20px; } /* styles from the my.profile.php file */ + +#social_widget { + border:1px dotted #ccc; + float:left; + padding:1px; + padding-bottom:10px; + margin-bottom:10px; + margin-left:0px; + margin-right:0px; + width:215px; +} + +#social_widget_image { + float:left; +} .message-content { float:right; - margin:0px 10px; background:#FFF; - border:1px dotted #ccc; - padding: 0px 10px 0 10px; - width:120px; + padding: 10px 0 0 5px; + width:125px; position:relative; } .message-content .message-delete { @@ -3335,12 +3435,13 @@ a.read { -webkit-border-radius: 10px; border: 1px solid #e1e1e0; -opera-border-radius: 10px; border: 1px solid #e1e1e0; - width:280px; + width:240px; margin-top:20px; margin-right:10px; margin-bottom:40px; + padding-left:10px; - padding-right:20px; + padding-right:10px; padding-top:5px; float: right; min-height: 150px; diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css index a116cd8bf7..6553fcb028 100644 --- a/main/css/chamilo/default.css +++ b/main/css/chamilo/default.css @@ -45,21 +45,19 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus { /* End hide from IE5-mac */ #main { +/* -moz-border-image:url(images/bg-main.png) 5 5 5 5; -webkit-border-image:url(images/bg-main.png) 5 5 5 5; -o-border-image:url(images/bg-main.png) 5 5 5 5; -xv-border-image:url(images/bg-main.png) 5 5 5 5; - border:5px solid #f6f6f6; +*/ + border:2px solid #ddd; position: relative; /* to avoid the IE peekabo bug*/ margin: 0px auto; width: 90%; min-height: 320px; - padding-top:10px; - padding-bottom:10px; - padding-left:10px; - padding-right:10px; + padding:12px; overflow:hidden; - } .item { -moz-border-radius-bottomleft:5px; @@ -78,11 +76,12 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus { | */ .maincontent { - float: left; - width: 68%; - padding: 0 20px 0 20px; + width: 65%; + float: left; + padding: 0 20px 0 20px; + //padding: 0px; min-height: 333px; - margin-top:30px; + margin-top:8px; margin-bottom:30px; } /* @@ -358,15 +357,17 @@ input[text] { #header3 { background-image:url(images/bg-header4.png); background-repeat:repeat-x; - width:92%; + width:90%; margin-left:auto; margin-right:auto; font-size: 1.0em; color: #006; border-bottom: 2px solid #0daee4; - height:36px; + overflow:hidden; margin-bottom: 1px; + padding: 0px 10px 0px 20px; + height:36px; } #header3 a:hover { @@ -374,6 +375,9 @@ input[text] { } +#header3 li { +float:left; /* important for ieX*/ +} #header3 li a span:hover { color:#fffc00; } @@ -394,8 +398,8 @@ input[text] { cursor:pointer; float:left; height:25px; - padding-left:9px; - padding-right:1px; + padding-left:9px; + padding-right:2px; text-decoration:none; } @@ -492,8 +496,7 @@ margin-top:0; background-image:url(images/bg-header4.png); background-repeat:repeat-x; color: #009; - padding: 4px; - padding-left: 20px; + padding: 4px 10px 4px 20px; clear:right; height:14px; } @@ -575,8 +578,8 @@ margin-top:0; padding-left: 12px; } .menusection { - margin: 20px 5px 0 6px; - padding-left: 10px; + margin: 20px 0px 0 6px; + padding-left: 3px; width: auto; } .menusectioncaption { @@ -2426,13 +2429,26 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} margin-left:20px; } /* styles from the my.profile.php file */ + +#social_widget { + border:1px dotted #ccc; + float:left; + padding:1px; + padding-bottom:10px; + margin-bottom:10px; + margin-left:0px; + margin-right:0px; + width:215px; +} + +#social_widget_image { + float:left; +} .message-content { float:right; - margin:0px 10px; background:#FFF; - border:1px dotted #ccc; - padding: 0px 10px 0 10px; - width:132px; + padding: 10px 0 0 5px; + width:125px; position:relative; } .message-content .message-delete { @@ -2872,17 +2888,6 @@ div.image-social-content center.friend { padding:2px 0px 2px 0px; } - - - - - - - - - - - /********************************************** * EXERCISE TOOL * **********************************************/ @@ -2948,6 +2953,7 @@ span.radio { padding-top:10px; padding-bottom:10px; font-weight:bold; + font-size:130%; } #question_feedback { background-color:#FCF7BA; @@ -3879,7 +3885,7 @@ a.read { -webkit-border-radius: 10px; border: 1px solid #e1e1e0; -opera-border-radius: 10px; border: 1px solid #e1e1e0; - width:280px; + width:218px; margin-top:20px; margin-right:10px; margin-bottom:40px; diff --git a/user_portal.php b/user_portal.php index 21044e5752..d2b9b28bde 100644 --- a/user_portal.php +++ b/user_portal.php @@ -1224,12 +1224,15 @@ if ($show_menu) { } $img_array = UserManager::get_picture_user(api_get_user_id(), $img_array['file'], 92, USER_IMAGE_SIZE_MEDIUM, ' width="90" height="90" '); - echo '
'; - if ($no_image == false) - echo ''; - else - echo ''; - + echo '
'; + + echo '
'; + if ($no_image == false) + echo ''; + else + echo ''; + echo '
'; + require_once api_get_path(LIBRARY_PATH).'message.lib.php'; require_once api_get_path(LIBRARY_PATH).'social.lib.php'; require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php'; @@ -1247,9 +1250,8 @@ if ($show_menu) { $cant_msg = ''; if ($number_of_new_messages > 0) $cant_msg = ' ('.$number_of_new_messages.')'; - - echo '
-

'.get_lang('Messages').'

+ //

'.get_lang('Messages').'

+ echo '

'; $link = ''; if (api_get_setting('show_tabs', 'social') == 'true') { @@ -1264,10 +1266,9 @@ if ($show_menu) { echo '

'; - echo '
'; - + echo '
'; - echo '

'; + echo '
'; }