Skip to content

Commit 1f3875f

Browse files
mawy7mawy7
committed
Conflicts: PyConGhana/__pycache__/settings.cpython-35.pyc PyConGhana/__pycache__/urls.cpython-35.pyc PyConGhana/settings.py registration/__pycache__/urls.cpython-35.pyc registration/templates/registration/activation_complete.html registration/templates/registration/login.html talks/__pycache__/admin.cpython-35.pyc
2 parents bbd7a7c + 04a3f00 commit 1f3875f

File tree

412 files changed

+902
-16629
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

412 files changed

+902
-16629
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ __pycache__/
1111
local_settings.py
1212
*db.sqlite3
1313
*db
14+
*media
1415

1516

1617
# If your build process includes running collectstatic, then you probably don't need or want to include staticfiles/

‎PyConGhana/__pycache__/__init__.cpython-35.pyc

23 Bytes
Binary file not shown.

‎PyConGhana/settings.py

+18-10
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@
1717
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
1818

1919

20-
# Quick-start development settings - unsuitable for production
20+
# Quick-start development settingss - unsuitable for production
2121
# See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/
2222

23-
# SECURITY WARNING: keep the secret key used in production secret!
2423

25-
26-
DEBUG = False
24+
DEBUG = True
2725

2826
LOGIN_REDIRECT_URL = '/profile'
2927
SIGNUP_REDIRECT_URL = '/profile'
@@ -49,7 +47,7 @@
4947

5048
# Third party apps
5149
#'cloudinary_storage',
52-
'cloudinary',
50+
#'cloudinary',
5351
'captcha',
5452
'crispy_forms',
5553
'rest_framework',
@@ -93,23 +91,35 @@
9391
ROOT_URLCONF = 'PyConGhana.urls'
9492

9593

96-
9794
# Absolute filesystem path to the directory that will hold user-uploaded files.
9895
# Example: "/home/media/media.lawrence.com/media/"
96+
9997
#MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
10098

10199
# URL that handles the media served from MEDIA_ROOT. Make sure to use a
102100
# trailing slash.
103101
# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
102+
<<<<<<< HEAD
104103
#MEDIA_URL = 'home/pyconghana/pyconghana2018/media/'
105104
#MEDIA_ROOT = 'home/pyconghana/pyconghana2018/media'
106105
MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
107106
#MEDIA_ROOT = os.path.join(BASE_DIR, *MEDIA_URL.strip("/").split("/"))
108107
MEDIA_URL = '/media/'
108+
=======
109+
110+
111+
#MEDIA_URL = 'home/pyconghana/pyconghana2018/media/'
112+
#MEDIA_ROOT = 'home/pyconghana/pyconghana2018/media'
113+
MEDIA_URL = '/media/'
114+
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
115+
116+
>>>>>>> 04a3f00734f44a87e626b3c84103ba70b39063fd
109117

110118

111119
STATIC_URL = '/static/'
120+
112121
STATIC_ROOT = os.path.join(PROJECT_ROOT, STATIC_URL.strip("/static/"))
122+
113123
#STATICFILES_STORAGE = 'cloudinary_storage.storage.StaticHashedCloudinaryStorage'
114124

115125

@@ -225,6 +235,7 @@
225235
# Path to Google Analytics client_secrets.json
226236
JET_MODULE_GOOGLE_ANALYTICS_CLIENT_SECRETS_FILE = os.path.join(BASE_DIR, 'client_secrets.json')
227237

238+
228239
# Using the new No Captcha reCaptcha
229240
NOCAPTCHA = True
230241

@@ -244,9 +255,6 @@
244255
NEWSLETTER_BATCH_SIZE = 100
245256

246257
# Sets the default site
247-
SITE_ID = 1
258+
SITE_ID = 3
248259

249260
AVATAR_MAX_AVATARS_PER_USER = 5
250-
251-
SENDGRID_SANDBOX_MODE_IN_DEBUG = False
252-

‎about/__pycache__/__init__.cpython-35.pyc

23 Bytes
Binary file not shown.

‎about/__pycache__/admin.cpython-35.pyc

23 Bytes
Binary file not shown.

‎about/__pycache__/models.cpython-35.pyc

23 Bytes
Binary file not shown.

‎about/__pycache__/urls.cpython-35.pyc

23 Bytes
Binary file not shown.

‎about/__pycache__/views.cpython-35.pyc

23 Bytes
Binary file not shown.

‎about/migrations/__pycache__/__init__.cpython-35.pyc

