symposion_app Changeset - 3a686ab1a82e

Changeset - 3a686ab1a82e

Parent rev.

Child rev.

[Not reviewed]

0 4 2

Christopher Neugebauer - 7 years ago 2016-11-23 06:08:00
_@chrisjrn.com

Wiki with styling (#78)

* Adds Django wiki and integrates our template

* Makes the wiki use lca2017 styling (to a point, anyway)

6 files changed with 141 insertions and 2 deletions:

pinaxcon/settings.py

pinaxcon/templates/site_base.html

pinaxcon/templates/wiki/base.html

pinaxcon/urls.py

requirements.txt

static/dist/css/wiki.css

0 comments (0 inline, 0 general)

pinaxcon/settings.py

➞

Show inline comments

@@ ... / @@ -105,12 +105,13 @@ TEMPLATES = [ @@
                 "django.core.context_processors.tz",
                 "django.core.context_processors.request",
                 "django.contrib.messages.context_processors.messages",
                 "account.context_processors.account",
                 "pinax_theme_bootstrap.context_processors.theme",
                 "symposion.reviews.context_processors.reviews",
                 "sekizai.context_processors.sekizai",
             ],
         },
     },
+]
 MIDDLEWARE_CLASSES = [
@@ ... / @@ -137,13 +138,14 @@ INSTALLED_APPS = [ @@
     "django.contrib.auth",
     "django.contrib.contenttypes",
     "django.contrib.messages",
     "django.contrib.sessions",
     "django.contrib.sites",
     "django.contrib.staticfiles",
     "django.contrib.humanize",
     # theme
     "bootstrapform",
     "pinax_theme_bootstrap",
     # external
     "account",
@@ ... / @@ -197,12 +199,24 @@ INSTALLED_APPS = [ @@
     "pinaxcon",
     "pinaxcon.proposals",
     "pinaxcon.registrasion",
     "jquery",
     "djangoformsetjs",
     # wiki
     "django_nyt",
     "mptt",
     "sekizai",
     "sorl.thumbnail",
     "wiki",
     "wiki.plugins.attachments",
     "wiki.plugins.notifications",
     "wiki.plugins.images",
     "wiki.plugins.macros",
     #testing
     "django_nose",
+]
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
@@ ... / @@ -295,12 +309,15 @@ CSRF_FAILURE_VIEW = "pinaxcon.csrf_view.csrf_failure" @@
 # Use nose to run all tests
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 ADMIN_USERNAMES = []
 # Wiki settings
 WIKI_CHECK_SLUG_URL_AVAILABLE = False
 # Tell nose to measure coverage on the 'foo' and 'bar' apps
 NOSE_ARGS = [
     '--with-coverage',
     '--cover-package=registrasion.controllers,registrasion.models',
+]

pinaxcon/templates/site_base.html

➞

Show inline comments

@@ ... / @@ -19,13 +19,13 @@ @@
     <link rel="icon" href="{% static 'lca2017/images/favicon.ico' %}"
     <!--FIXME: download-->
     <link href="https://fonts.googleapis.com/css?family=Titillium+Web:700,900|Roboto:400italic,400,700,700italic" rel="stylesheet" type="text/css">
     <!--Meta tags-->
     <meta name="theme-color" content="#0c486c">
     {% block extra_style %}
     <link rel="stylesheet" href="{% static 'css/site-0a247b924d.css' %}">
+      <link rel="stylesheet" href="{% static 'css/site-0a247b924d.css' %}">
     {% endblock %}
 {% endblock %}
     <!--Twitter-->
     <meta name="twitter:card" content="summary">
     <meta name="twitter:site" content="@linuxconfau">
     <meta name="twitter:title" content="linux.conf.au – 16-20 January 2017 – Hobart, Tasmania"

pinaxcon/templates/wiki/base.html

➞

Show inline comments

 new file 100644
 {% extends "site_base_wagtail.html" %}
 {% load sekizai_tags i18n wiki_tags static %}
 {% block head_title %}
 	{% block wiki_pagetitle %}{% endblock %}
 {% endblock %}
 {% block styles %}
 	<link rel="stylesheet" href="{% static 'css/site-0a247b924d.css' %}">
 	<link href="{% static "css/wiki.css" %}" rel="stylesheet">
 	{{ block.super }}
 	<style>
 		.wiki {
 			font-size: 70%;
+		}
 	</style>
 {% endblock styles %}
 {% block content %}
 	<div class="l-content-page">
 		<div class="l-content-page--richtext">
 			<div class="wiki">
 				{% block wiki_breadcrumbs %}{% endblock %}
 		  	{% block wiki_contents %}{% endblock %}
 			</div>
 		</div>
 	</div>
 {% endblock %}
 {% block scripts_extra %}
 	{{ block.super }}
 	<script src="{% static "wiki/js/core.js" %}"></script>
 	<script src="{% static "wiki/bootstrap/js/bootstrap.min.js" %}"></script>
 	<!-- Optionally enable responsive features in IE8 -->
 	<script src="{% static "wiki/js/respond.min.js" %}"></script>
 {% endblock %}

pinaxcon/urls.py

➞

Show inline comments

@@ ... / @@ -3,12 +3,15 @@ from django.conf.urls import patterns, include, url @@
 from django.conf.urls.static import static
 from django.views.generic import TemplateView
 from wagtail.wagtailadmin import urls as wagtailadmin_urls
 from wagtail.wagtailcore import urls as wagtail_urls
 from wiki.urls import get_pattern as get_wiki_pattern
 from django_nyt.urls import get_pattern as get_nyt_pattern
 from django.contrib import admin
 import symposion.views
 urlpatterns = [
@@ ... / @@ -33,12 +36,16 @@ urlpatterns = [ @@
     # Required by registrasion
     url(r'^tickets/payments/', include('registripe.urls')),
     url(r'^tickets/', include('registrasion.urls')),
     url(r'^nested_admin/', include('nested_admin.urls')),
     # Wiki
     url(r'^notifications/', get_nyt_pattern()),
     url(r'^wiki/', get_wiki_pattern()),
     # Default catch-all for wagtail pages.
     url(r'^', include(wagtail_urls)),
     # Matches *NOTHING* -- remove once site_tree is fixed
     url(r"^$", TemplateView.as_view(template_name="homepage.html"), name="home"),

requirements.txt

➞

Show inline comments

@@ ... / @@ -10,12 +10,15 @@ dj-database-url==0.4.0 @@
 #pinax-pages==0.4.2
 pinax-boxes==2.1.2
 wagtail==1.6.2
 pylibmc==1.5.1
 raven==5.27.0
 #Wiki
 wiki==0.1.2
 # For testing
 django-nose==1.4.3
 coverage==4.0.3
 # Registrasion + Symposion
 # Install via pip repo cloned locally

static/dist/css/wiki.css

➞

Show inline comments

 new file 100644
 #div_id_title .asteriskField{display:none}
 #id_title {font-size: 20px; height: 30px; padding: 6px; width: 98%;}
 #id_summary {width: 98%; padding: 6px;}
 h1#article-title {font-size: 2em; margin-top: -5px;}
 #article_edit_form label {max-width: 100px;}
 #article_edit_form .controls {margin-left: 120px;}
 .form-horizontal label { font-size: 16px; font-weight: normal; color: #777;}
 .settings-form label {min-width: 250px; font-size: inherit; font-weight: normal;}
 .settings-form .controls {margin-left: 270px;}
 .settings-form select {}
 .settings-form .form-actions { padding-left: 270px; }
 #attachment_form #id_description
 { width: 95% }
 #edit_sidebar .accordion {margin-bottom: 5px;}
 .wiki-article div.toc,
 .wiki-article div.article-list {
   margin: 10px 0;
   background: #f9f9f9;
   padding: 10px;
   width: 300px;
   border: 1px solid #CCC;
+}
 .wiki-article a.linknotfound {color: #C87;}
 .wiki-article pre {
   max-width: 700px;
+}
 input[type=file] {float: none; width: auto;}
 .asteriskField { font-size: 20px; margin-left: 5px;}
 .notification-list .since {
   font-size: 80%;
   color: #CCC;
+}
 .directory-toolbar .filter-clear { margin-right: 10px; position: relative; top: 5px; }
 .accordion-heading h3 {margin: 0;}
 .breadcrumb .icon-bar {
     display: block;
     width: 18px;
     height: 2px;
     background-color: rgb(245, 245, 245);
     border-radius: 1px 1px 1px 1px;
     box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.25);
     margin-top: 3px;
+}
 .breadcrumb .icon-bar:first-child{margin-top: 0;}
 #navbar_wiki_search input.search-query {width: 80px;}
 #article-menu
+{
   border-bottom: 1px solid #EEE;
+}
 #article-container
+{
   margin-top: 20px;
+}
 #wiki-footer
+{
   padding: 30px 0;
   clear: both;
+}

0 comments (0 inline, 0 general)