fixed supporter page, change footer info, added support-us page, changed contact email
This commit is contained in:
		
					parent
					
						
							
								7b0f0db338
							
						
					
				
			
			
				commit
				
					
						ceeed874d2
					
				
			
		
					 11 changed files with 79 additions and 33 deletions
				
			
		
							
								
								
									
										1
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -1,5 +1,6 @@
 | 
			
		|||
db.sqlite3
 | 
			
		||||
*.pyc
 | 
			
		||||
*.DS_Store
 | 
			
		||||
build/
 | 
			
		||||
dist/
 | 
			
		||||
*.egg_info
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -15,15 +15,15 @@ class Message(models.Model):
 | 
			
		|||
        return "%s - %s - %s" % (self.name, self.email, self.received_date)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# class Supporter(models.Model):
 | 
			
		||||
#     name = models.CharField(max_length=200)
 | 
			
		||||
#     description = models.TextField(null=True, blank=True)
 | 
			
		||||
#
 | 
			
		||||
#     def __str__(self):
 | 
			
		||||
#         return "%s" % (self.name)
 | 
			
		||||
#
 | 
			
		||||
#     def get_absolute_url(self):
 | 
			
		||||
#         return reverse('dgSupporters_view', args=[self.pk])
 | 
			
		||||
class Supporter(models.Model):
 | 
			
		||||
    name = models.CharField(max_length=200)
 | 
			
		||||
    description = models.TextField(null=True, blank=True)
 | 
			
		||||
 | 
			
		||||
    def __str__(self):
 | 
			
		||||
        return "%s" % (self.name)
 | 
			
		||||
 | 
			
		||||
    def get_absolute_url(self):
 | 
			
		||||
        return reverse('dgSupporters_view', args=[self.pk])
 | 
			
		||||
#
 | 
			
		||||
#
 | 
			
		||||
# class DGGallery(models.Model):
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										
											BIN
										
									
								
								digitalglarus/static/digitalglarus/img/thank-you.png
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								digitalglarus/static/digitalglarus/img/thank-you.png
									
										
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 557 KiB  | 
| 
						 | 
				
			
			@ -93,8 +93,8 @@
 | 
			
		|||
                    <p>Have you become interested in the project? 
 | 
			
		||||
                    <p>Contact us at<br>
 | 
			
		||||
                      <br>
 | 
			
		||||
                        <a href="mailto:digitalglarus@ungleich.ch">
 | 
			
		||||
                          digitalglarus@ungleich.ch
 | 
			
		||||
                        <a href="mailto: info@digitalglarus.ch">
 | 
			
		||||
                           info@digitalglarus.ch
 | 
			
		||||
                        </a> // <a href="tel:%2B41%20%280%29%2044%20534%2066%2022" value="+41445346622">+41 (0) 44 534 66 22</a>
 | 
			
		||||
                      </p>
 | 
			
		||||
                    </p>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -101,7 +101,7 @@
 | 
			
		|||
        <div class="row">
 | 
			
		||||
            <div class="col-lg-12 text-center">
 | 
			
		||||
                <p class="text-center">Copyright © <a href="http://www.ungleich.ch">ungleich GmbH
 | 
			
		||||
                    2015</a></p>
 | 
			
		||||
                    2016</a></p>
 | 
			
		||||
            </div>
 | 
			
		||||
        </div>
 | 
			
		||||
    </div>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -21,7 +21,7 @@
 | 
			
		|||
                        <strong>+41 (0) 44 534 66 22</strong>
 | 
			
		||||
                    </p>
 | 
			
		||||
                    <p>Email:
 | 
			
		||||
                        <strong><a href="mailto:digitalglarus@ungleich.ch">digitalglarus@ungleich.ch</a></strong>
 | 
			
		||||
                        <strong><a href="mailto: info@digitalglarus.ch"> info@digitalglarus.ch</a></strong>
 | 
			
		||||
                    </p>
 | 
			
		||||
                    <p>Address:
 | 
			
		||||
                      <strong>Hauptstrasse 14, 8775 Luchsingen<br>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -93,8 +93,8 @@
 | 
			
		|||
                    <p>Have you become interested in the project? 
 | 
			
		||||
                    <p>Contact us at<br>
 | 
			
		||||
                      <br>
 | 
			
		||||
                        <a href="mailto:digitalglarus@ungleich.ch">
 | 
			
		||||
                          digitalglarus@ungleich.ch
 | 
			
		||||
                        <a href="mailto:info@digitalglarus.ch">
 | 
			
		||||
                           info@digitalglarus.ch
 | 
			
		||||
                        </a> // <a href="tel:%2B41%20%280%29%2044%20534%2066%2022" value="+41445346622">+41 (0) 44 534 66 22</a>
 | 
			
		||||
                      </p>
 | 
			
		||||
                    </p>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										37
									
								
								digitalglarus/templates/digitalglarus/support.html
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										37
									
								
								digitalglarus/templates/digitalglarus/support.html
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,37 @@
 | 
			
		|||
{% 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="text-center">
 | 
			
		||||
                BECOME A SUPPORTER 
 | 
			
		||||
            </h2>
 | 
			
		||||
            <hr>
 | 
			
		||||
        </div>
 | 
			
		||||
        <div class="col-md-7 col-md-offset-3">
 | 
			
		||||
          <p>
 | 
			
		||||
            If you want to be our supporter,
 | 
			
		||||
            you can send your donation to:
 | 
			
		||||
          </p>
 | 
			
		||||
          <p>
 | 
			
		||||
            <strong>Bank info</strong>
 | 
			
		||||
            <br>
 | 
			
		||||
            Account: 123123123123123123
 | 
			
		||||
            <br>
 | 
			
		||||
            Name: Fake name
 | 
			
		||||
          </p>
 | 
			
		||||
          <p>
 | 
			
		||||
            If you want to donate us in other means (your time, skill, etc..)
 | 
			
		||||
            you can write us to <a href="mailto:donation@digitalglarus.ch">donation@digitalglarus.ch</a>
 | 
			
		||||
          </p>
 | 
			
		||||
        </div>
 | 
			
		||||
        <div class="clearfix"></div>
 | 
			
		||||
    </div>
 | 
			
		||||
</div>
 | 
			
		||||
<!-- /.container -->
 | 
			
		||||
 | 
			
		||||
{% endblock %}
 | 
			
		||||
| 
						 | 
				
			
			@ -5,24 +5,30 @@
 | 
			
		|||
{% block content %}
 | 
			
		||||
<div class="row">
 | 
			
		||||
    <div class="box">
 | 
			
		||||
        <img class="img-responsive img-full" src="{% static 'digitalglarus/img/thank-you.png' %}" alt="">
 | 
			
		||||
        <div class="col-lg-12">
 | 
			
		||||
            <hr>
 | 
			
		||||
            <h2 class="intro-text text-center">
 | 
			
		||||
            <h2 class="text-center">
 | 
			
		||||
                Supporters
 | 
			
		||||
            </h2>
 | 
			
		||||
            <hr>
 | 
			
		||||
        </div>
 | 
			
		||||
        <div class="col-md-12">
 | 
			
		||||
          <p>
 | 
			
		||||
            Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.
 | 
			
		||||
          </p>
 | 
			
		||||
        </div>
 | 
			
		||||
        <div class="col-md-12">
 | 
			
		||||
            <div class="text-center">
 | 
			
		||||
              {% 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 %}
 | 
			
		||||
              <hr>
 | 
			
		||||
              <a class="btn btn-default" href="{% url 'digitalglarus:support' %}" role="button">BECOME A SUPPORTER</a>
 | 
			
		||||
            </div>            
 | 
			
		||||
            
 | 
			
		||||
        </div>
 | 
			
		||||
        <div class="clearfix"></div>
 | 
			
		||||
    </div>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,7 +8,8 @@ urlpatterns = [
 | 
			
		|||
    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'supporters/?$', views.supporters, name='supporters'),
 | 
			
		||||
    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'),
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,7 +8,7 @@ from django.utils.translation import get_language
 | 
			
		|||
from djangocms_blog.models import Post
 | 
			
		||||
from django.core.urlresolvers import resolve
 | 
			
		||||
 | 
			
		||||
from .models import Message#, Supporter
 | 
			
		||||
from .models import Message, Supporter
 | 
			
		||||
 | 
			
		||||
class MessageForm(ModelForm):
 | 
			
		||||
    required_css_class = 'form-control'
 | 
			
		||||
| 
						 | 
				
			
			@ -36,7 +36,7 @@ def index(request):
 | 
			
		|||
    return home(request)
 | 
			
		||||
 | 
			
		||||
def home(request):
 | 
			
		||||
    return render(request, 'digitalglarus/index.html')
 | 
			
		||||
    return render(request, 'index.html')
 | 
			
		||||
 | 
			
		||||
def letscowork(request):
 | 
			
		||||
    return render(request, 'digitalglarus/letscowork.html')
 | 
			
		||||
| 
						 | 
				
			
			@ -62,7 +62,7 @@ def contact(request):
 | 
			
		|||
 | 
			
		||||
def blog(request):
 | 
			
		||||
    tags = ["digitalglarus"]
 | 
			
		||||
    posts = Post.objects.filter(tags__name__in=tags)
 | 
			
		||||
    posts = Post.objects.filter_by_language(get_language()).filter(tags__name__in=tags)
 | 
			
		||||
    context = {
 | 
			
		||||
        'post_list': posts,
 | 
			
		||||
    }
 | 
			
		||||
| 
						 | 
				
			
			@ -70,13 +70,14 @@ def blog(request):
 | 
			
		|||
 | 
			
		||||
 | 
			
		||||
def blog_detail(request, slug):
 | 
			
		||||
    language = get_language()
 | 
			
		||||
    post = Post.objects.translated('en-us', slug=slug).get()
 | 
			
		||||
    post = Post.objects.filter_by_language(get_language()).filter(slug=slug).first()
 | 
			
		||||
    context = {
 | 
			
		||||
        'post': post,
 | 
			
		||||
    }
 | 
			
		||||
    return render(request, 'glarus_blog/post_detail.html', context)
 | 
			
		||||
    return render(request, 'post_detail.html', context)
 | 
			
		||||
 | 
			
		||||
def support(request):
 | 
			
		||||
    return render(request, 'digitalglarus/support.html')
 | 
			
		||||
 | 
			
		||||
def supporters(request):
 | 
			
		||||
    context = {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue