diff --git a/.gitignore b/.gitignore index a8104f54..245c60a3 100644 --- a/.gitignore +++ b/.gitignore @@ -14,8 +14,8 @@ local_settings.py media/* !media/keep -CACHE/ -static/ +/CACHE/ +/static/ \#*# .\#* diff --git a/README.rst b/README.rst index 810e35eb..e7ec582d 100644 --- a/README.rst +++ b/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 +
+ diff --git a/digitalglarus/static/digitalglarus/img/img_2.jpg b/digitalglarus/static/digitalglarus/img/img_2.jpg new file mode 100644 index 00000000..e21015d5 Binary files /dev/null and b/digitalglarus/static/digitalglarus/img/img_2.jpg differ diff --git a/dynamicweb/settings.py b/dynamicweb/settings.py index 5467b559..e133cca3 100644 --- a/dynamicweb/settings.py +++ b/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 = ( diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py index cb17c48c..63353485 100644 --- a/dynamicweb/urls.py +++ b/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\S+?)/$', 'django.views.i18n.javascript_catalog'), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/railshosting/__init__.py b/hosting/__init__.py similarity index 100% rename from railshosting/__init__.py rename to hosting/__init__.py diff --git a/railshosting/admin.py b/hosting/admin.py similarity index 100% rename from railshosting/admin.py rename to hosting/admin.py diff --git a/railshosting/models.py b/hosting/models.py similarity index 100% rename from railshosting/models.py rename to hosting/models.py diff --git a/hosting/static/hosting/card-django.png b/hosting/static/hosting/card-django.png new file mode 100644 index 00000000..92dfc2df Binary files /dev/null and b/hosting/static/hosting/card-django.png differ diff --git a/hosting/static/hosting/card-nodejs.png b/hosting/static/hosting/card-nodejs.png new file mode 100644 index 00000000..5f70983e Binary files /dev/null and b/hosting/static/hosting/card-nodejs.png differ diff --git a/railshosting/static/railshosting/img/how3.png b/hosting/static/hosting/card-rails.png similarity index 100% rename from railshosting/static/railshosting/img/how3.png rename to hosting/static/hosting/card-rails.png diff --git a/railshosting/static/railshosting/css/bootstrap.css b/hosting/static/hosting/css/bootstrap.css similarity index 100% rename from railshosting/static/railshosting/css/bootstrap.css rename to hosting/static/hosting/css/bootstrap.css diff --git a/railshosting/static/railshosting/css/bootstrap.min.css b/hosting/static/hosting/css/bootstrap.min.css similarity index 100% rename from railshosting/static/railshosting/css/bootstrap.min.css rename to hosting/static/hosting/css/bootstrap.min.css diff --git a/railshosting/static/railshosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css similarity index 100% rename from railshosting/static/railshosting/css/landing-page.css rename to hosting/static/hosting/css/landing-page.css diff --git a/railshosting/djangohosting.css b/hosting/static/hosting/css/nodejshosting.css similarity index 100% rename from railshosting/djangohosting.css rename to hosting/static/hosting/css/nodejshosting.css diff --git a/hosting/static/hosting/django-intro-bg.png b/hosting/static/hosting/django-intro-bg.png new file mode 100644 index 00000000..4528b8ff Binary files /dev/null and b/hosting/static/hosting/django-intro-bg.png differ diff --git a/railshosting/static/railshosting/font-awesome/css/font-awesome.css b/hosting/static/hosting/font-awesome/css/font-awesome.css similarity index 100% rename from railshosting/static/railshosting/font-awesome/css/font-awesome.css rename to hosting/static/hosting/font-awesome/css/font-awesome.css diff --git a/railshosting/static/railshosting/font-awesome/css/font-awesome.min.css b/hosting/static/hosting/font-awesome/css/font-awesome.min.css similarity index 100% rename from railshosting/static/railshosting/font-awesome/css/font-awesome.min.css rename to hosting/static/hosting/font-awesome/css/font-awesome.min.css diff --git a/railshosting/static/railshosting/font-awesome/fonts/FontAwesome.otf b/hosting/static/hosting/font-awesome/fonts/FontAwesome.otf similarity index 100% rename from railshosting/static/railshosting/font-awesome/fonts/FontAwesome.otf rename to hosting/static/hosting/font-awesome/fonts/FontAwesome.otf diff --git a/railshosting/static/railshosting/font-awesome/fonts/fontawesome-webfont.eot b/hosting/static/hosting/font-awesome/fonts/fontawesome-webfont.eot similarity index 100% rename from railshosting/static/railshosting/font-awesome/fonts/fontawesome-webfont.eot rename to hosting/static/hosting/font-awesome/fonts/fontawesome-webfont.eot diff --git a/railshosting/static/railshosting/font-awesome/fonts/fontawesome-webfont.svg b/hosting/static/hosting/font-awesome/fonts/fontawesome-webfont.svg similarity index 100% rename from railshosting/static/railshosting/font-awesome/fonts/fontawesome-webfont.svg rename to hosting/static/hosting/font-awesome/fonts/fontawesome-webfont.svg diff --git a/railshosting/static/railshosting/font-awesome/fonts/fontawesome-webfont.ttf b/hosting/static/hosting/font-awesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from railshosting/static/railshosting/font-awesome/fonts/fontawesome-webfont.ttf rename to hosting/static/hosting/font-awesome/fonts/fontawesome-webfont.ttf diff --git a/railshosting/static/railshosting/font-awesome/fonts/fontawesome-webfont.woff b/hosting/static/hosting/font-awesome/fonts/fontawesome-webfont.woff similarity index 100% rename from railshosting/static/railshosting/font-awesome/fonts/fontawesome-webfont.woff rename to hosting/static/hosting/font-awesome/fonts/fontawesome-webfont.woff diff --git a/railshosting/static/railshosting/font-awesome/less/bordered-pulled.less b/hosting/static/hosting/font-awesome/less/bordered-pulled.less similarity index 100% rename from railshosting/static/railshosting/font-awesome/less/bordered-pulled.less rename to hosting/static/hosting/font-awesome/less/bordered-pulled.less diff --git a/railshosting/static/railshosting/font-awesome/less/core.less b/hosting/static/hosting/font-awesome/less/core.less similarity index 100% rename from railshosting/static/railshosting/font-awesome/less/core.less rename to hosting/static/hosting/font-awesome/less/core.less diff --git a/railshosting/static/railshosting/font-awesome/less/fixed-width.less b/hosting/static/hosting/font-awesome/less/fixed-width.less similarity index 100% rename from railshosting/static/railshosting/font-awesome/less/fixed-width.less rename to hosting/static/hosting/font-awesome/less/fixed-width.less diff --git a/railshosting/static/railshosting/font-awesome/less/font-awesome.less b/hosting/static/hosting/font-awesome/less/font-awesome.less similarity index 100% rename from railshosting/static/railshosting/font-awesome/less/font-awesome.less rename to hosting/static/hosting/font-awesome/less/font-awesome.less diff --git a/railshosting/static/railshosting/font-awesome/less/icons.less b/hosting/static/hosting/font-awesome/less/icons.less similarity index 100% rename from railshosting/static/railshosting/font-awesome/less/icons.less rename to hosting/static/hosting/font-awesome/less/icons.less diff --git a/railshosting/static/railshosting/font-awesome/less/larger.less b/hosting/static/hosting/font-awesome/less/larger.less similarity index 100% rename from railshosting/static/railshosting/font-awesome/less/larger.less rename to hosting/static/hosting/font-awesome/less/larger.less diff --git a/railshosting/static/railshosting/font-awesome/less/list.less b/hosting/static/hosting/font-awesome/less/list.less similarity index 100% rename from railshosting/static/railshosting/font-awesome/less/list.less rename to hosting/static/hosting/font-awesome/less/list.less diff --git a/railshosting/static/railshosting/font-awesome/less/mixins.less b/hosting/static/hosting/font-awesome/less/mixins.less similarity index 100% rename from railshosting/static/railshosting/font-awesome/less/mixins.less rename to hosting/static/hosting/font-awesome/less/mixins.less diff --git a/railshosting/static/railshosting/font-awesome/less/path.less b/hosting/static/hosting/font-awesome/less/path.less similarity index 100% rename from railshosting/static/railshosting/font-awesome/less/path.less rename to hosting/static/hosting/font-awesome/less/path.less diff --git a/railshosting/static/railshosting/font-awesome/less/rotated-flipped.less b/hosting/static/hosting/font-awesome/less/rotated-flipped.less similarity index 100% rename from railshosting/static/railshosting/font-awesome/less/rotated-flipped.less rename to hosting/static/hosting/font-awesome/less/rotated-flipped.less diff --git a/railshosting/static/railshosting/font-awesome/less/spinning.less b/hosting/static/hosting/font-awesome/less/spinning.less similarity index 100% rename from railshosting/static/railshosting/font-awesome/less/spinning.less rename to hosting/static/hosting/font-awesome/less/spinning.less diff --git a/railshosting/static/railshosting/font-awesome/less/stacked.less b/hosting/static/hosting/font-awesome/less/stacked.less similarity index 100% rename from railshosting/static/railshosting/font-awesome/less/stacked.less rename to hosting/static/hosting/font-awesome/less/stacked.less diff --git a/railshosting/static/railshosting/font-awesome/less/variables.less b/hosting/static/hosting/font-awesome/less/variables.less similarity index 100% rename from railshosting/static/railshosting/font-awesome/less/variables.less rename to hosting/static/hosting/font-awesome/less/variables.less diff --git a/railshosting/static/railshosting/font-awesome/scss/_bordered-pulled.scss b/hosting/static/hosting/font-awesome/scss/_bordered-pulled.scss similarity index 100% rename from railshosting/static/railshosting/font-awesome/scss/_bordered-pulled.scss rename to hosting/static/hosting/font-awesome/scss/_bordered-pulled.scss diff --git a/railshosting/static/railshosting/font-awesome/scss/_core.scss b/hosting/static/hosting/font-awesome/scss/_core.scss similarity index 100% rename from railshosting/static/railshosting/font-awesome/scss/_core.scss rename to hosting/static/hosting/font-awesome/scss/_core.scss diff --git a/railshosting/static/railshosting/font-awesome/scss/_fixed-width.scss b/hosting/static/hosting/font-awesome/scss/_fixed-width.scss similarity index 100% rename from railshosting/static/railshosting/font-awesome/scss/_fixed-width.scss rename to hosting/static/hosting/font-awesome/scss/_fixed-width.scss diff --git a/railshosting/static/railshosting/font-awesome/scss/_icons.scss b/hosting/static/hosting/font-awesome/scss/_icons.scss similarity index 100% rename from railshosting/static/railshosting/font-awesome/scss/_icons.scss rename to hosting/static/hosting/font-awesome/scss/_icons.scss diff --git a/railshosting/static/railshosting/font-awesome/scss/_larger.scss b/hosting/static/hosting/font-awesome/scss/_larger.scss similarity index 100% rename from railshosting/static/railshosting/font-awesome/scss/_larger.scss rename to hosting/static/hosting/font-awesome/scss/_larger.scss diff --git a/railshosting/static/railshosting/font-awesome/scss/_list.scss b/hosting/static/hosting/font-awesome/scss/_list.scss similarity index 100% rename from railshosting/static/railshosting/font-awesome/scss/_list.scss rename to hosting/static/hosting/font-awesome/scss/_list.scss diff --git a/railshosting/static/railshosting/font-awesome/scss/_mixins.scss b/hosting/static/hosting/font-awesome/scss/_mixins.scss similarity index 100% rename from railshosting/static/railshosting/font-awesome/scss/_mixins.scss rename to hosting/static/hosting/font-awesome/scss/_mixins.scss diff --git a/railshosting/static/railshosting/font-awesome/scss/_path.scss b/hosting/static/hosting/font-awesome/scss/_path.scss similarity index 100% rename from railshosting/static/railshosting/font-awesome/scss/_path.scss rename to hosting/static/hosting/font-awesome/scss/_path.scss diff --git a/railshosting/static/railshosting/font-awesome/scss/_rotated-flipped.scss b/hosting/static/hosting/font-awesome/scss/_rotated-flipped.scss similarity index 100% rename from railshosting/static/railshosting/font-awesome/scss/_rotated-flipped.scss rename to hosting/static/hosting/font-awesome/scss/_rotated-flipped.scss diff --git a/railshosting/static/railshosting/font-awesome/scss/_spinning.scss b/hosting/static/hosting/font-awesome/scss/_spinning.scss similarity index 100% rename from railshosting/static/railshosting/font-awesome/scss/_spinning.scss rename to hosting/static/hosting/font-awesome/scss/_spinning.scss diff --git a/railshosting/static/railshosting/font-awesome/scss/_stacked.scss b/hosting/static/hosting/font-awesome/scss/_stacked.scss similarity index 100% rename from railshosting/static/railshosting/font-awesome/scss/_stacked.scss rename to hosting/static/hosting/font-awesome/scss/_stacked.scss diff --git a/railshosting/static/railshosting/font-awesome/scss/_variables.scss b/hosting/static/hosting/font-awesome/scss/_variables.scss similarity index 100% rename from railshosting/static/railshosting/font-awesome/scss/_variables.scss rename to hosting/static/hosting/font-awesome/scss/_variables.scss diff --git a/railshosting/static/railshosting/font-awesome/scss/font-awesome.scss b/hosting/static/hosting/font-awesome/scss/font-awesome.scss similarity index 100% rename from railshosting/static/railshosting/font-awesome/scss/font-awesome.scss rename to hosting/static/hosting/font-awesome/scss/font-awesome.scss diff --git a/railshosting/static/railshosting/fonts/glyphicons-halflings-regular.eot b/hosting/static/hosting/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from railshosting/static/railshosting/fonts/glyphicons-halflings-regular.eot rename to hosting/static/hosting/fonts/glyphicons-halflings-regular.eot diff --git a/railshosting/static/railshosting/fonts/glyphicons-halflings-regular.svg b/hosting/static/hosting/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from railshosting/static/railshosting/fonts/glyphicons-halflings-regular.svg rename to hosting/static/hosting/fonts/glyphicons-halflings-regular.svg diff --git a/railshosting/static/railshosting/fonts/glyphicons-halflings-regular.ttf b/hosting/static/hosting/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from railshosting/static/railshosting/fonts/glyphicons-halflings-regular.ttf rename to hosting/static/hosting/fonts/glyphicons-halflings-regular.ttf diff --git a/railshosting/static/railshosting/fonts/glyphicons-halflings-regular.woff b/hosting/static/hosting/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from railshosting/static/railshosting/fonts/glyphicons-halflings-regular.woff rename to hosting/static/hosting/fonts/glyphicons-halflings-regular.woff diff --git a/railshosting/static/railshosting/fonts/glyphicons-halflings-regular.woff2 b/hosting/static/hosting/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from railshosting/static/railshosting/fonts/glyphicons-halflings-regular.woff2 rename to hosting/static/hosting/fonts/glyphicons-halflings-regular.woff2 diff --git a/railshosting/static/railshosting/img/Beta.png b/hosting/static/hosting/img/Beta.png similarity index 100% rename from railshosting/static/railshosting/img/Beta.png rename to hosting/static/hosting/img/Beta.png diff --git a/railshosting/static/railshosting/img/banner-bg copy.jpg b/hosting/static/hosting/img/banner-bg copy.jpg similarity index 100% rename from railshosting/static/railshosting/img/banner-bg copy.jpg rename to hosting/static/hosting/img/banner-bg copy.jpg diff --git a/railshosting/static/railshosting/img/banner-bg.jpg b/hosting/static/hosting/img/banner-bg.jpg similarity index 100% rename from railshosting/static/railshosting/img/banner-bg.jpg rename to hosting/static/hosting/img/banner-bg.jpg diff --git a/hosting/static/hosting/img/card-django.png b/hosting/static/hosting/img/card-django.png new file mode 100644 index 00000000..92dfc2df Binary files /dev/null and b/hosting/static/hosting/img/card-django.png differ diff --git a/hosting/static/hosting/img/card-nodejs.png b/hosting/static/hosting/img/card-nodejs.png new file mode 100644 index 00000000..5f70983e Binary files /dev/null and b/hosting/static/hosting/img/card-nodejs.png differ diff --git a/hosting/static/hosting/img/card-rails.png b/hosting/static/hosting/img/card-rails.png new file mode 100644 index 00000000..2f16f8f1 Binary files /dev/null and b/hosting/static/hosting/img/card-rails.png differ diff --git a/railshosting/static/railshosting/img/checkmark.png b/hosting/static/hosting/img/checkmark.png similarity index 100% rename from railshosting/static/railshosting/img/checkmark.png rename to hosting/static/hosting/img/checkmark.png diff --git a/railshosting/static/railshosting/img/configure.jpg b/hosting/static/hosting/img/configure.jpg similarity index 100% rename from railshosting/static/railshosting/img/configure.jpg rename to hosting/static/hosting/img/configure.jpg diff --git a/railshosting/static/railshosting/img/deluxeroom.jpg b/hosting/static/hosting/img/deluxeroom.jpg similarity index 100% rename from railshosting/static/railshosting/img/deluxeroom.jpg rename to hosting/static/hosting/img/deluxeroom.jpg diff --git a/hosting/static/hosting/img/django-intro-bg.png b/hosting/static/hosting/img/django-intro-bg.png new file mode 100644 index 00000000..4528b8ff Binary files /dev/null and b/hosting/static/hosting/img/django-intro-bg.png differ diff --git a/railshosting/static/railshosting/img/dog.png b/hosting/static/hosting/img/dog.png similarity index 100% rename from railshosting/static/railshosting/img/dog.png rename to hosting/static/hosting/img/dog.png diff --git a/railshosting/static/railshosting/img/economy.jpg b/hosting/static/hosting/img/economy.jpg similarity index 100% rename from railshosting/static/railshosting/img/economy.jpg rename to hosting/static/hosting/img/economy.jpg diff --git a/railshosting/static/railshosting/img/favicon.ico b/hosting/static/hosting/img/favicon.ico similarity index 100% rename from railshosting/static/railshosting/img/favicon.ico rename to hosting/static/hosting/img/favicon.ico diff --git a/railshosting/static/railshosting/img/header-bg.jpg b/hosting/static/hosting/img/header-bg.jpg similarity index 100% rename from railshosting/static/railshosting/img/header-bg.jpg rename to hosting/static/hosting/img/header-bg.jpg diff --git a/railshosting/static/railshosting/img/home.png b/hosting/static/hosting/img/home.png similarity index 100% rename from railshosting/static/railshosting/img/home.png rename to hosting/static/hosting/img/home.png diff --git a/railshosting/static/railshosting/img/how.png b/hosting/static/hosting/img/how.png similarity index 100% rename from railshosting/static/railshosting/img/how.png rename to hosting/static/hosting/img/how.png diff --git a/railshosting/static/railshosting/img/how1.png b/hosting/static/hosting/img/how1.png similarity index 100% rename from railshosting/static/railshosting/img/how1.png rename to hosting/static/hosting/img/how1.png diff --git a/railshosting/static/railshosting/img/how2.png b/hosting/static/hosting/img/how2.png similarity index 100% rename from railshosting/static/railshosting/img/how2.png rename to hosting/static/hosting/img/how2.png diff --git a/railshosting/static/railshosting/img/how4.png b/hosting/static/hosting/img/how4.png similarity index 100% rename from railshosting/static/railshosting/img/how4.png rename to hosting/static/hosting/img/how4.png diff --git a/railshosting/static/railshosting/img/intro-bg.jpg b/hosting/static/hosting/img/intro-bg.jpg similarity index 100% rename from railshosting/static/railshosting/img/intro-bg.jpg rename to hosting/static/hosting/img/intro-bg.jpg diff --git a/railshosting/static/railshosting/img/ipad.png b/hosting/static/hosting/img/ipad.png similarity index 100% rename from railshosting/static/railshosting/img/ipad.png rename to hosting/static/hosting/img/ipad.png diff --git a/railshosting/static/railshosting/img/logo_black.svg b/hosting/static/hosting/img/logo_black.svg similarity index 100% rename from railshosting/static/railshosting/img/logo_black.svg rename to hosting/static/hosting/img/logo_black.svg diff --git a/railshosting/static/railshosting/img/logo_white.svg b/hosting/static/hosting/img/logo_white.svg similarity index 100% rename from railshosting/static/railshosting/img/logo_white.svg rename to hosting/static/hosting/img/logo_white.svg diff --git a/hosting/static/hosting/img/nodejs-intro-bg.png b/hosting/static/hosting/img/nodejs-intro-bg.png new file mode 100644 index 00000000..397fec6b Binary files /dev/null and b/hosting/static/hosting/img/nodejs-intro-bg.png differ diff --git a/railshosting/static/railshosting/img/phones.png b/hosting/static/hosting/img/phones.png similarity index 100% rename from railshosting/static/railshosting/img/phones.png rename to hosting/static/hosting/img/phones.png diff --git a/railshosting/static/railshosting/img/presidentialroom.jpg b/hosting/static/hosting/img/presidentialroom.jpg similarity index 100% rename from railshosting/static/railshosting/img/presidentialroom.jpg rename to hosting/static/hosting/img/presidentialroom.jpg diff --git a/hosting/static/hosting/img/rails-intro-bg.png b/hosting/static/hosting/img/rails-intro-bg.png new file mode 100644 index 00000000..73375941 Binary files /dev/null and b/hosting/static/hosting/img/rails-intro-bg.png differ diff --git a/railshosting/static/railshosting/img/standardroom.jpg b/hosting/static/hosting/img/standardroom.jpg similarity index 100% rename from railshosting/static/railshosting/img/standardroom.jpg rename to hosting/static/hosting/img/standardroom.jpg diff --git a/railshosting/static/railshosting/img/ubuntu.png b/hosting/static/hosting/img/ubuntu.png similarity index 100% rename from railshosting/static/railshosting/img/ubuntu.png rename to hosting/static/hosting/img/ubuntu.png diff --git a/railshosting/static/railshosting/js/bootstrap.js b/hosting/static/hosting/js/bootstrap.js similarity index 100% rename from railshosting/static/railshosting/js/bootstrap.js rename to hosting/static/hosting/js/bootstrap.js diff --git a/railshosting/static/railshosting/js/bootstrap.min.js b/hosting/static/hosting/js/bootstrap.min.js similarity index 100% rename from railshosting/static/railshosting/js/bootstrap.min.js rename to hosting/static/hosting/js/bootstrap.min.js diff --git a/railshosting/static/railshosting/js/jquery.js b/hosting/static/hosting/js/jquery.js similarity index 100% rename from railshosting/static/railshosting/js/jquery.js rename to hosting/static/hosting/js/jquery.js diff --git a/hosting/static/hosting/nodejs-intro-bg.png b/hosting/static/hosting/nodejs-intro-bg.png new file mode 100644 index 00000000..397fec6b Binary files /dev/null and b/hosting/static/hosting/nodejs-intro-bg.png differ diff --git a/hosting/static/hosting/rails-intro-bg.png b/hosting/static/hosting/rails-intro-bg.png new file mode 100644 index 00000000..73375941 Binary files /dev/null and b/hosting/static/hosting/rails-intro-bg.png differ diff --git a/railshosting/templates/railshosting/base.html b/hosting/templates/hosting/base.html similarity index 87% rename from railshosting/templates/railshosting/base.html rename to hosting/templates/hosting/base.html index 63a33048..a9eb1d7a 100644 --- a/railshosting/templates/railshosting/base.html +++ b/hosting/templates/hosting/base.html @@ -11,19 +11,19 @@ - {% block title %} {%endblock%} as easy as possible + {{ domain }} - {{ hosting }} hosting as easy as possible - + - + - + - + @@ -32,8 +32,14 @@ - {% block customcss %} {%endblock%} - + {% with 'hosting/img/'|add:hosting|add:'-intro-bg.png' as image_static %} + alt=""> + +{% endwith %} + - + diff --git a/railshosting/templates/railshosting/beta.html b/hosting/templates/hosting/beta.html similarity index 73% rename from railshosting/templates/railshosting/beta.html rename to hosting/templates/hosting/beta.html index 7f774b31..36e4f857 100644 --- a/railshosting/templates/railshosting/beta.html +++ b/hosting/templates/hosting/beta.html @@ -14,16 +14,16 @@ Rails Hosting.ch - Ruby on Rails as easy as possible - + - + - + - + @@ -57,25 +57,25 @@ - + @@ -91,7 +91,7 @@
-
+

Thank you for your interest in joining Rails-Hosting Beta.
    We will come back to you shortly to give you access to our  infrastructure.

@@ -116,24 +116,24 @@

Copyright © ungleich GmbH 2015. All Rights Reserved

@@ -143,10 +143,10 @@ - + - + diff --git a/railshosting/templates/railshosting/checkout.html b/hosting/templates/hosting/checkout.html similarity index 100% rename from railshosting/templates/railshosting/checkout.html rename to hosting/templates/hosting/checkout.html diff --git a/hosting/templates/hosting/django.html b/hosting/templates/hosting/django.html new file mode 100644 index 00000000..99ada559 --- /dev/null +++ b/hosting/templates/hosting/django.html @@ -0,0 +1,12 @@ +{% extends "hosting/base.html" %} +{% load staticfiles %} + +{%block specification %} +
  • +

    Ubuntu 14.04 as the operating system, full root access!

    +
    • +

  • nginx as the frontend Server (optional with SSL Support)

    • +

  • uwsgi to have your application talk to nginx and vice versa +

  • PostgreSQL as the database

    +
    • +{%endblock%} diff --git a/railshosting/templates/railshosting/index.html b/hosting/templates/hosting/index.html similarity index 100% rename from railshosting/templates/railshosting/index.html rename to hosting/templates/hosting/index.html diff --git a/railshosting/templates/railshosting/login.html b/hosting/templates/hosting/login.html similarity index 100% rename from railshosting/templates/railshosting/login.html rename to hosting/templates/hosting/login.html diff --git a/railshosting/templates/railshosting/django.html b/hosting/templates/hosting/nodejs.html similarity index 77% rename from railshosting/templates/railshosting/django.html rename to hosting/templates/hosting/nodejs.html index df2cf991..8bedf943 100644 --- a/railshosting/templates/railshosting/django.html +++ b/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 %} - + + {%endblock%} {%block specification %} @@ -15,4 +15,4 @@

  • uwsgi to have your application talk to nginx and vice versa

  • PostgreSQL as the database

    • -{%endblock%} \ No newline at end of file +{%endblock%} diff --git a/hosting/templates/hosting/rails.html b/hosting/templates/hosting/rails.html new file mode 100644 index 00000000..d8db7a88 --- /dev/null +++ b/hosting/templates/hosting/rails.html @@ -0,0 +1,13 @@ +{% extends "hosting/base.html" %} +{% load staticfiles %} + +{%block specification %} +
  • +

    Ubuntu 14.04 as the operating system, full root access!

    +
    • +

  • rbenv to let you decide which Ruby version you want to use

    • s +

  • nginx as the frontend Server (optional with SSL Support)

    • +

  • uwsgi to have your application talk to nginx and vice versa +

  • PostgreSQL as the database

    +
    • +{%endblock%} diff --git a/railshosting/templates/railshosting/signup.html b/hosting/templates/hosting/signup.html similarity index 100% rename from railshosting/templates/railshosting/signup.html rename to hosting/templates/hosting/signup.html diff --git a/railshosting/tests.py b/hosting/tests.py similarity index 100% rename from railshosting/tests.py rename to hosting/tests.py diff --git a/hosting/urls.py b/hosting/urls.py new file mode 100644 index 00000000..105c0ce9 --- /dev/null +++ b/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'), +] diff --git a/hosting/views.py b/hosting/views.py new file mode 100644 index 00000000..5785461b --- /dev/null +++ b/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') diff --git a/railshosting/templates/railshosting/LICENSE b/railshosting/templates/railshosting/LICENSE deleted file mode 100644 index 610cecd0..00000000 --- a/railshosting/templates/railshosting/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ -Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2013-2015 Iron Summit Media Strategies, LLC - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - diff --git a/railshosting/templates/railshosting/README.md b/railshosting/templates/railshosting/README.md deleted file mode 100644 index 95aa2263..00000000 --- a/railshosting/templates/railshosting/README.md +++ /dev/null @@ -1,26 +0,0 @@ -# [Start Bootstrap](http://startbootstrap.com/) - [Landing Page](http://startbootstrap.com/template-overviews/landing-page/) - -[Landing Page](http://startbootstrap.com/template-overviews/landing-page/) is a multipurpose landing page template for [Bootstrap](http://getbootstrap.com/) created by [Start Bootstrap](http://startbootstrap.com/). - -## Getting Started - -To use this template, choose one of the following options to get started: -* Download the latest release on Start Bootstrap -* Fork this repository on GitHub - -## Bugs and Issues - -Have a bug or an issue with this template? [Open a new issue](https://github.com/IronSummitMedia/startbootstrap-landing-page/issues) here on GitHub or leave a comment on the [template overview page at Start Bootstrap](http://startbootstrap.com/template-overviews/landing-page/). - -## Creator - -Start Bootstrap was created by and is maintained by **David Miller**, Managing Parter at [Iron Summit Media Strategies](http://www.ironsummitmedia.com/). - -* https://twitter.com/davidmillerskt -* https://github.com/davidtmiller - -Start Bootstrap is based on the [Bootstrap](http://getbootstrap.com/) framework created by [Mark Otto](https://twitter.com/mdo) and [Jacob Thorton](https://twitter.com/fat). - -## Copyright and License - -Copyright 2013-2015 Iron Summit Media Strategies, LLC. Code released under the [Apache 2.0](https://github.com/IronSummitMedia/startbootstrap-landing-page/blob/gh-pages/LICENSE) license. \ No newline at end of file diff --git a/railshosting/templates/railshosting/error404.html b/railshosting/templates/railshosting/error404.html deleted file mode 100644 index dc819a9d..00000000 --- a/railshosting/templates/railshosting/error404.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - Rails Hosting.ch - Ruby on Rails as easy as possible | Page not found - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    -

     

    -

    404

    -

    - "Sorry, we could not find the page you are looking for!" -

    -
    -
    -
    - - - - - - - - - - diff --git a/railshosting/templates/railshosting/logo_black.svg b/railshosting/templates/railshosting/logo_black.svg deleted file mode 100644 index c7684df4..00000000 --- a/railshosting/templates/railshosting/logo_black.svg +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/railshosting/urls.py b/railshosting/urls.py deleted file mode 100644 index 97e91151..00000000 --- a/railshosting/urls.py +++ /dev/null @@ -1,9 +0,0 @@ -from django.conf.urls import url - -from . import views - -urlpatterns = [ - url(r'^$', views.index, name='index'), - url(r'beta$', views.beta, name='beta'), - url(r'djangohosting$', views.djangohosting, name='djangohosting'), -] diff --git a/railshosting/views.py b/railshosting/views.py deleted file mode 100644 index 16264cfe..00000000 --- a/railshosting/views.py +++ /dev/null @@ -1,56 +0,0 @@ -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 .models import RailsBetaUser - -class RailsBetaUserForm(ModelForm): - required_css_class = 'form-control' - class Meta: - model = RailsBetaUser - fields = [ 'email' ] - -def index(request): - email = RailsBetaUser(received_date=datetime.datetime.now()) - context = {} - context['form'] = RailsBetaUserForm() - - if request.method == 'POST': - form = RailsBetaUserForm(request.POST, instance=email) - context['form'] = form - if form.is_valid(): - form.save() - return HttpResponseRedirect(reverse("railshosting:beta")) - else: - context['error_message'] = "a problem" - - return render(request, 'railshosting/index.html', context) - -def djangohosting(request): - context = {} - - context["hosting"]="django" - context["hosting_long"]="Django" - context["domain"]="django-hosting.ch" - context["google_analytics"]="the right id" - context["email"]="info@django-hosting.ch" - - return render(request, 'railshosting/django.html', context) - - -def railshosting(request): - context = {} - - context["hosting"]="rails" - context["hosting_long"]="Ruby On Rails" - context["domain"]="rails-hosting.ch" - context["google_analytics"]="the right id" - context["email"]="info@rails-hosting.ch" - - return render(request, 'railshosting/rails.html', context) - -def beta(request): - return render(request, 'railshosting/beta.html')