pythonghana
diff --git a/‎PyConGhana/__pycache__/__init__.cpython-35.pyc
-23 Bytes b/‎PyConGhana/__pycache__/__init__.cpython-35.pyc
-23 Bytes
diff --git a/‎PyConGhana/__pycache__/settings.cpython-35.pyc
64 Bytes b/‎PyConGhana/__pycache__/settings.cpython-35.pyc
64 Bytes
diff --git a/‎PyConGhana/settings.py
+22-27 b/‎PyConGhana/settings.py
+22-27
diff --git a/‎about/__pycache__/__init__.cpython-35.pyc
-23 Bytes b/‎about/__pycache__/__init__.cpython-35.pyc
-23 Bytes
diff --git a/‎about/__pycache__/admin.cpython-35.pyc
-23 Bytes b/‎about/__pycache__/admin.cpython-35.pyc
-23 Bytes
diff --git a/‎about/__pycache__/models.cpython-35.pyc
-23 Bytes b/‎about/__pycache__/models.cpython-35.pyc
-23 Bytes
diff --git a/‎about/__pycache__/urls.cpython-35.pyc
-23 Bytes b/‎about/__pycache__/urls.cpython-35.pyc
-23 Bytes
diff --git a/‎about/__pycache__/views.cpython-35.pyc
-23 Bytes b/‎about/__pycache__/views.cpython-35.pyc
-23 Bytes
diff --git a/‎about/migrations/__pycache__/__init__.cpython-35.pyc
-23 Bytes b/‎about/migrations/__pycache__/__init__.cpython-35.pyc
-23 Bytes
diff --git a/‎coc/__pycache__/__init__.cpython-35.pyc
-23 Bytes b/‎coc/__pycache__/__init__.cpython-35.pyc
-23 Bytes
diff --git a/‎coc/__pycache__/admin.cpython-35.pyc
-23 Bytes b/‎coc/__pycache__/admin.cpython-35.pyc
-23 Bytes
diff --git a/‎coc/__pycache__/models.cpython-35.pyc
-23 Bytes b/‎coc/__pycache__/models.cpython-35.pyc
-23 Bytes
diff --git a/‎coc/__pycache__/urls.cpython-35.pyc
-23 Bytes b/‎coc/__pycache__/urls.cpython-35.pyc
-23 Bytes
diff --git a/‎coc/__pycache__/views.cpython-35.pyc
-23 Bytes b/‎coc/__pycache__/views.cpython-35.pyc
-23 Bytes
diff --git a/‎coc/migrations/__pycache__/__init__.cpython-35.pyc
-23 Bytes b/‎coc/migrations/__pycache__/__init__.cpython-35.pyc
-23 Bytes
diff --git a/‎contact/__pycache__/__init__.cpython-35.pyc
-23 Bytes b/‎contact/__pycache__/__init__.cpython-35.pyc
-23 Bytes
diff --git a/‎contact/__pycache__/admin.cpython-35.pyc
-23 Bytes b/‎contact/__pycache__/admin.cpython-35.pyc
-23 Bytes
diff --git a/‎contact/__pycache__/models.cpython-35.pyc
-23 Bytes b/‎contact/__pycache__/models.cpython-35.pyc
-23 Bytes
diff --git a/‎contact/migrations/__pycache__/__init__.cpython-35.pyc
-23 Bytes b/‎contact/migrations/__pycache__/__init__.cpython-35.pyc
-23 Bytes
diff --git a/‎home/__pycache__/__init__.cpython-35.pyc
-23 Bytes b/‎home/__pycache__/__init__.cpython-35.pyc
-23 Bytes
diff --git a/‎home/__pycache__/admin.cpython-35.pyc
-23 Bytes b/‎home/__pycache__/admin.cpython-35.pyc
-23 Bytes
diff --git a/‎home/__pycache__/models.cpython-35.pyc
-23 Bytes b/‎home/__pycache__/models.cpython-35.pyc
-23 Bytes
diff --git a/‎home/__pycache__/urls.cpython-35.pyc
-23 Bytes b/‎home/__pycache__/urls.cpython-35.pyc
-23 Bytes
diff --git a/‎home/__pycache__/views.cpython-35.pyc
-23 Bytes b/‎home/__pycache__/views.cpython-35.pyc
-23 Bytes
diff --git a/‎home/migrations/__pycache__/__init__.cpython-35.pyc
-23 Bytes b/‎home/migrations/__pycache__/__init__.cpython-35.pyc
-23 Bytes
diff --git a/‎home/templates/home.html
+1-3 b/‎home/templates/home.html
+1-3
diff --git a/‎newsletter/templates/newsletter/subscription_subscribe_activated.html
+1-30 b/‎newsletter/templates/newsletter/subscription_subscribe_activated.html
+1-30
diff --git a/‎registration/__pycache__/__init__.cpython-35.pyc
-23 Bytes b/‎registration/__pycache__/__init__.cpython-35.pyc
-23 Bytes
diff --git a/‎registration/__pycache__/admin.cpython-35.pyc
-23 Bytes b/‎registration/__pycache__/admin.cpython-35.pyc
-23 Bytes
diff --git a/‎registration/__pycache__/auth_urls.cpython-35.pyc
-23 Bytes b/‎registration/__pycache__/auth_urls.cpython-35.pyc
-23 Bytes
diff --git a/‎registration/__pycache__/forms.cpython-35.pyc
-23 Bytes b/‎registration/__pycache__/forms.cpython-35.pyc
-23 Bytes
diff --git a/‎registration/__pycache__/mixins.cpython-35.pyc
-23 Bytes b/‎registration/__pycache__/mixins.cpython-35.pyc
-23 Bytes
diff --git a/‎registration/__pycache__/models.cpython-35.pyc
-23 Bytes b/‎registration/__pycache__/models.cpython-35.pyc
-23 Bytes
diff --git a/‎registration/__pycache__/signals.cpython-35.pyc
-23 Bytes b/‎registration/__pycache__/signals.cpython-35.pyc
-23 Bytes
diff --git a/‎registration/__pycache__/users.cpython-35.pyc
-23 Bytes b/‎registration/__pycache__/users.cpython-35.pyc
-23 Bytes
diff --git a/‎registration/__pycache__/views.cpython-35.pyc
-23 Bytes b/‎registration/__pycache__/views.cpython-35.pyc
-23 Bytes
diff --git a/‎registration/backends/__pycache__/__init__.cpython-35.pyc
-23 Bytes b/‎registration/backends/__pycache__/__init__.cpython-35.pyc
-23 Bytes
diff --git a/‎registration/backends/default/__pycache__/__init__.cpython-35.pyc
-23 Bytes b/‎registration/backends/default/__pycache__/__init__.cpython-35.pyc
-23 Bytes
diff --git a/‎registration/backends/default/__pycache__/urls.cpython-35.pyc
-23 Bytes b/‎registration/backends/default/__pycache__/urls.cpython-35.pyc
-23 Bytes
diff --git a/‎registration/backends/default/__pycache__/views.cpython-35.pyc
-23 Bytes b/‎registration/backends/default/__pycache__/views.cpython-35.pyc
-23 Bytes
diff --git a/‎registration/management/__pycache__/__init__.cpython-35.pyc
-23 Bytes b/‎registration/management/__pycache__/__init__.cpython-35.pyc
-23 Bytes
diff --git a/‎registration/templates/profiles/update.html
+1-1 b/‎registration/templates/profiles/update.html
+1-1
diff --git a/‎registration/templates/registration/login.html
+2-4 b/‎registration/templates/registration/login.html
+2-4
diff --git a/‎schedule/__pycache__/__init__.cpython-35.pyc
-23 Bytes b/‎schedule/__pycache__/__init__.cpython-35.pyc
-23 Bytes
diff --git a/‎schedule/__pycache__/admin.cpython-35.pyc
-23 Bytes b/‎schedule/__pycache__/admin.cpython-35.pyc
-23 Bytes
diff --git a/‎schedule/__pycache__/models.cpython-35.pyc
-23 Bytes b/‎schedule/__pycache__/models.cpython-35.pyc
-23 Bytes
diff --git a/‎schedule/__pycache__/urls.cpython-35.pyc
-23 Bytes b/‎schedule/__pycache__/urls.cpython-35.pyc
-23 Bytes
diff --git a/‎schedule/__pycache__/views.cpython-35.pyc
-23 Bytes b/‎schedule/__pycache__/views.cpython-35.pyc
-23 Bytes
diff --git a/‎schedule/migrations/__pycache__/__init__.cpython-35.pyc
-23 Bytes b/‎schedule/migrations/__pycache__/__init__.cpython-35.pyc
-23 Bytes
diff --git a/‎sponsors/__pycache__/__init__.cpython-35.pyc
-23 Bytes b/‎sponsors/__pycache__/__init__.cpython-35.pyc
-23 Bytes
diff --git a/‎sponsors/__pycache__/admin.cpython-35.pyc
-23 Bytes b/‎sponsors/__pycache__/admin.cpython-35.pyc
-23 Bytes
diff --git a/‎sponsors/__pycache__/models.cpython-35.pyc
-23 Bytes b/‎sponsors/__pycache__/models.cpython-35.pyc
-23 Bytes
diff --git a/‎sponsors/__pycache__/urls.cpython-35.pyc
-23 Bytes b/‎sponsors/__pycache__/urls.cpython-35.pyc
-23 Bytes
diff --git a/‎sponsors/__pycache__/views.cpython-35.pyc
-23 Bytes b/‎sponsors/__pycache__/views.cpython-35.pyc
-23 Bytes
diff --git a/‎sponsors/migrations/__pycache__/__init__.cpython-35.pyc
-23 Bytes b/‎sponsors/migrations/__pycache__/__init__.cpython-35.pyc
-23 Bytes
diff --git a/‎sponsors/templates/sponsors/sponsors.html
+14-14 b/‎sponsors/templates/sponsors/sponsors.html
+14-14
diff --git a/‎static/avatar.png
7.37 KB b/‎static/avatar.png
7.37 KB
diff --git a/‎static/video/avatar.png
7.37 KB b/‎static/video/avatar.png
7.37 KB
diff --git a/‎support_us/__pycache__/__init__.cpython-35.pyc
-23 Bytes b/‎support_us/__pycache__/__init__.cpython-35.pyc
-23 Bytes
diff --git a/‎support_us/__pycache__/admin.cpython-35.pyc
-23 Bytes b/‎support_us/__pycache__/admin.cpython-35.pyc
-23 Bytes
diff --git a/‎support_us/__pycache__/models.cpython-35.pyc
-23 Bytes b/‎support_us/__pycache__/models.cpython-35.pyc
-23 Bytes
diff --git a/‎support_us/__pycache__/urls.cpython-35.pyc
-23 Bytes b/‎support_us/__pycache__/urls.cpython-35.pyc
-23 Bytes
diff --git a/‎support_us/__pycache__/views.cpython-35.pyc
-23 Bytes b/‎support_us/__pycache__/views.cpython-35.pyc
-23 Bytes
diff --git a/‎support_us/migrations/__pycache__/__init__.cpython-35.pyc
-23 Bytes b/‎support_us/migrations/__pycache__/__init__.cpython-35.pyc
-23 Bytes
diff --git a/‎talks/__pycache__/forms.cpython-35.pyc
-23 Bytes b/‎talks/__pycache__/forms.cpython-35.pyc
-23 Bytes
diff --git a/‎talks/__pycache__/mixins.cpython-35.pyc
-23 Bytes b/‎talks/__pycache__/mixins.cpython-35.pyc
-23 Bytes
diff --git a/‎talks/__pycache__/models.cpython-35.pyc
-23 Bytes b/‎talks/__pycache__/models.cpython-35.pyc
-23 Bytes
diff --git a/‎talks/__pycache__/serializers.cpython-35.pyc
-23 Bytes b/‎talks/__pycache__/serializers.cpython-35.pyc
-23 Bytes
diff --git a/‎talks/__pycache__/urls.cpython-35.pyc
-23 Bytes b/‎talks/__pycache__/urls.cpython-35.pyc
-23 Bytes
diff --git a/‎talks/__pycache__/views.cpython-35.pyc
-23 Bytes b/‎talks/__pycache__/views.cpython-35.pyc
-23 Bytes
diff --git a/‎talks/migrations/__pycache__/0001_initial.cpython-35.pyc
-29 Bytes b/‎talks/migrations/__pycache__/0001_initial.cpython-35.pyc
-29 Bytes
diff --git a/‎talks/migrations/__pycache__/0002_document.cpython-35.pyc
-23 Bytes b/‎talks/migrations/__pycache__/0002_document.cpython-35.pyc
-23 Bytes
diff --git a/‎talks/migrations/__pycache__/__init__.cpython-35.pyc
-23 Bytes b/‎talks/migrations/__pycache__/__init__.cpython-35.pyc
-23 Bytes
@@ -21,7 +21,7 @@
 # See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/
 
 
