aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-02-02 09:38:07 +0100
committerMario Vavti <mario@mariovavti.com>2017-02-02 09:38:07 +0100
commitc3bada3c329cac9b712e0d4d0c5fb0bb73f24d45 (patch)
treea13c2d56c1b14ba99a853fb7494a9214d075554d /view/tpl
parent2e0180ba55e5cbefcfc4066a82dbcaa5b59cacc2 (diff)
parent23303391e070120851d505a2ec8f3b9b696329e2 (diff)
downloadvolse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.tar.gz
volse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.tar.bz2
volse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.zip
resolve merge conflict
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/login.tpl4
-rwxr-xr-xview/tpl/nav.tpl8
-rw-r--r--view/tpl/remote_login.tpl2
3 files changed, 5 insertions, 9 deletions
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 bd829d4d3..f74c88ce7 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -147,16 +147,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>