moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' into feature/supporter

Browse source
This commit is contained in:
Levi 2016-04-03 21:15:05 -05:00
commit 0e380f6911
55 changed files with 676 additions and 426 deletions
Download patch file Download diff file Expand all files Collapse all files

20
digitalglarus/admin.py
View file

@ -1,12 +1,12 @@
from django.contrib import admin
# from .models import Message, Supporter, DGGallery, DGPicture
from .models import Message, Supporter, DGGallery, DGPicture
#
class DGPictureInline(admin.StackedInline):
model = DGPicture
# class DGPictureInline(admin.StackedInline):
# model = DGPicture
#
# class DGGalleryAdmin(admin.ModelAdmin):
# inlines = [DGPictureInline]
#
# admin.site.register(DGGallery, DGGalleryAdmin)
# admin.site.register(Message)
# admin.site.register(Supporter)
class DGGalleryAdmin(admin.ModelAdmin):
inlines = [DGPictureInline]
admin.site.register(DGGallery, DGGalleryAdmin)
admin.site.register(Message)
admin.site.register(Supporter)

66
digitalglarus/cms_plugins.py
View file

@ -1,36 +1,36 @@
# from cms.plugin_base import CMSPluginBase
# from cms.plugin_pool import plugin_pool
# from cms.wizards import wizard_base
# from .models import DGGalleryPlugin, DGSupportersPlugin, Supporter
# from django.utils.translation import ugettext as _
# class CMSGalleryPlugin(CMSPluginBase):
# model = DGGalleryPlugin
# name = _("Digital Glarus Gallery")
# render_template = "digitalglarus/gallery.html"
from cms.plugin_base import CMSPluginBase
from cms.plugin_pool import plugin_pool
from cms.wizards import wizard_base
from .models import DGGalleryPlugin, DGSupportersPlugin, Supporter
from django.utils.translation import ugettext as _
#
# def render(self, context, instance, placeholder):
# context.update({
# 'gallery':instance.dgGallery,
# 'object':instance,
# 'placeholder':placeholder
# })
# return context
class CMSGalleryPlugin(CMSPluginBase):
model = DGGalleryPlugin
name = _("Digital Glarus Gallery")
render_template = "gallery.html"
def render(self, context, instance, placeholder):
context.update({
'gallery':instance.dgGallery,
'object':instance,
'placeholder':placeholder
})
return context
class CMSSupportersPlugin(CMSPluginBase):
name = _("Digital Glarus Supporters")
model = DGSupportersPlugin
render_template = "supporters_plugin.html"
def render(self, context, instance, placeholder):
context.update({
'supporters': Supporter.objects.all().order_by('name'),
'object': instance,
'placeholder':placeholder
})
return context
#
# class CMSSupportersPlugin(CMSPluginBase):
# name = _("Digital Glarus Supporters")
# model = DGSupportersPlugin
# render_template = "digitalglarus/supporters_plugin.html"
#
# def render(self, context, instance, placeholder):
# context.update({
# 'supporters': Supporter.objects.all().order_by('name'),
# 'object': instance,
# 'placeholder':placeholder
# })
# return context
# plugin_pool.register_plugin(CMSGalleryPlugin)
# plugin_pool.register_plugin(CMSSupportersPlugin)
#
plugin_pool.register_plugin(CMSGalleryPlugin)
plugin_pool.register_plugin(CMSSupportersPlugin)

68
digitalglarus/migrations/0004_dggallery_dggalleryplugin_dgpicture_dgsupportersplugin_supporter.py Normal file
View file

@ -0,0 +1,68 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2016-03-30 22:23
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
import filer.fields.image
class Migration(migrations.Migration):
dependencies = [
('cms', '0013_urlconfrevision'),
('filer', '0002_auto_20150606_2003'),
('digitalglarus', '0003_auto_20160325_1659'),
]
operations = [
migrations.CreateModel(
name='DGGallery',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=30)),
('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='digitalglarus.DGGallery')),
],
options={
'verbose_name_plural': 'dgGallery',
},
),
migrations.CreateModel(
name='DGGalleryPlugin',
fields=[
('cmsplugin_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
('dgGallery', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='digitalglarus.DGGallery')),
],
options={
'abstract': False,
},
bases=('cms.cmsplugin',),
),
migrations.CreateModel(
name='DGPicture',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('description', models.CharField(max_length=60)),
('gallery', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='digitalglarus.DGGallery')),
('image', filer.fields.image.FilerImageField(on_delete=django.db.models.deletion.CASCADE, related_name='dg_gallery', to='filer.Image')),
],
),
migrations.CreateModel(
name='DGSupportersPlugin',
fields=[
('cmsplugin_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
],
options={
'abstract': False,
},
bases=('cms.cmsplugin',),
),
migrations.CreateModel(
name='Supporter',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=200)),
('description', models.TextField(blank=True, null=True)),
],
),
]

46
digitalglarus/models.py
View file

@ -18,7 +18,7 @@ class Message(models.Model):
class Supporter(models.Model):
name = models.CharField(max_length=200)
description = models.TextField(null=True, blank=True)
def __str__(self):
return "%s" % (self.name)
@ -39,16 +39,36 @@ class Supporter(models.Model):
# class Meta:
# verbose_name_plural = 'dgGallery'
# class DGPicture(models.Model):
# gallery = models.ForeignKey(DGGallery)
# image = FilerImageField(related_name='dg_gallery')
# description = models.CharField(max_length=60)
def __str__(self):
return "%s" % (self.name)
def get_absolute_url(self):
return reverse('dgSupporters_view', args=[self.pk])
class DGGallery(models.Model):
parent = models.ForeignKey('self', blank=True, null=True)
name = models.CharField(max_length=30)
def __str__(self):
return "%s" % (self.name)
def get_absolute_url(self):
return reverse('dgGallery_view', args=[self.pk])
class Meta:
verbose_name_plural = 'dgGallery'
#
# def __str__(self):
# return "%s" % (self.image.name)
#
# class DGGalleryPlugin(CMSPlugin):
# dgGallery = models.ForeignKey(DGGallery)
#
# class DGSupportersPlugin(CMSPlugin):
# pass
class DGPicture(models.Model):
gallery = models.ForeignKey(DGGallery)
image = FilerImageField(related_name='dg_gallery')
description = models.CharField(max_length=60)
def __str__(self):
return "%s" % (self.image.name)
class DGGalleryPlugin(CMSPlugin):
dgGallery = models.ForeignKey(DGGallery)
class DGSupportersPlugin(CMSPlugin):
pass

4
digitalglarus/templates/cms/digitalglarus/about.html → digitalglarus/templates/about.html
View file

@ -1,4 +1,4 @@
{% extends "digitalglarus/base.html" %}
{% extends "base_glarus.html" %}
{% load staticfiles cms_tags %}
{% block title %}About{% endblock %}
@ -54,4 +54,4 @@
</div>
<!-- /.container -->
{% endblock %}
{% endblock %}

0
digitalglarus/templates/digitalglarus/base.html → digitalglarus/templates/base_glarus.html
View file

0
digitalglarus/templates/cms/__init__.py
View file

10
digitalglarus/templates/cms/digitalglarus/__init__.py
View file

@ -1,10 +0,0 @@
# -*- coding: utf-8 -*-
from django.utils.translation import ugettext_lazy as _
TEMPLATES = {
'about.html': _('DG.About'),
'contact.html': _('DG.Contact'),
'index.html': _('DG.Home'),
'letscowork.html': _('DG.CoWork'),
'detail.html': _('DG.Detail'),
'one_column.html': _('DG.OneColumn'),
}

96
digitalglarus/templates/cms/digitalglarus/base.html
View file