-DEBUG = True
+DEBUG = False
 
 LOGIN_REDIRECT_URL = '/profile'
 SIGNUP_REDIRECT_URL = '/profile'
@@ -90,42 +90,37 @@
 
 ROOT_URLCONF = 'PyConGhana.urls'
 
+# URL prefix for static files.
+# Example: "http://media.lawrence.com/static/"
+STATIC_URL = "/static/"
+
+# 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 = os.path.join(PROJECT_ROOT, STATIC_URL.strip("/"))
 
-# Absolute filesystem path to the directory that will hold user-uploaded files.
-# Example: "/home/media/media.lawrence.com/media/"
 
-#MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
+# 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',
+)
+
 
 # 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/"
-<<<<<<< HEAD
-#MEDIA_URL = 'home/pyconghana/pyconghana2018/media/'
-#MEDIA_ROOT = 'home/pyconghana/pyconghana2018/media'
-MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
-#MEDIA_ROOT = os.path.join(BASE_DIR, *MEDIA_URL.strip("/").split("/"))
-MEDIA_URL = '/media/'
-=======
-
-
-#MEDIA_URL = 'home/pyconghana/pyconghana2018/media/'
-#MEDIA_ROOT = 'home/pyconghana/pyconghana2018/media'
-MEDIA_URL = '/media/'
-MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
+MEDIA_URL = STATIC_URL + "media/"
 
