summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Häusler <msquare@notrademark.de>2014-09-06 15:03:08 +0200
committerPhilip Häusler <msquare@notrademark.de>2014-09-08 13:57:36 +0200
commit1785c386989860f0608be245c02d03645a608cfc (patch)
treea9b0e54259cbbf523f2848a00a8a1c3fdf8a0980
parent4414358cf5abf410368341d80ec72340011d5b29 (diff)
fix login layout and add mobile nav
-rw-r--r--includes/pages/guest_login.php2
-rw-r--r--templates/layout.html16
2 files changed, 12 insertions, 6 deletions
diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php
index efacaeb9..c255266d 100644
--- a/includes/pages/guest_login.php
+++ b/includes/pages/guest_login.php
@@ -255,7 +255,7 @@ function guest_login() {
return page_with_title(login_title(), array(
msg(),
- '<div class="container"><div class="col-md-6">',
+ '<div class="row"><div class="col-md-6">',
form(array(
form_text('nick', _("Nick"), $nick),
form_password('password', _("Password")),
diff --git a/templates/layout.html b/templates/layout.html
index 297cf9a7..25b539eb 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -18,7 +18,13 @@
<body>
<div class="navbar navbar-default navbar-fixed-top">
<div class="container-fluid">
- <a class="navbar-brand" href="?"><span class="icon-icon_angel"></span> <strong>ENGELSYSTEM</strong></a> %header_toolbar%
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
+ <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="?"><span class="icon-icon_angel"></span> <strong>ENGELSYSTEM</strong></a>
+ </div>
+ <div class="collapse navbar-collapse" id="navbar-collapse-1">%header_toolbar%</div>
</div>
</div>
<div class="container-fluid">
@@ -40,10 +46,10 @@
<script type="text/javascript" src="js/forms.js"></script>
<script type="text/javascript" src="vendor/moment-with-locales.min.js"></script>
<script type="text/javascript">
- $(function() {
- moment.locale("%locale%");
- });
- </script>
+ $(function() {
+ moment.locale("%locale%");
+ });
+ </script>
<script type="text/javascript" src="js/moment-countdown.js"></script>
</body>
</html>