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

Merge pull request #437 from ungleich/tiwariav-bugfix/modal_icons

Browse source 
Tiwariav bugfix/modal icons

Added missing modal icons
This commit is contained in:
Pcoder 2017-08-04 20:42:51 +02:00 committed by GitHub
commit 2ae0d3186c
4 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
hosting/locale/de/LC_MESSAGES/django.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-08-03 03:31+0530\n" "POT-Creation-Date: 2017-08-04 18:25+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -39,6 +39,9 @@ msgstr "Meine virtuellen Maschinen"
msgid "My Orders" msgid "My Orders"
msgstr "Meine Bestellungen" msgstr "Meine Bestellungen"
msgid "SSH Keys"
msgstr "SSH Key"
msgid "Notifications " msgid "Notifications "
msgstr "Benachrichtigungen" msgstr "Benachrichtigungen"
@ -212,9 +215,6 @@ msgstr "Als gelesen markieren"
msgid "All notifications" msgid "All notifications"
msgstr "Alle Benachrichtigungen" msgstr "Alle Benachrichtigungen"
msgid "Confirm Order"
msgstr "Bestellung Bestätigen"
msgid "Date" msgid "Date"
msgstr "Datum" msgstr "Datum"
@ -390,12 +390,12 @@ msgstr ""
msgid "Private Key" msgid "Private Key"
msgstr "" msgstr ""
msgid "Delete SSH Key"
msgstr "SSH Key löschen"
msgid "Do You want to delete this key?" msgid "Do You want to delete this key?"
msgstr "Möchtest Du den Schlüssel löschen?" msgstr "Möchtest Du den Schlüssel löschen?"
msgid "Close"
msgstr "Schliessen"
msgid "Show" msgid "Show"
msgstr "Anzeigen" msgstr "Anzeigen"
@ -474,11 +474,17 @@ msgstr "Du kannst dich nun"
msgid "Sorry. Your request is invalid." msgid "Sorry. Your request is invalid."
msgstr "Entschuldigung, deine Anfrage ist ungültig." msgstr "Entschuldigung, deine Anfrage ist ungültig."
msgid "Confirm Order"
msgstr "Bestellung Bestätigen"
msgid "" msgid ""
"We could not find the requested VM. Please " "We could not find the requested VM. Please "
"contact Data Center Light Support." "contact Data Center Light Support."
msgstr "" msgstr ""
#~ msgid "Close"
#~ msgstr "Schliessen"
#~ msgid "Cancel" #~ msgid "Cancel"
#~ msgstr "Beenden" #~ msgstr "Beenden"

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>