Begin to refactor / cleanup hostings
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
This commit is contained in:
		
					parent
					
						
							
								8dd328fcc7
							
						
					
				
			
			
				commit
				
					
						54387c05d8
					
				
			
		
					 2 changed files with 47 additions and 6 deletions
				
			
		| 
						 | 
					@ -15,9 +15,14 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 | 
				
			||||||
# Quick-start development settings - unsuitable for production
 | 
					# Quick-start development settings - unsuitable for production
 | 
				
			||||||
# See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
 | 
					# See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ADMINS = (
 | 
					ADMINS = (
 | 
				
			||||||
    ('Nico Schottelius', 'nico.schottelius@ungleich.ch'),
 | 
					    ('Nico Schottelius', 'nico.schottelius@ungleich.ch'),
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					#    ('Sanghee Kim', 'sanghee.kim@ungleich.ch'),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					MANAGERS = ADMINS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SITE_ID = 1
 | 
					SITE_ID = 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -27,6 +32,9 @@ LOGIN_URL = None
 | 
				
			||||||
LOGOUT_URL = None
 | 
					LOGOUT_URL = None
 | 
				
			||||||
LOGIN_REDIRECT_URL = None
 | 
					LOGIN_REDIRECT_URL = None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					EMAIL_HOST="localhost"
 | 
				
			||||||
 | 
					EMAIL_PORT=25
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# SECURITY WARNING: keep the secret key used in production secret!
 | 
					# SECURITY WARNING: keep the secret key used in production secret!
 | 
				
			||||||
SECRET_KEY = 'xlhyv_l5-z6e8_@q6)n0up1a0$5-aad7d)om2t8g$bi6*@q44i'
 | 
					SECRET_KEY = 'xlhyv_l5-z6e8_@q6)n0up1a0$5-aad7d)om2t8g$bi6*@q44i'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5,6 +5,8 @@ from django.forms import ModelForm
 | 
				
			||||||
from django.http import HttpResponseRedirect
 | 
					from django.http import HttpResponseRedirect
 | 
				
			||||||
from django.core.urlresolvers import reverse
 | 
					from django.core.urlresolvers import reverse
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					from django.core.mail import send_mail
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from .models import RailsBetaUser
 | 
					from .models import RailsBetaUser
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class RailsBetaUserForm(ModelForm):
 | 
					class RailsBetaUserForm(ModelForm):
 | 
				
			||||||
| 
						 | 
					@ -23,34 +25,65 @@ def index(request):
 | 
				
			||||||
        context['form'] = form
 | 
					        context['form'] = form
 | 
				
			||||||
        if form.is_valid():
 | 
					        if form.is_valid():
 | 
				
			||||||
            form.save()
 | 
					            form.save()
 | 
				
			||||||
 | 
					            email = form.cleaned_data['email']
 | 
				
			||||||
 | 
					            send_mail('(Rails-)Hosting request', "email: %s" % email, 'django@ungleich.ch', ['nico.schottelius@ungleich.ch'], fail_silently=False)
 | 
				
			||||||
 | 
					            # mail_managers(subject, message, fail_silently=False, connection=None, html_message=None)[source]
 | 
				
			||||||
            return HttpResponseRedirect(reverse("railshosting:beta"))
 | 
					            return HttpResponseRedirect(reverse("railshosting:beta"))
 | 
				
			||||||
        else:
 | 
					        else:
 | 
				
			||||||
            context['error_message'] = "a problem"
 | 
					            context['error_message'] = "a problem"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return render(request, 'railshosting/index.html', context)
 | 
					    return render(request, 'railshosting/index.html', context)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def djangohosting(request):
 | 
					def hosting(request, context, page):
 | 
				
			||||||
    context = {}
 | 
					    email = RailsBetaUser(received_date=datetime.datetime.now())
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if request.method == 'POST':
 | 
				
			||||||
 | 
					        context['form'] = RailsBetaUserForm(request.POST, instance=email)
 | 
				
			||||||
 | 
					        if context['form'].is_valid():
 | 
				
			||||||
 | 
					            context['form'].save()
 | 
				
			||||||
 | 
					            email = context['form'].cleaned_data['email']
 | 
				
			||||||
 | 
					            subject = "%shosting request" % context['hosting']
 | 
				
			||||||
 | 
					            message = "Request for beta by: %s" % email
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            mail_managers(subject, message)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            # send_mail('(Rails-)Hosting request', "email: %s" % email, 'django@ungleich.ch', ['nico.schottelius@ungleich.ch'], fail_silently=False)
 | 
				
			||||||
 | 
					            return HttpResponseRedirect(reverse("railshosting:beta"))
 | 
				
			||||||
 | 
					        else:
 | 
				
			||||||
 | 
					            context['form'] = RailsBetaUserForm()
 | 
				
			||||||
 | 
					            context['error_message'] = "a problem"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    page = "railshosting/%s" % page
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return render(request, page, context)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					################################################################################
 | 
				
			||||||
 | 
					# Hostings
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					def djangohosting(request):
 | 
				
			||||||
 | 
					    page = 'django.html'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    context = {}
 | 
				
			||||||
    context["hosting"]="django"
 | 
					    context["hosting"]="django"
 | 
				
			||||||
    context["hosting_long"]="Django"
 | 
					    context["hosting_long"]="Django"
 | 
				
			||||||
    context["domain"]="django-hosting.ch"
 | 
					    context["domain"]="django-hosting.ch"
 | 
				
			||||||
    context["google_analytics"]="the right id"
 | 
					    context["google_analytics"]="the right id"
 | 
				
			||||||
    context["email"]="info@django-hosting.ch"
 | 
					    context["email"]="info@django-hosting.ch"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return render(request, 'railshosting/django.html', context)
 | 
					    return hosting(request, page, context)
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
def railshosting(request):
 | 
					def railshosting(request):
 | 
				
			||||||
    context = {}
 | 
					    page = 'rails.html'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    context = {}
 | 
				
			||||||
    context["hosting"]="rails"
 | 
					    context["hosting"]="rails"
 | 
				
			||||||
    context["hosting_long"]="Ruby On Rails"
 | 
					    context["hosting_long"]="Ruby On Rails"
 | 
				
			||||||
    context["domain"]="rails-hosting.ch"
 | 
					    context["domain"]="rails-hosting.ch"
 | 
				
			||||||
    context["google_analytics"]="the right id"
 | 
					    context["google_analytics"]="the right id"
 | 
				
			||||||
    context["email"]="info@rails-hosting.ch"
 | 
					    context["email"]="info@rails-hosting.ch"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return render(request, 'railshosting/rails.html', context)
 | 
					    return hosting(request, page, context)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def beta(request):
 | 
					def beta(request):
 | 
				
			||||||
    return render(request, 'railshosting/beta.html')
 | 
					    return render(request, 'railshosting/beta.html')
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue