Skip to content

Commit

Permalink
Merge pull request #299 from SpiderOak/BAC-3395/test_ldap_credentials
Browse files Browse the repository at this point in the history 
Bac 3395/test ldap credentials
  • Loading branch information
@bdzim
bdzim authored Oct 17, 2017
2 parents c817923 + 7831eca commit 7e3af19
Show file tree
Hide file tree
Showing 24 changed files with 517 additions and 473 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ apply_scripts:

manage:
cd ~/netkes/django/omva; \
. /etc/default/openmanage; python manage.py ${COMMAND}
sudo bash -c ". /etc/default/openmanage; python manage.py ${COMMAND}"

test_netkes:
. /etc/default/openmanage; python -m netkes/account_mgr/test/test_account_mgr
Expand Down
20 changes: 20 additions & 0 deletions django/apps/blue_management/blue_mgnt/migrations/0004_auto_20171011_1322.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11 on 2017-10-11 13:22
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('blue_mgnt', '0003_invoicenote'),
]

operations = [
migrations.AlterField(
model_name='invoicenote',
name='note',
field=models.TextField(default=b'', help_text=b'An optional note that will appear on your invoices. Use this if you need to add an address, VAT number, or similar.'),
),
]
191 changes: 95 additions & 96 deletions django/apps/blue_management/blue_mgnt/templates/base.html
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<!doctype html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>{% block title %}{% endblock title %}</title>
<meta name="description" content="{% block meta_description %}{% endblock meta_description %}" />
<meta name="keywords" content="{% block meta_keywords %}{% endblock meta_keywords %}" />
<meta name="robots" content="{% block meta_bots %}noindex, nofollow{% endblock meta_bots %}" />
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>{% block title %}{% endblock title %}</title>
<meta name="description" content="{% block meta_description %}{% endblock meta_description %}" />
<meta name="keywords" content="{% block meta_keywords %}{% endblock meta_keywords %}" />
<meta name="robots" content="{% block meta_bots %}noindex, nofollow{% endblock meta_bots %}" />
<meta http-equiv="refresh" content="905" />

{% block base_styles %}
{% endblock base_styles %}
{% block base_styles %}
{% endblock base_styles %}

{% with dev=False %}
{% block styles %}
<link rel="stylesheet" href="/static/blue_mgnt/css/ss-standard.css" />

{% if dev %}
<link rel="stylesheet/less" href="/static/blue_mgnt/less/style.less" type="text/css" />
<script type="text/javascript" src="/static/blue_mgnt/vendor/less-1.5.0.min.js"></script>
<script type="text/javascript">
less.env = "development";
</script>
{% else %}
<link rel="stylesheet" href="/static/blue_mgnt/css/console-min.css?v=20170215.0" />
{% endif %}
{% if dev %}
<link rel="stylesheet/less" href="/static/blue_mgnt/less/style.less" type="text/css" />
<script type="text/javascript" src="/static/blue_mgnt/vendor/less-1.5.0.min.js"></script>
<script type="text/javascript">
less.env = "development";
</script>
{% else %}
<link rel="stylesheet" href="/static/blue_mgnt/css/console-min.css?v=20170215.0" />
{% endif %}

{% endblock styles %}
{% endwith %}
Expand All @@ -32,89 +32,88 @@
<script src="/static/blue_mgnt/vendor/jquery-1.10.2.min.js" type="text/javascript"></script>
<script src="/static/blue_mgnt/js/jquery.cookie-1.4.1.js" type="text/javascript"></script>
<script src="/static/blue_mgnt/js/console.js" type="text/javascript"></script>
{% endblock jquery %}
<!--[if lt IE 9]>
<script src="/static/blue_common/scripts/html5shiv.js"></script>
<![endif]-->
</head>
<body class="{% block body_classes %}{% endblock body_classes %}">
{% endblock jquery %}
<!--[if lt IE 9]>
<script src="/static/blue_common/scripts/html5shiv.js"></script>
<![endif]-->
</head>
<body class="{% block body_classes %}{% endblock body_classes %}">
<div class="shield">
<img src="/static/blue_mgnt/img/loading.gif" class="loader" />
<img src="/static/blue_mgnt/img/loading.gif" class="loader" />
</div>
{% if not request_login %}
{% if not request_login %}
{% block modal_options %}{% endblock modal_options %}
<div id="bg-gradient">
<div><!--ZKP--></div>
</div>
<div id="bg-gradient">
<div><!--ZKP--></div>
</div>

<header>
<div>
<h1>
<a href="/">
<img src="/static/blue_mgnt/img/spideroak-logo-white.png" alt="logo" />
</a>
</h1>
<ul>
<li>{{ account_info.info.company_name }}</li>
<li>{{ username }}</li>
<li class="line"><a target="_blank" href="https://spideroak.com/mcuserman/">
<i class="ss-icon">&#x2753;</i>Help
</a></li>
<li class="line"><a href="{% url "blue_mgnt:logout" %}"><i class="ss-icon">&#x1F512;</i>Logout</a></li>
</ul>
</div>
</header>
<header>
<div>
<h1>
<a href="/">
<img src="/static/blue_mgnt/img/spideroak-logo-white.png" alt="logo" />
</a>
</h1>
<ul>
<li>{{ account_info.info.company_name }}</li>
<li>{{ username }}</li>
<li class="line"><a target="_blank" href="https://spideroak.com/mcuserman/">
<i class="ss-icon">&#x2753;</i>Help
</a></li>
<li class="line"><a href="{% url "blue_mgnt:logout" %}"><i class="ss-icon">&#x1F512;</i>Logout</a></li>
</ul>
</div>
</header>

