diff --git a/bootstrapTemplates/clean-canvas-wrap/blechreiz.html b/bootstrapTemplates/clean-canvas-wrap/blechreiz.html new file mode 100644 index 0000000..8c6c693 --- /dev/null +++ b/bootstrapTemplates/clean-canvas-wrap/blechreiz.html @@ -0,0 +1,500 @@ + + + + Business Template + + + + + + + + + + + + + + + + + +
+
+
+ + + + + + + Blechreiz + +
+ +
+
+
+
+ +
+ + +
+ +
+

Blechreiz

+

12 Musiker für einen guten Zweck

+
+
+ + + +
+
+

Konzerte

+ Termine +
+
+ +
+
+

Konzerte

+ Termine +
+
+ + +
+
+

Konzerte

+ Termine +
+
+ +
+
+

Konzerte

+ Termine +
+
+ +
+
+

Konzerte

+ Termine +
+
+ +
+
+

Konzerte

+ Termine +
+
+ +
+
+

Konzerte

+ Termine +
+
+ + +
+
+ + +
+ +
+

Konzerte

+ Nächste Termine + +
+
+
+ + + + +
+

Über uns

+ Los +
+
+
+
+

Unser Projekt

+
+ + + +
+ +
+ + +
+
+
+
+

Unser nächstes Konzert

+

+ Ist in Rohr um 19:00 in der WasWeissIch Kirche Bis dann +
+ Dorfplatz 5, Rohr +

+
+
+
+
+ +
+

Sekunden

+
+
+
+ +
+

Minuten

+
+
+
+ +
+

Stunden

+
+
+
+ +
+

Tage

+
+ +
+
+
+
+ + + +
+
+
+

Pricing

+
+ +
+ +
+
+
+

Lite

+
+ $ + 35 + /month +
+
+

+ 10 + Shared Projects +

+

+ 4 + Team Members +

+

+ 10 + Storage +

+
+ ORDER NOW +
+
+
+ +
+
+
+ +

Pro

+
+ $ + 99 + /month +
+
+

+ 10 + Shared Projects +

+

+ 25 + Team Members +

+

+ Unlimited + Storage +

+

+ Plus + Phone Support +

+
+ ORDER NOW +
+
+
+ +
+
+
+

Standard

+
+ $ + 65 + /month +
+
+

+ 10 + Shared Projects +

+

+ 4 + Team Members +

+

+ 10 + Storage +

+
+ ORDER NOW +
+
+
+
+
+

Start your free, no-risk, 14 day trial!

+ Start Now! +
+
+
+ +
+
+
+

Clients

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bootstrapTemplates/clean-canvas-wrap/css/coming-soon.css b/bootstrapTemplates/clean-canvas-wrap/css/coming-soon.css index 3b7e15e..fd001d3 100644 --- a/bootstrapTemplates/clean-canvas-wrap/css/coming-soon.css +++ b/bootstrapTemplates/clean-canvas-wrap/css/coming-soon.css @@ -2,7 +2,7 @@ margin-top: -35px; } #coming_soon .head{ - background: url("../img/backgrounds/color-splash.jpg") no-repeat; + /*background: url("../img/backgrounds/color-splash.jpg") no-repeat;*/ display: block; padding-top: 160px; height: 288px; @@ -17,15 +17,15 @@ } #coming_soon .text h4{ margin: 0 0 35px 0; - color: #fff; + /*color: #fff;*/ font-size: 35px; font-weight: normal; line-height: 38px; text-shadow: 1px 1px 0px #2A284D; } #coming_soon .text p{ - color: #fff; - font-size: 16px; + /*color: #fff;*/ + font-size: 18px; font-style: italic; line-height: 24px; } @@ -61,7 +61,7 @@ font-weight: bold; } #coming_soon .count p{ - color: #fff; + /*color: #fff;*/ margin: 0; text-transform: uppercase; font-size: 13px; diff --git a/bootstrapTemplates/clean-canvas-wrap/css/index.css b/bootstrapTemplates/clean-canvas-wrap/css/index.css index 9e53261..37c33cc 100644 --- a/bootstrapTemplates/clean-canvas-wrap/css/index.css +++ b/bootstrapTemplates/clean-canvas-wrap/css/index.css @@ -41,7 +41,7 @@ width: 7px; height: 7px; box-shadow: 0px 0px 1px 2px #ccc; - background: rgb(0, 0, 0); + background: rgb(156, 156, 156); border-radius: 10px; display: block; /*border: 1px solid #fff;*/ @@ -51,7 +51,7 @@ transition: opacity .1s linear; } #pagination li.active a { - background: rgb(46, 92, 177); + background: rgb(196, 16, 16); box-shadow: none; width: 8px; height: 8px; @@ -95,12 +95,14 @@ z-index: 10; } .slide#showcasing .info h2 { - color: #fff; font-size: 50px; font-weight: normal; line-height: 56px; text-shadow: 1px 1px 1px rgb(49, 57, 61); } + + + /* Slide 2 */ .slide#ideas .info { position: relative; @@ -120,7 +122,7 @@ width: 24%; } .slide#tour .info h2 { - color: #fff; + color: rgb(18,18,18); font-size: 45px; font-weight: normal; text-shadow: 1px 1px 1px #3b3262; @@ -129,7 +131,7 @@ .slide#tour .info a { color: #fff; font-weight: bold; - background-color: #2a205d; + background-color: rgba(18,18,18,0.6); padding: 13px 30px; font-size: 19px; border-radius: 5px; diff --git a/bootstrapTemplates/clean-canvas-wrap/css/theme.css b/bootstrapTemplates/clean-canvas-wrap/css/theme.css index c9a4af0..ffb9245 100644 --- a/bootstrapTemplates/clean-canvas-wrap/css/theme.css +++ b/bootstrapTemplates/clean-canvas-wrap/css/theme.css @@ -37,8 +37,8 @@ header { border-bottom: 1px solid rgb(88, 88, 88); } .navbar.transparent.navbar-inverse .navbar-inner .container { - margin-top: 10px; - margin-bottom: 10px; + /*margin-top: 10px; + margin-bottom: 10px;*/ -webkit-transition: margin .2s ease-in-out; -moz-transition: margin .2s ease-in-out; transition: margin .2s ease-in-out; @@ -58,9 +58,15 @@ header { .navbar-inverse .brand { color: #fff; } + +.navbar .brand { + padding: 5px; +} + .navbar-inverse .nav > li > a { /*color: rgb(177, 177, 177);*/ - font-size: 13px; + font-size: 18px; + padding-top: 23px; font-weight: bold; color: #fff; text-shadow: 0 1px 0 rgba(0,0,0,.5); diff --git a/bootstrapTemplates/clean-canvas-wrap/img/slides/blechreiz01/redstripes.jpg b/bootstrapTemplates/clean-canvas-wrap/img/backgrounds/redstripes.jpg similarity index 100% rename from bootstrapTemplates/clean-canvas-wrap/img/slides/blechreiz01/redstripes.jpg rename to bootstrapTemplates/clean-canvas-wrap/img/backgrounds/redstripes.jpg diff --git a/bootstrapTemplates/clean-canvas-wrap/img/logo.png b/bootstrapTemplates/clean-canvas-wrap/img/logo.png index 8a89631..4c00758 100644 Binary files a/bootstrapTemplates/clean-canvas-wrap/img/logo.png and b/bootstrapTemplates/clean-canvas-wrap/img/logo.png differ diff --git a/bootstrapTemplates/clean-canvas-wrap/img/slides/blechreiz01/logo.png b/bootstrapTemplates/clean-canvas-wrap/img/slides/blechreiz01/logo.png deleted file mode 100644 index 4c00758..0000000 Binary files a/bootstrapTemplates/clean-canvas-wrap/img/slides/blechreiz01/logo.png and /dev/null differ diff --git a/bootstrapTemplates/clean-canvas-wrap/js/index-slider.js b/bootstrapTemplates/clean-canvas-wrap/js/index-slider.js index e6b9078..9c8767c 100644 --- a/bootstrapTemplates/clean-canvas-wrap/js/index-slider.js +++ b/bootstrapTemplates/clean-canvas-wrap/js/index-slider.js @@ -362,7 +362,7 @@ $(document).ready(function () { }); var f = setInterval(function () { i() - }, 5000) + }, 15000) } c(); $(window).resize(function () { diff --git a/eventplanner/__init__.py b/eventplanner/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/eventplanner/admin.py b/eventplanner/admin.py new file mode 100644 index 0000000..d5e4562 --- /dev/null +++ b/eventplanner/admin.py @@ -0,0 +1,20 @@ +from django.contrib import admin +from eventplanner.models import Event, EventParticipation + + +class EventParticipationInline(admin.TabularInline): + model = EventParticipation + extra = 1 + readonly_fields = ('musician',) + fields = ( 'musician', 'status', 'comment', ) + has_add_permission = lambda self, req : False + has_delete_permission = lambda self, req, obj : False + + template = "custom_tabular.html" + + +class EventAdmin(admin.ModelAdmin): + inlines = ( EventParticipationInline, ) + + +admin.site.register( Event, EventAdmin ) \ No newline at end of file diff --git a/eventplanner/models.py b/eventplanner/models.py new file mode 100644 index 0000000..abc0d25 --- /dev/null +++ b/eventplanner/models.py @@ -0,0 +1,55 @@ +from django.db import models +from django.utils.translation import ugettext as _ +from locpick.field import LocationField + +from musicians.models import Musician + + +class Event ( models.Model ): + + EVENT_TYPES = ( + ( 'Reh', _('Rehearsal') ), + ( 'Conc', _('Concert') ), + ( 'GenReh', _('General Rehearsal') ), + ) + + title = models.CharField( max_length=40 ) + type = models.CharField( max_length=6, choices=EVENT_TYPES, default='Reh' ) + date = models.DateField() + time = models.TimeField( null=True, blank=True ) + participants = models.ManyToManyField( Musician, through='EventParticipation' ) + + desc = models.TextField( blank=True) + location = LocationField() + + + def __unicode__(self): + return self.title + " ( " + self.get_type_display() + " ) " + + + def save(self, *args, **kwargs): + # Call the "real" save() method + super(Event, self).save(*args, **kwargs) + + # Create a "Don't Know" participation for each Musician + for m in Musician.objects.all(): + if not m in self.participants.all(): + EventParticipation.objects.create( event=self, musician = m, status='?', comment = '' ) + + + + + +class EventParticipation( models.Model ): + OPTIONS = ( ('?' , _('?' )), + ('Yes', _('Yes')), + ('No' , _('No' )) + ) + + event = models.ForeignKey( Event ) + musician = models.ForeignKey( Musician ) + status = models.CharField ( max_length=3, choices = OPTIONS, default='?' ) + comment = models.CharField ( max_length=64, blank=True ) + + class Meta: + unique_together = ("event", "musician") \ No newline at end of file diff --git a/eventplanner/templates/custom_tabular.html b/eventplanner/templates/custom_tabular.html new file mode 100644 index 0000000..355cc9a --- /dev/null +++ b/eventplanner/templates/custom_tabular.html @@ -0,0 +1,78 @@ +{% load i18n admin_static admin_modify %} +
+
+{{ inline_admin_formset.formset.management_form }} +
+

{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}

+ {{ inline_admin_formset.formset.non_form_errors }} + + + {% for field in inline_admin_formset.fields %} + {% if not field.widget.is_hidden %} + {{ field.label|capfirst }} + {% if field.help_text %} ({{ field.help_text|striptags }}){% endif %} + + {% endif %} + {% endfor %} + {% if inline_admin_formset.formset.can_delete %}{% endif %} + + + + {% for inline_admin_form in inline_admin_formset %} + {% if inline_admin_form.form.non_field_errors %} + + {% endif %} + + + {% for fieldset in inline_admin_form %} + {% for line in fieldset %} + {% for field in line %} + + {% if field.is_readonly %} +

{{ field.contents|linebreaksbr }}

+ {% else %} + {{ field.field.errors.as_ul }} + {{ field.field }} + {% endif %} + + {% endfor %} + {% endfor %} + {% endfor %} + {% if inline_admin_formset.formset.can_delete %} + + {% endif %} + + {% endfor %} + +
{% trans "Delete?" %}
{{ inline_admin_form.form.non_field_errors }}
+ {% if inline_admin_form.original or inline_admin_form.show_url %}

+ +

{% endif %} + {% if inline_admin_form.has_auto_field %}{{ inline_admin_form.pk_field.field }}{% endif %} + {{ inline_admin_form.fk_field.field }} + {% spaceless %} + {% for fieldset in inline_admin_form %} + {% for line in fieldset %} + {% for field in line %} + {% if field.is_hidden %} {{ field.field }} {% endif %} + {% endfor %} + {% endfor %} + {% endfor %} + {% endspaceless %} + 		{% if inline_admin_form.original %}{{ inline_admin_form.deletion_field.field }}{% endif %}
+
+
+
+ + diff --git a/eventplanner/tests.py b/eventplanner/tests.py new file mode 100644 index 0000000..501deb7 --- /dev/null +++ b/eventplanner/tests.py @@ -0,0 +1,16 @@ +""" +This file demonstrates writing tests using the unittest module. These will pass +when you run "manage.py test". + +Replace this with more appropriate tests for your application. +""" + +from django.test import TestCase + + +class SimpleTest(TestCase): + def test_basic_addition(self): + """ + Tests that 1 + 1 always equals 2. + """ + self.assertEqual(1 + 1, 2) diff --git a/eventplanner/views.py b/eventplanner/views.py new file mode 100644 index 0000000..60f00ef --- /dev/null +++ b/eventplanner/views.py @@ -0,0 +1 @@ +# Create your views here.