Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/358424 )
Change subject: Remove web app bits of DjangoBannerStats
......................................................................
Remove web app bits of DjangoBannerStats
Not actually used, and preventing the app from running on newer versions
of Django
Change-Id: I5389a26266c4a24a6ed76733cc0dc72d41ea277d
---
D fundraiser/analytics/urls.py
D fundraiser/analytics/views.py
M fundraiser/settings.py
D fundraiser/templates/analytics/campaign_ecom.html
D fundraiser/templates/wmf_base.html
M fundraiser/urls.py
D fundraiser/wsgi.py
7 files changed, 0 insertions(+), 211 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools/DjangoBannerStats
refs/changes/24/358424/1
diff --git a/fundraiser/analytics/urls.py b/fundraiser/analytics/urls.py
deleted file mode 100644
index a6946a9..0000000
--- a/fundraiser/analytics/urls.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from django.conf.urls import patterns, include, url
-
-# Uncomment the next two lines to enable the admin:
-from django.contrib import admin
-admin.autodiscover()
-
-urlpatterns = patterns('fundraiser.analytics',
- # Examples:
- # url(r'^$', 'fundraiser.views.home', name='home'),
-
- url(r'^$', 'views.hello_world', name='hello_world'),
- url(u'campaign_ecom/$', 'views.campaign_ecom',
name='fundraiser.analytics.campaign_ecom'),
-
-)
diff --git a/fundraiser/analytics/views.py b/fundraiser/analytics/views.py
deleted file mode 100644
index ea9d1a6..0000000
--- a/fundraiser/analytics/views.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from django.http import HttpResponse
-from django.shortcuts import render_to_response
-from django.template import RequestContext
-
-import fundraiser.analytics.forms as forms
-
-# Create your views here.
-
-def hello_world(request):
-
-# return HttpResponse("Hello World")
- return render_to_response(
- "wmf_base.html",
- {'text':"Hello World"},
- context_instance=RequestContext(request)
- )
-
-def campaign_ecom(request):
- if request.method == 'POST': # If the form has been submitted...
- form = forms.CampaignForm(request.POST) # A form bound to the POST data
- if form.is_valid(): # All validation rules pass
- return render_to_response(
- "analytics/campaign_ecom.html",
- { 'form' : form,
- 'campaign' : form.cleaned_data['campaign']
- },
- context_instance=RequestContext(request)
- )
- else:
- form = forms.CampaignForm() # An unbound form
-
- return render_to_response(
- "analytics/campaign_ecom.html",
- { 'form' : form },
- context_instance=RequestContext(request)
- )
\ No newline at end of file
diff --git a/fundraiser/settings.py b/fundraiser/settings.py
index 338644f..47de14b 100644
--- a/fundraiser/settings.py
+++ b/fundraiser/settings.py
@@ -3,12 +3,6 @@
DEBUG = True
TEMPLATE_DEBUG = DEBUG
-ADMINS = (
- # ('Your Name', 'your_em...@example.com'),
-)
-
-MANAGERS = ADMINS
-
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2',
'mysql', 'sqlite3' or 'oracle'.
@@ -46,84 +40,11 @@
# If you set this to False, Django will not use timezone-aware datetimes.
USE_TZ = False
-# Absolute filesystem path to the directory that will hold user-uploaded files.
-# Example: "/home/media/media.lawrence.com/media/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash.
-# Examples: "http://media.lawrence.com/media/";, "http://example.com/media/";
-MEDIA_URL = ''
-
-# Absolute path to the directory static files should be collected to.
-# Don't put anything in this directory yourself; store your static files
-# in apps' "static/" subdirectories and in STATICFILES_DIRS.
-# Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = 'static/'
-
-# URL prefix for static files.
-# Example: "http://media.lawrence.com/static/";
-STATIC_URL = '/static/'
-
-# Additional locations of static files
-STATICFILES_DIRS = (
- # Put strings here, like "/home/html/static" or "C:/www/django/static".
- # Always use forward slashes, even on Windows.
- # Don't forget to use absolute paths, not relative paths.
-)
-
-# List of finder classes that know how to find static files in
-# various locations.
-STATICFILES_FINDERS = (
- 'django.contrib.staticfiles.finders.FileSystemFinder',
- 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-# 'django.contrib.staticfiles.finders.DefaultStorageFinder',
-)
-
# Make this unique, and don't share it with anybody.
SECRET_KEY = 'bcsz$xo#=a__75o4g$stg6s*+d$cpelg$mrp)kgsvm1eqkv@4^'
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.Loader',
- 'django.template.loaders.app_directories.Loader',
-# 'django.template.loaders.eggs.Loader',
-)
-
-MIDDLEWARE_CLASSES = (
- 'django.middleware.common.CommonMiddleware',
- 'django.contrib.sessions.middleware.SessionMiddleware',
- 'django.middleware.csrf.CsrfViewMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'django.contrib.messages.middleware.MessageMiddleware',
- # Uncomment the next line for simple clickjacking protection:
- # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
-)
-
-ROOT_URLCONF = 'fundraiser.urls'
-
-# Python dotted path to the WSGI application used by Django's runserver.
-WSGI_APPLICATION = 'fundraiser.wsgi.application'
-
-TEMPLATE_DIRS = (
- # Put strings here, like "/home/html/django_templates" or
"C:/www/django/templates".
- # Always use forward slashes, even on Windows.
- # Don't forget to use absolute paths, not relative paths.
- 'fundraiser/templates',
-)
-
INSTALLED_APPS = (
- 'django.contrib.auth',
- 'django.contrib.contenttypes',
- 'django.contrib.sessions',
- 'django.contrib.sites',
'django.contrib.messages',
- 'django.contrib.staticfiles',
- # Uncomment the next line to enable the admin:
- 'django.contrib.admin',
- # Uncomment the next line to enable admin documentation:
- 'django.contrib.admindocs',
-
'fundraiser.analytics'
)
diff --git a/fundraiser/templates/analytics/campaign_ecom.html
b/fundraiser/templates/analytics/campaign_ecom.html
deleted file mode 100644
index 5792ca2..0000000
--- a/fundraiser/templates/analytics/campaign_ecom.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "wmf_base.html" %}
-
-{% block content %}
-
- {% if not campaign %}
- <form action="{% url fundraiser.analytics.campaign_ecom %}"
method="post">{% csrf_token %}
- {{ form.as_p }}
- <input type="submit" value="Submit" />
- </form>
- {% else %}
- <h3>{{ campaign }}</h3>
- {% endif %}
-
-
-{% endblock %}
\ No newline at end of file
diff --git a/fundraiser/templates/wmf_base.html
b/fundraiser/templates/wmf_base.html
deleted file mode 100644
index 1237598..0000000
--- a/fundraiser/templates/wmf_base.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head>
- <link href="{{ STATIC_URL }}css/wmf_style.css" rel="stylesheet"
type="text/css">
- {% block custom_head %}{% endblock %}
- <title>{% block title %}WMF Fundraising Analytics{% endblock %}</title>
-</head>
-
-<!--[if lt IE 7]> <body class="ie ie6 lte9 lte8 lte7"> <![endif]-->
-<!--[if IE 7]> <body class="ie ie7 lte9 lte8 lte7"> <![endif]-->
-<!--[if IE 8]> <body class="ie ie8 lte9 lte8"> <![endif]-->
-<!--[if IE 9]> <body class="ie ie9 lte9"> <![endif]-->
-<!--[if gt IE 9]> <body> <![endif]-->
-<!--[if !IE]><!--> <body> <!--<![endif]-->
-
-
-{% block content %}{{ text }}{% endblock %}
-
-</body>
-</html>
diff --git a/fundraiser/urls.py b/fundraiser/urls.py
index b2a37b4..e69de29 100644
--- a/fundraiser/urls.py
+++ b/fundraiser/urls.py
@@ -1,19 +0,0 @@
-from django.conf import settings
-from django.conf.urls import patterns, include, url
-from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-
-# Uncomment the next two lines to enable the admin:
-from django.contrib import admin
-admin.autodiscover()
-
-urlpatterns = patterns('',
- # Examples:
- # url(r'^$', 'fundraiser.views.home', name='home'),
- url(r'^fundraiser/', include('fundraiser.analytics.urls')),
-
- # Uncomment the admin/doc line below to enable admin documentation:
- # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
- # Uncomment the next line to enable the admin:
- url(r'^admin/', include(admin.site.urls)),
-)
diff --git a/fundraiser/wsgi.py b/fundraiser/wsgi.py
deleted file mode 100644
index 440466f..0000000
--- a/fundraiser/wsgi.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""
-WSGI config for fundraiser project.
-
-This module contains the WSGI application used by Django's development server
-and any production WSGI deployments. It should expose a module-level variable
-named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
-this application via the ``WSGI_APPLICATION`` setting.
-
-Usually you will have the standard Django WSGI application here, but it also
-might make sense to replace the whole Django WSGI application with a custom one
-that later delegates to the Django one. For example, you could introduce WSGI
-middleware here, or combine a Django application with an application of another
-framework.
-
-"""
-import os, sys
-
-sys.path.append("/home/pgehres/analytics/source/")
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "fundraiser.settings")
-
-# This application object is used by any WSGI server configured to use this
-# file. This includes Django's development server, if the WSGI_APPLICATION
-# setting points here.
-from django.core.wsgi import get_wsgi_application
-application = get_wsgi_application()
-
-# Apply WSGI middleware here.
-# from helloworld.wsgi import HelloWorldApplication
-# application = HelloWorldApplication(application)
--
To view, visit https://gerrit.wikimedia.org/r/358424
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5389a26266c4a24a6ed76733cc0dc72d41ea277d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools/DjangoBannerStats
Gerrit-Branch: master
Gerrit-Owner: Ejegg <ej...@ejegg.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