@ -1,96 +0,0 @@
{% load staticfiles cms_tags menu_tags sekizai_tags menu_tags %}
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<title>
{% page_attribute "page_title" %}
</title>
<!-- Favicon -->
<link rel="shortcut icon" href="{% static 'digitalglarus/img/favicon.ico' %}"/>
<!-- Bootstrap Core CSS -->
<link href="{% static 'digitalglarus/css/bootstrap.min.css' %}" rel="stylesheet">
<!-- Custom CSS -->
<link href="{% static 'digitalglarus/css/business-casual.css' %}" rel="stylesheet">
<!-- Fonts -->
<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" rel="stylesheet" type="text/css">
<link href="//fonts.googleapis.com/css?family=Josefin+Slab:100,300,400,600,700,100italic,300italic,400italic,600italic,700italic" rel="stylesheet" type="text/css">
<!-- 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:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->
{% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %}
{% render_block "js" postprocessor "compressor.contrib.sekizai.compress" %}
<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),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-62285904-2', 'auto');
ga('send', 'pageview');
</script>
</head>
<body>
{% cms_toolbar %}
<div class="brand">Digital Glarus</div>
<div class="address-bar">
{# {% placeholder 'digital_glarus_legend' %}#}
</div>
<div class="center-block">
<ul class="list-inline center-block language-chooser-list">
{% language_chooser "cms/digitalglarus/partials/language-chooser.html" %}
</ul>
</div>
<!-- Navigation -->
{% include "cms/digitalglarus/partials/menu.html" %}
<div class="container">
{% block content %} {% endblock %}
</div>
<!-- /.container -->
<footer>
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<p class="text-center">Copyright &copy; <a href="http://www.ungleich.ch">ungleich GmbH 2015</a></p>
</div>
</div>
</div>
</footer>
<!-- jQuery -->
<script src="{% static 'digitalglarus/js/jquery.js' %}"></script>
<!-- Bootstrap Core JavaScript -->
<script src="{% static 'digitalglarus/js/bootstrap.min.js' %}"></script>
<script src="{% static 'digitalglarus/js/digital.glarus.js' %}"></script>
<!-- Script to Activate the Carousel -->
<script>
$('.carousel').carousel({
interval: 5000 //changes the speed
})
</script>
</body>
</html>

11
digitalglarus/templates/cms/digitalglarus/detail.html
View file

@ -1,11 +0,0 @@
<h1>{{ message }}</h1>
<ul>
<li>{{ message.name }}
<li>{{ message.email }}
<li>{{ message.phone_number }}
<li>{{ message.message }}
<li>{{ message.received_date }}
</ul>
<p><a href="{% url 'digitalglarus:index' %}">Back to Main</a>

18
digitalglarus/templates/cms/digitalglarus/one_column.html
View file

@ -1,18 +0,0 @@
{% extends "digitalglarus/base.html" %}
{% load staticfiles cms_tags %}
{% block title %}About{% endblock %}
{% block content %}
<div class="row">
<div class="box">
<div class="col-lg-12">
{% placeholder 'digitalglarus_why_us' %}
</div>
<div class="clearfix"></div>
</div>
</div>
</div>
<!-- /.container -->
{% endblock %}

9
digitalglarus/templates/cms/digitalglarus/partials/language-chooser.html
View file

@ -1,9 +0,0 @@
{% load i18n menu_tags %}
{% if languages|length > 1 %}
{% for language in languages %}
<li class="lang{% if current_language == language.0 %} active{% endif %}">
<a href="{% page_language_url language.0 %}" title="{% trans "Change to language:" %} {{ language.1 }}">{{ language.1 }}</a>
</li>
{% endfor %}
{% endif %}

26
digitalglarus/templates/cms/digitalglarus/partials/menu.html
View file

@ -1,26 +0,0 @@
{% load menu_tags staticfiles cms_tags %}
<!-- Navigation -->
<nav class="navbar navbar-default" role="navigation">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<!-- navbar-brand is hidden on larger screens, but visible when the menu is collapsed -->
<a class="navbar-brand" href="index.html">Digital Glarus</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">
{% show_menu 0 0 0 1 %}
{% show_menu_below_id "digital-glarus-page" 0 %}
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
<!-- /.container -->
</nav>

21
digitalglarus/templates/cms/digitalglarus/two_columns.html
View file

@ -1,21 +0,0 @@
{% extends "cms/digitalglarus/base.html" %}
{% load staticfiles cms_tags %}
{% block title %}About{% endblock %}
{% block content %}
<div class="row">
<div class="box">
<div class="col-lg-6">
{% placeholder 'two_columns_a' %}
</div>
<div class="col-lg-6">
{% placeholder 'two_columns_b' %}
</div>
<div class="clearfix"></div>
</div>
</div>
</div>
<!-- /.container -->
{% endblock %}

4
digitalglarus/templates/cms/digitalglarus/contact.html → digitalglarus/templates/contact.html
View file

@ -1,4 +1,4 @@
{% extends "digitalglarus/base.html" %}
{% extends "base_glarus.html" %}
{% load cms_tags %}
{% block title %}Contact{% endblock %}
@ -62,4 +62,4 @@
</div>
</div>
<!-- /.container -->
{% endblock %}
{% endblock %}

72
digitalglarus/templates/digitalglarus/about.html
View file

@ -1,72 +0,0 @@
{% extends "digitalglarus/base.html" %}
{% load staticfiles %}
{% block title %}About{% endblock %}
{% block content %}
<div class="row">
<div class="box">
<div class="col-lg-12">
<hr>
<h2 class="intro-text text-center">why
<strong>Us?</strong>
</h2>
<hr>
</div>
<div class="col-md-6">
<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.
We have long knowledge in tech industry, and have extensive
networks with small to medium tech companies in Switzerland,
because we are one of them. We have been working at coworking
spaces with these small to medium sized IT companies ;
tech-savvy and flexible, tech companies have open culture in
work environment, and very often experience difficulty in
letting their employees be as creative as possible. We
understand and share their needs and problems. This is how we
came up with a solution of our own, of finding and providing
an attractive working space for technology companies
in Switzerland.
</p>
</div>
<div class="clearfix"></div>
</div>
</div>
<div class="row">
<div class="box">
<div class="col-lg-12">
<hr>
<h2 class="intro-text text-center">why
<strong>glarus?</strong>
</h2>
<hr>
</div>
<div class="col-sm-4 text-center">
<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 'digitalglarus/img/price_1.jpg' %}" alt="">
<h3>AFFORDABLE
<small>price</small></h3>
</div>
<div class="col-sm-4 text-center">
<img class="img-responsive" src="{% static 'digitalglarus/img/img_3.jpg' %}" alt="">
<h3>direct
<small> connection to zurich</small>
</h3>
</div>
<div class="clearfix"></div>
</div>
</div>
</div>
<!-- /.container -->
{% endblock %}

11
digitalglarus/templates/digitalglarus/detail.html
View file

@ -1,11 +0,0 @@
<h1>{{ message }}</h1>
<ul>
<li>{{ message.name }}
<li>{{ message.email }}
<li>{{ message.phone_number }}
<li>{{ message.message }}
<li>{{ message.received_date }}
</ul>
<p><a href="{% url 'digitalglarus:index' %}">Back to Main</a>

19
digitalglarus/templates/digitalglarus/gallery.html
View file

@ -1,19 +0,0 @@
{% load thumbnail %}
<div id="dg-gallery-{{gallery.name}}" class="carousel slide">
<!-- Indicators --><!-- Wrapper for slides -->
<div class="carousel-inner">
{% for image in gallery.dgpicture_set.all %}
<div class="item {% if forloop.first %} active {% endif %} ">
<img class="img-responsive img-full" src="{{ image.image.url }}" alt="{{ image.description }}">
</div>
{% endfor %}
</div>
<!-- Controls -->
<a class="left carousel-control" href="#dg-gallery-{{gallery.name}}" data-slide="prev">
<span class="icon-prev"></span>
</a>
<a class="right carousel-control" href="#dg-gallery-{{gallery.name}}" data-slide="next">
<span class="icon-next"></span>
</a>
</div>

51
digitalglarus/templates/digitalglarus/letscowork.html
View file

@ -1,51 +0,0 @@
{% extends "digitalglarus/base.html" %}
{% load staticfiles %}
{% block title %}crowdfunding{% endblock %}
{% block content %}
<div class="row">
<div class="box">
<div class="col-lg-12 text-center">
<h1> <span id="date-quantity">99</span> days to go! </h1>
</div>
</div>
<div class="clearfix"></div>
</div>
<div class="row">
<div class="box">
<div class="col-lg-12">
<iframe width="980" height="600" src="//www.100-days.net/de/projekt-iframe/start-digital-glarus" frameborder="0" scrolling="auto" class="center-block"></iframe>
</div>
</div>
</div>
<div class="row">
<div class="box">
<div class="col-lg-12">
<hr>
<h2 class="intro-text text-center">why
<strong>glarus?</strong>
</h2>
<hr>
</div>
<div class="col-sm-4 text-center">
<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 'digitalglarus/img/price_1.jpg' %}" alt="">
<h3>AFFORDABLE
<small>price</small></h3>
</div>
<div class="col-sm-4 text-center">
<img class="img-responsive" src="{% static 'digitalglarus/img/img_3.jpg' %}" alt="">
<h3>direct
<small> connection to zurich</small>
</h3>
</div>
<div class="clearfix"></div>
</div>
</div>
<!-- /.container -->
{% endblock %}

