ajustes estadão

danielneis · Apr 15, 2024 · d555a42 · d555a42
1 parent 260f525
commit d555a42
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 28 deletions.
diff --git a/layout/includes/blockregions.php b/layout/includes/blockregions.php
@@ -67,13 +67,14 @@ public function regionsdata() {
         global $OUTPUT, $PAGE;
 
         $regionsdata = [];
-        foreach ($this->regions as $name => $region) {
+	foreach ($this->regions as $name => $region) {
 
+            /* 
             if (!has_capability('theme/boost_union:viewregion'.$name, $PAGE->context)) {
                 $regionsdata[$name] = ['hasblocks' => false];
                 continue;
             }
-
+            */
             $regionhtml = $OUTPUT->blocks($region);
             $blockbutton = (has_capability('theme/boost_union:editregion'.$name, $PAGE->context)) ?
                              $OUTPUT->addblockbutton($region) : '';

diff --git a/templates/core/loginform.mustache b/templates/core/loginform.mustache
@@ -121,6 +121,22 @@
     {{#cansignup}}
         <a href="{{signupurl}}" class="sr-only">{{#str}} tocreatenewaccount {{/str}}</a>
     {{/cansignup}}
+    <h2 id="start">Dê start nos seus estudos!</h2>
+    {{#hasidentityproviders}}
+        <div class="login-divider"></div>
+        <div class="login-identityproviders mb-5">
+            <h2 class="login-heading">{{#str}} potentialidps, auth {{/str}}</h2>
+            {{#identityproviders}}
+                <a class="btn login-identityprovider-btn btn-block btn-secondary" href="{{url}}">
+                    {{#iconurl}}
+                        <img src="{{iconurl}}" alt="" width="24" height="24"/>
+                    {{/iconurl}}
+                    {{name}}
+                </a>
+            {{/identityproviders}}
+        </div>
+        <div class="login-divider"></div>
+    {{/hasidentityproviders}}
     <form class="login-form" action="{{loginurl}}" method="post" id="login">
         <input id="anchor" type="hidden" name="anchor" value="">
         <script>document.getElementById('anchor').value = location.hash;</script>
@@ -148,27 +164,25 @@
                 !}}placeholder="{{#cleanstr}}password{{/cleanstr}}" {{!
                 !}}autocomplete="current-password">
         </div>
-        <div class="login-form-submit form-group">
+<div class="row">
+        <div class="login-form-submit form-group col">
             <button class="btn btn-primary btn-lg" type="submit" id="loginbtn">{{#str}}login{{/str}}</button>
         </div>
+	{{#canloginasguest}}
+<div class="col">
+	    <form action="{{loginurl}}" method="post" id="guestlogin">
+	        <input type="hidden" name="logintoken" value="{{logintoken}}">
+	        <input type="hidden" name="username" value="guest" />
+	        <input type="hidden" name="password" value="guest" />
+	        <button class="btn btn-secondary" type="submit" id="loginguestbtn">{{#str}}loginguest{{/str}}</button>
+	    </form>
+</div>
+</div>
+	{{/canloginasguest}}
         <div class="login-form-forgotpassword form-group">
             <a href="{{forgotpasswordurl}}">{{#str}}forgotaccount{{/str}}</a>
         </div>
     </form>
-    {{#hasidentityproviders}}
-        <div class="login-divider"></div>
-        <div class="login-identityproviders">
-            <h2 class="login-heading">{{#str}} potentialidps, auth {{/str}}</h2>
-            {{#identityproviders}}
-                <a class="btn login-identityprovider-btn btn-block btn-secondary" href="{{url}}">
-                    {{#iconurl}}
-                        <img src="{{iconurl}}" alt="" width="24" height="24"/>
-                    {{/iconurl}}
-                    {{name}}
-                </a>
-            {{/identityproviders}}
-        </div>
-    {{/hasidentityproviders}}
     {{#hasinstructions}}
         <div class="login-divider"></div>
         <div class="login-instructions {{#cansignup}}mb-3{{/cansignup}}">
@@ -181,17 +195,6 @@
             <a class="btn btn-secondary" href="{{signupurl}}">{{#str}}startsignup{{/str}}</a>
         </div>
     {{/cansignup}}
-    {{#canloginasguest}}
-        <div class="login-divider"></div>
-        <h2 class="login-heading">{{#str}}someallowguest{{/str}}</h2>
-        <form action="{{loginurl}}" method="post" id="guestlogin">
-            <input type="hidden" name="logintoken" value="{{logintoken}}">
-            <input type="hidden" name="username" value="guest" />
-            <input type="hidden" name="password" value="guest" />
-            <button class="btn btn-secondary" type="submit" id="loginguestbtn">{{#str}}loginguest{{/str}}</button>
-        </form>
-    {{/canloginasguest}}
-    <div class="login-divider"></div>
     <div class="d-flex">
         {{#languagemenu}}
             <div class="login-languagemenu">