Addressbook

- location field.. has to be refactored

blechreiz/settings.py

@@ -141,10 +141,10 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     'django.contrib.admindocs',
+    'location_field',
     'crispy_forms',
     'musicians',
     'eventplanner',
-    'locpick',
     'sekizai',
     'intern_area',
     'website',

blechreiz/templates/field.html

@@ -0,0 +1,20 @@
+{% if field.is_hidden %}
+    {{ field }}
+{% else %}
+<div class="control-group {% if field.errors %}error{% endif %}">
+    <label for="{{ field.auto_id }}" class="control-label">
+        {% if field.field.required %}<b>{% endif %}{{ field.label|safe }}{% if field.field.required %}*</b>{% endif %}
+    </label>
+    <div class="controls">
+        {{ field }}
+        {% if field.errors %}
+            <span class="help-inline">{% for error in field.errors %}{{ error }}<br/> {% endfor %}</span>
+        {% endif %}
+        {% if field.help_text%}
+            <p class="help-block">
+                {{ field.help_text|safe }}
+            </p>
+        {% endif %}
+    </div>
+</div>
+{% endif %}

blechreiz/urls.py

@@ -2,7 +2,7 @@ from django.conf.urls import patterns, include, url
 
 from django.contrib import admin
 
-from musicians.views import MusicianList
+from musicians.views import MusicianList, addressbook
 from musicians.views import user_edit
 
 import intern_area.views
@@ -17,15 +17,17 @@ from django.conf.urls.static import static
 admin.autodiscover()
 
 urlpatterns = patterns('',
-    url(r'$^', website.views.home_view),
+    url(r'$^', website.views.home_view ),
     url(r'^events/',     include( eventplanner.urls.urlpatterns) ),
     url(r'^admin/',     include(admin.site.urls) ),
     url(r'^admin/doc/', include('django.contrib.admindocs.urls') ),
     
     url(r'^musicians/$', MusicianList.as_view() ),
     url(r'^musicians/(?P<username>[\w]+)$', user_edit ),
+    url(r'^addressbook/$', addressbook ),
     url(r'^admin_area/$', intern_area.views.login_site ),
     url(r'^login/$', website.views.login_view),
     url(r'^logout/$', website.views.logout_view),
     url(r'^messages/$', messages.views.message_view ),
+    url(r'^location_field/', include('location_field.urls')),
 ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)