Changeset - fdc2503fcfc3
[Not reviewed]
Merge
90 11 109
Christopher Neugebauer - 7 years ago 2017-08-09 02:16:40
chrisjrn@gmail.com
Merge remote-tracking branch 'rd/all-python'
198 files changed with 13289 insertions and 2977 deletions:
LICENSE
54
0 comments (0 inline, 0 general)
.gitignore
Show inline comments
...
 
@@ -6 +6,2 @@ dev.db
 
.coverage
 
staticfiles
LICENSE
Show inline comments
 
registrasion-demo
 
-----------------
 

	
 
# Copyright (c) 2016-2017 Christopher Neugebauer and contributors
 
#
 
# Permission is hereby granted, free of charge, to any person obtaining a copy
 
# of this software and associated documentation files (the "Software"), to deal
 
# in the Software without restriction, including without limitation the rights
 
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 
# copies of the Software, and to permit persons to whom the Software is
 
# furnished to do so, subject to the following conditions:
 
#
 
# The above copyright notice and this permission notice shall be included in
 
# all copies or substantial portions of the Software.
 
#
 
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 
# THE SOFTWARE.
 

	
 

	
 
pinaxcon
 
--------
 

	
 
# Copyright (c) 2009-2015 James Tauber and contributors
...
 
@@ -19 +46,28 @@
 
# THE SOFTWARE.
 

	
 

	
 
bootstrap-sass
 
--------------
 

	
 
The MIT License (MIT)
 

	
 
Copyright (c) 2011-2016 Twitter, Inc
 
Copyright (c) 2011-2016 The Bootstrap Authors
 

	
 
Permission is hereby granted, free of charge, to any person obtaining a copy
 
of this software and associated documentation files (the "Software"), to deal
 
in the Software without restriction, including without limitation the rights
 
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 
copies of the Software, and to permit persons to whom the Software is
 
furnished to do so, subject to the following conditions:
 

	
 
The above copyright notice and this permission notice shall be included in
 
all copies or substantial portions of the Software.
 

	
 
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 
THE SOFTWARE.
fixtures/sitetree.json
Show inline comments
...
 
@@ -19,3 +19,3 @@
 
            "hint": "",
 
            "url": "pages_page \"about/\"",
 
            "url": "page_about",
 
            "inbreadcrumbs": true,
...
 
@@ -42,3 +42,3 @@
 
            "hint": "",
 
            "url": "pages_page \"venue/\"",
 
            "url": "page_venue",
 
            "inbreadcrumbs": true,
...
 
@@ -111,5 +111,5 @@
 
            "hint": "",
 
            "url": "sponsor_apply",
 
            "url": "page_sponsor_info",
 
            "inbreadcrumbs": true,
 
            "title": "Apply to be a Sponsor",
 
            "title": "Prospectus",
 
            "tree": 1,
gondor.yml
Show inline comments
 
deleted file
gulpfile.js
Show inline comments
 
deleted file
pinaxcon/settings.py
Show inline comments
...
 
@@ -58,3 +58,3 @@ MEDIA_URL = "/site_media/media/"
 
# Example: "/home/media/media.lawrence.com/static/"
 
STATIC_ROOT = os.path.join(PACKAGE_ROOT, "site_media", "static")
 
STATIC_ROOT = os.path.join(PROJECT_ROOT, 'staticfiles')
 

	
...
 
@@ -62,8 +62,8 @@ STATIC_ROOT = os.path.join(PACKAGE_ROOT, "site_media", "static")
 
# Example: "http://media.lawrence.com/static/"
 
STATIC_URL = "/site_media/static/"
 
STATIC_URL = '/static/'
 

	
 
# Additional locations of static files
 
STATICFILES_DIRS = [
 
    os.path.join(PROJECT_ROOT, "static", "dist"),
 
]
 
STATICFILES_DIRS = (
 
    os.path.join(PROJECT_ROOT, 'static'),
 
)
 

	
...
 
@@ -74,2 +74,3 @@ STATICFILES_FINDERS = [
 
    "django.contrib.staticfiles.finders.AppDirectoriesFinder",
 
    "compressor.finders.CompressorFinder",
 
]
...
 
@@ -157,2 +158,3 @@ INSTALLED_APPS = [
 
    "registrasion",
 
    "symposion_templates",
 

	
...
 
@@ -173,2 +175,5 @@ INSTALLED_APPS = [
 
    "django_nose",
 

	
 
    # stylesheets and js
 
    'compressor',
 
]
...
 
@@ -204,2 +209,6 @@ LOGGING = {
 

	
 
COMPRESS_PRECOMPILERS = (
 
    ('text/x-scss', 'django_libsass.SassCompiler'),
 
)
 

	
 
FIXTURE_DIRS = [
pinaxcon/templates/_footer.html
Show inline comments
 
<div class="pull-left">
 
    &copy;2016
 
    &copy; 2017
 
</div>
...
 
@@ -5,3 +5,4 @@
 
<div class="pull-right">
 
    Site powered by <a href="http://eldarion.com/symposion/"><b>Symposion</b></a>.
 
    Site powered by <a href="http://eldarion.com/symposion/"><b>Symposion</b></a>
 
    and <a href="http://github.com/chrisjrn/registrasion/"><b>Registrasion</b></a>.
 
</div>
pinaxcon/templates/_scripts.html
Show inline comments
 
<script src='/site_media/static/js/site-92ae8d0d6c.js'></script>
 
{% load compress %}
 
{% load staticfiles %}
 

	
 
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.js"></script>
 
<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.2.0/ace.js"></script>
 

	
 
{% compress js %}
 
  <script src='{% static "bootstrap/javascripts/bootstrap.min.js" %}'></script>
 
  <script src='{% static "js/site.js" %}'></script>
 
{% endcompress %}
pinaxcon/templates/_styles.html
Show inline comments
 
<link href='/site_media/static/css/site-0a247b924d.css' rel='stylesheet' />
 
{% load compress %}
 
{% load staticfiles %}
 

	
 
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
 
{% compress css %}
 
    <link rel="stylesheet" type="text/x-scss" href="{% static "scss/site.scss" %}" />
 
{% endcompress %}
pinaxcon/templates/homepage.html
Show inline comments
...
 
@@ -3,5 +3,2 @@
 
{% load i18n %}
 
{% load pinax_boxes_tags %}
 

	
 
{% block head_title %}{% trans "Welcome" %}{% endblock %}
 

	
...
 
@@ -10,3 +7,4 @@
 
{% block body %}
 
    {% box "homepage" %}
 
  <h1>{{ SITE_NAME }}</h1>
 
  <p class="lead">Welcome to the demo site.</p>
 
{% endblock %}
pinaxcon/templates/page_with_title_and_lede.html
Show inline comments
 
new file 100644
 
{% extends "site_base.html" %}
 

	
 
{% block head_title %}{% block title %}{% endblock %}{% endblock %}
 

	
 
{% block body %}
 

	
 
  {% block heading_base %}
 
    <h1>{% block heading %}{% endblock %}</h1>
 
  {% endblock %}
 

	
 
  {% block lede_base %}
 
    <p class="lead">{% block lede %}{% endblock %}</p>
 
  {% endblock %}
 

	
 
  {% block content %}
 
  {% endblock %}
 

	
 
{% endblock %}
pinaxcon/templates/pages/about.html
Show inline comments
 
new file 100644
 
{% extends "page_with_title_and_lede.html" %}
 

	
 
{% block title %}About {{ SITE_NAME }}{% endblock %}
 
{% block heading %}About {{ SITE_NAME }}{% endblock %}
 
{% block lede %}{{ SITE_NAME }} is the premier demo conference site for Symposion and Registrasion{% endblock %}
 

	
 
{% block content %}
 
  <p>I am the body content</p>
 
{% endblock %}
pinaxcon/templates/pages/sponsors/info.html
Show inline comments
 
new file 100644
 
{% extends "page_with_title_and_lede.html" %}
 

	
 
{% block title %}Sponsorship Prospectus{% endblock %}
 
{% block heading %}Sponsorship Prospectus{% endblock %}
 
{% block lede %}{{ SITE_NAME }} wants sponsors.{% endblock %}
 

	
 
{% block content %}
 
  <p>I am the body content</p>
<