CopyleftConf/copyleftconf-website Changeset - 9c4663a5c0ed

Changeset - 9c4663a5c0ed

Parent rev.

Child rev.

[Not reviewed]

Merge

1 3 6

Christopher Neugebauer - 7 years ago 2017-08-09 02:53:25
_@chrisjrn.com

Merge pull request #5 from northbaypython/josh/copy

stub out static site pages

9 files changed with 66 insertions and 16 deletions:

.gitignore

pinaxcon/templates/_default_sidebar.html

pinaxcon/templates/static_pages/about.html

pinaxcon/templates/static_pages/code-of-conduct.html

pinaxcon/templates/static_pages/homepage.html

pinaxcon/templates/static_pages/news.html

pinaxcon/templates/static_pages/proposals.html

pinaxcon/templates/static_pages/sponsors.html

pinaxcon/urls.py

0 comments (0 inline, 0 general)

.gitignore

➞

Show inline comments

@@ ... / @@ -6,2 +6,3 @@ dev.db @@
 .coverage
 staticfiles
 venv/

pinaxcon/templates/_default_sidebar.html

➞

Show inline comments

@@ ... / @@ -8,9 +8,8 @@ @@
 <div class="sponsor-list">
     {% box "sponsor-top" %}
     {% for level in levels %}
         {% if level.sponsors %}
             <h3 style="margin-top: 3em;">{{ level.name }}</h3>
+\
             {% for sponsor in level.sponsors %}
                 <div style="margin: 10px 0;">

pinaxcon/templates/static_pages/about.html

➞

Show inline comments

 new file 100644
 {% extends "site_base.html" %}
 {% load i18n %}
 {% block head_title %}{% trans "Welcome" %}{% endblock %}
 {% block body_class %}home{% endblock %}
 {% block body %}
 {% endblock %}

pinaxcon/templates/static_pages/code-of-conduct.html

➞

Show inline comments

 new file 100644
 {% extends "site_base.html" %}
 {% load i18n %}
 {% block head_title %}{% trans "Welcome" %}{% endblock %}
 {% block body_class %}home{% endblock %}
 {% block body %}
 {% endblock %}

pinaxcon/templates/static_pages/homepage.html

➞

Show inline comments

 file renamed from pinaxcon/templates/homepage.html to pinaxcon/templates/static_pages/homepage.html
@@ ... / @@ -3,8 +3,9 @@ @@
 {% load i18n %}
 {% block head_title %}{% trans "Welcome" %}{% endblock %}
 {% block body_class %}home{% endblock %}
 {% block body %}
   <h1>{{ SITE_NAME }}</h1>
   <p class="lead">Welcome to the demo site.</p>
 {% endblock %}

pinaxcon/templates/static_pages/news.html

➞

Show inline comments

 new file 100644
 {% extends "site_base.html" %}
 {% load i18n %}
 {% block head_title %}{% trans "Welcome" %}{% endblock %}
 {% block body_class %}home{% endblock %}
 {% block body %}
 {% endblock %}

pinaxcon/templates/static_pages/proposals.html

➞

Show inline comments

 new file 100644
 {% extends "site_base.html" %}
 {% load i18n %}
 {% block head_title %}{% trans "Welcome" %}{% endblock %}
 {% block body_class %}home{% endblock %}
 {% block body %}
 {% endblock %}

pinaxcon/templates/static_pages/sponsors.html

➞

Show inline comments

 new file 100644
 {% extends "site_base.html" %}
 {% load i18n %}
 {% block head_title %}{% trans "Welcome" %}{% endblock %}
 {% block body_class %}home{% endblock %}
 {% block body %}
 {% endblock %}

pinaxcon/urls.py

➞

Show inline comments

@@ ... / @@ -10,14 +10,8 @@ import symposion.views @@
 urlpatterns = [
     url(r"^$", TemplateView.as_view(template_name="homepage.html"), name="home"),
     url(r"^about$", TemplateView.as_view(template_name="pages/about.html"), name="page_about"),
     url(r"^venue$", TemplateView.as_view(template_name="pages/venue.html"), name="page_venue"),
     url(
         r"^sponsors/info$",
         TemplateView.as_view(template_name="pages/sponsors/info.html"),
         name="page_sponsor_info",
     ),
     url(r"^$", TemplateView.as_view(template_name="static_pages/homepage.html"), name="home"),
     url(r"^code-of-conduct$", TemplateView.as_view(template_name="static_pages/proposals.html"), name="code-of-conduct"),
     url(r"^about$", TemplateView.as_view(template_name="static_pages/proposals.html"), name="about"),
     url(r"^news$", TemplateView.as_view(template_name="static_pages/proposals.html"), name="news"),
     url(r"^admin/", include(admin.site.urls)),
@@ ... / @@ -28,5 +22,7 @@ urlpatterns = [ @@
     url(r"^speaker/", include("symposion.speakers.urls")),
     url(r"^proposals/", include("symposion.proposals.urls")),
     url(r"^proposals$", TemplateView.as_view(template_name="static_pages/proposals.html"), name="proposals"),
     url(r"^sponsors/", include("symposion.sponsorship.urls")),
     url(r"^sponsors$", TemplateView.as_view(template_name="static_pages/proposals.html"), name="sponsors"),
     url(r"^reviews/", include("symposion.reviews.urls")),
     url(r"^schedule/", include("symposion.schedule.urls")),
@@ ... / @@ -44,6 +40,4 @@ urlpatterns = [ @@
     url(r'^nested_admin/', include('nested_admin.urls')),
     url(r"^boxes/", include("pinax.boxes.urls")),
     # Catch-all MUST go last.
     #url(r"^", include("pinax.pages.urls")),

0 comments (0 inline, 0 general)