aatish/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/modal_icons' of https://github.com/tiwariav/dynamicweb into tiwariav-bugfix/modal_icons

Browse source
This commit is contained in:
PCoder 2017-08-04 23:53:47 +05:30
commit 7d334fddb0
3 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hosting/static/hosting/css/user_keys.css
View file

@ -140,10 +140,11 @@
.btn-custom-delete a, .btn-custom-download a{ .btn-custom-delete a, .btn-custom-download a{
text-decoration: none; text-decoration: none;
} }
.modal-body p{ .modal-body p.ssh-key{
width: 100%; width: 100%;
word-wrap: break-word; word-wrap: break-word;
text-align: left; text-align: left;
margin-top: 10px;
} }
@media screen and (max-width: 768px) { @media screen and (max-width: 768px) {

2
hosting/templates/hosting/orders.html
View file

@ -59,7 +59,7 @@
action="{% url 'hosting:delete_order' order.id %}"> action="{% url 'hosting:delete_order' order.id %}">
{% csrf_token %} {% csrf_token %}
<div class="modal-footer"> <div class="modal-footer">
<button type="submit" class="btn btn-primary">{% trans "Delete"%} <button type="submit" class="btn btn-danger">{% trans "Delete"%}
</button> </button>
</div> </div>
</form> </form>

11
hosting/templates/hosting/user_keys.html
View file

@ -38,7 +38,6 @@
<span class="pc-only">{% trans "Delete" %}</span> <span class="pc-only">{% trans "Delete" %}</span>
<span class="mob-only"><i class="fa fa-trash"></i></span> <span class="mob-only"><i class="fa fa-trash"></i></span>
</button> </button>
<div class="modal fade" id="Modal{{user_key.id }}" tabindex="-1" role="dialog"> <div class="modal fade" id="Modal{{user_key.id }}" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
@ -49,11 +48,13 @@
</button> </button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<h4 class="modal-title" id="ModalLabel">{% trans "Do You want to delete this key?" %}</h4> <div class="modal-icon"><i class="fa fa-trash" aria-hidden="true"></i></div>
<h4 class="modal-title" id="ModalLabel">{% trans "Delete SSH Key"%}</h4>
<p class="modal-text">{% trans "Do You want to delete this key?"%}</p>
<form method="post" action="{% url 'hosting:delete_ssh_key' user_key.id %}"> <form method="post" action="{% url 'hosting:delete_ssh_key' user_key.id %}">
{% csrf_token %} {% csrf_token %}
<div class="modal-footer"> <div class="modal-footer">
<button type="submit" class="btn btn-primary">{% trans "Delete" %} <button type="submit" class="btn btn-danger">{% trans "Delete"%}
</button> </button>
</div> </div>
</form> </form>
@ -79,10 +80,6 @@
<h4 class="modal-title" id="ModalLabel_Public_Key">{% trans "Public ssh key" %}</h4> <h4 class="modal-title" id="ModalLabel_Public_Key">{% trans "Public ssh key" %}</h4>
<p style="margin-top: 10px;">{{ user_key.public_key }}</p> <p style="margin-top: 10px;">{{ user_key.public_key }}</p>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default"
data-dismiss="modal">
{% trans "Close" %}
</button>
</div> </div>
</div> </div>
</div> </div>