Merge branch 'develop' of git.ungleich.ch:dynamicweb into develop

This commit is contained in:
rascencio 2015-06-10 21:19:47 -06:00
commit 207fc31417
38 changed files with 46 additions and 46 deletions

View file

@ -7,7 +7,7 @@ from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('digital_glarus', '0001_initial'),
('digitalglarus', '0001_initial'),
]
operations = [

View file

@ -7,7 +7,7 @@ from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('digital_glarus', '0001_initial'),
('digitalglarus', '0001_initial'),
]
operations = [

View file

@ -7,8 +7,8 @@ from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('digital_glarus', '0002_auto_20150522_0450'),
('digital_glarus', '0002_auto_20150527_1023'),
('digitalglarus', '0002_auto_20150522_0450'),
('digitalglarus', '0002_auto_20150527_1023'),
]
operations = [

View file

Before

Width:  |  Height:  |  Size: 192 KiB

After

Width:  |  Height:  |  Size: 192 KiB

View file

Before

Width:  |  Height:  |  Size: 416 KiB

After

Width:  |  Height:  |  Size: 416 KiB

View file

Before

Width:  |  Height:  |  Size: 235 KiB

After

Width:  |  Height:  |  Size: 235 KiB

View file

Before

Width:  |  Height:  |  Size: 239 KiB

After

Width:  |  Height:  |  Size: 239 KiB

View file

Before

Width:  |  Height:  |  Size: 431 KiB

After

Width:  |  Height:  |  Size: 431 KiB

View file

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 63 KiB

View file

Before

Width:  |  Height:  |  Size: 338 KiB

After

Width:  |  Height:  |  Size: 338 KiB

View file

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

View file

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

View file

@ -1,4 +1,4 @@
{% extends "digital_glarus/base.html" %}
{% extends "digitalglarus/base.html" %}
{% load staticfiles %}
{% block title %}About{% endblock %}
@ -13,7 +13,7 @@
<hr>
</div>
<div class="col-md-6">
<img class="img-responsive img-border-left" src="{% static 'digital_glarus/img/img_4.png' %}" alt="">
<img class="img-responsive img-border-left" src="{% static 'digitalglarus/img/img_4.png' %}" alt="">
</div>
<div class="col-md-6">
<p>We, the ungleich GmbH, were founded 2013 in Switzerland - however our first incarnation in Germany dates back to 2000.
@ -33,18 +33,18 @@
<hr>
</div>
<div class="col-sm-4 text-center">
<img class="img-responsive" src="{% static 'digital_glarus/img/img_1.jpg' %}" alt="">
<img class="img-responsive" src="{% static 'digitalglarus/img/img_1.jpg' %}" alt="">
<h3>BEAUTIFUL
<small> landscape</small>
</h3>
</div>
<div class="col-sm-4 text-center">
<img class="img-responsive" src="{% static 'digital_glarus/img/img_2.jpg' %}" alt="">
<img class="img-responsive" src="{% static 'digitalglarus/img/img_2.jpg' %}" alt="">
<h3>AFFORDABLE
<small>price</small></h3>
</div>
<div class="col-sm-4 text-center">
<img class="img-responsive" src="{% static 'digital_glarus/img/img_3.jpg' %}" alt="">
<img class="img-responsive" src="{% static 'digitalglarus/img/img_3.jpg' %}" alt="">
<h3>direct
<small> connection to zurich</small>
</h3>

View file

@ -14,10 +14,10 @@
<title>Digital.Glarus - {% block title %}Welcome{% endblock %}</title>
<!-- Bootstrap Core CSS -->
<link href="{% static 'digital_glarus/css/bootstrap.min.css' %}" rel="stylesheet">
<link href="{% static 'digitalglarus/css/bootstrap.min.css' %}" rel="stylesheet">
<!-- Custom CSS -->
<link href="{% static 'digital_glarus/css/business-casual.css' %}" rel="stylesheet">
<link href="{% static 'digitalglarus/css/business-casual.css' %}" rel="stylesheet">
<!-- Fonts -->
<link href="http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" rel="stylesheet" type="text/css">
@ -64,13 +64,13 @@
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li>
<a href="{% url 'digital_glarus:index' %}">Home</a>
<a href="{% url 'digitalglarus:index' %}">Home</a>
</li>
<li>
<a href="{% url 'digital_glarus:about' %}">About</a>
<a href="{% url 'digitalglarus:about' %}">About</a>
</li>
<li>
<a href="{% url 'digital_glarus:contact' %}">Contact</a>
<a href="{% url 'digitalglarus:contact' %}">Contact</a>
</li>
</ul>
</div>
@ -95,10 +95,10 @@
</footer>
<!-- jQuery -->
<script src="{% static 'digital_glarus/js/jquery.js' %}"></script>
<script src="{% static 'digitalglarus/js/jquery.js' %}"></script>
<!-- Bootstrap Core JavaScript -->
<script src="{% static 'digital_glarus/js/bootstrap.min.js' %}"></script>
<script src="{% static 'digitalglarus/js/bootstrap.min.js' %}"></script>
<!-- Script to Activate the Carousel -->
<script>

View file

@ -1,4 +1,4 @@
{% extends "digital_glarus/base.html" %}
{% extends "digitalglarus/base.html" %}
{% block title %}Contact{% endblock %}
@ -40,7 +40,7 @@
</h2>
<hr>
<p>If you want further information on Digital Glarus, please send us a message using the form below.</p>
<form action="{% url 'digital_glarus:contact' %}" method="post" role="form">
<form action="{% url 'digitalglarus:contact' %}" method="post" role="form">
{% csrf_token %}
<div class="row">
<div class="form-group col-lg-4">

View file

@ -8,4 +8,4 @@
<li>{{ message.received_date }}
</ul>
<p><a href="{% url 'digital_glarus:index' %}">Back to Main</a>
<p><a href="{% url 'digitalglarus:index' %}">Back to Main</a>

View file

@ -1,4 +1,4 @@
{% extends "digital_glarus/base.html" %}
{% extends "digitalglarus/base.html" %}
{% load staticfiles %}
{% block content %}
@ -9,13 +9,13 @@
<!-- Indicators --><!-- Wrapper for slides -->
<div class="carousel-inner">
<div class="item active">
<img class="img-responsive img-full" src="{% static 'digital_glarus/img/slide-1.jpg' %}" alt="">
<img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-1.jpg' %}" alt="">
</div>
<div class="item">
<img class="img-responsive img-full" src="{% static 'digital_glarus/img/slide-2.jpg' %}" alt="">
<img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-2.jpg' %}" alt="">
</div>
<div class="item">
<img class="img-responsive img-full" src="{% static 'digital_glarus/img/slide-3.jpg' %}" alt="">
<img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-3.jpg' %}" alt="">
</div>
</div>
@ -47,7 +47,7 @@
<hr>
<h2 class="intro-text text-center">Build a tech valley <strong>in the heart of switzerland</strong></h2>
<hr>
<img class="img-responsive img-border img-left" src="{% static 'digital_glarus/img/intro-pic.jpg' %}" alt="">
<img class="img-responsive img-border img-left" src="{% static 'digitalglarus/img/intro-pic.jpg' %}" alt="">
<hr class="visible-xs">
<p>Digital Glarus, this is how we call the new home for high tech companies. Located south of Zurich, it has unique features you can not find anywhere else in Switzerland.</p>
<p> The combination of beautiful landscape, recreational areas as well as having high speed Internet connections and huge variety of great food offers forms what we call "Digital Glarus".</p>

View file

@ -16,10 +16,10 @@
<title>Digital.Glarus - {% block title %}Welcome{% endblock %}</title>
<!-- Bootstrap Core CSS -->
<link href="{% static 'digital_glarus/css/bootstrap.min.css' %}" rel="stylesheet">
<link href="{% static 'digitalglarus/css/bootstrap.min.css' %}" rel="stylesheet">
<!-- Custom CSS -->
<link href="{% static 'digital_glarus/css/business-casual.css' %}" rel="stylesheet">
<link href="{% static 'digitalglarus/css/business-casual.css' %}" rel="stylesheet">
<!-- Fonts -->
<link href="http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" rel="stylesheet" type="text/css">
@ -66,13 +66,13 @@
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li>
<a href="{% url 'digital_glarus:index' %}">Home</a>
<a href="{% url 'digitalglarus:index' %}">Home</a>
</li>
<li>
<a href="{% url 'digital_glarus:index' %}">About</a>
<a href="{% url 'digitalglarus:index' %}">About</a>
</li>
<li>
<a href="{% url 'digital_glarus:index' %}">Contact</a>
<a href="{% url 'digitalglarus:index' %}">Contact</a>
</li>
</ul>
</div>
@ -90,13 +90,13 @@
<!-- Indicators --><!-- Wrapper for slides -->
<div class="carousel-inner">
<div class="item active">
<img class="img-responsive img-full" src="{% static 'digital_glarus/img/slide-1.jpg' %}" alt="">
<img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-1.jpg' %}" alt="">
</div>
<div class="item">
<img class="img-responsive img-full" src="{% static 'digital_glarus/img/slide-2.jpg' %}" alt="">
<img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-2.jpg' %}" alt="">
</div>
<div class="item">
<img class="img-responsive img-full" src="{% static 'digital_glarus/img/slide-3.jpg' %}" alt="">
<img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-3.jpg' %}" alt="">
</div>
</div>
@ -128,7 +128,7 @@
<hr>
<h2 class="intro-text text-center">Build a tech valley <strong>in the heart of switzerland</strong></h2>
<hr>
<img class="img-responsive img-border img-left" src="{% static 'digital_glarus/img/intro-pic.jpg' %}" alt="">
<img class="img-responsive img-border img-left" src="{% static 'digitalglarus/img/intro-pic.jpg' %}" alt="">
<hr class="visible-xs">
<p>Digital Glarus, this is how we call the new home for high tech companies. Located south of Zurich, it has unique features you can not find anywhere else in Switzerland.</p>
<p> The combination of beautiful landscape, recreational areas as well as having high speed Internet connections and huge variety of great food offers forms what we call "Digital Glarus".</p>

View file

@ -4,7 +4,7 @@
{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
<form action="{% url 'digital_glarus:index' %}" method="post">
<form action="{% url 'digitalglarus:index' %}" method="post">
{% csrf_token %}
{{ form }}
<input type="submit" value="Send Message" />

View file

@ -18,13 +18,13 @@ def detail(request, message_id):
p = get_object_or_404(Message, pk=message_id)
context = { 'message': p, }
return render(request, 'digital_glarus/detail.html', context)
return render(request, 'digitalglarus/detail.html', context)
def about(request):
return render(request, 'digital_glarus/about.html')
return render(request, 'digitalglarus/about.html')
def index(request):
return render(request, 'digital_glarus/index.html')
return render(request, 'digitalglarus/index.html')
def contact(request):
message = Message(received_date=datetime.datetime.now())
@ -34,7 +34,7 @@ def contact(request):
if form.is_valid():
form.save()
return HttpResponseRedirect(reverse("digital_glarus:contact"))
return HttpResponseRedirect(reverse("digitalglarus:contact"))
# form = MessageForm()
@ -42,4 +42,4 @@ def contact(request):
'form': form,
}
return render(request, 'digital_glarus/contact.html', context)
return render(request, 'digitalglarus/contact.html', context)

View file

@ -1,5 +1,5 @@
"""
Copyright 2015 Ungleich.
Copyright 2015 ungleich.
"""
# -*- coding: utf-8 -*-
@ -50,7 +50,6 @@ INSTALLED_APPS = (
'django.contrib.staticfiles',
'django.contrib.sites',
'cms', # django CMS itself
'digital_glarus',
'treebeard', # utilities for implementing a tree
'menus', # helper for model independent hierarchical website navigation
'sekizai', # for javascript and css management
@ -88,6 +87,7 @@ INSTALLED_APPS = (
# ungleich
'ungleich',
'railshosting',
'digitalglarus',
)
MIDDLEWARE_CLASSES = (

View file

@ -6,11 +6,11 @@ from dynamicweb import settings
urlpatterns = [
url(r'^admin/', include(admin.site.urls)),
url(r'^digital.glarus/', include('digital_glarus.urls',
namespace="digital_glarus")),
url(r'^digitalglarus/', include('digitalglarus.urls',
namespace="digitalglarus")),
url(r'^railshosting/', include('railshosting.urls',
namespace="railshosting")),
url(r'^', include('cms.urls')),
url(r'^cms/', include('cms.urls')),
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

View file

@ -25,7 +25,8 @@ django-cms==3.1.0
# django-cms-plugins
djangocms-admin-style==0.2.5
djangocms-text-ckeditor==2.4.3
djangocms-text-ckeditor==2.5.2
-e git+git@github.com:applegrew/django-select2.git#egg=django-select2-py3
djangocms-blog==0.4.0
djangocms-flash==0.2.0
@ -56,7 +57,6 @@ aldryn-common==0.1.3
aldryn-search==0.2.7
anyjson==0.3.3
cssselect==0.9.1
Django==1.7.8
django-admin-enhancer==1.0.0
django-appconf==1.0.1
django-appdata==0.1.4