removed some admin stuff. Fixed version-info, if no mercurial is installed

openslides/__init__.py

@@ -20,6 +20,8 @@ def get_version(version=None):
         mercurial_version = hg_version()
         if mercurial_version != 'unknown':
             sub = '.dev%s' % mercurial_version
+        else:
+            sub = '.dev'
 
     elif version[3] != 'final':
         mapping = {'alpha': 'a', 'beta': 'b', 'rc': 'c'}

openslides/openslides_settings.py

@@ -61,10 +61,6 @@ MEDIA_ROOT = ''
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
 MEDIA_URL = ''
 
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
 
 STATIC_DOC_ROOT = os.path.join(SITE_ROOT, 'static')
 
@@ -99,7 +95,6 @@ INSTALLED_APPS = (
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
-    'django.contrib.admin',
     'mptt',
     'utils',
     'poll',

openslides/urls.py

@@ -10,9 +10,8 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, url, include
 from django.conf import settings
-from django.contrib import admin
 from django.views.generic import RedirectView
 from django.utils.importlib import import_module
 import settings
@@ -20,7 +19,6 @@ import settings
 handler500 = 'openslides.utils.views.server_error'
 
 urlpatterns = patterns('',
-
     # frontpage
     (r'^$', RedirectView.as_view(
         url='projector/control',
@@ -40,7 +38,7 @@ urlpatterns = patterns('',
 for plugin in settings.INSTALLED_PLUGINS:
     try:
         mod = import_module(plugin + '.urls')
-    except (ImportError):
+    except ImportError, err:
         continue
 
     plugin_name = mod.__name__.split('.')[0]