8
digitalglarus/templates/digitalglarus/supporters_plugin.html
View file

@ -1,8 +0,0 @@
<div class="row">
{% for supporter in supporters.all %}
<div class="col-md-12">
<h3 class="text-center">{{supporter.name}}</h3>
<p class="text-center">{{supporter.description}}</p>
</div>
{% endfor %}
</div>

4
digitalglarus/templates/glarus_blog/base.html
View file

@ -1,4 +1,4 @@
{% extends "digitalglarus/base.html" %}
{% extends "base_glarus.html" %}
{% block meta %}
{% if meta %}
@ -16,4 +16,4 @@
</div>
</div>
{% endblock content %}
</div>
</div>

2
digitalglarus/templates/glarus_blog/includes/blog_item.html
View file

@ -29,4 +29,4 @@
<div class="read-more">
<a class="lead" href="{% url 'djangocms_blog:post-detail' post.slug %}">{% trans "read more" %} &raquo;</a>
</div>
</article>
</article>

2
digitalglarus/templates/glarus_blog/includes/blog_meta.html
View file

@ -20,4 +20,4 @@
<li class="tag_{{ forloop.counter }}"><a href="{% url 'djangocms_blog:posts-tagged' tag=tag.slug %}" class="blog-tag blog-tag-{{ tag.count }}">{{ tag.name }}</a>{% if not forloop.last %}, {% endif %}</li>
{% endfor %}
{% endif %}
</ul>
</ul>

9
digitalglarus/templates/glarus_blog/post_detail.html
View file

@ -1,4 +1,4 @@
{% extends "glarus_blog/base.html" %}
{% extends "base_glarus.html" %}
{% load i18n thumbnail cms_tags %}
{% block meta_description %}{{ post.meta_description }}{% endblock meta_description %}
@ -7,7 +7,6 @@
{% block title %}{{ post.get_title }}{% endblock %}
{% block content_blog %}{% spaceless %}
{% debug %}
<article id="post-{{ post.slug }}" class="post-item post-detail">
{% if post.main_image_id %}
<div class="blog-visual">
@ -18,7 +17,7 @@
<header class="text-center">
<hr></hr>
<h2 class="text-center intro-text">
<a href="{% url 'djangocms_blog:post-detail' post.slug %}" class="post-title center-block">
<a href="{% url 'digitalglarus:blog-detail' post.slug %}" class="post-title center-block">
<b>{{ post.title }}</b>
</a>
<small>
@ -27,10 +26,10 @@
</h2>
<hr></hr>
{% block blog_meta %}
include "glarus_blog/includes/blog_meta.html"
{# include "glarus_blog/includes/blog_meta.html" #}
{% endblock %}
</header>
{% endspaceless %}
<div class="digitalglarus-blog-content">{% render_placeholder post.content %}</div>
</article>
{% endblock content_blog %}
{% endblock content_blog %}

4
digitalglarus/templates/glarus_blog/post_list.html
View file

@ -1,4 +1,4 @@
{% extends "glarus_blog/base.html" %}
{% extends "base.html" %}
{% load i18n thumbnail %}{% spaceless %}
{% block canonical_url %}<link rel="canonical" href="{{ SITE.domain }}{{ view.get_view_url }}"/>{% endblock canonical_url %}
@ -32,4 +32,4 @@
{% endif %}
</section>
{% endblock %}
{% endspaceless %}
{% endspaceless %}

99
digitalglarus/templates/index.html Normal file
View file

@ -0,0 +1,99 @@
{% extends "base_glarus.html" %}
{% load staticfiles cms_tags %}
{% block content %}
<div class="row">
<div class="box">
<div class="col-lg-12 text-center">
<div id="carousel-example-generic" class="carousel slide">
<!-- Indicators --><!-- Wrapper for slides -->
<div class="carousel-inner">
<div class="item active">
<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 'digitalglarus/img/slide-2.jpg' %}" alt="">
</div>
<div class="item">
<img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-3.jpg' %}" alt="">
</div>
</div>
<!-- Controls -->
<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev">
<span class="icon-prev"></span>
</a>
<a class="right carousel-control" href="#carousel-example-generic" data-slide="next">
<span class="icon-next"></span>
</a>
</div>
<h2 class="brand-before">
<small>WELCOME TO</small>
</h2>
<h1 class="brand-name">Digital Glarus</h1>
<hr class="tagline-divider">
<h2>
<small>By
<strong><a href="http://ungleich.ch">ungleich gmbh</a></strong>
</small>
</h2>
</div>
</div>
</div>
<div class="row">
<div class="box">
<div class="col-lg-12">
<hr>
<h2 class="intro-text text-center">
{% placeholder 'digital_glarus_build_a_tech_valley' %}
</h2>
<hr>
<img class="img-responsive img-border img-left" src="{% static 'digitalglarus/img/intro-pic.jpg' %}" alt="">
<hr class="visible-xs">
{% placeholder 'digital_glarus_build_a_tech_valley_content' %}
<p>&nbsp;</p>
</div>
</div>
</div>
<div class="row">
<div class="box">
<div class="col-lg-12">
<hr>
<h2 class="intro-text text-center">
{% placeholder 'digital_glarus_a_new_area' %}
</h2>
<hr>
{% placeholder 'digital_glarus_a_new_area_content' %}
</div>
</div>
</div>
<div class="row">
<div class="box">
<div class="col-lg-12">
<hr>
<h2 class="intro-text text-center">
{% placeholder 'digital_glarus_why_be_interested' %}
</h2>
<hr>
{% placeholder 'digital_glarus_why_be_interested_content' %}
</div>
</div>
</div>
<div class="row">
<div class="box">
<div class="col-lg-12">
<hr>
<h2 class="intro-text text-center">
{% placeholder 'digital_glarus_where_we_are' %}
</h2>
<hr>
{% placeholder 'digital_glarus_where_we_are_content' %}
<p>&nbsp;</p>
</div>
</div>
</div>
{% endblock %}