23 Bytes
Binary file not shown.

‎avatar/templates/avatar/add.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends "base.html" %}
1+
{% extends "avatar/base.html" %}
22
{% load i18n avatar_tags %}
33

44
{% block content %}

‎avatar/templates/avatar/base.html

+110-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,110 @@
1-
<html>
2-
<head>
3-
<title>{% block title %}django-avatar{% endblock %}</title>
4-
</head>
5-
<body>
6-
{% block content %}{% endblock %}
7-
</body>
8-
</html>
1+
{% load static %}
2+
<!DOCTYPE html>
3+
<html lang="en">
4+
5+
<head>
6+
<meta charset="utf-8">
7+
<meta name="google-site-verification" content="xCET18Os5b91G1mzfLvHeWAXn7FRAtH4K9lwcBD8vdA" />
8+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
9+
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
10+
11+
<!-- Favicons -->
12+
<link rel="shortcut icon" href="{% static 'images/favicon.png' %}">
13+
14+
<!-- Page Title -->
15+
<title>{% block meta_title %}{% endblock %}{% if settings.SITE_TITLE %} | {{ settings.SITE_TITLE }}{% endif %}</title>
16+
17+
18+
<!-- Bootstrap -->
19+
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">
20+
21+
<!-- Custom Google Font : Open Sans & Montserrat -->
22+
<link href='https://fonts.googleapis.com/css?family=Open+Sans:300,600' rel='stylesheet' type='text/css'>
23+
<link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,900" rel="stylesheet">
24+
25+
<!-- Plugins -->
26+
<link href="{% static 'css/plugins/animate.css' %}" rel="stylesheet">
27+
<link href="{% static 'css/plugins/slick.css' %}" rel="stylesheet">
28+
<link href="{% static 'css/plugins/magnific-popup.css' %}" rel="stylesheet">
29+
<link href="{% static 'css/plugins/font-awesome.css' %}" rel="stylesheet">
30+
<link href="{% static 'css/plugins/streamline-icons.css' %}" rel="stylesheet">
31+
32+
<!-- Event Style -->
33+
<link href="{% static 'css/event.css' %}" rel="stylesheet">
34+
35+
<link href="{% static 'css/themes/red.css' %}" rel="stylesheet">
36+
<!-- Modernizr -->
37+
<script src="{% static 'js/modernizr.min.js' %}"></script>
38+
<!-- Subtle Loading bar -->
39+
<script src="{% static 'js/plugins/pace.js' %}"></script>
40+
<script type="text/javascript" src="https://addevent.com/libs/atc/1.6.1/atc.min.js" async defer></script>
41+
42+
<script type="text/javascript"> window.$crisp=[];window.CRISP_WEBSITE_ID="79a43d1d-2013-4bd1-a0a0-a386d8ce4467";(function(){ d=document;s=d.createElement("script"); s.src="https://client.crisp.chat/l.js"; s.async=1;d.getElementsByTagName("head")[0].appendChild(s);})(); </script>
43+
44+
</head>
45+
46+
<body>
47+
48+
49+
<font color="black">
50+
51+
<!-- Nav tabs -->
52+
{% block content %}
53+
54+
{% endblock %}
55+
</font>
56+
57+
58+
<!--
59+
Registration Popup (Eventbrite)
60+
====================================== -->
61+
62+
<div class="modal fade" id="eventbrite-register" tabindex="-1" role="dialog">
63+
<div class="modal-dialog modal-lg modal-transparent" role="document">
64+
<div class="modal-content">
65+
<div class="modal-body">
66+
67+
<div class="eventbrite-wrapper">
68+
<iframe src="/" height="350"></iframe>
69+
</div>
70+
71+
</div>
72+
73+
</div>
74+
</div>
75+
</div
76+
<!--
77+
Javascripts : Nerd Stuff :)
78+
====================================== -->
79+
80+
<!-- jQuery Library -->
81+
<script src="{% static 'js/jquery.min.js' %}"></script>
82+
83+
<!-- Bootstrap JS -->
84+
<script src="{% static 'js/bootstrap.min.js' %}"></script>
85+
86+
<!-- 3rd party Plugins -->
87+
<script src="{% static 'js/plugins/countdown.js' %}"></script>
88+
<script src="{% static 'js/plugins/wow.js' %}"></script>
89+
<script src="{% static 'js/plugins/slick.js' %}"></script>
90+
<script src="{% static 'js/plugins/magnific-popup.js' %}"></script>
91+
<script src="{% static 'js/plugins/validate.js' %}"></script>
92+
<script src="{% static 'js/plugins/appear.js' %}"></script>
93+
<script src="{% static 'js/plugins/count-to.js' %}"></script>
94+
<script src="{% static 'js/plugins/nicescroll.js' %}"></script>
95+
96+
<!-- Google Map -->
97+
<script src="https://maps.google.com/maps/api/js?sensor=false"></script>
98+
<script src="{% static 'js/plugins/infobox.js' %}"></script>
99+
<script src="{% static 'js/plugins/google-map.js' %}"></script>
100+
<script src="{% static 'js/plugins/directions.js' %}"></script>
101+
102+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
103+
<!-- Main Script -->
104+
<script src="{% static 'js/main.js' %}"></script>
105+
106+
</body>
107+
108+
</html>
109+
110+

