diff --git a/config.php b/config.php index c49238b..5fc7d98 100644 --- a/config.php +++ b/config.php @@ -84,7 +84,7 @@ $THEME->layouts = array( 'file' => 'my.php', 'regions' => array('side-pre'), 'defaultregion' => 'side-pre', - 'options' => array('nonavbar' => true), + 'options' => array('nonavbar' => false), ), 'course' => array( 'file' => 'course.php', diff --git a/layout/my.php b/layout/my.php index 8ad4d0a..515cb8c 100644 --- a/layout/my.php +++ b/layout/my.php @@ -54,6 +54,7 @@ $phoneno = theme_qualisaude_get_setting('phoneno'); $emailid = theme_qualisaude_get_setting('emailid'); $scallus = get_string('callus', 'theme_qualisaude'); $semail = get_string('email', 'theme_qualisaude'); +$username = $USER->firstname.' '.$USER->lastname; // Footer Content. $footlogourl = get_footer_logo_url(); @@ -145,7 +146,8 @@ $templatecontext = [ "footerblock1" => $footerblock1, "colclass" => $colclass, "block1" => $block1, - "footlogourl" => $footlogourl + "footlogourl" => $footlogourl, + "username" => $username ]; $templatecontext['flatnavigation'] = $PAGE->flatnav; diff --git a/renderers/core_renderer.php b/renderers/core_renderer.php index c3068ef..c8b4eb7 100644 --- a/renderers/core_renderer.php +++ b/renderers/core_renderer.php @@ -54,6 +54,32 @@ class theme_qualisaude_core_renderer extends theme_boost\output\core_renderer { return $content; } + /** + * This renders the navbar. + * Uses bootstrap compatible html. + */ + public function breadscrumb() { +// print_object($this->page->navbar); + return $this->render_from_template('theme_qualisaude/breadscrumb', $this->page->navbar); + } + + /** + * Wrapper for header elements. + * + * @return string HTML to display the main header. + */ + public function edit_buttons() { + global $PAGE; + + $header = new stdClass(); + $header->settingsmenu = $this->context_header_settings_menu(); + $header->contextheader = $this->context_header(); + $header->hasnavbar = empty($PAGE->layout_options['nonavbar']); + $header->navbar = $this->navbar(); + $header->pageheadingbutton = $this->page_heading_button(); + $header->courseheader = $this->course_header(); + return $this->render_from_template('theme_qualisaude/edit_buttons', $header); + } /** * Extract first image from html diff --git a/scss/preset/custom.scss b/scss/preset/custom.scss index 884fae3..b15c52e 100644 --- a/scss/preset/custom.scss +++ b/scss/preset/custom.scss @@ -194,7 +194,7 @@ section#inicial{ } } -/* ################################### HEADER ################################# */ +/* ################################### TOPO ################################# */ #header{ .navbar-nav{ .logo{ @@ -208,4 +208,49 @@ section#inicial{ } } } +} + +/* ################################### HEADER ################################# */ + +.cabecalho-header{ + background-image: url([[pix:theme|bg/bg-cabecalho]]); + background-repeat: round; + //background-position: center center; + //background-attachment: fixed; + background-color: #ffffff; + //background-size: cover; + min-height: 250px; +} +#cabecalho-geral{ + max-width: 1280px; + padding-top: 40px; +} +#cabecalho-geral .card{ + background-color:transparent; +} +#cabecalho-geral .breadcrumb .breadcrumb-item{ + color:#fff; + text-transform: uppercase; + font-size: 12px; +} +#cabecalho-geral .breadcrumb >li>a{color:#fff;} +#cabecalho-geral .breadcrumb >li>a:hover{color:#f60; text-decoration: none;} +#cabecalho-geral .breadcrumb-item + .breadcrumb-item::before{ + color:#fff; + content: ">"; + padding-left: 0px; + padding-right: 0px; +} +#cabecalho-geral div.page-title > h1{ + color:#fff; + font-size: 28px; + font-weight: 700; +} + +/* ################################### DASHBOARD ################################# */ + +.pagelayout-mydashboard{ + #region-main{ + border: 0px; + } } \ No newline at end of file diff --git a/scss/preset/theme.scss b/scss/preset/theme.scss index 1ce027b..d72157c 100644 --- a/scss/preset/theme.scss +++ b/scss/preset/theme.scss @@ -44,8 +44,8 @@ $color_whisper: #e6e6e6; $color_light_gray: #f8f9fa; //fonts -$font_0: Century Gothic; -$font_1: Arial; +$font_0: 'Lato'; +$font_1: 'Poppins'; $font_2: Helvetica; $font_3: sans-serif; $font_4: FontAwesome; @@ -1876,7 +1876,7 @@ input { color: $color_chicago_approx; &.form-submit { font-weight: bold; - font-family: $font_1, $font_2, $font_3; + font-family: $font_0, $font_1, $font_2; color: $white; padding: 11px 16px; border-radius: 0; @@ -1982,7 +1982,7 @@ input { } } button { - font-family: $font_1, $font_2, $font_3; + font-family: $font_0, $font_1, $font_2; color: $white; font-weight: bold; text-shadow: none; @@ -2191,7 +2191,7 @@ input[type="color"] { .btn-primary, input[type="button"] { font-weight: bold; - font-family: $font_1, $font_2, $font_3; + font-family: $font_0, $font_1, $font_2; color: $white; text-shadow: none; background: $color_olivine_approx; @@ -2218,7 +2218,7 @@ input[type="button"] { .btn-primary, input[type="submit"] { font-weight: bold; - font-family: $font_1, $font_2, $font_3; + font-family: $font_0, $font_1, $font_2; color: $white; text-shadow: none; background: $color_olivine_approx; @@ -2266,7 +2266,7 @@ input[type="submit"] { } input[type="reset"] { font-weight: bold; - font-family: $font_1, $font_2, $font_3; + font-family: $font_0, $font_1, $font_2; color: $white; text-shadow: none; background: $color_olivine_approx; @@ -2451,19 +2451,26 @@ table { border-color: $color_gray_nurse_approx; border-radius: 0; box-shadow: none; + &.block_myoverview{ + .card-body{ + .card-title{ + display: none !important; + } + } + } .card-body { padding: 0; .card-title { width: 60%; padding: 15px; margin-bottom: 0; - display: inline-block !important; + //display: none !important; } .content { padding: 10px 18px; margin: 0 !important; background: $color_alabaster_approx; - border-top: 1px solid $color_gray_nurse_approx; + //border-top: 1px solid $color_gray_nurse_approx; .content { border: 0; } @@ -2882,11 +2889,11 @@ table { display: inline-block; } .fpassword .unmask label { - font: 14px $font_1, $font_2, $font_3; + font: 14px $font_0, $font_1, $font_2; padding: 0 0 0 7px; } .fdescription.required { - font: 12px $font_1, $font_2, $font_3; + font: 12px $font_0, $font_1, $font_2; color: $color_stack_approx; margin: 0; text-align: right; @@ -3012,7 +3019,7 @@ table { clear: none; border: 1px solid $color_celeste_approx; li { - font-family: $font_1, $font_2, $font_3; + font-family: $font_0, $font_1, $font_2; } } .summary { @@ -3160,7 +3167,7 @@ table { } } .summary .no-overflow { - font-family: $font_1, $font_2, $font_3; + font-family: $font_0, $font_1, $font_2; color: $color_boston_blue_approx; line-height: 24px; background: $color_link_water_approx; @@ -3522,7 +3529,7 @@ select[size] { } #notice .singlebutton + .singlebutton input { font-weight: bold; - font-family: $font_1, $font_2, $font_3; + font-family: $font_0, $font_1, $font_2; color: $white; text-shadow: none; background: $color_olivine_approx; @@ -3543,7 +3550,7 @@ select[size] { } .submit.buttons input[name="cancel"] { font-weight: bold; - font-family: $font_1, $font_2, $font_3; + font-family: $font_0, $font_1, $font_2; color: $white; text-shadow: none; background: $color_olivine_approx; diff --git a/style/custom.css b/style/custom.css index 2c3fc28..c8614c4 100644 --- a/style/custom.css +++ b/style/custom.css @@ -3,7 +3,7 @@ /*############################################################# Reset*/ h1, h2, h3, h4, h5, h6{ - font-family: 'Poppins', sans-serif; + /*font-family: 'Poppins', sans-serif;*/ } a{color: #474749;} @@ -90,7 +90,7 @@ a{color: #474749;} /* Course page */ .barra_progresso{ - font-family: "Poppins",sans-serif; + /*font-family: "Poppins",sans-serif;*/ margin-bottom: 30px; } .barra_progresso > .progresso{background-color: #ebebeb;} diff --git a/templates/breadscrumb.mustache b/templates/breadscrumb.mustache new file mode 100644 index 0000000..f682c2e --- /dev/null +++ b/templates/breadscrumb.mustache @@ -0,0 +1,80 @@ +{{! + This file is part of Moodle - http://moodle.org/ + + Moodle is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Moodle is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Moodle. If not, see . +}} +{{! + @template core/navbar + + Navbar template. + + Classes required for JS: + * none + + Data attributes required for JS: + * none + + Context variables required for this template: + * get_items - array of items + * has_action - boolean + * action - string + * get_title - string + * get_content - string + * is_hidden - boolean + + Example context (json): + { + "get_items": [ + { + "has_action": true, + "action": "#", + "get_title": "Test title", + "get_content": "First & fresh", + "is_hidden": false + }, + { + "has_action": true, + "action": "#", + "get_title": "Second item & a title", + "get_content": "Second item", + "is_hidden": false + }, + { + "has_action": false, + "get_content": "Third item", + "is_hidden": false + }, + { + "has_action": false, + "get_content": "Fourth & last", + "is_hidden": true + } + ] + } +}} + diff --git a/templates/edit_buttons.mustache b/templates/edit_buttons.mustache new file mode 100644 index 0000000..c07d4ed --- /dev/null +++ b/templates/edit_buttons.mustache @@ -0,0 +1,48 @@ +{{! + This file is part of Moodle - http://moodle.org/ + + Moodle is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Moodle is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Moodle. If not, see . +}} +{{! + @template boost/header + + This template renders the header. + + Example context (json): + { + "contextheader": "context_header_html", + "settingsmenu": "settings_html", + "hasnavbar": false, + "navbar": "navbar_if_available", + "courseheader": "course_header_html" + } + + Page header. +}} + \ No newline at end of file diff --git a/templates/my.mustache b/templates/my.mustache index 217e0ef..10a3365 100644 --- a/templates/my.mustache +++ b/templates/my.mustache @@ -58,12 +58,18 @@ {{>theme_qualisaude/header}} -
- - {{{ output.full_header }}} -
-

Meus cursos

+
+
+
+ {{{ output.breadscrumb }}} + +

Meus módulos

+
+ {{{ output.edit_buttons }}}
+
+ +
{{#hasregionmainsettingsmenu}}