From 52dafc99d328239e3c333c583c0bbc82826c44f4 Mon Sep 17 00:00:00 2001
From: Arvind Tiwari <tiwariav@gmail.com>
Date: Tue, 27 Mar 2018 00:54:44 +0530
Subject: [PATCH 1/2] ungleich gmbh -> ungleich glarus ag, settings page fix

---
 datacenterlight/cms_models.py                    |  4 ++--
 .../templates/datacenterlight/base.html          |  2 +-
 .../templates/datacenterlight/base_hosting.html  |  4 ++--
 .../templates/datacenterlight/cms/base.html      |  2 +-
 .../datacenterlight/includes/_footer.html        |  2 +-
 hosting/static/hosting/css/landing-page.css      |  1 +
 hosting/templates/hosting/base_short.html        |  2 +-
 hosting/templates/hosting/includes/_footer.html  |  4 ++--
 hosting/views.py                                 | 16 ++++------------
 9 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/datacenterlight/cms_models.py b/datacenterlight/cms_models.py
index 8c9ae740..0f46e831 100644
--- a/datacenterlight/cms_models.py
+++ b/datacenterlight/cms_models.py
@@ -160,7 +160,7 @@ class DCLNavbarDropdownPluginModel(CMSPlugin):
 class DCLContactPluginModel(CMSPlugin):
     heading = models.CharField(max_length=100, default="Contact", blank=True)
     organization_name = models.CharField(
-        max_length=100, default="ungleich GmbH", blank=True
+        max_length=100, default="ungleich glarus ag", blank=True
     )
     email = models.EmailField(max_length=200, default="info@ungleich.ch")
     address = models.CharField(
@@ -176,7 +176,7 @@ class DCLContactPluginModel(CMSPlugin):
 
 class DCLFooterPluginModel(CMSPlugin):
     copyright_label = models.CharField(
-        max_length=100, default='ungleich GmbH', blank=True,
+        max_length=100, default='ungleich glarus ag', blank=True,
         help_text='Name of the company alongside the copyright year'
     )
 
diff --git a/datacenterlight/templates/datacenterlight/base.html b/datacenterlight/templates/datacenterlight/base.html
index 8bdfb65f..75cb8de2 100644
--- a/datacenterlight/templates/datacenterlight/base.html
+++ b/datacenterlight/templates/datacenterlight/base.html
@@ -9,7 +9,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="Data Center Light by ungleich">
-    <meta name="author" content="ungleich GmbH">
+    <meta name="author" content="ungleich glarus ag">
     <title>Data Center Light - {% block title %}VM hosting made in Switzerland{% endblock %}</title>
 
     <!-- Vendor CSS -->
diff --git a/datacenterlight/templates/datacenterlight/base_hosting.html b/datacenterlight/templates/datacenterlight/base_hosting.html
index 7e4f7fac..1f8bf1d9 100644
--- a/datacenterlight/templates/datacenterlight/base_hosting.html
+++ b/datacenterlight/templates/datacenterlight/base_hosting.html
@@ -9,7 +9,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="Data Center Light by ungleich">
-    <meta name="author" content="ungleich GmbH">
+    <meta name="author" content="ungleich glarus ag">
 
     <title>Data Center Light - {% block title %}VM hosting made in Switzerland{% endblock %}</title>
 
@@ -57,7 +57,7 @@
     {% if request.user.is_authenticated %}
         <footer class="footer-vm">
             <div class="container">
-                <p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. {% trans "All Rights Reserved" %}</p>
+                <p class="copyright text-muted small">Copyright &copy; ungleich glarus ag {% now "Y" %}. {% trans "All Rights Reserved" %}</p>
             </div>
         </footer>
     {% else %}
diff --git a/datacenterlight/templates/datacenterlight/cms/base.html b/datacenterlight/templates/datacenterlight/cms/base.html
index 79bb2bef..0c356735 100644
--- a/datacenterlight/templates/datacenterlight/cms/base.html
+++ b/datacenterlight/templates/datacenterlight/cms/base.html
@@ -9,7 +9,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="Data Center Light by ungleich">
-    <meta name="author" content="ungleich GmbH">
+    <meta name="author" content="ungleich glarus ag">
     <title>{% page_attribute page_title %}</title>
 
     <!-- Vendor CSS -->
diff --git a/datacenterlight/templates/datacenterlight/includes/_footer.html b/datacenterlight/templates/datacenterlight/includes/_footer.html
index 4a2d8786..8643deda 100644
--- a/datacenterlight/templates/datacenterlight/includes/_footer.html
+++ b/datacenterlight/templates/datacenterlight/includes/_footer.html
@@ -39,6 +39,6 @@
             </li>
         </ul>
 
-        <p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. {% trans "All Rights Reserved" %}</p>
+        <p class="copyright text-muted small">Copyright &copy; ungleich glarus ag {% now "Y" %}. {% trans "All Rights Reserved" %}</p>
     </div>
 </footer>
diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css
index 275292d5..d5236324 100644
--- a/hosting/static/hosting/css/landing-page.css
+++ b/hosting/static/hosting/css/landing-page.css
@@ -426,6 +426,7 @@ footer {
     right: 0;
     bottom: 0;
     left: 0;
+    font-weight: 300;
 }
 
 p.copyright {
diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html
index 2a1e645c..9c1538db 100644
--- a/hosting/templates/hosting/base_short.html
+++ b/hosting/templates/hosting/base_short.html
@@ -63,7 +63,7 @@
     {% if request.user.is_authenticated %}
         <footer class="footer-vm">
             <div class="container">
-                <p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. {% trans "All Rights Reserved" %}</p>
+                <p class="copyright text-muted small">Copyright &copy; ungleich glarus ag {% now "Y" %}. {% trans "All Rights Reserved" %}</p>
             </div>
         </footer>
     {% else %}
diff --git a/hosting/templates/hosting/includes/_footer.html b/hosting/templates/hosting/includes/_footer.html
index 24f4cea6..a74e529f 100644
--- a/hosting/templates/hosting/includes/_footer.html
+++ b/hosting/templates/hosting/includes/_footer.html
@@ -1,5 +1,5 @@
-{% load staticfiles %}
 {% load i18n %}
+
 <footer>
     <div class="container">
         <div class="row">
@@ -26,7 +26,7 @@
                         <a href="#contact">Contact</a>
                     </li>
                 </ul>
-                <p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. {% trans "All Rights Reserved" %}</p>
+                <p class="copyright text-muted small">Copyright &copy; ungleich glarus ag {% now "Y" %}. {% trans "All Rights Reserved" %}</p>
             </div>
         </div>
     </div>
diff --git a/hosting/views.py b/hosting/views.py
index 5f4ed639..8e7380fb 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -494,6 +494,7 @@ class SSHKeyChoiceView(LoginRequiredMixin, View):
         return redirect(reverse_lazy('hosting:ssh_keys'), foo='bar')
 
 
+@method_decorator(decorators, name='dispatch')
 class SSHKeyCreateView(LoginRequiredMixin, FormView):
     form_class = UserHostingKeyForm
     model = UserHostingKey
@@ -545,11 +546,6 @@ class SSHKeyCreateView(LoginRequiredMixin, FormView):
         manager.manage_public_key([{'value': public_key, 'state': True}])
         return HttpResponseRedirect(self.success_url)
 
-    @method_decorator(decorators)
-    def get(self, request, *args, **kwargs):
-        return render(request, self.template_name)
-
-    @method_decorator(decorators)
     def post(self, request, *args, **kwargs):
         form = self.get_form()
         required = 'add_ssh' in self.request.POST
@@ -561,6 +557,7 @@ class SSHKeyCreateView(LoginRequiredMixin, FormView):
             return self.form_invalid(form)
 
 
+@method_decorator(decorators, name='dispatch')
 class SettingsView(LoginRequiredMixin, FormView):
     template_name = "hosting/settings.html"
     login_url = reverse_lazy('hosting:login')
@@ -595,11 +592,6 @@ class SettingsView(LoginRequiredMixin, FormView):
 
         return context
 
-    @method_decorator(decorators)
-    def get(self, request, *args, **kwargs):
-        return render(request, self.template_name)
-
-    @method_decorator(decorators)
     def post(self, request, *args, **kwargs):
         form = self.get_form()
         if form.is_valid():
@@ -1218,8 +1210,8 @@ class VirtualMachineView(LoginRequiredMixin, View):
         email_to_admin_data = {
             'subject': "Deleted VM and Subscription for VM {vm_id} and "
                        "user: {user}".format(
-                            vm_id=vm.id, user=owner.email
-                        ),
+                           vm_id=vm.id, user=owner.email
+                       ),
             'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
             'to': ['info@ungleich.ch'],
             'body': "\n".join(

From 1402c7fde115bc906f6a4d7743bba1cf40a10b99 Mon Sep 17 00:00:00 2001
From: Arvind Tiwari <tiwariav@gmail.com>
Date: Thu, 29 Mar 2018 01:19:10 +0530
Subject: [PATCH 2/2] footer padding fix

---
 datacenterlight/static/datacenterlight/css/common.css  | 8 ++++++--
 datacenterlight/static/datacenterlight/css/hosting.css | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/datacenterlight/static/datacenterlight/css/common.css b/datacenterlight/static/datacenterlight/css/common.css
index 214dbfd9..70902d2d 100644
--- a/datacenterlight/static/datacenterlight/css/common.css
+++ b/datacenterlight/static/datacenterlight/css/common.css
@@ -101,14 +101,18 @@ a.list-group-item-danger.active:focus {
 }
 
 p.copyright {
-  margin: 15px 0;
+  margin: 0;
 }
 
 footer {
-  padding: 20px 0;
+  padding: 25px 0;
   background-color: #f8f8f8;
 }
 
+footer .list-inline {
+  margin-bottom: 15px;
+}
+
 footer a {
   color: #777;
 }
diff --git a/datacenterlight/static/datacenterlight/css/hosting.css b/datacenterlight/static/datacenterlight/css/hosting.css
index 8769ed60..7764f0c3 100644
--- a/datacenterlight/static/datacenterlight/css/hosting.css
+++ b/datacenterlight/static/datacenterlight/css/hosting.css
@@ -163,7 +163,7 @@
 }
 
 .content-dashboard {
-  min-height: calc(100vh - 86px);
+  min-height: calc(100vh - 96px);
   width: 100%;
   margin: 0 auto;
   max-width: 1120px;