Merge pull request #597 from tiwariav/task/4313/hosting_footer_text
Task/4313/hosting_footer_style_fix
This commit is contained in:
commit
8708b3a513
11 changed files with 21 additions and 24 deletions
|
@ -181,7 +181,7 @@ class DCLNavbarDropdownPluginModel(CMSPlugin):
|
||||||
class DCLContactPluginModel(CMSPlugin):
|
class DCLContactPluginModel(CMSPlugin):
|
||||||
heading = models.CharField(max_length=100, default="Contact", blank=True)
|
heading = models.CharField(max_length=100, default="Contact", blank=True)
|
||||||
organization_name = models.CharField(
|
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")
|
email = models.EmailField(max_length=200, default="info@ungleich.ch")
|
||||||
address = models.CharField(
|
address = models.CharField(
|
||||||
|
@ -197,7 +197,7 @@ class DCLContactPluginModel(CMSPlugin):
|
||||||
|
|
||||||
class DCLFooterPluginModel(CMSPlugin):
|
class DCLFooterPluginModel(CMSPlugin):
|
||||||
copyright_label = models.CharField(
|
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'
|
help_text='Name of the company alongside the copyright year'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -101,14 +101,18 @@ a.list-group-item-danger.active:focus {
|
||||||
}
|
}
|
||||||
|
|
||||||
p.copyright {
|
p.copyright {
|
||||||
margin: 15px 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
footer {
|
footer {
|
||||||
padding: 20px 0;
|
padding: 25px 0;
|
||||||
background-color: #f8f8f8;
|
background-color: #f8f8f8;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
footer .list-inline {
|
||||||
|
margin-bottom: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
footer a {
|
footer a {
|
||||||
color: #777;
|
color: #777;
|
||||||
}
|
}
|
||||||
|
|
|
@ -163,7 +163,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.content-dashboard {
|
.content-dashboard {
|
||||||
min-height: calc(100vh - 86px);
|
min-height: calc(100vh - 96px);
|
||||||
width: 100%;
|
width: 100%;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
max-width: 1120px;
|
max-width: 1120px;
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<meta name="description" content="Data Center Light by ungleich">
|
<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>
|
<title>Data Center Light - {% block title %}VM hosting made in Switzerland{% endblock %}</title>
|
||||||
|
|
||||||
<!-- Vendor CSS -->
|
<!-- Vendor CSS -->
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<meta name="description" content="Data Center Light by ungleich">
|
<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>
|
<title>Data Center Light - {% block title %}VM hosting made in Switzerland{% endblock %}</title>
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<meta name="description" content="Data Center Light by ungleich">
|
<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>
|
<title>{% page_attribute page_title %}</title>
|
||||||
|
|
||||||
<!-- Vendor CSS -->
|
<!-- Vendor CSS -->
|
||||||
|
|
|
@ -39,6 +39,6 @@
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<p class="copyright text-muted small">Copyright © ungleich GmbH {% now "Y" %}. {% trans "All Rights Reserved" %}</p>
|
<p class="copyright text-muted small">Copyright © ungleich glarus ag {% now "Y" %}. {% trans "All Rights Reserved" %}</p>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
|
|
|
@ -426,6 +426,7 @@ footer {
|
||||||
right: 0;
|
right: 0;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
|
font-weight: 300;
|
||||||
}
|
}
|
||||||
|
|
||||||
p.copyright {
|
p.copyright {
|
||||||
|
|
|
@ -63,7 +63,7 @@
|
||||||
{% if request.user.is_authenticated %}
|
{% if request.user.is_authenticated %}
|
||||||
<footer class="footer-vm">
|
<footer class="footer-vm">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<p class="copyright text-muted small">Copyright © ungleich GmbH {% now "Y" %}. {% trans "All Rights Reserved" %}</p>
|
<p class="copyright text-muted small">Copyright © ungleich glarus ag {% now "Y" %}. {% trans "All Rights Reserved" %}</p>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
{% else %}
|
{% else %}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{% load staticfiles %}
|
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
|
|
||||||
<footer>
|
<footer>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
<a href="#contact">Contact</a>
|
<a href="#contact">Contact</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<p class="copyright text-muted small">Copyright © ungleich GmbH {% now "Y" %}. {% trans "All Rights Reserved" %}</p>
|
<p class="copyright text-muted small">Copyright © ungleich glarus ag {% now "Y" %}. {% trans "All Rights Reserved" %}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -494,6 +494,7 @@ class SSHKeyChoiceView(LoginRequiredMixin, View):
|
||||||
return redirect(reverse_lazy('hosting:ssh_keys'), foo='bar')
|
return redirect(reverse_lazy('hosting:ssh_keys'), foo='bar')
|
||||||
|
|
||||||
|
|
||||||
|
@method_decorator(decorators, name='dispatch')
|
||||||
class SSHKeyCreateView(LoginRequiredMixin, FormView):
|
class SSHKeyCreateView(LoginRequiredMixin, FormView):
|
||||||
form_class = UserHostingKeyForm
|
form_class = UserHostingKeyForm
|
||||||
model = UserHostingKey
|
model = UserHostingKey
|
||||||
|
@ -545,11 +546,6 @@ class SSHKeyCreateView(LoginRequiredMixin, FormView):
|
||||||
manager.manage_public_key([{'value': public_key, 'state': True}])
|
manager.manage_public_key([{'value': public_key, 'state': True}])
|
||||||
return HttpResponseRedirect(self.success_url)
|
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):
|
def post(self, request, *args, **kwargs):
|
||||||
form = self.get_form()
|
form = self.get_form()
|
||||||
required = 'add_ssh' in self.request.POST
|
required = 'add_ssh' in self.request.POST
|
||||||
|
@ -561,6 +557,7 @@ class SSHKeyCreateView(LoginRequiredMixin, FormView):
|
||||||
return self.form_invalid(form)
|
return self.form_invalid(form)
|
||||||
|
|
||||||
|
|
||||||
|
@method_decorator(decorators, name='dispatch')
|
||||||
class SettingsView(LoginRequiredMixin, FormView):
|
class SettingsView(LoginRequiredMixin, FormView):
|
||||||
template_name = "hosting/settings.html"
|
template_name = "hosting/settings.html"
|
||||||
login_url = reverse_lazy('hosting:login')
|
login_url = reverse_lazy('hosting:login')
|
||||||
|
@ -595,11 +592,6 @@ class SettingsView(LoginRequiredMixin, FormView):
|
||||||
|
|
||||||
return context
|
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):
|
def post(self, request, *args, **kwargs):
|
||||||
form = self.get_form()
|
form = self.get_form()
|
||||||
if form.is_valid():
|
if form.is_valid():
|
||||||
|
@ -1218,8 +1210,8 @@ class VirtualMachineView(LoginRequiredMixin, View):
|
||||||
email_to_admin_data = {
|
email_to_admin_data = {
|
||||||
'subject': "Deleted VM and Subscription for VM {vm_id} and "
|
'subject': "Deleted VM and Subscription for VM {vm_id} and "
|
||||||
"user: {user}".format(
|
"user: {user}".format(
|
||||||
vm_id=vm.id, user=owner.email
|
vm_id=vm.id, user=owner.email
|
||||||
),
|
),
|
||||||
'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
|
'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
|
||||||
'to': ['info@ungleich.ch'],
|
'to': ['info@ungleich.ch'],
|
||||||
'body': "\n".join(
|
'body': "\n".join(
|
||||||
|
|
Loading…
Reference in a new issue