12
digitalglarus/templates/cms/digitalglarus/letscowork.html → digitalglarus/templates/letscowork.html
View file

@ -1,8 +1,16 @@
{% extends "digitalglarus/base.html" %}
{% extends "base_glarus.html" %}
{% load staticfiles cms_tags %}
{% block title %}crowdfunding{% endblock %}
{% block content %}
<div class="row">
<div class="box">
<div class="col-lg-12 text-center">
<h1> <span id="date-quantity">99</span> days to go! </h1>
</div>
</div>
<div class="clearfix"></div>
</div>
<div class="row">
<div class="box">
<div class="col-lg-12">
@ -42,4 +50,4 @@
</div>
<!-- /.container -->
{% endblock %}
{% endblock %}

2
digitalglarus/templates/digitalglarus/supporters.html → digitalglarus/templates/supporters.html
View file

@ -1,4 +1,4 @@
{% extends "digitalglarus/base.html" %}
{% extends "base_glarus.html" %}
{% load staticfiles %}
{% block title %}About{% endblock %}

7
digitalglarus/urls.py
View file

@ -3,14 +3,9 @@ from django.conf.urls import url
from . import views
urlpatterns = [
url(r'old^$', views.index, name='index'),
url(r'old_about$', views.about, name='about'),
url(r'old_contact$', views.contact, name='contact'),
url(r'old_letscowork$', views.letscowork, name='letscowork'),
url(r'old_home$', views.home, name='home'),
url(r'supporters/?$', views.supporters, name='supporters'),
url(r'support-us/?$', views.support, name='support'),
url(r'', views.index, name='index'),
url(r'support-us/?$', views.support, name='support'), # url(r'', views.index, name='index'),
url(r'blog/',views.blog,name='blog'),
url(r'^blog/(?P<slug>\w[-\w]*)/$', views.blog_detail, name='blog-detail'),
]

2
digitalglarus/views.py
View file

@ -83,4 +83,4 @@ def supporters(request):
context = {
'supporters': Supporter.objects.order_by('name')
}
return render(request, 'digitalglarus/supporters.html', context)
return render(request, 'supporters.html', context)