‎avatar/templates/avatar/change.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends "base.html" %}
1+
{% extends "avatar/base.html" %}
22
{% load i18n avatar_tags %}
33

44
{% block content %}

‎avatar/templates/avatar/confirm_delete.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends "base.html" %}
1+
{% extends "avatar/base.html" %}
22
{% load i18n avatar_tags %}
33

44
{% block content %}

‎coc/__pycache__/__init__.cpython-35.pyc

23 Bytes
Binary file not shown.

‎coc/__pycache__/admin.cpython-35.pyc

23 Bytes
Binary file not shown.

‎coc/__pycache__/models.cpython-35.pyc

23 Bytes
Binary file not shown.

‎coc/__pycache__/urls.cpython-35.pyc

23 Bytes
Binary file not shown.

‎coc/__pycache__/views.cpython-35.pyc

23 Bytes
Binary file not shown.

‎coc/migrations/__pycache__/__init__.cpython-35.pyc

23 Bytes
Binary file not shown.

‎contact/__pycache__/__init__.cpython-35.pyc

23 Bytes
Binary file not shown.

‎contact/__pycache__/admin.cpython-35.pyc

23 Bytes
Binary file not shown.

‎contact/__pycache__/models.cpython-35.pyc

23 Bytes
Binary file not shown.

‎contact/migrations/__pycache__/__init__.cpython-35.pyc

23 Bytes
Binary file not shown.

‎dashboard.py

+102-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,111 @@
1+
# encoding: utf-8
2+
from django.core.urlresolvers import reverse
13
from django.utils.translation import ugettext_lazy as _
4+
from jet.dashboard import modules
25
from jet.dashboard.dashboard import Dashboard, AppIndexDashboard
6+
from jet.utils import get_admin_site_name
37
from jet.dashboard.dashboard_modules import google_analytics
48

59

610
class CustomIndexDashboard(Dashboard):
711
columns = 3
812

913
def init_with_context(self, context):
10-
self.available_children.append(google_analytics.GoogleAnalyticsVisitorsTotals)
11-
self.available_children.append(google_analytics.GoogleAnalyticsVisitorsChart)
12-
self.available_children.append(google_analytics.GoogleAnalyticsPeriodVisitors)
14+
self.available_children.append(modules.LinkList)
15+
self.available_children.append(modules.Feed)
16+
17+
self.available_children.append(google_analytics.GoogleAnalyticsVisitorsTotals)
18+
self.available_children.append(google_analytics.GoogleAnalyticsVisitorsChart)
19+
self.available_children.append(google_analytics.GoogleAnalyticsPeriodVisitors)
20+
21+
site_name = get_admin_site_name(context)
22+
# append a link list module for "quick links"
23+
self.children.append(modules.LinkList(
24+
_('Quick links'),
25+
layout='inline',
26+
draggable=False,
27+
deletable=False,
28+
collapsible=False,
29+
children=[
30+
[_('Return to site'), '/'],
31+
[_('Change password'),
32+
reverse('%s:password_change' % site_name)],
33+
[_('Log out'), reverse('%s:logout' % site_name)],
34+
],
35+
column=2,
36+
order=0
37+
))
38+
39+
# append an app list module for "Applications"
40+
self.children.append(modules.AppList(
41+
_('Applications'),
42+
exclude=('auth.*',),
43+
column=1,
44+
order=0
45+
))
46+
47+
# append an app list module for "Administration"
48+
self.children.append(modules.AppList(
49+
_('Administration'),
50+
models=('auth.*',),
51+
column=2,
52+
order=0
53+
))
54+
55+
# append a recent actions module
56+
self.children.append(modules.RecentActions(
57+
_('Recent Actions'),
58+
10,
59+
column=2,
60+
order=1
61+
))
62+
63+
# append a feed module
64+
self.children.append(modules.Feed(
65+
_('Latest Django News'),
66+
feed_url='http://www.djangoproject.com/rss/weblog/',
67+
limit=5,
68+
column=2,
69+
order=1
70+
))
71+
72+
# append another link list module for "support".
73+
self.children.append(modules.LinkList(
74+
_('Support'),
75+
children=[
76+
{
77+
'title': _('Django documentation'),
78+
'url': 'http://docs.djangoproject.com/',
79+
'external': True,
80+
},
81+
{
82+
'title': _('Django "django-users" mailing list'),
83+
'url': 'http://groups.google.com/group/django-users',
84+
'external': True,
85+
},
86+
{
87+
'title': _('Django irc channel'),
88+
'url': 'irc://irc.freenode.net/django',
89+
'external': True,
90+
},
91+
],
92+
column=2,
93+
order=1
94+
))
95+
96+
97+
class CustomAppIndexDashboard(AppIndexDashboard):
98+
def init_with_context(self, context):
99+
self.available_children.append(modules.LinkList)
100+
101+
self.children.append(modules.ModelList(
102+
title=_('Application models'),
103+
models=self.models(),
104+
column=0,
105+
order=0
106+
))
107+
self.children.append(modules.RecentActions(
108+
include_list=self.get_app_content_types(),
109+
column=1,
110+
order=0
111+
))

‎faq/templates/faq.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ <h6 class="faq-title">What payment types do you accept?</h6>
3939
<h6 class="faq-title">Can I get a refund on my tickets?</h6>
4040
<p>Yes you can, although all tickets refunds would be 60% of the price unless the event is cancelled by us, in which case we will always make a full refund.</p><br><br>
4141

42-
<p>You can contact <b><a href="mailto:[email protected]">[email protected]</a></b> for further inquiries.</p>
42+
<p>You can contact <b><a href="mailto:[email protected]">[email protected]</a></b> for further inquiries.</p>
4343

4444
</div>
4545
</div>

‎home/__pycache__/__init__.cpython-35.pyc

23 Bytes
Binary file not shown.

‎home/__pycache__/admin.cpython-35.pyc

23 Bytes
Binary file not shown.

‎home/__pycache__/models.cpython-35.pyc

23 Bytes
Binary file not shown.

‎home/__pycache__/urls.cpython-35.pyc

23 Bytes
Binary file not shown.

‎home/__pycache__/views.cpython-35.pyc

23 Bytes
Binary file not shown.

‎home/migrations/__pycache__/__init__.cpython-35.pyc

23 Bytes
Binary file not shown.

‎home/templates/home.html

+1
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ <h6 class="susbcribe-head wow fadeInLeft"> SUBSCRIBE <small><font color="black">
213213
<button id="id_submit" name="submit" class="btn btn-lg btn-success btn-block" value="Subscribe" type="submit">Subscribe Now →</button>
214214
</div>
215215
</form>
216+
</div>
216217
</div>
217218
</div>
218219
</div>

‎media/avatar.jpg

-12.9 KB
Binary file not shown.

‎media/avatars/Williano/WIN_20171130_00_28_56_Pro.jpg

48.8 KB

‎media/avatars/Williano/resized/150/WIN_20171130_00_28_56_Pro.jpg

4.41 KB

‎media/avatars/Williano/resized/160/WIN_20171130_00_28_56_Pro.jpg

4.63 KB

‎media/avatars/Williano/resized/80/WIN_20171130_00_28_56_Pro.jpg

2.06 KB

‎media/avatars/mawy7/resized/150/webpyladies.jpg

6.27 KB

‎media/avatars/mawy7/resized/160/webpyladies.jpg

6.56 KB

‎media/avatars/mawy7/resized/40/23975184897_666d068652_k.jpg

1.07 KB

‎media/avatars/mawy7/resized/80/webpyladies.jpg

2.86 KB

‎media/avatars/mawy7/webpyladies.jpg

53 KB

‎media/sponsors/01-sticker-mule-logo-dark.png

15.4 KB

‎media/sponsors/1.png

50.7 KB

‎media/sponsors/PythonAnywhere_1280x237.png

29.4 KB

‎media/sponsors/PythonAnywhere_1280x237_LqKmr2i.png

29.4 KB

0 commit comments

Comments
 (0)