diff options
| author | Andrew Manning <tamanning@zoho.com> | 2017-02-01 20:07:38 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2017-02-01 20:07:38 -0500 |
| commit | 0ae3e50bd4e83011034ba70ecec91b6f6fe295ee (patch) | |
| tree | e84e3e107373aa0adf97d42dfaab60a04970ae4f | |
| parent | 61407ad6c833b67398736e04742f8e6ca0c17a2a (diff) | |
| parent | db710cd2dfc67f4bb4c6dfde5ff62cf0a11d9f08 (diff) | |
| download | volse-hubzilla-0ae3e50bd4e83011034ba70ecec91b6f6fe295ee.tar.gz volse-hubzilla-0ae3e50bd4e83011034ba70ecec91b6f6fe295ee.tar.bz2 volse-hubzilla-0ae3e50bd4e83011034ba70ecec91b6f6fe295ee.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
| -rwxr-xr-x | boot.php | 3 | ||||
| -rw-r--r-- | include/nav.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 16 | ||||
| -rwxr-xr-x | view/tpl/login.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/remote_login.tpl | 2 |
6 files changed, 18 insertions, 17 deletions
@@ -1694,7 +1694,7 @@ function fix_system_urls($oldurl, $newurl) { // link. This will most always depend on the value of App::$config['system']['register_policy']. // returns the complete html for inserting into the page -function login($register = false, $form_id = 'main-login', $hiddens=false) { +function login($register = false, $form_id = 'main-login', $hiddens=false, $login_page = true) { $o = ''; $reg = false; $reglink = get_config('system', 'register_link'); @@ -1720,6 +1720,7 @@ function login($register = false, $form_id = 'main-login', $hiddens=false) { $o .= replace_macros($tpl,array( '$dest_url' => $dest_url, + '$login_page' => $login_page, '$logout' => t('Logout'), '$login' => t('Login'), '$form_id' => $form_id, diff --git a/include/nav.php b/include/nav.php index 25f2a1df4..7d6877600 100644 --- a/include/nav.php +++ b/include/nav.php @@ -112,7 +112,7 @@ EOT; } else { if(! get_account_id()) { - $nav['login'] = login(); + $nav['login'] = login(true,'main-login',false,false); $nav['loginmenu'][] = Array('login',t('Login'),'',t('Sign in'),'login_nav_btn'); } else diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index cd222e06d..77b969712 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2106,16 +2106,20 @@ dl.bb-dl > dd > li { text-align: center; } -.rmagic-button { - padding-top: 10px; - margin-left: 10px; - margin-bottom: 10px; -} - #nav-login { display: none; width: 200px; border: 1px solid #ccc; border-radius: $radiuspx; +} + +.login-dropdown-menu { + padding: 8px; + background-color: #eee; +} + +.rmagic-button { + margin: 15px 0 5px; + }
\ No newline at end of file diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl index d56c8f272..1c2841adf 100755 --- a/view/tpl/login.tpl +++ b/view/tpl/login.tpl @@ -1,4 +1,6 @@ +{{if $login_page}} <div class="generic-content-wrapper-styled"> +{{/if}} <form action="{{$dest_url}}" id="{{$form_id}}" method="post" > <input type="hidden" name="auth-params" value="login" /> <div id="login-main"> @@ -17,5 +19,7 @@ <input type="hidden" name="{{$k}}" value="{{$v}}" /> {{/foreach}} </form> +{{if $login_page}} </div> <script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script> +{{/if}}
\ No newline at end of file diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 86f9d5cf9..bda833b94 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -160,16 +160,8 @@ <div id="nav-login" class="login-dropdown-menu" style="display:none; width:150%;"> {{$nav.login}} {{$nav.remote_login}} - - <!-- {{foreach $nav.loginmenu as $loginmenu}} - <li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem" id="{{$loginmenu.4}}">{{$loginmenu.1}}</a></li> - {{/foreach}} --> </div> </li> -<!-- {{foreach $nav.loginmenu as $loginmenu}} - <li role="presentation"><a class="{{$loginmenu.2}} visible-xs" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li> - {{/foreach}} ---> {{/if}} {{if $nav.register}} diff --git a/view/tpl/remote_login.tpl b/view/tpl/remote_login.tpl index 1d11fb712..e6d387265 100644 --- a/view/tpl/remote_login.tpl +++ b/view/tpl/remote_login.tpl @@ -1 +1 @@ -<a href="rmagic" class="btn btn-default rmagic-button">{{$title}}</a> +<a href="rmagic" class="btn btn-block btn-success rmagic-button">{{$title}}</a> |