diff --git a/main/course_home/activity.php b/main/course_home/activity.php index c0913ac7dd..083a9674a8 100755 --- a/main/course_home/activity.php +++ b/main/course_home/activity.php @@ -66,12 +66,12 @@ if ($enabled == 'true') { // Start of tools for CourseAdmins (teachers/tutors) if ($session_id == 0 && api_is_course_admin() && api_is_allowed_to_edit(null, true)) { - $content .= '
+ $content .= '
- +
'; $content .= $pluginExtra; @@ -190,9 +190,9 @@ if ($session_id == 0 && api_is_course_admin() && api_is_allowed_to_edit(null, tr function return_block($title, $content, $class = null) { $html = '
-
-
-

'.$title.'

+
+
+

'.$title.'

diff --git a/main/css/base.css b/main/css/base.css index 291adf71f8..ab1b9b7a2d 100755 --- a/main/css/base.css +++ b/main/css/base.css @@ -20,49 +20,21 @@ select { visibility: visible; } -legend { - margin-bottom: 10px; -} - -#header_right { - text-align: right; - float: right; -} - -#header_right #notifications { - padding:0; +/* NEW CSS BASE */ +.logo{ + margin-bottom: 10px; + padding: 5px; + margin-top: 10px; } - -#header_right #notifications li { - text-align: right; +.title-header-tools{ + text-align: center; } - -/* button load ajax form */ +/* END CSS BASE */ .button-load{ background: url("../img/icons/64/file_upload.png") no-repeat center 20px; padding-top: 70px; - /*-webkit-animation:glide 2250ms infinite; - animation:glide 2250ms infinite;*/ -} -/*@-webkit-keyframes glide { - from { - background-position: center 0; - } to { - background-position: center 20px; - - } - -} - -@keyframes glide { - from { - background-position:center 0; - } to { - background-position:center 20px; - - } -}*/ + } /* START COURSE PROGRESS */ .thematic-postit{ padding-top: 5px; diff --git a/main/img/icons/22/catalog-course.png b/main/img/icons/22/catalog-course.png new file mode 100644 index 0000000000..a69e025b08 Binary files /dev/null and b/main/img/icons/22/catalog-course.png differ diff --git a/main/img/icons/22/edit-profile.png b/main/img/icons/22/edit-profile.png new file mode 100644 index 0000000000..afc0fc4c31 Binary files /dev/null and b/main/img/icons/22/edit-profile.png differ diff --git a/main/img/icons/22/history-course.png b/main/img/icons/22/history-course.png new file mode 100644 index 0000000000..5bd5cc275e Binary files /dev/null and b/main/img/icons/22/history-course.png differ diff --git a/main/img/icons/22/inbox.png b/main/img/icons/22/inbox.png new file mode 100644 index 0000000000..ad9812cd72 Binary files /dev/null and b/main/img/icons/22/inbox.png differ diff --git a/main/img/icons/22/invitations.png b/main/img/icons/22/invitations.png new file mode 100644 index 0000000000..7e0fefde52 Binary files /dev/null and b/main/img/icons/22/invitations.png differ diff --git a/main/img/icons/22/new-course.png b/main/img/icons/22/new-course.png new file mode 100644 index 0000000000..2402657b3d Binary files /dev/null and b/main/img/icons/22/new-course.png differ diff --git a/main/img/icons/22/new-message.png b/main/img/icons/22/new-message.png new file mode 100644 index 0000000000..92c74ee831 Binary files /dev/null and b/main/img/icons/22/new-message.png differ diff --git a/main/img/icons/22/order-course.png b/main/img/icons/22/order-course.png new file mode 100644 index 0000000000..9a531d15bd Binary files /dev/null and b/main/img/icons/22/order-course.png differ diff --git a/main/img/icons/32/inbox.png b/main/img/icons/32/inbox.png new file mode 100644 index 0000000000..9ba758cbb2 Binary files /dev/null and b/main/img/icons/32/inbox.png differ diff --git a/main/inc/lib/course_home.lib.php b/main/inc/lib/course_home.lib.php index e8fbb983ca..118ae7f8b9 100755 --- a/main/inc/lib/course_home.lib.php +++ b/main/inc/lib/course_home.lib.php @@ -869,7 +869,7 @@ class CourseHome switch ($theme) { case 'activity_big': $data = ''; - $html .= '
'; + $html .= '
'; $image = (substr($item['tool']['image'], 0, strpos($item['tool']['image'], '.'))).'.png'; $toolId = isset($item['tool']['id']) ? $item['tool']['id'] : null; if (isset($item['tool']['custom_image'])) { diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php index 9898645645..33ee2765d4 100755 --- a/main/inc/lib/display.lib.php +++ b/main/inc/lib/display.lib.php @@ -502,19 +502,19 @@ class Display $class = ""; switch($type) { case 'warning': - $class .= 'warning-message'; + $class .= 'alert alert-warning'; break; case 'error': - $class .= 'error-message'; + $class .= 'alert alert-danger'; break; case 'confirmation': case 'confirm': case 'success': - $class .= 'confirmation-message'; + $class .= 'alert alert-success'; break; case 'normal': default: - $class .= 'normal-message'; + $class .= 'alert alert-info'; } return self::div($message, array('class'=> $class)); } diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php index 622730dc4d..d4b1d4a672 100755 --- a/main/inc/lib/template.lib.php +++ b/main/inc/lib/template.lib.php @@ -472,11 +472,10 @@ class Template $this->theme = $this->preview_theme; } - // Base CSS - $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'base.css'); - // Default CSS Bootstrap $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'bootstrap.css'); + // Base CSS + $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'base.css'); //Extra CSS files $css[] = api_get_path(WEB_LIBRARY_PATH).'javascript/thickbox.css'; @@ -490,7 +489,7 @@ class Template $css[] = api_get_path(WEB_LIBRARY_PATH).'javascript/mediaelement/mediaelementplayer.css'; //THEME CSS STYLE // $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'responsive.css'); - $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).$this->theme.'/default.css'); + // $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).$this->theme.'/default.css'); if ($this->show_learnpath) { $css[] = api_get_path(WEB_CSS_PATH).$this->theme.'/learnpath.css'; diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php index 29e3697feb..741807a02e 100755 --- a/main/inc/lib/userportal.lib.php +++ b/main/inc/lib/userportal.lib.php @@ -680,7 +680,7 @@ class IndexManager if (!empty($id)) { $params['id'] = $id; } - $params['class'] = 'panel panel-primary'; + $params['class'] = 'panel panel-default'; $html = null; if (!empty($title)) { $html.= '
'.$title.'
'; diff --git a/main/template/default/layout/main_header.tpl b/main/template/default/layout/main_header.tpl index ff78b1d3d5..838ed70dca 100755 --- a/main/template/default/layout/main_header.tpl +++ b/main/template/default/layout/main_header.tpl @@ -58,7 +58,9 @@ {% endif %}
- {{ logo }} +