pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed authentication

Browse source
This commit is contained in:
Teja 2015-02-11 13:02:30 +01:00
parent 8f7b92f33b
commit 9c0e2b29ea
4 changed files with 16 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/octoprint/plugins/laser_safety_notes/__init__.py
View file

@ -64,7 +64,6 @@ class LaserSafetyNotesPlugin(octoprint.plugin.SettingsPlugin,
if(s.get(["agreed_to_safety_notes"])):
clazz = "hide"
d = dict(has_agreed_class = clazz)
print("foo", d)
return d
def get_template_folder(self):

40
src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
View file

@ -12,7 +12,7 @@
</head>
<body>
<div class="container octoprint-container">
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
<nav class="navbar navbar-default navbar-fixed-top" role="navigation" id="navbar">
<div class="container">
<div class="navbar-header brand" style="min-width: 272px;">
<a class="navbar-brand" href="#">
@ -25,11 +25,6 @@
<!--<li><a href="#gcode" data-toggle="tab">gcode</a></li>-->
<li><a href="#focus" data-toggle="tab">focus</a></li>
<li><a href="#term" data-toggle="tab">terminal</a></li>
<li xstyle="display: none;" xdata-bind="visible: loginState.isAdmin">
<a id="navbar_show_settings" class="pull-right" href="#settings" data-toggle="tab"><i class="icon-gear"></i></a>
</li>
</ul>
<ul class="nav pull-right">
{% if enableSystemMenu %}
<li class="dropdown" style="display: none" data-bind="visible: loginState.isAdmin">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
@ -41,28 +36,17 @@
</ul>
</li>
{% endif %}
{% 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 %}
{% for data in navbarEntries %}
{% if "custom_bindings" not in data or data["custom_bindings"] %}<!-- ko allowBindings: false -->{% endif %}
<li id="{{ data._div }}"
{% if "data_bind" in data %}data-bind="{{ data.data_bind }}"{% endif %}
{% if "classes" in data %}class="{{ data.classes|join(' ') }}"{% endif %}
{% if "styles" in data %}style="{{ data.styles|join(', ') }}"{% endif %}
>
{% include data.template ignore missing %}
</li>
{% if "custom_bindings" not in data or data["custom_bindings"] %}<!-- /ko -->{% endif %}
{% endfor %}
</ul>
</div>
</nav>

2
src/octoprint/static/js/app/main.js
View file

@ -507,7 +507,7 @@ $(function() {
gcodeViewModel.initialize();
ko.applyBindings(gcodeViewModel, gcode);
}
// ko.applyBindings(navigationViewModel, document.getElementById("navbar"));
ko.applyBindings(navigationViewModel, document.getElementById("navbar"));
// ko.applyBindings(appearanceViewModel, document.getElementsByTagName("head")[0]);
// ko.applyBindings(printerStateViewModel, document.getElementById("drop_overlay"));
// ko.applyBindings(logViewModel, document.getElementById("logs"));

6
src/octoprint/templates/navbar/settings.jinja2
View file

@ -1,3 +1,3 @@
<a id="navbar_show_settings" class="pull-right" href="#settings_dialog">
<i class="icon-wrench"></i> {{ _('Settings') }}
</a>
<a id="navbar_show_settings" class="pull-right" href="#settings" data-toggle="tab">
<i class="icon-wrench"></i>
</a>