Skip to content

Commit

Permalink
#22 - правки по дизайну за субботу
Browse files Browse the repository at this point in the history
  • Loading branch information
@HellWithin
HellWithin committed Jun 3, 2017
1 parent 177c0af commit 054b67f
Show file tree
Hide file tree
Showing 16 changed files with 173 additions and 212 deletions.
74 changes: 42 additions & 32 deletions core/static/core/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,8 @@ hr {
min-height: 53.7rem;
}

.col-sm-12 {

}

.intro-text {
margin-top: 5rem;
text-transform: uppercase;
font-size: 1.25em;
font-weight: 400;
Expand Down Expand Up @@ -121,20 +118,10 @@ footer {
}

footer p {
margin-top: 3rem;
padding: 0;
padding-top: 3rem;
font-size: 16px;
}

footer a {
color: #333;
}

footer a:hover {
color: #000;
text-decoration: underline;
}

@media screen and (min-width:768px) {
.brand {
display: inherit;
Expand Down Expand Up @@ -197,10 +184,11 @@ footer a:hover {
line-height: normal;
}

.navbar-nav>li:last-child {
float: right;
}

.navbar-nav {
display: flex;
float: left;
table-layout: fixed;
width: 100%;
}
}
Expand Down Expand Up @@ -266,16 +254,12 @@ footer a:hover {
resize: none;
}

.page-title {
margin: 0 auto;
padding: 2rem;
}

.auth-form {
margin-top: 10rem;
margin-top: 7rem;
}

.no-root-key-form {
margin-top: 3rem;
margin-left: 25%;
}

Expand All @@ -289,18 +273,16 @@ footer a:hover {
resize: none;
}

.cn-search {
.cn-search,
.view-root-crt-btns,
.view-crt-buttons {
margin: 1rem 0;
}

.cn-search label {
margin-right: 1rem;
}

.cn-view-index {
color: #333333;
}

#id_crt_file {
display: inline-block;
}
Expand All @@ -309,6 +291,34 @@ footer a:hover {
display: inline-block;
}

.root-crt-warning {
padding-top: 3rem;
}
.root-doesnt-exist {
padding-top: 5rem;
}

.upload-existing {
margin-top: 5rem;
}

.upload-existing-btn {
margin-right: 1rem;
}

.upload-existing-btns {
padding: 0;
}

.breadcrumb {
margin-bottom: 0;
margin-top: 1rem;
}

#first-input-button,
#second-input-button {
margin-bottom: 3rem;
}

.has-root-key,
.has-root-crt {
margin-top: 3rem;
margin-bottom: 3rem;
}
24 changes: 12 additions & 12 deletions core/static/core/js/custom.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
* Created by mefesto on 24.05.17.
*/
$(document).ready(function () {
$('#files-upload').click(function () {
$('#first-textarea').hide();
$('#second-textarea').hide();
$('#first-input-button').show();
$('#second-input-button').show();
});
$('#textareas-upload').click(function () {
$('#first-textarea').show();
$('#second-textarea').show();
$('#first-input-button').hide();
$('#second-input-button').hide();
});
// $('#files-upload').click(function () {
// $('#first-textarea').hide();
// $('#second-textarea').hide();
// $('#first-input-button').show();
// $('#second-input-button').show();
// });
// $('#textareas-upload').click(function () {
// $('#first-textarea').show();
// $('#second-textarea').show();
// $('#first-input-button').hide();
// $('#second-input-button').hide();
// });

$('#copy-to-clipboard').click(function () {
new Clipboard('#copy-to-clipboard');
Expand Down
87 changes: 43 additions & 44 deletions core/templates/core/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,53 +19,52 @@
{% block brand %}{% endblock %}

{% block menu %}
<nav class="navbar navbar-default" role="navigation">
<div class="">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse"
data-target="#bs-example-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="{% url 'index' %}">soft-way.biz</a>
<nav class="navbar navbar-default" role="navigation">
<div class="">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse"
data-target="#bs-example-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="{% url 'index' %}">soft-way.biz</a>
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li>
{% if root_crt.crt.url %}
<a href="{{ root_crt.crt.url }}" title="Download root certificate">CA.crt
.crt</a>{% endif %}
</li>
<li>
{% if breadcrumbs %}
<div class="breadcrumbs col-sm-12">
<ol class="breadcrumb navbar-text head-breadcrumbs" style="margin-left: 10px">
{% for label, url in breadcrumbs %}
{% if url %}
<li><a href="{{ url }}">{{ label }}</a></li>
{% else %}
<li class="active">{{ label }}</li>
{% endif %}
{% endfor %}
</ol>
</div>
{% endif %}
</li>
{% if user.is_authenticated %}
<li>Hello, <strong style="display: inline-block">{{ user.get_username }}</strong><a
href="{% url 'logout' %}" style="display: inline-block">Logout</a></li>
{% else %}
<li><a href="{% url 'login' %}">Login</a></li>
{% endif %}
</ul>
</div>
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li><a href="{% url 'index' %}">Home</a></li>
<li>{% if root_crt.crt.url %}
<a href="{{ root_crt.crt.url }}" title="Download root certificate">Download ca.crt
.crt</a>{% endif %}</li>

<li class="page-title">{% block page_title %}{% endblock %}</li>

{% if user.is_authenticated %}
<li>Hello, <strong style="display: inline-block">{{ user.get_username }}</strong><a
href="{% url 'logout' %}" style="display: inline-block">Logout</a></li>
{% else %}
<li><a href="{% url 'login' %}">Login</a></li>
{% endif %}
</ul>
</div>
</div>
</nav>
</nav>
{% endblock %}

{% if breadcrumbs %}
<div class="breadcrumbs col-sm-12">
<ol class="breadcrumb navbar-text head-breadcrumbs" style="margin-left: 10px">
{% for label, url in breadcrumbs %}
{% if url %}
<li><a href="{{ url }}">{{ label }}</a></li>
{% else %}
<li class="active">{{ label }}</li>
{% endif %}
{% endfor %}
</ol>
</div>
{% endif %}

{% block content %}

{% endblock %}
Expand Down
6 changes: 3 additions & 3 deletions core/templates/core/certificate/create.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
<div class="box">
<div class="container">
<div class="col-sm-12" style="margin-top: 7rem">
<form class="form form-horizontal col-sm-6 col-sm-offset-3" method="post">
<form class="form-horizontal col-sm-9 col-sm-offset-2 col-md-6 col-md-offset-3" method="post">
{% csrf_token %}
{% bootstrap_form form layout='horizontal' field_class='col-lg-7' label_class='col-sm-5' %}
{% bootstrap_form form layout='horizontal' field_class='col-xs-6' label_class='col-xs-6' %}
<div class="form-group">
<div class="col-sm-offset-5">
<div class="col-sm-offset-5 col-sm-2">
<button type="submit" class="btn btn-default">Create</button>
</div>
</div>
Expand Down
2 changes: 0 additions & 2 deletions core/templates/core/certificate/delete.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
<div class="">
<div class="col-sm-12">
<h2 class="intro-text text-center">Are you sure?</h2>
<hr>
<hr class="visible-xs">
<form enctype="multipart/form-data" method="post">
{% csrf_token %}
<div class="text-center">
Expand Down
9 changes: 0 additions & 9 deletions core/templates/core/certificate/recreation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,10 @@
<div class="row">
<div class="box">
<div class="col-lg-12">
<hr>
<h2 class="intro-text text-center">Recreate <strong>.crt</strong> file</h2>
<hr>
<hr class="visible-xs">
<form class="form form-horizontal col-sm-6 col-sm-offset-3" method="post">
{% csrf_token %}
{% bootstrap_form form layout='horiznontal' label_class='col-sm-4' field_class='col-sm-8'%}
<!--
<div class="form-group">
<label for="commonName">Common Name</label>
<input type="text" class="form-control" id="commonName">
</div>
-->
<div class="form-group">
<div class="col-sm-offset-5 col-sm-12">
<button type="submit" class="btn btn-default">Create</button>
Expand Down
46 changes: 22 additions & 24 deletions core/templates/core/certificate/upload_existing.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,36 +9,34 @@
<div class="box">
<div class="container">
<div class="row">
<div class="col-sm-12" style="margin-top: 5rem">
<p class="text-center">
<a class="btn btn-default" id="files-upload">Upload via files</a>
<a class="btn btn-default" id="textareas-upload">Upload via textareas</a>
</p>

<div class="col-sm-12 upload-existing">
<form enctype="multipart/form-data" class="form" method="post">
{% csrf_token %}
{% bootstrap_form_errors form %}
<div class="raw">
<div id="first-input-button" style="display: none">
{% bootstrap_field form.crt_file layout='horizontal' label_class="btn btn-default btn-file" field_class="hidden-input-field" form_group_class='col-sm-6 text-center' %}
</div>

<div id="second-input-button" style="display: none">
{% bootstrap_field form.key_file layout='horizontal' label_class="btn btn-default btn-file" field_class="hidden-input-field" form_group_class='col-sm-6 text-center' %}
<div class="col-sm-6 crt-upload">
<div id="first-input-button">
{% bootstrap_field form.crt_file layout='horizontal' form_group_class='col-sm-12' %}
</div>

<div id="first-textarea">
{% bootstrap_field form.crt_text show_label=False field_class='not-resize' %}
</div>
</div>

<div class="col-sm-6 key-upload">
<div id="second-input-button">
{% bootstrap_field form.key_file layout='horizontal' form_group_class='col-sm-12' %}
</div>

<div id="second-textarea">
{% bootstrap_field form.key_text show_label=False field_class='not-resize'%}
</div>
</div>
</div>
</div>

<div id="first-textarea" style="display: none">
{% bootstrap_field form.crt_text show_label=False field_class='not-resize' %}
</div>

<div id="second-textarea" style="display: none">
{% bootstrap_field form.key_text show_label=False field_class='not-resize'%}
</div>

<div class="form-group text-center col-sm-12">
<button type="submit" class="btn btn-default">Submit</button>
<button type="submit" class="btn btn-danger">Cancel</button>
<button type="submit" class="btn btn-danger pull-left">Cancel</button>
<button type="submit" class="btn btn-default pull-right">Submit</button>
</div>
</form>
</div>
Expand Down

0 comments on commit 054b67f

Please sign in to comment.