Merge branch 'devel' into dev/templateRefactoring

src/octoprint/templates/navbar/login.jinja2

@@ -0,0 +1,22 @@
+{% if enableAccessControl %}
+    <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+            <i class="icon-user"></i> <span data-bind="text: loginState.userMenuText">{{ _('Login') }}</span>
+            <b class="caret"></b>
+        </a>
+        <div id="login_dropdown_loggedout" style="padding: 15px" class="dropdown-menu" data-bind="css: {hide: loginState.loggedIn(), 'dropdown-menu': !loginState.loggedIn()}">
+            <label for="login_user">{{ _('Username') }}</label>
+            <input type="text" id="login_user" placeholder="{{ _('Username') }}" autocapitalize="none">
+            <label for="login_pass">{{ _('Password') }}</label>
+            <input type="password" id="login_pass" placeholder="{{ _('Password') }}">
+            <label class="checkbox">
+                <input type="checkbox" id="login_remember"> {{ _('Remember me') }}
+            </label>
+            <button class="btn btn-block btn-primary" id="login_button" data-bind="click: loginState.login">{{ _('Login') }}</button>
+        </div>
+        <ul id="login_dropdown_loggedin" class="hide" data-bind="css: {hide: !loginState.loggedIn(), 'dropdown-menu': loginState.loggedIn()}">
+            <li><a href="#" id="change_password_button" data-bind="click: function() { users.showChangePasswordDialog(loginState.currentUser()); }">{{ _('Change Password') }}</a></li>
+            <li><a href="#" id="logout_button" data-bind="click: loginState.logout">{{ _('Logout') }}</a></li>
+        </ul>
+    </li>
+{% endif %}

src/octoprint/templates/navbar/settings.jinja2

@@ -0,0 +1,5 @@
+<li style="display: none;" data-bind="visible: loginState.isAdmin">
+    <a id="navbar_show_settings" class="pull-right" href="#settings_dialog">
+        <i class="icon-wrench"></i> {{ _('Settings') }}
+    </a>
+</li>

src/octoprint/templates/navbar/systemmenu.jinja2

@@ -0,0 +1,11 @@
+{% if enableSystemMenu %}
+    <li class="dropdown" style="display: none" data-bind="visible: loginState.isAdmin">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+            <i class="icon-off"></i> {{ _('System') }}
+            <b class="caret"></b>
+        </a>
+        <ul class="dropdown-menu" data-bind="foreach: systemActions">
+            <li><a href="#" data-bind="click: $root.triggerAction, text: name"></a></li>
+        </ul>
+    </li>
+{% endif %}