Merge branch 'task/3354/modal_restyling' of https://github.com/geethamondi/dynamicweb into geethamondi-task/3354/modal_restyling

This commit is contained in:
PCoder 2017-07-07 23:21:27 +05:30
commit 79df35a765
4 changed files with 93 additions and 16 deletions

View file

@ -57,4 +57,74 @@
width: 90%; width: 90%;
} }
} }
/***********Styles for Model********************/
.modal-content {
border-radius: 0px;
font-family: 'Lato', sans-serif;
width: 100%;
float: left;
}
.close {
font-size: 50px;
font-weight: 300;
}
.modal-header {
border-bottom: 0px solid #e5e5e5;
padding: 0px 15px;
width: 100%;
float: left;
}
.modal-body {
text-align: center;
width: 100%;
float: left;
padding: 0px 30px 15px 30px;
}
.modal-body .modal-icon i {
font-size: 50px;
font-weight: 100;
color: #999;
}
.modal-title {
margin: 0;
line-height: 1.42857143;
font-size: 25px;
padding: 0;
font-family: 'Lato', sans-serif;
}
.modal-text {
padding-top: 20px;
font-size: 16px;
}
.modal-footer {
border-top: 0px solid #e5e5e5;
width: 100%;
float: left;
text-align: center;
padding: 30px 15px;
}
@media (min-width: 1300px) {
.modal-dialog {
top: 30%;
width: 25%;
}
}
@media (max-width: 1299px) {
.modal-dialog {
top: 20%;
width: 43%;
}
}
@media (max-width: 900px) {
.modal-dialog {
top: 20%;
width: 50%;
}
}
@media (max-width: 767px) {
.modal-dialog {
top: 30%;
width: 90%;
margin: 0 auto !important;
}
}

View file

@ -52,17 +52,18 @@
</button> </button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<h4 class="modal-title" id="ModalLabel">{% trans "Do You want to delete your order?"%}</h4> <div class="modal-icon"><i class="fa fa-question" aria-hidden="true"></i></div>
<h4 class="modal-title" id="ModalLabel">{% trans "Cancel Order"%}</h4>
<p class="modal-text">{% trans "Do you want to delete your order?"%}</p>
<form method="post" <form method="post"
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="button" class="btn btn-default" <!--button type="button" class="btn btn-default"
data-dismiss="modal"> data-dismiss="modal">
{% trans "Close"%} {% trans "Close"%}
</button> </button-->
<button type="submit" class="btn btn-primary">{% trans "Delete"%} <button type="submit" class="btn btn-danger btn-ok">{% trans "Delete"%}
</button> </button>
</div> </div>
</form> </form>

View file

@ -53,16 +53,17 @@
</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-question" 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="button" class="btn btn-default" <!--button type="button" class="btn btn-default"
data-dismiss="modal"> data-dismiss="modal">
{% trans "Close"%} {% trans "Close"%}
</button> </button-->
<button type="submit" class="btn btn-primary">{% trans "Delete"%} <button type="submit" class="btn btn-danger">{% trans "Delete"%}
</button> </button>
</div> </div>
</form> </form>

View file

@ -159,14 +159,19 @@
<div class="modal fade" id="confirm-cancel" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="confirm-cancel" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
{% trans "Terminate your Virtual Machine"%} <button type="button" class="close" data-dismiss="modal"
</div> aria-label="Confirm"><span
aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body"> <div class="modal-body">
{% trans "Are you sure do you want to cancel your Virtual Machine "%} {{virtual_machine.name}} ? <div class="modal-icon"><i class="fa fa-question" aria-hidden="true"></i></div>
<h4 class="modal-title" id="ModalLabel">{% trans "Terminate your Virtual Machine"%}</h4>
<p class="modal-text">{% trans "Are you sure do you want to cancel your Virtual Machine "%} {{virtual_machine.name}} ?</p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Cancel"%}</button> <!--button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Cancel"%}</button-->
<a class="btn btn-danger btn-ok">OK</a> <a class="btn btn-danger btn-ok">OK</a>
</div> </div>
</div> </div>