diff --git a/README.rst b/README.rst index 74318ac9..f4e33fad 100644 --- a/README.rst +++ b/README.rst @@ -5,3 +5,18 @@ Website for Ungleich GMBH dynamicweb ---------- + +- 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/dynamicweb/settings.py b/dynamicweb/settings.py index 1b5ae0a5..cdaf12e5 100644 --- a/dynamicweb/settings.py +++ b/dynamicweb/settings.py @@ -44,9 +44,6 @@ DEBUG = False ALLOWED_HOSTS = [ ".ungleich.ch", "digital.glarus.ungleich.ch" , - "rails-hosting.ch", - "django-hosting.ch", - "node-hosting.ch" ] @@ -72,6 +69,7 @@ INSTALLED_APPS = ( 'djangocms_link', 'djangocms_snippet', 'djangocms_teaser', + 'djangocms_page_meta', #django-filer 'cmsplugin_filer_file', 'cmsplugin_filer_folder', @@ -98,9 +96,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 7bafdf28..f3157fac 100644 --- a/dynamicweb/urls.py +++ b/dynamicweb/urls.py @@ -6,10 +6,8 @@ from dynamicweb import settings urlpatterns = [ url(r'^admin/', include(admin.site.urls)), - url(r'^digitalglarus/', include('digitalglarus.urls', - namespace="digitalglarus")), - url(r'^railshosting/', include('railshosting.urls', - namespace="railshosting")), + url(r'^digitalglarus/', include('digitalglarus.urls', namespace="digitalglarus")), + url(r'^hosting/', include('hosting.urls', namespace="hosting")), url(r'^', include('cms.urls')), url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')), ] + 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/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/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/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/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/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/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/railshosting/templates/railshosting/base.html b/hosting/templates/hosting/base.html similarity index 90% rename from railshosting/templates/railshosting/base.html rename to hosting/templates/hosting/base.html index 236d99ca..a9eb1d7a 100644 --- a/railshosting/templates/railshosting/base.html +++ b/hosting/templates/hosting/base.html @@ -14,16 +14,16 @@ {{ domain }} - {{ hosting }} hosting as easy as possible - + - + - + - + @@ -32,7 +32,7 @@ - {% with 'railshosting/img/'|add:hosting|add:'-intro-bg.png' as image_static %} + {% with 'hosting/img/'|add:hosting|add:'-intro-bg.png' as image_static %} alt="">