->>>>>>> 04a3f00734f44a87e626b3c84103ba70b39063fd
-
-
-STATIC_URL = '/static/'
-
-STATIC_ROOT = os.path.join(PROJECT_ROOT, STATIC_URL.strip("/static/"))
+# Absolute filesystem path to the directory that will hold user-uploaded files.
+# Example: "/home/media/media.lawrence.com/media/"
+MEDIA_ROOT = os.path.join(PROJECT_ROOT, *MEDIA_URL.strip("/").split("/"))
 
 #STATICFILES_STORAGE = 'cloudinary_storage.storage.StaticHashedCloudinaryStorage'
 
 
-STATICFILES_DIRS = [
-    os.path.join(BASE_DIR, "static"),
-]
 
 
 TEMPLATES = [
@@ -255,6 +250,6 @@
 NEWSLETTER_BATCH_SIZE = 100
 
 # Sets the default site
-SITE_ID = 3
+SITE_ID = 1
 
 AVATAR_MAX_AVATARS_PER_USER = 5
@@ -62,11 +62,9 @@
             <h1><p class="lead text-center">PyCon Ghana is organized by volunteers and python enthusiasts from the python programming community in Ghana. We expect speakers from Africa and the rest of the world.  We will announce the venue soon. The two day conference will bring together students, professionals, experts and enthusiasts who wish to share their knowledge and passion about Python and related technologies. Its purpose is to increase the visibility of developers, organizations, and companies within the community and all necessary stakeholders. The conference is suited for all skill levels, from beginners to expert developers.</p></h1>
 
             <div class="countdown_wrap">
-                <br>
+          <!--      <br>
                 <h6 class="countdown_title text-center">EVENT WILL START IN</h6>
 
-                <!-- Countdown JS for the Event Date Starts here.
-    TIP: You can change your event time below in the Same Format.  -->
 
                 <ul id="countdown" data-event-date="10 august 2018 08:00:00">
                     <li class="wow zoomIn" data-wow-delay="0s"> <span class="days">00</span>
 
@@ -3,40 +3,11 @@
 {% load i18n %}
 
 
-<<<<<<< HEAD
 {% block title %}
 {% trans "Newsletter" %} {{ newsletter.title }} {{ action }} {% trans "activate" %}
 {% endblock title %}
 
 
-{% block body %}
-<br><br><br><br><br><br>
-<section>
-   
- <div class="col-md-12">
-       
- <div class="panel panel-danger wow fadeInLeft">
-          
-  <div class="container">
-    			
-<div class="row ">
-                      
-  <h5 class="page-title wow fadeInDown">{{ newsletter.title }} Newsletter Activation<br></h5><br>
-
-  
-                      <div class="col-xs-15">
-                      
-      <p>Your subscription has successfully been activated. Thanks</p><br>
-   
-                     </div>
-                </div>
-            </div>
-        </div>
-    
-</div>
-</section><br><br><br><br><br>
-{% endblock body %}
-=======
 {% block body %}
 <br><br><br><br><br><br>
 <section>
@@ -56,4 +27,4 @@ <h5 class="page-title wow fadeInDown">{{ newsletter.title }} Newsletter Activati
 </section><br><br><br><br><br>
 {% endblock body %}
 
->>>>>>> b18953eea674049e9bcf01ae4e90bcd1fd79f2b9
+
@@ -36,7 +36,7 @@ <h4>  </h4>
                                             <div class="col-md-10">
                                             <h5 class="page-title wow fadeInDown">Update your Profile  {% firstof user.get_short_name user.get_username %}<br></h5>
                                                 <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                                                    <br><h5><a href="/avatar/change" data-toggle="modal" data-target="#avatarC-upload" class="btn warn">Change your Avatar</a></h5><br>
+                                                    <br><h5><a href="/avatar/change" data-toggle="modal" data-target="#avatarC-upload" class="btn warn">Click here to change your Avatar</a></h5><br>
                                                         {% crispy form form.helper %}
                                                 </form>
                                             </div>
 
@@ -26,11 +26,9 @@
                                                         </div><strong>
 
                                                         <p>{% trans "Not Registered?" %} <a href="{% url 'registration_register' %}">{% trans "SIGNUP" %}</a>.</p></strong>
-<<<<<<< HEAD
+
                                                          <p><a href="{% url 'auth_password_reset' %}">{% trans "reset my password" %}</a>.</p>
-=======
-                                                         <a href="{% url 'auth_password_reset' %}">{% trans "reset my password" %}</a>.</p> 
->>>>>>> 04a3f00734f44a87e626b3c84103ba70b39063fd
+
                                                     </div>
                                                     </div>
                                                 </form>
 
@@ -13,22 +13,22 @@
 <section>
     <div class="col-md-12">
         <div class="panel panel-danger wow fadeInLeft">
-                <div class="container"> 
+                <div class="container">
                     <div class="row ">
                         <h5 class="page-title wow fadeInDown">Our Sponsors<br><small>Sponsors and Supporters of PyCon Ghana 2018</small></h5><br>
-                        <div class="col-xs-12">
+                        <div class="col-md-12">
                             <p>
                               <b>Python Conference Ghana is generously sponsored by organisations that support its aim</b>
                             </p>
                             <p>Would you like to join them? <a href="/support_us"><b>See How to sponsor PyCon Ghana.</b></a></p><br><br>
 
                      {% if diamond %}
-                   
+
                     <h3 style="color: #000; text-shadow: 2px 2px 3px #b9f2ff"><b>Diamond Sponsors</b></h3>
                     <br><br>
                      <div class="container-fluid">
                        {% for sponsor in diamond %}
-                            <div class="col-xs-6">
+                            <div class="col-md-6">
                                 <p><a href="{{ sponsor.url }}" target="blank"><img src="{{ sponsor.logo.url }}" class='img-responsive'></a></p>
                                 <p><br>
                                 {{ sponsor.description }}
@@ -44,7 +44,7 @@ <h4 style="color: #000; text-shadow: 2px 2px 3px #FFD700"><b>Gold Sponsors</b></
                     <br />
                     <div class="container">
                     {% for sponsor in gold %}
-                        <div class="col-xs-6">
+                        <div class="col-md-6">
                             <a href="{{ sponsor.url }}" target="_blank"><img src="{{ sponsor.logo.url }}" class='img-responsive'></a>
                             <p><br>
                                 {{ sponsor.description }}
@@ -55,14 +55,14 @@ <h4 style="color: #000; text-shadow: 2px 2px 3px #FFD700"><b>Gold Sponsors</b></
                         <br><br>
                     {% endif %}
 
-                    
+
 
                      {% if silver %}
                     <h5 style="color: #000; text-shadow: 2px 2px 3px #C0C0C0"><b>Silver Sponsors<b></h5>
                     <br />
                     <div class="container">
                     {% for sponsor in silver %}
-                        <div class="col-xs-6">
+                        <div class="col-md-6">
                             <a href="{{ sponsor.url }}" target="_blank"><img src="{{ sponsor.logo.url }}" class='img-responsive'></a>
                             <p><br>
                                 {{ sponsor.description }}
@@ -80,7 +80,7 @@ <h6 style="color: #000; text-shadow: 2px 2px 3px #cd7f32"><b>Bronze Sponsors</b>
                     <br />
                     <div class="container">
                     {% for sponsor in bronze %}
-                        <div class="col-xs-6">
+                        <div class="col-md-6">
                             <a href="{{ sponsor.url }}" target="_blank"><img src="{{ sponsor.logo.url }}" class='img-responsive'></a>
                             <p><br>
                                 {{ sponsor.description }}
@@ -95,11 +95,11 @@ <h6 style="color: #000; text-shadow: 2px 2px 3px #cd7012"><b>Special Sponsors</b
                     <br />
                     <div class="container">
                     {% for sponsor in special %}
-                        <div class="col-xs-4">
+                        <div class="col-md-4">
                             <a href="{{ sponsor.url }}" target="_blank"><img src="{{ sponsor.logo.url }}" class='img-responsive'></a>
-                            <p><br>
+                            <p>
                                 {{ sponsor.description }}
-                            </p>
+                            </p><br>
                         </div>
                         {% endfor %}
                         </div><br><br>
@@ -112,16 +112,16 @@ <h6 style="color: #000; text-shadow: 2px 2px 3px "><b>Individual Sponsors</b></h
                     <div class="container-fluid">
                         <div class="row">
                                 {% for individual in individuals %}
-                                <div class="col-xs-2">
+                                <div class="col-md-2">
                                     <h6><a href="{{ individual.url }}" target="_blank">{{ individual.name }}</a></h6>
                                 </div>
                                 {% endfor %}
-                            
+
                         </div>
                     </div>
                     {% endif %}
                     <br><br>
-                               
+
                     </div>
 
                         </div>