Fix conflicts

hosting/locale/de/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-01 21:03+0000\n"
+"POT-Creation-Date: 2017-05-30 13:47+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -236,7 +236,6 @@ msgstr ""
 msgid "The %(site_name)s team"
 msgstr ""
 
-
 #: hosting/templates/hosting/login.html:26
 msgid "You haven been logged out"
 msgstr "Sie wurden abgmeldet"
@@ -302,15 +301,14 @@ msgstr "Bestellungsübersicht"
 msgid "Cores"
 msgstr "Prozessorkerne"
 
-#: templates/hosting/order_detail.html:54
-#: templates/hosting/virtual_machine_detail.html:82
 #: hosting/templates/hosting/order_detail.html:54
 #: hosting/templates/hosting/payment.html:20
 #: hosting/templates/hosting/virtual_machine_detail.html:81
+#: templates/hosting/order_detail.html:54
+#: templates/hosting/virtual_machine_detail.html:82
 msgid "Memory"
 msgstr "Arbeitsspeicher"
 
-#: templates/hosting/order_detail.html:56
 #: hosting/templates/hosting/order_detail.html:56
 #: hosting/templates/hosting/payment.html:23
 msgid "Disk space"
@@ -442,11 +440,7 @@ msgstr "Ihre virtuelle Maschine beenden"
 
 #: templates/hosting/virtual_machine_detail.html:166
 msgid "Are you sure do you want to cancel your Virtual Machine "
-msgstr ""
-
-#: templates/hosting/virtual_machine_detail.html:166
-msgid "plan?"
-msgstr ""
+msgstr "Sind Sie sicher, dass Sie ihre virtuelle Maschine beenden wollen "
 
 #: templates/hosting/virtual_machine_detail.html:169
 msgid "Cancel"

hosting/templates/hosting/base_short.html

@@ -130,11 +130,15 @@
     {% if request.user.is_authenticated %}
     <footer class="footer-vm">
         <div class="container">
+<<<<<<< HEAD
             <div class="row">
                 <div class="col-lg-12">
                     <p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. All Rights Reserved</p>
                 </div>
             </div>
+=======
+            <p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. All Rights Reserved</p>
+>>>>>>> 7b197ec75bb8eecd239988ac929315b50c50d233
         </div>
     </footer>
     {% endif %}

hosting/templates/hosting/reset_password.html

@@ -10,6 +10,16 @@
                 <h2>{% trans "Your VM hosted in Switzerland"%}</h2>
             </div>
             <div class="auth-content">
+
+                {% if messages %}
+                    <ul class="list-unstyled" style="color: #fff">
+                    {% for message in messages %}
+                        <li>{{ message }}</li>
+                    {% endfor %}
+                    </ul>
+                {% endif %}
+
+                
                 <div class="intro-message auth-box sign-up">
                     <h2  class="section-heading">{% trans "Reset your password"%}</h2>
                     <form action="{% url 'hosting:reset_password' %}" method="post" class="form" novalidate>

hosting/views.py

@@ -298,7 +298,7 @@ class SSHKeyDeleteView(LoginRequiredMixin, DeleteView):
         manager = OpenNebulaManager()
         pk = self.kwargs.get('pk')
         # Get user ssh key
-        public_key = UserHostingKey.objects.get(pk=pk)
+        public_key = UserHostingKey.objects.get(pk=pk).public_key
         # Add ssh key to user
         try:
             manager.remove_public_key(user=owner, public_key=public_key)