Merge branch 'develop' of git-ungleich:dynamicweb into develop

.gitignore

@@ -14,8 +14,8 @@ local_settings.py
 media/*
 !media/keep
 
-CACHE/
-static/
+/CACHE/
+/static/
 
 \#*#
 .\#*

README.rst

@@ -3,5 +3,20 @@ ungleich
 
 dynamicweb
 ----------
-
 Website for ungleich GmbH
+=======
+
+- djangocms
+    - forms!
+    - hosting urls
+        - /hosting/django/
+        - /hosting/rubyonrails/
+        - /hosting/nodejs/
+        --
+    - feedback app
+        - below ungleich?
+            - no
+        - redirect back to // render other url?
+        - /feedback
+        <form action="{% url 'hosting:index' %}" method="post" role="form" class="form-inline">
+

dynamicweb/settings.py

@@ -15,9 +15,14 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
 
+
 ADMINS = (
     ('Nico Schottelius', 'nico.schottelius@ungleich.ch'),
 )
+#    ('Sanghee Kim', 'sanghee.kim@ungleich.ch'),
+
+
+MANAGERS = ADMINS
 
 SITE_ID = 1
 
@@ -65,6 +70,7 @@ INSTALLED_APPS = (
     'djangocms_link',
     'djangocms_snippet',
     'djangocms_teaser',
+    'djangocms_page_meta',
     #django-filer
     'cmsplugin_filer_file',
     'cmsplugin_filer_folder',
@@ -91,9 +97,8 @@ INSTALLED_APPS = (
     'compressor',
     # ungleich
     'ungleich',
-    'railshosting',
+    'hosting',
     'digitalglarus',
-    'djangocms_page_meta',
 )
 
 MIDDLEWARE_CLASSES = (

dynamicweb/urls.py

@@ -12,6 +12,7 @@ urlpatterns = [
                                      namespace="digitalglarus")),
     url(r'^railshosting/', include('railshosting.urls',
                                    namespace="railshosting")),
+    url(r'^hosting/', include('hosting.urls', namespace="hosting")),
     url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
     url(r'^jsi18n/(?P<packages>\S+?)/$', 'django.views.i18n.javascript_catalog'),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

hosting/templates/hosting/base.html

@@ -11,19 +11,19 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <title>{% block title %} {%endblock%} as easy as possible</title>
+    <title>{{ domain }} - {{ hosting }} hosting as easy as possible</title>
 
     <!-- Bootstrap Core CSS -->
-    <link href="{% static 'railshosting/css/bootstrap.min.css' %}" rel="stylesheet">
+    <link href="{% static 'hosting/css/bootstrap.min.css' %}" rel="stylesheet">
 
     <!-- Custom CSS -->
-    <link href="{% static 'railshosting/css/landing-page.css' %}" rel="stylesheet">
+    <link href="{% static 'hosting/css/landing-page.css' %}" rel="stylesheet">
 
     <!-- Custom Fonts -->
     <link href='http://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
-    <link href="{% static 'railshosting/font-awesome/css/font-awesome.min.css' %}" rel="stylesheet" type="text/css">
+    <link href="{% static 'hosting/font-awesome/css/font-awesome.min.css' %}" rel="stylesheet" type="text/css">
     <link href="http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
-    <link rel="shortcut icon" href="{% static 'railshosting/img/favicon.ico' %}" type="image/x-icon" />
+    <link rel="shortcut icon" href="{% static 'hosting/img/favicon.ico' %}" type="image/x-icon" />
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -32,8 +32,14 @@
         <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
 
-    {% block customcss %} {%endblock%}
-
+    {% with 'hosting/img/'|add:hosting|add:'-intro-bg.png' as image_static %}
+     alt="">   
+    <style media="screen" type="text/css">
+    .intro-header {
+        background: url("{% static image_static %}") no-repeat center center;
+    }
+</style>
+{% endwith %}   
 <script>
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
   (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -59,7 +65,7 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand topnav" href="#"><img src="{% static 'railshosting/img/logo_black.svg' %}"></a>
+                <a class="navbar-brand topnav" href="#"><img src="{% static 'hosting/img/logo_black.svg' %}"></a>
             </div>
             <!-- Collect the nav links, forms, and other content for toggling -->
             <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
@@ -96,7 +102,7 @@
                 <div class="col-lg-12">
     
                     <div class="intro-message">
-                    <img class="responsive" src="{% static 'railshosting/img/Beta.png' %}">
+                    <img class="responsive" src="{% static 'hosting/img/Beta.png' %}">
                         <h1>{{ domain }}</h1>
                         <h3>{{ hosting_long }} as easy as possible</h3>
                         <hr class="intro-divider">
@@ -133,9 +139,11 @@
   {% endblock %}
 </ul>
               </div>
-                <div class="col-lg-5 col-sm-pull-6  col-sm-6">
-                    <img class="img-responsive" src="{% static 'railshosting/img/how3.png' %}" alt="">
-                </div>
+                 {% with 'hosting/img/card-'|add:hosting|add:'.png' as image_static %}
+                  <div class="col-lg-5 col-sm-pull-6  col-sm-6">
+                    <img class="img-responsive" src="{% static image_static %}" alt="">
+                  </div>
+                  {% endwith %}
             </div>
 
         </div>
@@ -153,7 +161,7 @@
                     <p class="lead">We configure your own infrastructure for {{ hosting_long }}. Keep the comfort and safety of being at your home, while we set things up for you.</p>
                 </div>
                 <div class="col-lg-5 col-lg-offset-2 col-sm-6">
-                    <img class="img-responsive" src="{% static 'railshosting/img/home.png' %}" alt="">
+                    <img class="img-responsive" src="{% static 'hosting/img/home.png' %}" alt="">
                 </div>
             </div>
 
@@ -173,10 +181,10 @@
                     <hr class="section-heading-spacer">
                     <div class="clearfix"></div>
                     <h2 class="section-heading">Option 2 : Our infrastructure</h2>
-                    <p class="lead">We take care of everything for you! You don't need your infrastructure. We give you everything you need in {{ hosting_long }}ls hosting. Full root access, 24x7 support.</p>
+                    <p class="lead">We take care of everything for you! You don't need your infrastructure. We give you everything you need in {{ hosting_long }} hosting. Full root access, 24x7 support.</p>
                 </div>
                 <div class="col-lg-5 col-sm-pull-6  col-sm-6">
-                    <img class="img-responsive" src="{% static 'railshosting/img/dog.png' %}" alt="">
+                    <img class="img-responsive" src="{% static 'hosting/img/dog.png' %}" alt="">
                 </div>
             </div>
 
@@ -209,7 +217,7 @@
 
             <div class="col-md-3 col-sm-6 hero-feature">
                 <div class="thumbnail">
-                    <img class="relsonsive" src="{% static 'railshosting/img/economy.jpg' %}" alt="">
+                    <img class="relsonsive" src="{% static 'hosting/img/economy.jpg' %}" alt="">
                     <div class="caption">
                       <h3>Economy                      </h3>
                       <p>Suited for smaller applications                      </p>
@@ -224,7 +232,7 @@
 
             <div class="col-md-3 col-sm-6 hero-feature">
                 <div class="thumbnail">
-                    <img class="relsonsive" src="{% static 'railshosting/img/standardroom.jpg' %}" alt="">
+                    <img class="relsonsive" src="{% static 'hosting/img/standardroom.jpg' %}" alt="">
                     <div class="caption">
                       <h3>Standard</h3>
                       <p>Suited for standard {{ hosting_long }} applications</p>
@@ -240,7 +248,7 @@
 
             <div class="col-md-3 col-sm-6 hero-feature">
                 <div class="thumbnail">
-                    <img class="reponsive" src="{% static 'railshosting/img/deluxeroom.jpg' %}" alt="">
+                    <img class="reponsive" src="{% static 'hosting/img/deluxeroom.jpg' %}" alt="">
                     <div class="caption">
                       <h3>Deluxe</h3>
                       <p>Suited for performance critical project</p>
@@ -255,7 +263,7 @@
 
             <div class="col-md-3 col-sm-6 hero-feature">
                 <div class="thumbnail">
-                    <img class="responsive" src="{% static 'railshosting/img/presidentialroom.jpg' %}" alt="">
+                    <img class="responsive" src="{% static 'hosting/img/presidentialroom.jpg' %}" alt="">
                     <div class="caption">
                       <h3>Presidential Premium</h3>
                         <p> Suited for performance critical &amp; </p>
@@ -292,7 +300,7 @@
     {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
     {{ form.non_field_errors }}
     {{ form.email.errors }}
-    <form action="{% url 'railshosting:index' %}" method="post" role="form" class="form-inline">
+    <form action="{% url 'hosting:railshosting' %}" method="post" role="form" class="form-inline">
     {% csrf_token %}
   <div class="form-group">
     <label class="sr-only" for="email">Email address</label>
@@ -377,10 +385,10 @@
     </footer>
 
     <!-- jQuery -->
-    <script src="{% static 'railshosting/js/jquery.js' %}"></script>
+    <script src="{% static 'hosting/js/jquery.js' %}"></script>
 
     <!-- Bootstrap Core JavaScript -->
-    <script src="{% static 'railshosting/js/bootstrap.min.js' %}"></script>
+    <script src="{% static 'hosting/js/bootstrap.min.js' %}"></script>
 
 </body>
 

hosting/templates/hosting/beta.html

@@ -14,16 +14,16 @@
     <title>Rails Hosting.ch - Ruby on Rails as easy as possible</title>
 
     <!-- Bootstrap Core CSS -->
-    <link href="{% static 'railshosting/css/bootstrap.min.css' %}" rel="stylesheet">
+    <link href="{% static 'hosting/css/bootstrap.min.css' %}" rel="stylesheet">
 
     <!-- Custom CSS -->
-    <link href="{% static 'railshosting/css/landing-page.css' %}" rel="stylesheet">
+    <link href="{% static 'hosting/css/landing-page.css' %}" rel="stylesheet">
 
     <!-- Custom Fonts -->
     <link href='http://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
-    <link href="{% static 'railshosting/font-awesome/css/font-awesome.min.css' %}" rel="stylesheet" type="text/css">
+    <link href="{% static 'hosting/font-awesome/css/font-awesome.min.css' %}" rel="stylesheet" type="text/css">
     <link href="http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
-    <link rel="shortcut icon" href="{% static 'railshosting/img/favicon.ico' %}" type="image/x-icon" />
+    <link rel="shortcut icon" href="{% static 'hosting/img/favicon.ico' %}" type="image/x-icon" />
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -57,25 +57,25 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand topnav" href="#"><img src="{% static 'railshosting/img/logo_black.svg' %}"></a>
+                <a class="navbar-brand topnav" href="#"><img src="{% static 'hosting/img/logo_black.svg' %}"></a>
             </div>
             <!-- Collect the nav links, forms, and other content for toggling -->
             <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                 <ul class="nav navbar-nav navbar-right">
                     <li>
-                        <a href="{% url 'railshosting:index' %}#how">How it works</a>
+                        <a href="{% url 'hosting:index' %}#how">How it works</a>
                     </li>
                     <li>
-                        <a href="{% url 'railshosting:index' %}#your">Your infrastructure</a>
+                        <a href="{% url 'hosting:index' %}#your">Your infrastructure</a>
                     </li>
                    <li>
-                        <a href="{% url 'railshosting:index' %}#our">Our inftrastructure</a>
+                        <a href="{% url 'hosting:index' %}#our">Our inftrastructure</a>
                     </li>
                     <li>
-                        <a href="{% url 'railshosting:index' %}#price">Pricing</a>
+                        <a href="{% url 'hosting:index' %}#price">Pricing</a>
                     </li>
                     <li>
-                        <a href="{% url 'railshosting:index' %}#contact">Contact</a>
+                        <a href="{% url 'hosting:index' %}#contact">Contact</a>
                     </li>
                 </ul>
             </div>
@@ -91,7 +91,7 @@
         <div class="container">
           <div class=".col-md-6">
     
-                    <div class="intro-message"><img src="{% static 'railshosting/img/checkmark.png' %}" class="responsive">
+                    <div class="intro-message"><img src="{% static 'hosting/img/checkmark.png' %}" class="responsive">
                       <p>Thank you  for your interest in joining Rails-Hosting Beta.<br>
                             We will come back to you shortly to give you access to our  infrastructure.
                       </p>
@@ -116,24 +116,24 @@
                 <div class="col-lg-12">
                     <ul class="list-inline">
                         <li>
-                            <a href="{% url 'railshosting:index' %}">Home</a>
+                            <a href="{% url 'hosting:index' %}">Home</a>
                         </li>
                         <li class="footer-menu-divider">&sdot;</li>
                         <li>
-                            <a href="{% url 'railshosting:index' %}#how">How it works</a></li>
+                            <a href="{% url 'hosting:index' %}#how">How it works</a></li>
                         <li class="footer-menu-divider">&sdot;</li>
                         <li>
-                            <a href="{% url 'railshosting:index' %}#your">Your infrastructure</a></li>
+                            <a href="{% url 'hosting:index' %}#your">Your infrastructure</a></li>
                         <li>&sdot;</li>
                         <li>
-                            <a href="{% url 'railshosting:index' %}#our">Our infrastructure</a></li>
+                            <a href="{% url 'hosting:index' %}#our">Our infrastructure</a></li>
                         <li class="footer-menu-divider">&sdot;</li>
                         <li>
-                            <a href="{% url 'railshosting:index' %}#price">Pricing</a>
+                            <a href="{% url 'hosting:index' %}#price">Pricing</a>
                         </li>
                         <li class="footer-menu-divider">&sdot;</li>
                         <li>
-                            <a href="{% url 'railshosting:index' %}#contact">Contact</a>
+                            <a href="{% url 'hosting:index' %}#contact">Contact</a>
                         </li>
                     </ul>
                     <p class="copyright text-muted small">Copyright &copy; ungleich GmbH 2015. All Rights Reserved</p>
@@ -143,10 +143,10 @@
     </footer>
 
     <!-- jQuery -->
-    <script src="{% static 'railshosting/js/jquery.js' %}"></script>
+    <script src="{% static 'hosting/js/jquery.js' %}"></script>
 
     <!-- Bootstrap Core JavaScript -->
-    <script src="{% static 'railshosting/js/bootstrap.min.js' %}"></script>
+    <script src="{% static 'hosting/js/bootstrap.min.js' %}"></script>
 
 </body>
 

hosting/templates/hosting/django.html

@@ -0,0 +1,12 @@
+{% extends "hosting/base.html" %}
+{% load staticfiles %}
+
+{%block specification %} 
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i>
+  <p class="lead">Ubuntu 14.04 as the operating system, full root access!</p>
+  </li>
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">nginx as the frontend Server (optional with SSL Support)</p></li>
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">uwsgi to have your application talk to nginx and vice versa
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">PostgreSQL as the database</p>
+  </li>
+{%endblock%}

hosting/templates/hosting/nodejs.html

@@ -1,10 +1,10 @@
-{% extends "railshosting/base.html" %}
+{% extends "hosting/base.html" %}
 {% load staticfiles %}
 
-{% block title %}django hosting.ch - django hosting{%endblock%}
 
 {%block customcss %} 
-<link href="{% static 'railshosting/css/djangohosting.css' %}" rel="stylesheet">
+<link href="{% static "railshosting/css/djangohosting.css" %}" rel="stylesheet">
+
 {%endblock%}
 
 {%block specification %} 
@@ -15,4 +15,4 @@
   <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">uwsgi to have your application talk to nginx and vice versa
   <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">PostgreSQL as the database</p>
   </li>
-{%endblock%}
+{%endblock%}

hosting/templates/hosting/rails.html

@@ -0,0 +1,13 @@
+{% extends "hosting/base.html" %}
+{% load staticfiles %}
+
+{%block specification %} 
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i>
+  <p class="lead">Ubuntu 14.04 as the operating system, full root access!</p>
+  </li>
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">rbenv to let you decide which Ruby version you want to use</p></li>s
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">nginx as the frontend Server (optional with SSL Support)</p></li>
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">uwsgi to have your application talk to nginx and vice versa
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">PostgreSQL as the database</p>
+  </li>
+{%endblock%}

hosting/urls.py

@@ -0,0 +1,10 @@
+from django.conf.urls import url
+
+from . import views
+
+urlpatterns = [
+    url(r'beta$', views.beta, name='beta'),
+    url(r'django$', views.djangohosting, name='djangohosting'), 
+    url(r'nodejs$', views.nodejshosting, name='nodejshosting'),
+    url(r'rails$', views.railshosting,   name='railshosting'),
+]

hosting/views.py

@@ -0,0 +1,75 @@
+import datetime
+
+from django.shortcuts import get_object_or_404, render
+from django.forms import ModelForm
+from django.http import HttpResponseRedirect
+from django.core.urlresolvers import reverse
+
+from django.core.mail import send_mail
+
+from .models import RailsBetaUser
+
+class RailsBetaUserForm(ModelForm):
+    required_css_class = 'form-control'
+    class Meta:
+        model = RailsBetaUser
+        fields = [ 'email' ]
+
+def hosting(request, 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)
+
+            return HttpResponseRedirect(reverse("hosting:beta"))
+        else:
+            context['form'] = RailsBetaUserForm()
+            context['error_message'] = "a problem"
+
+    page = "hosting/%s.html" % context['hosting']
+
+    return render(request, page, context)
+
+################################################################################
+# Hostings
+#
+def djangohosting(request):
+    context = {}
+    context["hosting"]="django"
+    context["hosting_long"]="Django"
+    context["domain"]="django-hosting.ch"
+    context["google_analytics"]="UA-62285904-6"
+    context["email"]="info@django-hosting.ch"
+
+    return hosting(request, context)
+
+def railshosting(request):
+    context = {}
+    context["hosting"]="rails"
+    context["hosting_long"]="Ruby On Rails"
+    context["domain"]="rails-hosting.ch"
+    context["google_analytics"]="UA-62285904-5"
+    context["email"]="info@rails-hosting.ch"
+
+    return hosting(request, context)
+
+def nodejshosting(request):
+    context = {}
+
+    context["hosting"]="nodejs"
+    context["hosting_long"]="NodeJS"
+    context["domain"]="node-hosting.ch"
+    context["google_analytics"]="UA-62285904-7"
+    context["email"]="info@node-hosting.ch"
+    
+    return hosting(request, context)
+
+def beta(request):
+    return render(request, 'hosting/beta.html')