summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Klinger2016-06-15 16:42:18 +0200
committerChristian Klinger2016-06-15 16:42:18 +0200
commit6fcf1047caa1d8f57f4f1fbc355f4007656d15d2 (patch)
treea421bac6697148bb9bc0a6a35b5da389a2de3ada
parentMultiple locations per exam. (diff)
downloadslx-admin-6fcf1047caa1d8f57f4f1fbc355f4007656d15d2.tar.gz
slx-admin-6fcf1047caa1d8f57f4f1fbc355f4007656d15d2.tar.xz
slx-admin-6fcf1047caa1d8f57f4f1fbc355f4007656d15d2.zip
small style changes
-rw-r--r--modules-available/exams/templates/page-exams.html2
-rw-r--r--modules-available/main/templates/main-menu.html24
-rw-r--r--style/default.css4
3 files changed, 25 insertions, 5 deletions
diff --git a/modules-available/exams/templates/page-exams.html b/modules-available/exams/templates/page-exams.html
index 95c73d34..9e3c102f 100644
--- a/modules-available/exams/templates/page-exams.html
+++ b/modules-available/exams/templates/page-exams.html
@@ -29,7 +29,7 @@
</table>
<a href="?do=exams&action=add" class="btn btn-success">Add Exam </a>
- <div id="timeline"> </div>
+ <div class="block" id="timeline"> </div>
</div>
<script type="application/javascript"><!--
diff --git a/modules-available/main/templates/main-menu.html b/modules-available/main/templates/main-menu.html
index af8f833f..b14d1ace 100644
--- a/modules-available/main/templates/main-menu.html
+++ b/modules-available/main/templates/main-menu.html
@@ -52,11 +52,12 @@
</ul>
</li>
</ul>
- <ul class="nav navbar-nav navbar-right">
+
+ <ul class="nav navbar-nav navbar-right visible-xs visible-lg">
{{#user}}
<li><span>{{lang_loggedInPrefix}} {{user}} {{lang_loggedInSuffix}}</span></li>
<li>
- <form method="post" action="?do=Session">
+ <form id="logoutForm" method="post" action="?do=Session">
<input type="hidden" name="token" value="{{token}}">
<input type="hidden" name="action" value="logout">
<button class="btn btn-default btn-xs" type="submit">{{lang_logout}}</button>
@@ -67,6 +68,25 @@
<li><a href="?do=Session&amp;action=login">{{lang_login}}</a></li>
{{/user}}
</ul>
+
+ <ul class="nav navbar-nav navbar-right visible-sm visible-md" style="margin-top:10px">
+ {{#user}}
+ <ul class="btn-group">
+ <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+ {{user}}
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu">
+ <li><a href="#">Settings</a></li>
+ <li role="separator" class="divider"></li>
+ <li><a href="#" onclick="$('#logoutForm').submit();">{{lang_logout}}</a></li>
+ </ul>
+ </ul>
+ {{/user}}
+ {{^user}}
+ <a type="button" href="?do=Session&action=login" class="btn btn-default">{{lang_login}}</a>
+ {{/user}}
+ </ul>
</div>
</div>
</nav>
diff --git a/style/default.css b/style/default.css
index 9fa2db8d..d49bcb18 100644
--- a/style/default.css
+++ b/style/default.css
@@ -347,7 +347,7 @@ nav.sidebar li {
margin-top: 32px;
min-width: 900px;
position: absolute;
- width: calc(100% - 200px);
+ width: calc(100% - 220px);
}
.navbar-inverse,.sidebar-bg
@@ -377,7 +377,7 @@ nav.sidebar li {
display: none;
}
- .dropdown-toggle
+ nav .dropdown-toggle
{
background-color: transparent !important;
color: #fff !important;