<div class="overlord">
{% block navtab %}{% include "partials/navtab-widget.html" %}{% endblock navtab %}
<div class="account-overview">
<ul>
<li>
<i class="ss-icon">&#x1F464;</i>
<strong>Total Users:</strong>
{{account_info.total_users}}
</li>
<li>
<i class="ss-icon">&#x1F465;</i>
<strong>Total Groups:</strong>
{{account_info.total_groups}}
</li>
<li>
<i class="ss-icon">&#xEE00;</i>
<strong>Total Shares:</strong>
{{account_info.share_count }}
</li>
</ul>
</div>
<div class="spacer"><!--ZKP--></div>
<div class="breadcrumb">{% block breadcrumb %}{% endblock breadcrumb%}</div>
<div class="spacer"><!--ZKP--></div>
{% endif %}
{% if request_login %}
<div class="overlord">
{% endif %}
<div class="content">{% block content %}{% endblock content %}</div>
<div class="overlord">
{% block navtab %}{% include "partials/navtab-widget.html" %}{% endblock navtab %}
<div class="account-overview">
<ul>
<li>
<i class="ss-icon">&#x1F464;</i>
<strong>Total Users:</strong>
{{account_info.total_users}}
</li>
<li>
<i class="ss-icon">&#x1F465;</i>
<strong>Total Groups:</strong>
{{account_info.total_groups}}
</li>
<li>
<i class="ss-icon">&#xEE00;</i>
<strong>Total Shares:</strong>
{{account_info.share_count }}
</li>
</ul>
</div>
<div class="spacer"><!--ZKP--></div>
<div class="breadcrumb">{% block breadcrumb %}{% endblock breadcrumb%}</div>
<div class="spacer"><!--ZKP--></div>
{% endif %}
{% if request_login %}
<div class="overlord">
{% endif %}
<div class="content">{% block content %}{% endblock content %}</div>
<div class="spacer"><!--ZKP--></div>
<div class="footer">
<p>Copyright &copy; {% now "Y" %} Spideroak. All Rights Reserved.</p>
<ul>
<li><a href="https://spideroak.com/about/">About</a></li>
<li><a href="https://spideroak.com/privacy_policy">Privacy Policy</a></li>
<li><a href="https://spideroak.com/terms_of_use">Terms of Use</a></li>
<li>{{ account_info.version }}</li>
</ul>
<div class="spacer"><!--ZKP--></div>
</div>
</div>

<noscript>
<div class="javascript-required">
<h3>Error: Scripting Disabled</h3>
<p>This page requires JavaScript to operate properly.</p>
<p>Please use a compatible browser or enable JavaScript.</p>
</div>
</noscript>
{% block js_templates %}{% endblock js_templates %}
{% block js_main %}{% endblock js_main %}
</body>
<div class="footer">
<p>Copyright &copy; {% now "Y" %} Spideroak. All Rights Reserved.</p>
<ul>
<li><a href="https://spideroak.com/about/">About</a></li>
<li><a href="https://spideroak.com/privacy_policy">Privacy Policy</a></li>
<li><a href="https://spideroak.com/terms_of_use">Terms of Use</a></li>
<li>{{ account_info.version }}</li>
</ul>
<div class="spacer"><!--ZKP--></div>
</div>
</div>
<noscript>
<div class="javascript-required">
<h3>Error: Scripting Disabled</h3>
<p>This page requires JavaScript to operate properly.</p>
<p>Please use a compatible browser or enable JavaScript.</p>
</div>
</noscript>
{% block js_templates %}{% endblock js_templates %}
{% block js_main %}{% endblock js_main %}
</body>
</html>
24 changes: 2 additions & 22 deletions django/apps/blue_management/blue_mgnt/templates/partials/add-authcode-widget.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,36 +18,16 @@ <h2 class="page-header"><i class="ss-icon">&#x1F511;</i>Create New Setup Code
{% if field.errors %}
{% for error in field.errors %}
<span class="error-highlight">
{{ field }}
{{ field }} {{ field.help_text }}
<span class="error-tag">{{ error }}</span>
</span>
{% endfor %}
{% else %}
{{ field }}
{{ field }} {{ field.help_text }}
{% endif %}
</td>
</tr>
{% endfor %}
{% comment %}
<!-- MOCKUP -->
<tr>
<td>
<label>Actions</label>
</td>
<td>
<input type="radio" class="radio-submit"name="action-select" id=""> Global
<input type="radio" class="radio-submit" name="action-select" id=""> By Group:
<select>
<option>Select Group</option>
<option value="a">a</option>
<option value="b">b</option>
<option value="c">c</option>
<option value="d">d</option>
</select>
</td>
</tr>
<!-- END MOCKUP -->
{% endcomment %}
</table>
<div class="widget-actions">
<input type='submit' value="Create Auth Code" class="rhs button button-primary-basic">
Expand Down
Loading

0 comments on commit 7e3af19

Please sign in to comment.