Skip to content
Snippets Groups Projects
Commit 4f46df8f authored by Kathrin Osswald's avatar Kathrin Osswald
Browse files

Adjusted improved mustache templates due to changes in the original templates.

parent 2fa6a2f5
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 482 additions and 480 deletions
CHANGES.md
+ 1
− 0
View file @ 4f46df8f
...@@ -6,6 +6,7 @@ Changes ...@@ -6,6 +6,7 @@ Changes
### Unreleased ### Unreleased
* 2018-05-14 - Adjusted improved mustache templates due to changes in the original templates.
* 2018-05-14 - Removed setting to show icons in the navdrawer due to integration of MDL-61298 into the core. * 2018-05-14 - Removed setting to show icons in the navdrawer due to integration of MDL-61298 into the core.
* 2018-05-14 - Made changes to nav drawer HTML structure undone due to integration of MDL-61343 into the core. * 2018-05-14 - Made changes to nav drawer HTML structure undone due to integration of MDL-61343 into the core.
* 2018-05-14 - Changed used SCSS variable name due to renaming of variables by Moodle. * 2018-05-14 - Changed used SCSS variable name due to renaming of variables by Moodle.
......
scss/post.scss
+ 14
− 7
View file @ 4f46df8f
...@@ -779,16 +779,23 @@ a[href^="mailto"]::before { ...@@ -779,16 +779,23 @@ a[href^="mailto"]::before {
#boost-campus-activity-settings { #boost-campus-activity-settings {
/* Initially do not display the settings. Visibility will be changed on click with incoursesettings.js. */ /* Initially do not display the settings. Visibility will be changed on click with incoursesettings.js. */
display: none; display: none;
border: none; padding: 1rem;
padding-bottom: 0.1rem; padding-top: 0;
margin-bottom: 3rem; margin-bottom: 3rem;
margin-top: 1rem;
border: none;
.nav-tabs {
border: none;
.active {
background-color: darken($body-bg, 5%);
border-color: darken($body-bg, 5%);
}
}
/* Improve color of tab content so it looks more like a real tab. */ /* Improve color of tab content so it looks more like a real tab. */
.tab-content .card { .tab-content .card {
background-color: #f4f4f4; background-color: darken($body-bg, 5%);
border-left: 1px solid #ddd; border: none;
border-right: 1px solid #ddd;
border-bottom: 1px solid #ddd;
margin-bottom: 2rem;
} }
} }
......
templates/activity_settings_incourse.mustache
+ 53
− 57
View file @ 4f46df8f
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<div id="boost-campus-activity-settings" class="card" > <div id="boost-campus-activity-settings" class="card" >
<h2>{{incourse_activitynode_heading}}</h2> <h2>{{incourse_activitynode_heading}}</h2>
<div class="p-t-2"> <div class="mx-2 pt-2">
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<!-- First the top most activitynode and immediate children --> <!-- First the top most activitynode and immediate children -->
<li class="nav-item"> <li class="nav-item">
...@@ -66,8 +66,7 @@ ...@@ -66,8 +66,7 @@
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane active" id="activity-settings-{{key}}" role="tabpanel"> <div class="tab-pane active" id="activity-settings-{{key}}" role="tabpanel">
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-body pb-0">
<div class="container">
<div class="row"> <div class="row">
<div class="col-sm-4"> <div class="col-sm-4">
{{#action}}<h4><a href="{{action}}">{{text}}</a></h4>{{/action}} {{#action}}<h4><a href="{{action}}">{{text}}</a></h4>{{/action}}
...@@ -88,13 +87,11 @@ ...@@ -88,13 +87,11 @@
</div> </div>
</div> </div>
</div> </div>
</div>
{{#activitynode.children}} {{#activitynode.children}}
{{#children.count}} {{#children.count}}
<div class="tab-pane" id="activity-settings-{{key}}" role="tabpanel"> <div class="tab-pane" id="activity-settings-{{key}}" role="tabpanel">
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-body pb-0">
<div class="container">
<div class="row"> <div class="row">
<div class="col-sm-4"> <div class="col-sm-4">
{{#action}}<h4><a href="{{action}}">{{text}}</a></h4>{{/action}} {{#action}}<h4><a href="{{action}}">{{text}}</a></h4>{{/action}}
...@@ -135,7 +132,6 @@ ...@@ -135,7 +132,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
{{/children.count}} {{/children.count}}
{{/activitynode.children}} {{/activitynode.children}}
</div> </div>
......
templates/columns2.mustache
+ 19
− 24
View file @ 4f46df8f
...@@ -56,14 +56,7 @@ ...@@ -56,14 +56,7 @@
* Use additional JavaScript functionality if the setting nawdrawerfullwidth is enabled. We write this here, so we do not * Use additional JavaScript functionality if the setting nawdrawerfullwidth is enabled. We write this here, so we do not
have to override the drawer.js file for this small addition. have to override the drawer.js file for this small addition.
}} }}
{{{ output.doctype }}} {{> theme_boost/head }}
<html {{{ output.htmlattributes }}}>
<head>
<title>{{{ output.page_title }}}</title>
<link rel="shortcut icon" href="{{{ output.favicon }}}" />
{{{ output.standard_head_html }}}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
<body {{{ bodyattributes }}}> <body {{{ bodyattributes }}}>
...@@ -71,23 +64,24 @@ ...@@ -71,23 +64,24 @@
{{{ output.standard_top_of_body_html }}} {{{ output.standard_top_of_body_html }}}
{{>theme_boost/header}} {{>theme_boost/navbar}}
<div id="page" class="container-fluid"> <div id="page" class="container-fluid">
{{{ output.full_header }}} {{{ output.full_header }}}
<div id="page-content" class="row"> <div id="page-content" class="row">
<div id="region-main-box" class="col-xs-12"> <div id="region-main-box" class="col-12">
{{#node}} {{#node}}
{{> theme_boost_campus/settings_link_page }} {{> theme_boost_campus/settings_link_page }}
{{/node}} {{/node}}
{{#hasregionmainsettingsmenu}} {{#hasregionmainsettingsmenu}}
<div id="region-main-settings-menu" class="hidden-print {{#hasblocks}}has-blocks{{/hasblocks}}"> <div id="region-main-settings-menu" class="d-print-none {{#hasblocks}}has-blocks{{/hasblocks}}">
<div> {{{ output.region_main_settings_menu }}} </div> <div> {{{ output.region_main_settings_menu }}} </div>
</div> </div>
{{/hasregionmainsettingsmenu}} {{/hasregionmainsettingsmenu}}
<section id="region-main" {{#hasblocks}}class="has-blocks"{{/hasblocks}}> <section id="region-main" {{#hasblocks}}class="has-blocks mb-3"{{/hasblocks}}>
<div class="card card-block"> <div class="card">
<div class="card-body">
{{#hasregionmainsettingsmenu}} {{#hasregionmainsettingsmenu}}
<div class="region_main_settings_menu_proxy"></div> <div class="region_main_settings_menu_proxy"></div>
{{/hasregionmainsettingsmenu}} {{/hasregionmainsettingsmenu}}
...@@ -99,9 +93,10 @@ ...@@ -99,9 +93,10 @@
{{{ output.activity_navigation }}} {{{ output.activity_navigation }}}
{{{ output.course_content_footer }}} {{{ output.course_content_footer }}}
</div> </div>
</div>
</section> </section>
{{#hasblocks}} {{#hasblocks}}
<section data-region="blocks-column" class="hidden-print"> <section data-region="blocks-column" class="d-print-none">
{{{ sidepreblocks }}} {{{ sidepreblocks }}}
</section> </section>
{{/hasblocks}} {{/hasblocks}}
......
templates/columns2.mustache.original
+ 17
− 42
View file @ 4f46df8f
...@@ -48,14 +48,7 @@ ...@@ -48,14 +48,7 @@
"hasregionmainsettingsmenu": false "hasregionmainsettingsmenu": false
} }
}} }}
{{{ output.doctype }}} {{> theme_boost/head }}
<html {{{ output.htmlattributes }}}>
<head>
<title>{{{ output.page_title }}}</title>
<link rel="shortcut icon" href="{{{ output.favicon }}}" />
{{{ output.standard_head_html }}}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
<body {{{ bodyattributes }}}> <body {{{ bodyattributes }}}>
...@@ -63,20 +56,21 @@ ...@@ -63,20 +56,21 @@
{{{ output.standard_top_of_body_html }}} {{{ output.standard_top_of_body_html }}}
{{>theme_boost/header}} {{>theme_boost/navbar}}
<div id="page" class="container-fluid"> <div id="page" class="container-fluid">
{{{ output.full_header }}} {{{ output.full_header }}}
<div id="page-content" class="row"> <div id="page-content" class="row">
<div id="region-main-box" class="col-xs-12"> <div id="region-main-box" class="col-12">
{{#hasregionmainsettingsmenu}} {{#hasregionmainsettingsmenu}}
<div id="region-main-settings-menu" class="hidden-print {{#hasblocks}}has-blocks{{/hasblocks}}"> <div id="region-main-settings-menu" class="d-print-none {{#hasblocks}}has-blocks{{/hasblocks}}">
<div> {{{ output.region_main_settings_menu }}} </div> <div> {{{ output.region_main_settings_menu }}} </div>
</div> </div>
{{/hasregionmainsettingsmenu}} {{/hasregionmainsettingsmenu}}
<section id="region-main" {{#hasblocks}}class="has-blocks"{{/hasblocks}}> <section id="region-main" {{#hasblocks}}class="has-blocks mb-3"{{/hasblocks}}>
<div class="card card-block"> <div class="card">
<div class="card-body">
{{#hasregionmainsettingsmenu}} {{#hasregionmainsettingsmenu}}
<div class="region_main_settings_menu_proxy"></div> <div class="region_main_settings_menu_proxy"></div>
{{/hasregionmainsettingsmenu}} {{/hasregionmainsettingsmenu}}
...@@ -85,9 +79,10 @@ ...@@ -85,9 +79,10 @@
{{{ output.activity_navigation }}} {{{ output.activity_navigation }}}
{{{ output.course_content_footer }}} {{{ output.course_content_footer }}}
</div> </div>
</div>
</section> </section>
{{#hasblocks}} {{#hasblocks}}
<section data-region="blocks-column" class="hidden-print"> <section data-region="blocks-column" class="d-print-none">
{{{ sidepreblocks }}} {{{ sidepreblocks }}}
</section> </section>
{{/hasblocks}} {{/hasblocks}}
...@@ -96,28 +91,8 @@ ...@@ -96,28 +91,8 @@
</div> </div>
{{> theme_boost/nav-drawer }} {{> theme_boost/nav-drawer }}
</div> </div>
<footer id="page-footer" class="p-y-1 bg-inverse">
<div class="container">
<div id="course-footer">{{{ output.course_footer }}}</div>
{{# output.page_doc_link }}
<p class="helplink">{{{ output.page_doc_link }}}</p>
{{/ output.page_doc_link }}
{{{ output.login_info }}} {{> theme_boost/footer }}
<div class="tool_usertours-resettourcontainer"></div>
{{{ output.home_link }}}
<nav class="nav navbar-nav hidden-lg-up">
{{# output.custom_menu_flat }}
<ul class="list-unstyled p-t-1">
{{> theme_boost/custom_menu_footer }}
</ul>
{{/ output.custom_menu_flat }}
</nav>
{{{ output.standard_footer_html }}}
{{{ output.standard_end_of_body_html }}}
</div>
</footer>
</body> </body>
</html> </html>
......
templates/footer.mustache
+ 15
− 18
View file @ 4f46df8f
...@@ -33,8 +33,7 @@ ...@@ -33,8 +33,7 @@
"footerrightblocks": "<aside id='block-region-footer-right' class='block-region' data-blockregion='footer-right' data-droptarget='1'>This is the right footer region</aside>" "footerrightblocks": "<aside id='block-region-footer-right' class='block-region' data-blockregion='footer-right' data-droptarget='1'>This is the right footer region</aside>"
} }
}} }}
<footer id="page-footer" class="p-y-1 bg-inverse container-fluid"> <footer id="page-footer" class="py-3 bg-dark text-light">
<div class="container-fluid"> <div class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<div id="course-footer" class="col-12"> <div id="course-footer" class="col-12">
...@@ -44,7 +43,7 @@ ...@@ -44,7 +43,7 @@
{{! If admin setting is set to one footer column. }} {{! If admin setting is set to one footer column. }}
{{#footerblock1columns }} {{#footerblock1columns }}
{{! Add blocks to the first footer column.}} {{! Add blocks to the first footer column.}}
<section data-region="footer-left" class="hidden-print col-12"> <section data-region="footer-left" class="d-print-none col-12">
{{{ footerleftblocks }}} {{{ footerleftblocks }}}
</section> </section>
{{/footerblock1columns }} {{/footerblock1columns }}
...@@ -53,12 +52,12 @@ ...@@ -53,12 +52,12 @@
{{#footerblock2columns }} {{#footerblock2columns }}
{{! The layout is 2 columns on large screens. For medium and small screens it is better to display just 1 column.}} {{! The layout is 2 columns on large screens. For medium and small screens it is better to display just 1 column.}}
{{! Add blocks to the first footer column.}} {{! Add blocks to the first footer column.}}
<section data-region="footer-left" class="hidden-print col-12 col-lg-6"> <section data-region="footer-left" class="d-print-none col-12 col-lg-6">
{{{ footerleftblocks }}} {{{ footerleftblocks }}}
</section> </section>
{{! Add blocks to the third footer column.}} {{! Add blocks to the third footer column.}}
<section data-region="footer-right" class="hidden-print col-12 col-lg-6"> <section data-region="footer-right" class="d-print-none col-12 col-lg-6">
{{{ footerrightblocks }}} {{{ footerrightblocks }}}
</section> </section>
{{/footerblock2columns }} {{/footerblock2columns }}
...@@ -67,17 +66,17 @@ ...@@ -67,17 +66,17 @@
{{#footerblock3columns }} {{#footerblock3columns }}
{{! The layout is 3 columns on large screens. For medium and small screens it is better to display just 1 column.}} {{! The layout is 3 columns on large screens. For medium and small screens it is better to display just 1 column.}}
{{! Add blocks to the first footer column.}} {{! Add blocks to the first footer column.}}
<section data-region="footer-left" class="hidden-print col-12 col-lg-4"> <section data-region="footer-left" class="d-print-none col-12 col-lg-4">
{{{ footerleftblocks }}} {{{ footerleftblocks }}}
</section> </section>
{{! Add blocks to the second footer column.}} {{! Add blocks to the second footer column.}}
<section data-region="footer-middle" class="hidden-print col-12 col-lg-4"> <section data-region="footer-middle" class="d-print-none col-12 col-lg-4">
{{{ footermiddleblocks }}} {{{ footermiddleblocks }}}
</section> </section>
{{! Add blocks to the third footer column.}} {{! Add blocks to the third footer column.}}
<section data-region="footer-right" class="hidden-print col-12 col-lg-4"> <section data-region="footer-right" class="d-print-none col-12 col-lg-4">
{{{ footerrightblocks }}} {{{ footerrightblocks }}}
</section> </section>
{{/footerblock3columns }} {{/footerblock3columns }}
...@@ -89,7 +88,6 @@ ...@@ -89,7 +88,6 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<div class="col-12"> <div class="col-12">
{{# output.page_doc_link }} {{# output.page_doc_link }}
<p class="helplink">{{{ output.page_doc_link }}}</p> <p class="helplink">{{{ output.page_doc_link }}}</p>
{{/ output.page_doc_link }} {{/ output.page_doc_link }}
...@@ -97,9 +95,9 @@ ...@@ -97,9 +95,9 @@
{{{ output.login_info }}} {{{ output.login_info }}}
<div class="tool_usertours-resettourcontainer"></div> <div class="tool_usertours-resettourcontainer"></div>
{{{ output.home_link }}} {{{ output.home_link }}}
<nav class="nav navbar-nav hidden-lg-up"> <nav class="nav navbar-nav d-md-none">
{{# output.custom_menu_flat }} {{# output.custom_menu_flat }}
<ul class="list-unstyled p-t-1"> <ul class="list-unstyled pt-3">
{{> theme_boost/custom_menu_footer }} {{> theme_boost/custom_menu_footer }}
</ul> </ul>
{{/ output.custom_menu_flat }} {{/ output.custom_menu_flat }}
...@@ -108,6 +106,5 @@ ...@@ -108,6 +106,5 @@
{{{ output.standard_end_of_body_html }}} {{{ output.standard_end_of_body_html }}}
</div> </div>
</div> </div>
</div>
</footer> </footer>
templates/footer.mustache.original 0 → 100644
+ 41
− 0
View file @ 4f46df8f
{{!
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 <http://www.gnu.org/licenses/>.
}}
{{!
Page footer.
}}
<footer id="page-footer" class="py-3 bg-dark text-light">
<div class="container">
<div id="course-footer">{{{ output.course_footer }}}</div>
{{# output.page_doc_link }}
<p class="helplink">{{{ output.page_doc_link }}}</p>
{{/ output.page_doc_link }}
{{{ output.login_info }}}
<div class="tool_usertours-resettourcontainer"></div>
{{{ output.home_link }}}
<nav class="nav navbar-nav d-md-none">
{{# output.custom_menu_flat }}
<ul class="list-unstyled pt-3">
{{> theme_boost/custom_menu_footer }}
</ul>
{{/ output.custom_menu_flat }}
</nav>
{{{ output.standard_footer_html }}}
{{{ output.standard_end_of_body_html }}}
</div>
</footer>
\ No newline at end of file
templates/loginform.mustache
+ 110
− 110
View file @ 4f46df8f
...@@ -94,21 +94,18 @@ ...@@ -94,21 +94,18 @@
* Changed col- definitions for login form container * Changed col- definitions for login form container
}} }}
<div class="m-y-3 hidden-sm-down"></div> <div class="my-1 my-sm-5"></div>
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-6 col-lg-4 "> <div class="col-sm-12 col-md-6 col-lg-4 ">
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-body">
<div class="card-title text-xs-center">
{{#logourl}} {{#logourl}}
<h2><img src="{{logourl}}" title="{{sitename}}" alt="{{sitename}}"/></h2> <h2 class="card-header text-center" ><img src="{{logourl}}" title="{{sitename}}" alt="{{sitename}}"/></h2>
{{/logourl}} {{/logourl}}
{{^logourl}} {{^logourl}}
<h2>{{sitename}}</h2> <h2 class="card-header text-center">{{sitename}}</h2>
{{/logourl}} {{/logourl}}
<hr> <div class="card-body">
</div>
{{#cansignup}} {{#cansignup}}
<div class="sr-only"> <div class="sr-only">
<a href="{{signupurl}}">{{#str}} tocreatenewaccount {{/str}}</a> <a href="{{signupurl}}">{{#str}} tocreatenewaccount {{/str}}</a>
...@@ -116,18 +113,18 @@ ...@@ -116,18 +113,18 @@
{{/cansignup}} {{/cansignup}}
{{#error}} {{#error}}
<div class="loginerrors m-t-1"> <div class="loginerrors mt-3">
<a href="#" id="loginerrormessage" class="accesshide">{{error}}</a> <a href="#" id="loginerrormessage" class="accesshide">{{error}}</a>
<div class="alert alert-danger" role="alert">{{error}}</div> <div class="alert alert-danger" role="alert">{{error}}</div>
</div> </div>
{{/error}} {{/error}}
<div class="container"> <div class="row justify-content-md-center">
<div class="row"> <div class="col-12">
<form class="m-t-1" action="{{loginurl}}" method="post" id="login" {{^passwordautocomplete}}autocomplete="off"{{/passwordautocomplete}}> <form class="mt-3" action="{{loginurl}}" method="post" id="login">
<input id="anchor" type="hidden" name="anchor" value=""> <input id="anchor" type="hidden" name="anchor" value="">
<script>document.getElementById('anchor').value = location.hash;</script> <script>document.getElementById('anchor').value = location.hash;</script>
<div class="form-group">
<label for="username" class="sr-only"> <label for="username" class="sr-only">
{{^canloginbyemail}} {{^canloginbyemail}}
{{#str}} username {{/str}} {{#str}} username {{/str}}
...@@ -140,33 +137,35 @@ ...@@ -140,33 +137,35 @@
class="form-control" class="form-control"
value="{{username}}" value="{{username}}"
placeholder={{#quote}}{{^canloginbyemail}}{{#str}}username{{/str}}{{/canloginbyemail}}{{#canloginbyemail}}{{#str}}usernameemail{{/str}}{{/canloginbyemail}}{{/quote}}> placeholder={{#quote}}{{^canloginbyemail}}{{#str}}username{{/str}}{{/canloginbyemail}}{{#canloginbyemail}}{{#str}}usernameemail{{/str}}{{/canloginbyemail}}{{/quote}}>
</div>
<div class="form-group">
<label for="password" class="sr-only">{{#str}} password {{/str}}</label> <label for="password" class="sr-only">{{#str}} password {{/str}}</label>
<input type="password" name="password" id="password" value="" <input type="password" name="password" id="password" value=""
class="form-control" class="form-control"
placeholder={{#quote}}{{#str}}password{{/str}}{{/quote}} placeholder={{#quote}}{{#str}}password{{/str}}{{/quote}}>
</div>
{{#rememberusername}} {{#rememberusername}}
<div class="rememberpass m-t-1"> <div class="rememberpass mt-3">
<input type="checkbox" name="rememberusername" id="rememberusername" value="1" {{#username}}checked="checked"{{/username}} /> <input type="checkbox" name="rememberusername" id="rememberusername" value="1" {{#username}}checked="checked"{{/username}} />
<label for="rememberusername">{{#str}} rememberusername, admin {{/str}}</label> <label for="rememberusername">{{#str}} rememberusername, admin {{/str}}</label>
</div> </div>
{{/rememberusername}} {{/rememberusername}}
<button type="submit" class="btn btn-primary btn-block m-t-1" id="loginbtn">{{#str}}login{{/str}}</button> <button type="submit" class="btn btn-primary btn-block mt-3" id="loginbtn">{{#str}}login{{/str}}</button>
</form> </form>
</div> </div>
<div class="row"> <div class="col-12">
<div class="forgetpass m-a-1"> <div class="forgetpass mt-3">
<p><a href="{{forgotpasswordurl}}">{{#str}}forgotten{{/str}}</a></p> <p><a href="{{forgotpasswordurl}}">{{#str}}forgotten{{/str}}</a></p>
</div> </div>
<div class="m-a-1"> <div class="mt-3">
{{#str}} cookiesenabled {{/str}} {{#str}} cookiesenabled {{/str}}
{{{cookieshelpiconformatted}}} {{{cookieshelpiconformatted}}}
</div> </div>
{{#canloginasguest}} {{#canloginasguest}}
<div class="m-a-1"> <div class="mt-2">
<p>{{#str}}someallowguest{{/str}}</p> <p>{{#str}}someallowguest{{/str}}</p>
<form action="{{loginurl}}" method="post" id="guestlogin"> <form action="{{loginurl}}" method="post" id="guestlogin">
<input type="hidden" name="username" value="guest" /> <input type="hidden" name="username" value="guest" />
...@@ -177,8 +176,8 @@ ...@@ -177,8 +176,8 @@
{{/canloginasguest}} {{/canloginasguest}}
{{#hasidentityproviders}} {{#hasidentityproviders}}
<h6 class="m-t-2">{{#str}} potentialidps, auth {{/str}}</h6> <h6 class="mt-2">{{#str}} potentialidps, auth {{/str}}</h6>
<div class="potentialidplist" class="m-t-1"> <div class="potentialidplist" class="mt-3">
{{#identityproviders}} {{#identityproviders}}
<div class="potentialidp"> <div class="potentialidp">
<a href="{{url}}" title={{#quote}}{{name}}{{/quote}} class="btn btn-secondary btn-block"> <a href="{{url}}" title={{#quote}}{{name}}{{/quote}} class="btn btn-secondary btn-block">
...@@ -197,20 +196,21 @@ ...@@ -197,20 +196,21 @@
</div> </div>
</div> </div>
</div> </div>
</div>
{{#hasinstructions}} {{#hasinstructions}}
<div class="row"> <div class="row justify-content-center mt-3">
<div class="col-sm-12 col-md-6 col-lg-4"> <div class="col-xl-6 col-sm-8">
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-body">
<div class="card-title"> <div class="card-title">
<h2>{{#str}}firsttime{{/str}}</h2> <h2>{{#str}}firsttime{{/str}}</h2>
</div> </div>
<div> <div>
{{{instructions}}} {{{instructions}}}
{{#cansignup}} {{#cansignup}}
<form class="m-t-1" action="{{signupurl}}" method="get" id="signup"> <form class="mt-3" action="{{signupurl}}" method="get" id="signup">
<button type="submit" class="btn btn-secondary">{{#str}}startsignup{{/str}}</button> <button type="submit" class="btn btn-secondary">{{#str}}startsignup{{/str}}</button>
</form> </form>
{{/cansignup}} {{/cansignup}}
......
templates/loginform.mustache.original
+ 92
− 92
View file @ 4f46df8f
...@@ -91,21 +91,18 @@ ...@@ -91,21 +91,18 @@
} }
}} }}
<div class="m-y-3 hidden-sm-down"></div> <div class="my-1 my-sm-5"></div>
<div class="row"> <div class="row justify-content-center">
<div class="col-xl-6 push-xl-3 m-2-md col-sm-8 push-sm-2"> <div class="col-xl-6 col-sm-8 ">
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<div class="card-title text-xs-center">
{{#logourl}} {{#logourl}}
<h2><img src="{{logourl}}" title="{{sitename}}" alt="{{sitename}}"/></h2> <h2 class="card-header text-center" ><img src="{{logourl}}" title="{{sitename}}" alt="{{sitename}}"/></h2>
{{/logourl}} {{/logourl}}
{{^logourl}} {{^logourl}}
<h2>{{sitename}}</h2> <h2 class="card-header text-center">{{sitename}}</h2>
{{/logourl}} {{/logourl}}
<hr> <div class="card-body">
</div>
{{#cansignup}} {{#cansignup}}
<div class="sr-only"> <div class="sr-only">
<a href="{{signupurl}}">{{#str}} tocreatenewaccount {{/str}}</a> <a href="{{signupurl}}">{{#str}} tocreatenewaccount {{/str}}</a>
...@@ -113,18 +110,18 @@ ...@@ -113,18 +110,18 @@
{{/cansignup}} {{/cansignup}}
{{#error}} {{#error}}
<div class="loginerrors m-t-1"> <div class="loginerrors mt-3">
<a href="#" id="loginerrormessage" class="accesshide">{{error}}</a> <a href="#" id="loginerrormessage" class="accesshide">{{error}}</a>
<div class="alert alert-danger" role="alert">{{error}}</div> <div class="alert alert-danger" role="alert">{{error}}</div>
</div> </div>
{{/error}} {{/error}}
<div class="row"> <div class="row justify-content-md-center">
<div class="col-md-4 push-md-1"> <div class="col-md-5">
<form class="m-t-1" action="{{loginurl}}" method="post" id="login"> <form class="mt-3" action="{{loginurl}}" method="post" id="login">
<input id="anchor" type="hidden" name="anchor" value=""> <input id="anchor" type="hidden" name="anchor" value="">
<script>document.getElementById('anchor').value = location.hash;</script> <script>document.getElementById('anchor').value = location.hash;</script>
<div class="form-group">
<label for="username" class="sr-only"> <label for="username" class="sr-only">
{{^canloginbyemail}} {{^canloginbyemail}}
{{#str}} username {{/str}} {{#str}} username {{/str}}
...@@ -137,33 +134,35 @@ ...@@ -137,33 +134,35 @@
class="form-control" class="form-control"
value="{{username}}" value="{{username}}"
placeholder={{#quote}}{{^canloginbyemail}}{{#str}}username{{/str}}{{/canloginbyemail}}{{#canloginbyemail}}{{#str}}usernameemail{{/str}}{{/canloginbyemail}}{{/quote}}> placeholder={{#quote}}{{^canloginbyemail}}{{#str}}username{{/str}}{{/canloginbyemail}}{{#canloginbyemail}}{{#str}}usernameemail{{/str}}{{/canloginbyemail}}{{/quote}}>
</div>
<div class="form-group">
<label for="password" class="sr-only">{{#str}} password {{/str}}</label> <label for="password" class="sr-only">{{#str}} password {{/str}}</label>
<input type="password" name="password" id="password" value="" <input type="password" name="password" id="password" value=""
class="form-control" class="form-control"
placeholder={{#quote}}{{#str}}password{{/str}}{{/quote}}> placeholder={{#quote}}{{#str}}password{{/str}}{{/quote}}>
</div>
{{#rememberusername}} {{#rememberusername}}
<div class="rememberpass m-t-1"> <div class="rememberpass mt-3">
<input type="checkbox" name="rememberusername" id="rememberusername" value="1" {{#username}}checked="checked"{{/username}} /> <input type="checkbox" name="rememberusername" id="rememberusername" value="1" {{#username}}checked="checked"{{/username}} />
<label for="rememberusername">{{#str}} rememberusername, admin {{/str}}</label> <label for="rememberusername">{{#str}} rememberusername, admin {{/str}}</label>
</div> </div>
{{/rememberusername}} {{/rememberusername}}
<button type="submit" class="btn btn-primary btn-block m-t-1" id="loginbtn">{{#str}}login{{/str}}</button> <button type="submit" class="btn btn-primary btn-block mt-3" id="loginbtn">{{#str}}login{{/str}}</button>
</form> </form>
</div> </div>
<div class="col-md-4 push-md-3"> <div class="col-md-5">
<div class="forgetpass m-t-1"> <div class="forgetpass mt-3">
<p><a href="{{forgotpasswordurl}}">{{#str}}forgotten{{/str}}</a></p> <p><a href="{{forgotpasswordurl}}">{{#str}}forgotten{{/str}}</a></p>
</div> </div>
<div class="m-t-1"> <div class="mt-3">
{{#str}} cookiesenabled {{/str}} {{#str}} cookiesenabled {{/str}}
{{{cookieshelpiconformatted}}} {{{cookieshelpiconformatted}}}
</div> </div>
{{#canloginasguest}} {{#canloginasguest}}
<div class="m-t-2"> <div class="mt-2">
<p>{{#str}}someallowguest{{/str}}</p> <p>{{#str}}someallowguest{{/str}}</p>
<form action="{{loginurl}}" method="post" id="guestlogin"> <form action="{{loginurl}}" method="post" id="guestlogin">
<input type="hidden" name="username" value="guest" /> <input type="hidden" name="username" value="guest" />
...@@ -174,8 +173,8 @@ ...@@ -174,8 +173,8 @@
{{/canloginasguest}} {{/canloginasguest}}
{{#hasidentityproviders}} {{#hasidentityproviders}}
<h6 class="m-t-2">{{#str}} potentialidps, auth {{/str}}</h6> <h6 class="mt-2">{{#str}} potentialidps, auth {{/str}}</h6>
<div class="potentialidplist" class="m-t-1"> <div class="potentialidplist" class="mt-3">
{{#identityproviders}} {{#identityproviders}}
<div class="potentialidp"> <div class="potentialidp">
<a href="{{url}}" title={{#quote}}{{name}}{{/quote}} class="btn btn-secondary btn-block"> <a href="{{url}}" title={{#quote}}{{name}}{{/quote}} class="btn btn-secondary btn-block">
...@@ -194,20 +193,21 @@ ...@@ -194,20 +193,21 @@
</div> </div>
</div> </div>
</div> </div>
</div>
{{#hasinstructions}} {{#hasinstructions}}
<div class="row"> <div class="row justify-content-center mt-3">
<div class="col-xl-6 push-xl-3 m-2-md col-sm-8 push-sm-2"> <div class="col-xl-6 col-sm-8">
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-body">
<div class="card-title"> <div class="card-title">
<h2>{{#str}}firsttime{{/str}}</h2> <h2>{{#str}}firsttime{{/str}}</h2>
</div> </div>
<div> <div>
{{{instructions}}} {{{instructions}}}
{{#cansignup}} {{#cansignup}}
<form class="m-t-1" action="{{signupurl}}" method="get" id="signup"> <form class="mt-3" action="{{signupurl}}" method="get" id="signup">
<button type="submit" class="btn btn-secondary">{{#str}}startsignup{{/str}}</button> <button type="submit" class="btn btn-secondary">{{#str}}startsignup{{/str}}</button>
</form> </form>
{{/cansignup}} {{/cansignup}}
......
templates/settings_link_page.mustache
+ 53
− 57
View file @ 4f46df8f
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<div id="boost-campus-course-settings" class="card" > <div id="boost-campus-course-settings" class="card" >
<h2>{{incourse_node_heading}}</h2> <h2>{{incourse_node_heading}}</h2>
<div class="m-x-2 p-t-2"> <div class="mx-2 pt-2">
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<!-- First the top most node and immediate children --> <!-- First the top most node and immediate children -->
<li class="nav-item"> <li class="nav-item">
...@@ -66,8 +66,7 @@ ...@@ -66,8 +66,7 @@
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane active" id="course-settings-{{node.key}}" role="tabpanel"> <div class="tab-pane active" id="course-settings-{{node.key}}" role="tabpanel">
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-body pb-0">
<div class="container">
<div class="row"> <div class="row">
<div class="col-sm-4"> <div class="col-sm-4">
{{#action}}<h4><a href="{{action}}">{{text}}</a></h4>{{/action}} {{#action}}<h4><a href="{{action}}">{{text}}</a></h4>{{/action}}
...@@ -88,13 +87,11 @@ ...@@ -88,13 +87,11 @@
</div> </div>
</div> </div>
</div> </div>
</div>
{{#node.children}} {{#node.children}}
{{#children.count}} {{#children.count}}
<div class="tab-pane" id="course-settings-{{key}}" role="tabpanel"> <div class="tab-pane" id="course-settings-{{key}}" role="tabpanel">
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-body pb-0">
<div class="container">
<div class="row"> <div class="row">
<div class="col-sm-4"> <div class="col-sm-4">
{{#action}}<h4><a href="{{action}}">{{text}}</a></h4>{{/action}} {{#action}}<h4><a href="{{action}}">{{text}}</a></h4>{{/action}}
...@@ -135,7 +132,6 @@ ...@@ -135,7 +132,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
{{/children.count}} {{/children.count}}
{{/node.children}} {{/node.children}}
</div> </div>
......
templates/settings_link_page.mustache.original
+ 67
− 73
View file @ 4f46df8f
...@@ -56,13 +56,13 @@ ...@@ -56,13 +56,13 @@
{{/node.children}} {{/node.children}}
</ul> </ul>
<div class="tab-content"> <div class="tab-content mt-3">
<div class="tab-pane active" id="link{{node.key}}" role="tabpanel"> <div class="tab-pane active" id="link{{node.key}}" role="tabpanel">
<div class="card">
<div class="card-block">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-sm-9 push-sm-3"> <div class="col-sm-3">
</div>
<div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
{{#node.children}} {{#node.children}}
{{^children.count}} {{^children.count}}
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
{{#action}}<h4><a href="{{action}}">{{text}}</a><h4>{{/action}} {{#action}}<h4><a href="{{action}}">{{text}}</a><h4>{{/action}}
{{^action}}<h4>{{text}}<h4>{{/action}} {{^action}}<h4>{{text}}<h4>{{/action}}
</div> </div>
<div class="col-sm-9"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
{{#children}} {{#children}}
{{> core/settings_link_page_single }} {{> core/settings_link_page_single }}
...@@ -99,13 +99,9 @@ ...@@ -99,13 +99,9 @@
{{/node.children}} {{/node.children}}
</div> </div>
</div> </div>
</div>
</div>
{{#node.children}} {{#node.children}}
{{#children.count}} {{#children.count}}
<div class="tab-pane" id="link{{key}}" role="tabpanel"> <div class="tab-pane" id="link{{key}}" role="tabpanel">
<div class="card">
<div class="card-block">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-sm-3"> <div class="col-sm-3">
...@@ -146,8 +142,6 @@ ...@@ -146,8 +142,6 @@
{{/children}} {{/children}}
</div> </div>
</div> </div>
</div>
</div>
{{/children.count}} {{/children.count}}
{{/node.children}} {{/node.children}}
</div> </div>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment