aatish
/
dynamicweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #178 from HenryGBC/feature/new_digitalglarus 

Feature/new digitalglarus
This commit is contained in:
Levi Velázquez 2017-03-22 11:07:08 -04:00 committed by GitHub
parent dd546d568c 0e9637baa1
commit c6120cf951
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
alplora/static/alplora/img/favicon.ico Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

18
alplora/templates/alplora/index.html
View File

@ -1,5 +1,8 @@
{% load staticfiles i18n%}
<html lang="en"><head>
<html lang={{language}}>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@ -21,10 +24,10 @@
<!-- Custom Fonts -->
<link href="https://fonts.googleapis.com/css?family=Raleway" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Questrial" rel="stylesheet">
<link href="//fonts.googleapis.com/css?family=Raleway" rel="stylesheet">
<link href="//fonts.googleapis.com/css?family=Questrial" rel="stylesheet">
<link rel="stylesheet" href="{% static 'alplora/font-awesome/css/font-awesome.min.css' %}">
<link href="http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
<link href="//fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
<link rel="shortcut icon" href="{% static 'alplora/img/favicon.ico' %}" type="image/x-icon">
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
@ -123,8 +126,8 @@
<div class="intro-message">
<img class="responsive" src="{% static 'alplora/img/alplora_logo_nopadding.svg' %}">
<h1>{% trans 'Perfect fit for Swiss Alps' %}</h1>
<h3>{% trans 'Find your herd anytime, anywhere' %}</h3>
<h1>{% trans 'Find your herd anytime, anywhere' %}</h1>
<h3>{% trans 'Perfect fit for Swiss Alps' %}</h3>
<hr class="intro-divider">
<!-- <ul class="list-inline intro-social-buttons">
<li>
@ -500,4 +503,5 @@
<div id="feedly-mini" title="feedly Mini tookit"></div>
</body>
</html>
</html>
<!DOCTYPE html>

6
alplora/templates/alplora/login.html
View File

@ -21,10 +21,10 @@
<!-- Custom Fonts -->
<link href="https://fonts.googleapis.com/css?family=Raleway" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Questrial" rel="stylesheet">
<link href="//fonts.googleapis.com/css?family=Raleway" rel="stylesheet">
<link href="//fonts.googleapis.com/css?family=Questrial" rel="stylesheet">
<link rel="stylesheet" href="{% static 'alplora/font-awesome/css/font-awesome.min.css' %}">
<link href="http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
<link href="//fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
<link rel="shortcut icon" href="{% static 'alplora/img/favicon.ico' %}" type="image/x-icon">
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->

11
alplora/views.py
View File

@ -1,8 +1,17 @@
from django.views.generic import TemplateView
from django.utils.translation import get_language
class IndexView(TemplateView):
template_name = "alplora/index.html"
def get_context_data(self, *args, **kwargs):
context = super(IndexView, self).get_context_data(**kwargs)
language = get_language()
context.update({
'language': language
})
return context
class LoginView(TemplateView):
template_name = "alplora/login.html"