diff options
| -rw-r--r-- | Zotlabs/Module/Home.php | 15 | ||||
| -rw-r--r-- | Zotlabs/Module/Login.php | 11 | ||||
| -rw-r--r-- | view/tpl/login.tpl | 7 | ||||
| -rw-r--r-- | view/tpl/rmagic.tpl | 14 |
4 files changed, 35 insertions, 12 deletions
diff --git a/Zotlabs/Module/Home.php b/Zotlabs/Module/Home.php index 691ca1af9..3ac445f9f 100644 --- a/Zotlabs/Module/Home.php +++ b/Zotlabs/Module/Home.php @@ -100,14 +100,25 @@ class Home extends Controller { goaway($frontpage); } + $o .= '<div class="generic-content-wrapper">'; + $sitename = Config::Get('system', 'sitename'); - if ($sitename) - $o .= '<h1 class="home-welcome">' . sprintf(t('Welcome to %s'), $sitename) . '</h1>'; + if ($sitename) { + $o .= '<div class="section-title-wrapper">'; + $o .= '<h2 class="">' . sprintf(t('Welcome to %s'), $sitename) . '</h2>'; + $o .= '</div>'; + + } + + $o .= '<div class="section-content-wrapper">'; $loginbox = Config::Get('system', 'login_on_homepage'); if (intval($loginbox) || $loginbox === false) $o .= login(true); + $o .= '</div>'; + $o .= '</div>'; + return $o; } diff --git a/Zotlabs/Module/Login.php b/Zotlabs/Module/Login.php index 721ac15ac..269990a54 100644 --- a/Zotlabs/Module/Login.php +++ b/Zotlabs/Module/Login.php @@ -10,7 +10,16 @@ class Login extends \Zotlabs\Web\Controller { if(remote_channel() && $_SESSION['atoken']) goaway(z_root()); - return login(true); + $o = '<div class="generic-content-wrapper">'; + $o .= '<div class="section-title-wrapper">'; + $o .= '<h2 class="">' . t('Login') . '</h2>'; + $o .= '</div>'; + $o .= '<div class="section-content-wrapper">'; + $o .= login(true); + $o .= '</div>'; + $o .= '</div>'; + + return $o; } } diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl index ead524193..778a48cc0 100644 --- a/view/tpl/login.tpl +++ b/view/tpl/login.tpl @@ -1,17 +1,18 @@ <form action="{{$dest_url}}" id="{{$form_id}}" method="post" > <input type="hidden" name="auth-params" value="login" /> - <div class="login-wrapper d-grid gap-2"> + <div> {{include file="field_input.tpl" field=$lname}} {{include file="field_password.tpl" field=$lpassword}} {{include file="field_checkbox.tpl" field=$remember_me}} <button type="submit" name="submit" class="btn btn-primary">{{$login}}</button> - {{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" class="register-link float-end">{{$register.desc}}</a>{{/if}} {{if $lostlink}}<a href="lostpass" title="{{$lostpass}}" class="lost-pass-link">{{$lostlink}}</a>{{/if}} <hr> <a href="rmagic" class="btn btn-outline-success">{{$remote_login}}</a> + {{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" class="register-link float-end">{{$register.desc}}</a>{{/if}} + </div> {{foreach $hiddens as $k=>$v}} - <input type="hidden" name="{{$k}}" value="{{$v}}" /> + <input type="hidden" name="{{$k}}" value="{{$v}}" /> {{/foreach}} </form> {{if $login_page}} diff --git a/view/tpl/rmagic.tpl b/view/tpl/rmagic.tpl index bc181c323..e852223e0 100644 --- a/view/tpl/rmagic.tpl +++ b/view/tpl/rmagic.tpl @@ -1,9 +1,11 @@ -<div class="generic-content-wrapper-styled"> - <h3>{{$title}}</h3> - <form action="rmagic" method="post" > - <div class="mb-3"> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <div class="section-content-wrapper"> + <form action="rmagic" method="post" > {{include file="field_input.tpl" field=$address}} <input class="btn btn-primary" type="submit" name="submit" id="rmagic-submit-button" value="{{$submit}}" /> - </div> - </form> + </form> + </div> </div> |