:Merge branch 'updating_calendar' of https://github.com/tmslav/dynamicweb into tmslav-updating_calendar
Conflicts: dynamicweb/urls.py
This commit is contained in:
commit
c653917358
25 changed files with 6477 additions and 3800 deletions
|
|
@ -1,6 +1,7 @@
|
|||
from django.db import models
|
||||
from cms.models import CMSPlugin
|
||||
from filer.fields.image import FilerImageField
|
||||
from django.core.urlresolvers import reverse
|
||||
|
||||
|
||||
class Supporter(models.Model):
|
||||
|
|
|
|||
71
digitalglarus/static/digitalglarus/css/login.css
Normal file
71
digitalglarus/static/digitalglarus/css/login.css
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
.user {
|
||||
padding-right: 2%;
|
||||
background-position: 6px 7px;
|
||||
background-repeat: no-repeat;
|
||||
background-color: white;
|
||||
padding: 5px 8px 4px 8px;
|
||||
-webkit-border-radius: 0px 0px 8px 8px;
|
||||
-moz-border-radius: 0px 0px 8px 8px;
|
||||
border-radius: 1px 1px 1px 1px;
|
||||
-webkit-box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
margin-left: 8px;
|
||||
background-color: #333;
|
||||
padding: 4px 4px 0px 4px;
|
||||
-webkit-border-radius: 0px 0px 10px 10px;
|
||||
-moz-border-radius: 0px 0px 10px 10px;
|
||||
border-radius: 0px 0px 10px 10px;
|
||||
font-size: 14px;
|
||||
line-height: 1.42857143;
|
||||
color: #794646;
|
||||
background-color: #fff;
|
||||
|
||||
}
|
||||
|
||||
.user_loggedin{
|
||||
padding-bottom: 2%;
|
||||
padding-right: 2%;
|
||||
background-position: 6px 7px;
|
||||
background-repeat: no-repeat;
|
||||
background-color: white;
|
||||
padding: 5px 8px 4px 8px;
|
||||
-webkit-border-radius: 0px 0px 8px 8px;
|
||||
-moz-border-radius: 0px 0px 8px 8px;
|
||||
border-radius: 1px 1px 1px 1px;
|
||||
-webkit-box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
float: left;
|
||||
margin-left: 8px;
|
||||
background-color: #333;
|
||||
padding: 4px 4px 0px 4px;
|
||||
-webkit-border-radius: 0px 0px 10px 10px;
|
||||
-moz-border-radius: 0px 0px 10px 10px;
|
||||
border-radius: 0px 0px 10px 10px;
|
||||
font-size: 14px;
|
||||
line-height: 1.42857143;
|
||||
color: #777;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
.user > span {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.u_P {
|
||||
background-color: #fffcfc;
|
||||
text-transform: uppercase;
|
||||
padding-right: 2%;
|
||||
padding-left:2%;
|
||||
padding-bottom:0.5%;
|
||||
margin-right: 1%;
|
||||
}
|
||||
.u_P a{
|
||||
margin-bottom: 1%;
|
||||
color: #777;
|
||||
}
|
||||
.u_P a:hover{
|
||||
text-decoration: None;
|
||||
color: #000;
|
||||
}
|
||||
|
|
@ -21,12 +21,15 @@
|
|||
|
||||
<!-- Custom CSS -->
|
||||
<link href="{% static 'digitalglarus/css/business-casual.css' %}" rel="stylesheet">
|
||||
<link href="{% static 'digitalglarus/css/login.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">
|
||||
<link href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.3.0/css/font-awesome.min.css"
|
||||
rel="stylesheet" type="text/css">
|
||||
|
||||
{% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %}
|
||||
{% render_block "js" postprocessor "compressor.contrib.sekizai.compress" %}
|
||||
|
|
@ -37,6 +40,7 @@
|
|||
<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]-->
|
||||
|
||||
<script>
|
||||
(function (i, s, o, g, r, a, m) {
|
||||
i['GoogleAnalyticsObject'] = r;
|
||||
|
|
@ -58,14 +62,28 @@
|
|||
|
||||
<body>
|
||||
{% cms_toolbar %}
|
||||
<div class="pull-right u_P user">
|
||||
{% if request.user.is_authenticated %}
|
||||
<div class="user_loggedin">
|
||||
<h4>{{ request.user.name }}
|
||||
<a href="{% url 'logout_glarus' %}"><i class="fa fa-1x fa-sign-out"
|
||||
aria-hidden="true"></i></a>
|
||||
</h4>
|
||||
</div>
|
||||
{% else %}
|
||||
<a href="{% url 'login_glarus' %}"><h4>Login</h4></a>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="brand">Digital Glarus</div>
|
||||
<div class="address-bar">The Swiss IT Valley | Schwanden, 8762 GL Switzerland | From 2015.10.13</div>
|
||||
<div>{% language_chooser "language_chooser.html" %}</div>
|
||||
|
||||
<!-- 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">
|
||||
|
|
@ -80,8 +98,8 @@
|
|||
<!-- 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">
|
||||
{# <pre> {% filter force_escape %} {% debug %} {% endfilter %} </pre>#}
|
||||
{# {% show_menu 0 0 0 1 %}#}
|
||||
{# <pre> {% filter force_escape %} {% debug %} {% endfilter %} </pre>#}
|
||||
{# {% show_menu 0 0 0 1 %}#}
|
||||
<li>
|
||||
<a href="{% url 'digitalglarus:home' %}">Home</a>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@ urlpatterns = [
|
|||
url(_(r'about/?$'), AboutView.as_view(), name='about'),
|
||||
url(_(r'contact/?$'), ContactView.as_view(), name='contact'),
|
||||
url(_(r'supporters/?$'), views.supporters, name='supporters'),
|
||||
url(_(r'calendar_api/(?P<month>\d+)/(?P<year>\d+)?$'),views.CalendarApi.as_view()),
|
||||
url(_(r'calendar_api/'),views.CalendarApi.as_view()),
|
||||
url(_(r'support-us/?$'), views.support, name='support'),
|
||||
url(r'^blog/(?P<slug>\w[-\w]*)/$', views.blog_detail, name='blog-detail'),
|
||||
url(r'blog/$', views.blog, name='blog'),
|
||||
|
|
|
|||
|
|
@ -9,12 +9,28 @@ from django.views.generic import TemplateView
|
|||
from django.utils.translation import get_language
|
||||
from djangocms_blog.models import Post
|
||||
from django.contrib import messages
|
||||
|
||||
from django.http import JsonResponse
|
||||
from django.views.generic import View
|
||||
|
||||
from .models import Supporter
|
||||
from utils.forms import ContactUsForm
|
||||
from django.views.generic.edit import FormView
|
||||
from membership.calendar.calendar import BookCalendar
|
||||
from membership.models import Calendar as CalendarModel
|
||||
import json
|
||||
from django.contrib.auth import logout
|
||||
|
||||
class CalendarApi(View):
|
||||
def get(self,request,month,year):
|
||||
calendar = BookCalendar(request.user,requested_month=month).formatmonth(int(year),int(month))
|
||||
ret = {'calendar':calendar,'month':month,'year':year}
|
||||
return JsonResponse(ret)
|
||||
|
||||
def post(self,request):
|
||||
pd = json.loads(request.POST.get('data',''))
|
||||
ret = {'status':'success'}
|
||||
CalendarModel.add_dates(pd,request.user)
|
||||
return JsonResponse(ret)
|
||||
|
||||
class ContactView(FormView):
|
||||
template_name = 'contact.html'
|
||||
|
|
@ -45,17 +61,6 @@ def detail(request, message_id):
|
|||
def about(request):
|
||||
return render(request, 'digitalglarus/about.html')
|
||||
|
||||
|
||||
|
||||
#def index(request):
|
||||
# return render(request, 'digitalglarus/index.html')
|
||||
#
|
||||
#def letscowork(request):
|
||||
# return render(request, 'digitalglarus/letscowork.html')
|
||||
|
||||
# def index(request):
|
||||
# return home(request)
|
||||
|
||||
def home(request):
|
||||
return render(request, 'index.html')
|
||||
|
||||
|
|
@ -92,3 +97,6 @@ def supporters(request):
|
|||
'supporters': Supporter.objects.order_by('name')
|
||||
}
|
||||
return render(request, 'supporters.html', context)
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue