diff --git a/config.php b/config.php index 71ed403..e93f2a3 100644 --- a/config.php +++ b/config.php @@ -42,6 +42,12 @@ $THEME->parents = array( 'leatherbound', ); +///////////////////////////////////////////////////// +// theme renderers +///////////////////////////////////////////////////// + +$THEME->rendererfactory = 'theme_overridden_renderer_factory'; + ///////////////////////////////////////////////////// // Which existing theme(s) in the /theme/ directory // do you want this theme to extend. A theme can @@ -88,7 +94,7 @@ $THEME->layouts = array( 'defaultregion' => 'side-pre', ), 'course' => array( - 'file' => 'general.php', + 'file' => 'course.php', 'regions' => array('side-pre', 'side-post'), 'defaultregion' => 'side-pre' ), diff --git a/layout/course.php b/layout/course.php new file mode 100644 index 0000000..c50b262 --- /dev/null +++ b/layout/course.php @@ -0,0 +1,165 @@ +heading); +$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar()); +$hasfooter = (empty($PAGE->layout_options['nofooter'])); +$hassidepre = $PAGE->blocks->region_has_content('side-pre', $OUTPUT); +$hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT); +$custommenu = $OUTPUT->custom_menu(); +$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu)); + +$courseheader = $coursecontentheader = $coursecontentfooter = $coursefooter = ''; +if (empty($PAGE->layout_options['nocourseheaderfooter'])) { + $courseheader = $OUTPUT->course_header(); + $coursecontentheader = $OUTPUT->course_content_header(); + if (empty($PAGE->layout_options['nocoursefooter'])) { + $coursecontentfooter = $OUTPUT->course_content_footer(); + $coursefooter = $OUTPUT->course_footer(); + } +} + +$bodyclasses = array(); +if ($hassidepre && !$hassidepost) { + $bodyclasses[] = 'side-pre-only'; +} else if ($hassidepost && !$hassidepre) { + $bodyclasses[] = 'side-post-only'; +} else if (!$hassidepost && !$hassidepre) { + $bodyclasses[] = 'content-only'; +} +if ($hascustommenu) { + $bodyclasses[] = 'has_custom_menu'; +} + +echo $OUTPUT->doctype() ?> +htmlattributes() ?>> + + <?php echo $PAGE->title ?> + + standard_head_html() ?> + + + +standard_top_of_body_html() ?> + +
+ + + + +
+
+
+ + + +
+
+

heading ?>

+
+
+ login_info(); + if (!empty($PAGE->layout_options['langmenu'])) { + echo $OUTPUT->lang_menu(); + } + echo $PAGE->headingmenu + ?> +
+ + + + + + +
+
+
+
+ + + +
+ + + +
+ + + +
+
+
navbar(); ?>
+
button; ?>
+
+
+ + + +
+
+
+
+ +
+
+
+ + main_content() ?> + +
+
+
+ + +
+
+ blocks_for_region('side-pre') ?> +
+
+ + + +
+
+ blocks_for_region('side-post') ?> +
+
+ + +
+
+
+
+ + + + + + + +
+

+ login_info(); + //echo $OUTPUT->home_link(); + echo $OUTPUT->standard_footer_html(); + ?> +
+ +
+
+
+ Senado Federal - Praça dos Três Poderes - Brasília DF - CEP 70165-900 +
+
+ + + +
+
+
+ +
+standard_end_of_body_html() ?> + + diff --git a/layout/frontpage.php b/layout/frontpage.php index c00cdd9..2bc1336 100644 --- a/layout/frontpage.php +++ b/layout/frontpage.php @@ -46,9 +46,6 @@ echo $OUTPUT->doctype() ?> -
-

heading ?>

-
login_info(); @@ -58,12 +55,12 @@ echo $OUTPUT->doctype() ?> echo $PAGE->headingmenu ?>
- - - + + +
diff --git a/layout/general.php b/layout/general.php index a14e689..ee9fe01 100644 --- a/layout/general.php +++ b/layout/general.php @@ -53,9 +53,6 @@ echo $OUTPUT->doctype() ?> -
-

heading ?>

-
login_info(); @@ -65,12 +62,12 @@ echo $OUTPUT->doctype() ?> echo $PAGE->headingmenu ?>
+ + + - - -
diff --git a/layout/incourse.php b/layout/incourse.php index d3d1210..6f677ab 100644 --- a/layout/incourse.php +++ b/layout/incourse.php @@ -47,9 +47,9 @@ echo $OUTPUT->doctype() ?>
-
+
- +
@@ -64,12 +64,12 @@ echo $OUTPUT->doctype() ?> echo $PAGE->headingmenu ?>
- - - + + +
@@ -106,7 +106,7 @@ echo $OUTPUT->doctype() ?> main_content() ?> - Voltar ao curso +
Voltar ao curso
diff --git a/pix/logo-ilb.png b/pix/logo-ilb.png index 2e6b7d6..1234b02 100644 Binary files a/pix/logo-ilb.png and b/pix/logo-ilb.png differ diff --git a/pix/logo-saberes.png b/pix/logo-saberes.png index 8e1d70a..0a68912 100644 Binary files a/pix/logo-saberes.png and b/pix/logo-saberes.png differ diff --git a/renderers.php b/renderers.php new file mode 100644 index 0000000..df88cfe --- /dev/null +++ b/renderers.php @@ -0,0 +1,60 @@ +. + +/** + * Renderer for use with the course section and all the goodness that falls + * within it. + * + * This renderer should contain methods useful to courses, and categories. + * + * @package theme_ilb2014 + * @copyright 2014 ILB / Interlegis / Senado Federal + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v2 + */ + +include_once("$CFG->dirroot/course/renderer.php"); + +/** + * The core course renderer + * + * Can be retrieved with the following: + * $renderer = $PAGE->get_renderer('core','course'); + */ + +class theme_ilb2014_core_course_renderer extends core_course_renderer { + + /** + * Returns HTML to print tree of course categories (with number of courses) for the frontpage + * + * @return string + */ + public function frontpage_categories_list() { + global $CFG; + require_once($CFG->libdir. '/coursecatlib.php'); + $chelper = new coursecat_helper(); + $chelper->set_subcat_depth($CFG->maxcategorydepth)-> + set_show_courses(self::COURSECAT_SHOW_COURSES_AUTO)-> + set_categories_display_options(array( + 'limit' => $CFG->coursesperpage, + 'viewmoreurl' => new moodle_url('/course/index.php', + array('browse' => 'categories', 'page' => 1)) + ))-> + set_attributes(array('class' => 'frontpage-category-names')); + return $this->coursecat_tree($chelper, coursecat::get(0)); + } + +} diff --git a/style/core.css b/style/core.css index 95f2d45..3149b18 100644 --- a/style/core.css +++ b/style/core.css @@ -108,6 +108,68 @@ margin:0 0 0 0 auto; padding:0 0 0 0; } +/*Pagina Placeholder de Login*/ + +.login-placeholder{ +width: 30.2% !important; +float: left !important; +margin-bottom: -2000px !important; +padding-bottom: 2000px !important; +border: 0 !important; +padding-top: 30px; +} + +.signuppanel2{ +border-left: 2px solid #E6E6E6 !important; +border-right: 2px solid #E6E6E6 !important; +} + +.login-placeholder.signuppanel2 .subcontent{ +text-align: justify !important; +} + +.login-placeholder.signuppanel .subcontent{ +text-align: center !important; +} + +.login-placeholder.signuppanel2{ +padding-left: 2%; +padding-right: 2%; +} + +.login-placeholder.signuppanel{ +padding-left: 2%; +} + +.login-placeholder.loginpanel{ +padding-right: 2%; +} + +.login-placeholder h2{ +margin: 0; +padding: 0; +color: #042656; +} + +.signuppanel2 .subcontent, .signuppanel .subcontent, .loginpanel .desc{ +color: #042656; +} + +.obs-box{ +margin-top: 35px; +padding-top: 35px; +border-top: 2px solid #E6E6E6; +font-size: 12px; +} + +.obs{ +width: 28.95%; +padding: 0 2%; +float: left; +text-align: justify; +} + + /* Global ------------------------*/ @@ -127,6 +189,7 @@ background: #00305c; color: whitesmoke; font-weight: bold; border: 0; +margin: 4px 2px; padding: 4px 10px; white-space: normal; } @@ -166,6 +229,23 @@ a img { a:active { outline: none; } +/*Incourse e Coursecategory*/ + +.voltar-curso{ +text-align: center; +margin-top: 10px; +} + +.coursebox > .info > .name{ +width: 90%; +} + +.coursebox .content .summary{ +width: 90%; +float: left; +padding-left: 31px; +text-align: justify; +} /* Header -----------------------*/ @@ -194,14 +274,17 @@ a:active { #page-header-wrapper { height: 110px; + position: relative; } .headermenu { margin: 0; font-size: 0.9em; - position: relative; + position: absolute; height: 100%; width: 268px; + right: 0; + top: 0; } .vertical-helper{ @@ -212,22 +295,33 @@ a:active { .heading-wrapper{ position: absolute; - margin-left: 230px; + margin-left: 320px; margin-right: 300px; margin-top: 30px; } -.logo-header { +.course-logo-header { margin-right: 25px; - height: 75px; + height: 70px; vertical-align: middle; } -.logo-wrapper { +.course-logo-wrapper { float: left; width: 220px; margin-top: 18px; } + +.logo-header { + height: 91px; + vertical-align: middle; +} + +.logo-wrapper { + width: 402px; + margin: 0 auto; + padding-top: 8px; +} .header-banners img{ height: 35px; } @@ -349,7 +443,7 @@ color: #fff; background-color: #042656; text-align: center; font-weight: bold; -font-size: 0.7em; +font-size: 0.8em; height: 30px; margin-top: 10px; padding: 5px 13px;