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

Merge pull request #597 from tiwariav/task/4313/hosting_footer_text

Browse source 
Task/4313/hosting_footer_style_fix
This commit is contained in:
Arvind Tiwari 2018-03-29 01:20:11 +05:30 committed by GitHub
commit 8708b3a513
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
datacenterlight/cms_models.py
View file

@ -181,7 +181,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(
@ -197,7 +197,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'
)

8
datacenterlight/static/datacenterlight/css/common.css
View file

@ -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;
}

2
datacenterlight/static/datacenterlight/css/hosting.css
View file

@ -163,7 +163,7 @@
}
.content-dashboard {
min-height: calc(100vh - 86px);
min-height: calc(100vh - 96px);
width: 100%;
margin: 0 auto;
max-width: 1120px;

2
datacenterlight/templates/datacenterlight/base.html
View file

@ -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 -->

2
datacenterlight/templates/datacenterlight/base_hosting.html
View file

@ -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>

2
datacenterlight/templates/datacenterlight/cms/base.html
View file

@ -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 -->

2
datacenterlight/templates/datacenterlight/includes/_footer.html
View file

@ -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>

1
hosting/static/hosting/css/landing-page.css
View file

@ -426,6 +426,7 @@ footer {
right: 0;
bottom: 0;
left: 0;
font-weight: 300;
}
p.copyright {

2
hosting/templates/hosting/base_short.html
View file

@ -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 %}

4
hosting/templates/hosting/includes/_footer.html
View file

@ -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>

16
hosting/views.py
View file

@ -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(