From ee8345d7850c26da5113ef3a6cf489684ead5aed Mon Sep 17 00:00:00 2001
From: eduardogusmao <31075edu>
Date: Mon, 2 Sep 2019 19:28:52 -0300
Subject: [PATCH] =?UTF-8?q?Implementa=C3=A7=C3=A3o=20do=20rodap=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
layout/columns2.php | 5 +-
layout/course.php | 5 +-
layout/frontpage.php | 2 +-
layout/includes/footer.php | 5 +-
layout/includes/header.php | 3 +-
lib.php | 12 ++++
renderers/core_renderer.php | 2 +-
scss/preset/custom.scss | 41 +++++++++++
scss/preset/theme.scss | 15 ++--
templates/footer.mustache | 137 +++++++++++++++++-------------------
10 files changed, 139 insertions(+), 88 deletions(-)
diff --git a/layout/columns2.php b/layout/columns2.php
index f18afae..076ca6a 100644
--- a/layout/columns2.php
+++ b/layout/columns2.php
@@ -56,7 +56,7 @@ $scallus = get_string('callus', 'theme_qualisaude');
$semail = get_string('email', 'theme_qualisaude');
// Footer Content.
-$logourl = get_logo_url();
+$footlogourl = get_footer_logo_url();
$footlogo = theme_qualisaude_get_setting('footlogo');
$footlogo = (!$footlogo) ? 0 : 1;
$footnote = theme_qualisaude_get_setting('footnote', 'format_html');
@@ -144,7 +144,8 @@ $templatecontext = [
"footerblock" => $footerblock,
"footerblock1" => $footerblock1,
"colclass" => $colclass,
- "block1" => $block1
+ "block1" => $block1,
+ "footlogourl" => $footlogourl
];
$templatecontext['flatnavigation'] = $PAGE->flatnav;
diff --git a/layout/course.php b/layout/course.php
index 5f3b65c..cf992ec 100644
--- a/layout/course.php
+++ b/layout/course.php
@@ -59,7 +59,7 @@ $scallus = get_string('callus', 'theme_qualisaude');
$semail = get_string('email', 'theme_qualisaude');
// Footer Content.
-$logourl = get_logo_url();
+$footlogourl = get_footer_logo_url();
$footlogo = theme_qualisaude_get_setting('footlogo');
$footlogo = (!$footlogo) ? 0 : 1;
$footnote = theme_qualisaude_get_setting('footnote', 'format_html');
@@ -149,7 +149,8 @@ $templatecontext = [
"footerblock" => $footerblock,
"footerblock1" => $footerblock1,
"colclass" => $colclass,
- "block1" => $block1
+ "block1" => $block1,
+ "footlogourl" => $footlogourl
];
//var_dump($COURSE);
diff --git a/layout/frontpage.php b/layout/frontpage.php
index a01f1c3..b958a44 100644
--- a/layout/frontpage.php
+++ b/layout/frontpage.php
@@ -98,7 +98,7 @@ $bgCapa = rand(1,1);
/* ########################### Notícias ########################### */
echo <<
- Sobre o mestrado
+ Sobre o mestrado
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris
HTML;
diff --git a/layout/includes/footer.php b/layout/includes/footer.php
index 16a1c6c..188bac8 100644
--- a/layout/includes/footer.php
+++ b/layout/includes/footer.php
@@ -50,7 +50,7 @@ $semail = get_string('email', 'theme_qualisaude');
// Footer Content.
-$logourl = get_logo_url();
+$footlogourl = get_footer_logo_url();
$footlogo = theme_qualisaude_get_setting('footlogo');
$footlogo = (!$footlogo) ? 0 : 1;
$footnote = theme_qualisaude_get_setting('footnote', 'format_html');
@@ -136,7 +136,8 @@ $templatecontext = [
"footerblock" => $footerblock,
"footerblock1" => $footerblock1,
"colclass" => $colclass,
- "block1" => $block1
+ "block1" => $block1,
+ "footlogourl" => $footlogourl
];
diff --git a/layout/includes/header.php b/layout/includes/header.php
index f7a67b0..ed5397b 100644
--- a/layout/includes/header.php
+++ b/layout/includes/header.php
@@ -57,7 +57,7 @@ $scallus = get_string('callus', 'theme_qualisaude');
$semail = get_string('email', 'theme_qualisaude');
// Footer Content.
-$logourl = get_logo_url();
+$footlogourl = get_footer_logo_url();
$footnote = theme_qualisaude_get_setting('footnote', 'format_html');
$fburl = theme_qualisaude_get_setting('fburl');
$pinurl = theme_qualisaude_get_setting('pinurl');
@@ -110,6 +110,7 @@ $templatecontext = [
"url" => $url,
"infolink" => $infolink,
"navbarclass" => $navbarclass,
+ "footlogourl" => $footlogourl
];
diff --git a/lib.php b/lib.php
index 4df8a84..d603e09 100644
--- a/lib.php
+++ b/lib.php
@@ -335,6 +335,18 @@ if (!function_exists('get_logo_url')) {
$logo = empty($logo) ? $OUTPUT->image_url('home/logo', 'theme') : $logo;
return $logo;
}
+
+}
+
+function get_footer_logo_url() {
+ global $OUTPUT;
+ static $theme;
+ if (empty($theme)) {
+ $theme = theme_config::load('qualisaude');
+ }
+ $logo = $theme->setting_file_url('logo', 'logo');
+ $logo = empty($logo) ? $OUTPUT->image_url('logos/logo-footer2x', 'theme') : $logo;
+ return $logo;
}
/**
diff --git a/renderers/core_renderer.php b/renderers/core_renderer.php
index 3ca05f6..c3068ef 100644
--- a/renderers/core_renderer.php
+++ b/renderers/core_renderer.php
@@ -95,7 +95,7 @@ class theme_qualisaude_core_renderer extends theme_boost\output\core_renderer {
$context = \context_module::instance($cm->id, MUST_EXIST);
$output = html_writer::start_tag('div', array('id' => 'site-news-forum', 'class' => 'clearfix'));
- $output .= $this->heading(format_string('Notícias', true, array('context' => $context)));
+ $output .= $this->heading(format_string('Notícias', true, array('context' => $context)), 2,'titulo');
$groupmode = groups_get_activity_groupmode($cm, $SITE);
$currentgroup = groups_get_activity_group($cm);
diff --git a/scss/preset/custom.scss b/scss/preset/custom.scss
index d453685..11f5c0e 100644
--- a/scss/preset/custom.scss
+++ b/scss/preset/custom.scss
@@ -1,4 +1,10 @@
+p{
+ color: #666;
+ line-height: 21px;
+ font-size: 15px !important;
+}
+
@media (min-width: 768px) {
.container {
width: 750px;
@@ -151,4 +157,39 @@ section#inicial{
}
}
}
+#page{
+ #page-content{
+ .titulo{
+ font-weight: 900;
+ font-size: 24px;
+ color: #003D70;
+ margin-bottom: 8px;
+ }
+ #site-news-forum{
+ #news-articles{
+ .news-article{
+ margin-bottom: 15px;
+ .news-article-content{
+ h3{
+ a{
+ color: #565656;
+ font-weight: bold;
+ text-decoration: none;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
+/* ################################### FOOTER ################################# */
+#page-footer{
+ margin-top: 55px;
+ .footer-logo{
+ .logo-qualisaude{
+ height: 50px;
+ }
+ }
+}
\ No newline at end of file
diff --git a/scss/preset/theme.scss b/scss/preset/theme.scss
index 04a6bb6..ed5aa4d 100644
--- a/scss/preset/theme.scss
+++ b/scss/preset/theme.scss
@@ -1003,10 +1003,10 @@ i.icon {
a {
color: #919191;
}
+ background: #ffffff url([[pix:theme|bg/bg_footer]]) no-repeat;
+ background-size: cover;
.footer-main {
- background: #eaeaea url([[pix:theme|bg/footer]]) no-repeat;
- background-size: contain;
- padding: 30px 0 54px;
+ padding: 160px 0 50px;
h2 {
font-weight: 100;
line-height: 36px;
@@ -1015,14 +1015,15 @@ i.icon {
color: #888888;
}
p {
- color: #919191;
- line-height: 22px;
+ color: #31539d;
+ font-size: 14px;
+ line-height: 21px;
}
.infoarea {
padding: 24px 0 0;
.footer-logo {
- max-width: 251px;
- margin: 0 0 18px;
+ //max-width: 251px;
+ //margin: 0 0 18px;
a {
display: block;
img {
diff --git a/templates/footer.mustache b/templates/footer.mustache
index 6ce3217..99484b6 100644
--- a/templates/footer.mustache
+++ b/templates/footer.mustache
@@ -21,79 +21,72 @@
{{#footerblock}}
{{/footerblock}}
+