Merge remote-tracking branch 'refs/remotes/origin/master'
mmit.
This commit is contained in:
parent
958ed9572b
commit
8f4dd038bd
44 changed files with 597 additions and 144 deletions
|
|
@ -1,4 +1,4 @@
|
|||
{% load menu_tags staticfiles cms_tags %}
|
||||
{% load staticfiles cms_tags menu_tags sekizai_tags menu_tags %}
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
|
@ -26,6 +26,9 @@
|
|||
<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">
|
||||
|
||||
{% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %}
|
||||
{% render_block "js" postprocessor "compressor.contrib.sekizai.compress" %}
|
||||
|
||||
<!-- 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]>
|
||||
|
|
@ -45,7 +48,7 @@
|
|||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
{% cms_toolbar %}
|
||||
<div class="brand">Digital Glarus</div>
|
||||
<div class="address-bar">The Swiss IT Valley | Schwanden, 8762 GL Switzerland | From 2015.10.13</div>
|
||||
|
||||
|
|
@ -68,6 +71,9 @@
|
|||
<ul class="nav navbar-nav">
|
||||
{% show_menu 0 0 0 1 %}
|
||||
{% show_menu_below_id "digital-glarus-page" 0 %}
|
||||
<li>
|
||||
<a href="{% url 'digitalglarus:supporters' %}">Supporters</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{% url 'digitalglarus:blog' %}">Blog</a>
|
||||
</li>
|
||||
|
|
|
|||
19
digitalglarus/templates/digitalglarus/gallery.html
Normal file
19
digitalglarus/templates/digitalglarus/gallery.html
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{% 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>
|
||||
32
digitalglarus/templates/digitalglarus/supporters.html
Normal file
32
digitalglarus/templates/digitalglarus/supporters.html
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{% 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">
|
||||
Supporters
|
||||
</h2>
|
||||
<hr>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
{% for supporter in supporters %}
|
||||
<div class="col-md-6">
|
||||
<div class="thumbnail">
|
||||
<div class="caption">
|
||||
<h3>{{supporter.name}}</h3>
|
||||
<p>{{supporter.description}}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.container -->
|
||||
|
||||
{% endblock %}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<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>
|
||||
Loading…
Add table
Add a link
Reference in a new issue