diff --git a/theme/noname/classes/output/core/admin_renderer.php b/theme/noname/classes/output/core/admin_renderer.php new file mode 100644 index 00000000000..099e877b2e3 --- /dev/null +++ b/theme/noname/classes/output/core/admin_renderer.php @@ -0,0 +1,52 @@ +. + +/** + * Admin renderer. + * + * @package theme_noanme + * @copyright 2016 Frédéric Massart - FMCorz.net + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +namespace theme_noname\output\core; +defined('MOODLE_INTERNAL') || die(); + +use moodle_url; + +require_once($CFG->dirroot . '/admin/renderer.php'); + +/** + * Admin renderer class. + * + * @package theme_noanme + * @copyright 2016 Frédéric Massart - FMCorz.net + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +class admin_renderer extends \core_admin_renderer { + + /** + * Output a warning message. + * + * @param string $message the message to display. + * @param string $type type class + * @return string HTML to output. + */ + protected function warning($message, $type = 'warning') { + return $this->box($message, 'generalbox m-b-1 admin' . $type); + } + +} diff --git a/theme/noname/classes/output/core_renderer.php b/theme/noname/classes/output/core_renderer.php index 4aaace870d5..7e839cfd7c4 100644 --- a/theme/noname/classes/output/core_renderer.php +++ b/theme/noname/classes/output/core_renderer.php @@ -61,6 +61,25 @@ class core_renderer extends \core_renderer { return parent::box_start($classes . ' p-a-1', $id, $attributes); } + /** + * Wrapper for header elements. + * + * @return string HTML to display the main header. + */ + public function full_header() { + $html = html_writer::start_tag('header', array('id' => 'page-header', 'class' => 'row')); + $html .= html_writer::start_div('col-xs-12 p-t-1 p-b-1'); + $html .= $this->context_header(); + $html .= html_writer::start_div('clearfix', array('id' => 'page-navbar')); + $html .= html_writer::tag('div', $this->navbar(), array('class' => 'breadcrumb-nav')); + $html .= html_writer::div($this->page_heading_button(), 'breadcrumb-button'); + $html .= html_writer::end_div(); + $html .= html_writer::tag('div', $this->course_header(), array('id' => 'course-header')); + $html .= html_writer::end_div(); + $html .= html_writer::end_tag('header'); + return $html; + } + /** * The standard tags that should be included in the tag * including a meta description for the front page diff --git a/theme/noname/scss/moodle/buttons.scss b/theme/noname/scss/moodle/buttons.scss index df1df0ef9c8..d60889f130d 100644 --- a/theme/noname/scss/moodle/buttons.scss +++ b/theme/noname/scss/moodle/buttons.scss @@ -1,18 +1,7 @@ .singlebutton { - div { - display: inline-block; - margin-right: 5px; - margin-bottom: 5px; - margin-left: 5px; - } -} - -// Two singlebuttons side by side for ok/cancel. -#notice { - .buttons { - .singlebutton { - display: inline-block; - } + display: inline-block; + + .singlebutton { + margin-left: $spacer / 2; } } diff --git a/theme/noname/scss/moodle/core.scss b/theme/noname/scss/moodle/core.scss index 92f04c72cd7..b3bebc13c6d 100644 --- a/theme/noname/scss/moodle/core.scss +++ b/theme/noname/scss/moodle/core.scss @@ -1608,7 +1608,6 @@ img#persona_signin { } .breadcrumb-nav { float: left; - margin-bottom: 10px; } .breadcrumb-button .singlebutton div { margin-right: 0; diff --git a/theme/noname/templates/columns1.mustache b/theme/noname/templates/columns1.mustache index 8de1d06ebb3..801baf2b70e 100644 --- a/theme/noname/templates/columns1.mustache +++ b/theme/noname/templates/columns1.mustache @@ -44,12 +44,14 @@ {{{ output.full_header }}}
-
-
- {{{ output.course_content_header }}} - {{{ output.main_content }}} - {{{ output.course_content_footer }}} -
+
+
+
+ {{{ output.course_content_header }}} + {{{ output.main_content }}} + {{{ output.course_content_footer }}} +
+
diff --git a/theme/noname/templates/columns2.mustache b/theme/noname/templates/columns2.mustache index bd58e8e7b42..24554abf5d0 100644 --- a/theme/noname/templates/columns2.mustache +++ b/theme/noname/templates/columns2.mustache @@ -45,11 +45,13 @@
-
- {{{ output.course_content_header }}} - {{{ output.main_content }}} - {{{ output.course_content_footer }}} -
+
+
+ {{{ output.course_content_header }}} + {{{ output.main_content }}} + {{{ output.course_content_footer }}} +
+
{{{ sidepreblocks }}}
diff --git a/theme/noname/templates/core/block.mustache b/theme/noname/templates/core/block.mustache index 6f7835810e0..57239285c53 100644 --- a/theme/noname/templates/core/block.mustache +++ b/theme/noname/templates/core/block.mustache @@ -21,7 +21,7 @@
{{! Block header }} {{#title}} -

{{{title}}}

+

{{{title}}}

{{/title}}
{{{content}}} diff --git a/theme/noname/templates/core/login.mustache b/theme/noname/templates/core/login.mustache index dad40bfb6a3..77a7a7c9d9a 100644 --- a/theme/noname/templates/core/login.mustache +++ b/theme/noname/templates/core/login.mustache @@ -113,7 +113,7 @@
{{#hasinstructions}} -
+