Issues 78-80, 25

.gitignore

@@ -20,3 +20,10 @@ pip-log.txt
 # paste config files
 development.ini
 production.ini
+
+# Default wiki directory
+wiki.git/
+wiki/
+
+# Default assets directory
+assets/

README.rst

@@ -152,3 +152,26 @@ Here is an example config for Apache with ``mod_wsgi``:
         # Make sure to setup anything else you are using, such as SSL certs
     </VirtualHost>
 
+Static Assets
+~~~~~~~~~~~~~
+
+The location of site-specific assets for development can be configured in your development config: 
+
+.. code:: ini 
+
+    # Custom Assets Configuration
+    custom_assets.dir = /path/to/assets/dir
+    custom_assets.css = relative/path/to/css.file
+    custom_assets.logo = relative/path/to/logo.file
+
+Wiki
+~~~~
+
+Mozzarella includes a wiki that can be enabled by uncommenting the `wiki.repo` option in your configuration.
+When visiting the wiki for the first time after enabling it, Mozzarella will generate a bare git repository with a sample
+page in it.
+
+.. code:: ini
+
+   # Wiki repository location
+   wiki.repo = /path/to/wiki/dir

acmwebsite/config/app_cfg.py

@@ -75,6 +75,9 @@
 # what is the class you want to use to search for users in the database
 base_config.sa_auth.user_class = model.User
 
+#Configure site name
+base_config['site.name'] = 'Mozzarella'
+
 from tg.configuration.auth import TGAuthMetadata
 
 

acmwebsite/config/middleware.py

@@ -2,10 +2,10 @@
 """WSGI middleware initialization for the acm-website application."""
 from acmwebsite.config.app_cfg import base_config
 from acmwebsite.config.environment import load_environment
-
 # Depot
 from depot.manager import DepotManager
 
+from tg.support.statics import StaticsMiddleware
 
 __all__ = ['make_app']
 
@@ -34,6 +34,10 @@ def make_app(global_conf, full_stack=True, **app_conf):
     """
     app = make_base_app(global_conf, full_stack=True, **app_conf)
     app = DepotManager.make_middleware(app)
+    try:
+        app = StaticsMiddleware(app, app_conf['site.custom_assets'])
+    except KeyError:
+        pass
 
     # Wrap your base TurboGears 2 application with custom middleware here
 

acmwebsite/controllers/root.py

@@ -23,6 +23,7 @@
 from acmwebsite.controllers.schedule import ScheduleController
 from acmwebsite.controllers.survey import SurveysController
 from acmwebsite.controllers.project import ProjectsController
+from acmwebsite.controllers.wiki import WikiPagesController
 
 from sqlalchemy.sql import functions
 
@@ -53,6 +54,7 @@ class RootController(BaseController):
     error = ErrorController()
     contact = ContactController()
     projects = ProjectsController()
+    wiki = WikiPagesController()
 
     def _before(self, *args, **kw):
         tmpl_context.project_name = "acmwebsite"

acmwebsite/controllers/wiki.py

@@ -0,0 +1,86 @@
+"""Wiki controller module"""
+import os
+import tg
+import pygit2 as pg
+
+from tg import expose
+
+from acmwebsite.lib.base import BaseController
+
+from pygit2 import Repository,init_repository
+from pygit2 import Tree
+from pygit2 import Signature
+
+from docutils.core import publish_parts
+
+
+__all__ = ['WikiController']
+
+class WikiController(BaseController):
+    """Controls the wiki"""
+
+    def __init__(self, repo, entry):
+        self.repo = repo
+        self.entry = entry
+
+    @expose('acmwebsite.templates.wiki_view')
+    def _default(self):
+        """Display a specific page"""
+        settings = {'initial_header_level': 2,
+                    'file_insertion_enabled': 0,
+                    'raw_enabled': 0,
+                    'disable_config': 1,
+        }
+
+        blob = self.repo.get(self.entry.id)
+        document = publish_parts(blob.data, writer_name='html5', settings_overrides=settings)
+        return dict(pagename=self.entry.name.strip('.rst'), parts=document)
+
+    @expose('acmwebsite.templates.wiki_history')
+    def history(self):
+        revision_list = []
+        last_id = None
+
+        #Get a list of commits that include the queried file
+        for commit in self.repo.walk(self.repo.head.target, pg.GIT_SORT_TIME):
+            if filename in commit.tree:
+                entry = commit.tree[filename]
+                if entry.id != last_id: #Only add to history if it file chnaged.
+                    revision_list.append({"author": commit.author,
+                                          "time": commit.commit_time,
+                                          "message": commit.message})
+                last_id = entry.id
+
+        if not revision_list: #No commits include file - possibly faulty?
+            tg.abort(404, "Page not found")
+        return dict(page=pagename, revisions=revision_list)
+
+class WikiPagesController(BaseController):
+    def __new__(cls, repo_path=None):
+        if not repo_path:
+            repo_path = tg.config.get('wiki.repo')
+        if not repo_path:
+            return None
+
+        obj = super().__new__(cls)
+        obj.repo = Repository(repo_path)
+        return obj
+
+    @expose()
+    def _lookup(self, pagename=None, *args):
+        entry = None
+        if pagename:
+            tb = self.repo.TreeBuilder(self.repo.head.peel(Tree))
+            entry = tb.get(pagename + '.rst')
+        if not entry:
+            tg.abort(404, "Page not found")
+        return WikiController(self.repo, entry), args
+
+    @expose()
+    def index(self):
+        tg.redirect('/wiki/FrontPage')
+
+    @expose('acmwebsite.templates.wiki_pagelist')
+    def pagelist(self):
+        pages = [entry.name[:-4] for entry in self.repo.head.peel(Tree)]
+        return dict(pages=pages)

acmwebsite/public/css/style.css

@@ -80,7 +80,7 @@
 }
 
 /* Logo */
-.acm-logo {
+.logo {
   margin: 20px 0;
   max-width: 400px;
   width: 100%;

acmwebsite/templates/archives.xhtml

@@ -5,7 +5,7 @@
   <py:extends href="master.xhtml" />
 
   <head py:block="head" py:strip="True">
-    <title>Mines ACM - Mailing List Archives</title>
+    <title>${tg.config.get('site.name')} - Mailing List Archives</title>
   </head>
 
   <body py:block="body" py:strip="True">

acmwebsite/templates/contact.xhtml

@@ -1,6 +1,6 @@
 <html py:extends="master.xhtml" py:strip="True">
   <head py:block="head" py:strip="True">
-    <title>Mines ACM - Contact</title>
+    <title>${tg.config.get('site.name')} - Contact</title>
   </head>
   <body py:block="body" py:strip="True">
     <div class="row">

acmwebsite/templates/error.xhtml

@@ -1,6 +1,6 @@
 <html py:extends="master.xhtml" py:strip="True">
   <head py:block="head" py:strip="True">
-    <title>Mines ACM - Error</title>
+    <title>${tg.config.get('site.name')} - Error</title>
   </head>
   <body py:block="body" py:strip="True">
     <h1>Error ${code}</h1>

acmwebsite/templates/index.xhtml

@@ -4,19 +4,19 @@
 
   <py:extends href="master.xhtml" />
   <head py:block="head" py:strip="True">
-    <title>Mines ACM</title>
+    <title>${tg.config.get('site.name')}</title>
   </head>
   <body py:block="body" py:strip="True">
     <div class="row">
-      <div class="col-md-7">
-        <div py:if="banner is not None" class="home-banner">
+      <div py:if="banner is not None" class="col-md-7">
+        <div class="home-banner">
           <img class="home-banner-img" src="${banner.photo.url}" />
           <small py:if="banner.description" py:content="h.rst(banner.description)"></small>
         </div>
       </div>
       <div class="col-md-5">
         <div class="intro-block">
-        <h2>Mines ACM Student Chapter</h2>
+        <h2>${tg.config.get('site.name')}</h2>
         <p>
             The Mines ACM Student Chapter is the local chapter of the <a href="http://www.acm.org" target="_blank">Association for Computing
             Machinery</a> at the <a href="http://www.mines.edu" target="_blank">Colorado School of Mines</a>. As a Mozilla Open Source
@@ -32,7 +32,7 @@
     <div class="col-md-6">
       <div class="panel panel-default">
         <div class="panel-heading">
-          <h3 class="panel-title">Join our ACM Chapter!</h3>
+          <h3 class="panel-title">Join our ${tg.config.get('site.name')}!</h3>
         </div>
         <div class="panel-body">
           <p>To join our ACM chapter, simply show up to our meetings. Newcomers are welcome to all meetings.</p>
@@ -57,6 +57,17 @@
         </div>
       </div>
     </div>
+    <div class="col-md-6">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h3 class="panel-title">${tg.config.get('site.name')} Wiki</h3>
+            </div>
+            <div class="panel-body">
+                <p>Did you know our website has a wiki? You can go to the wiki homepage <a href="${tg.url('/wiki')}">here</a>
+                or by clicking on the "wiki" button on the toolbar.</p>
+            </div>
+        </div>
+    </div>
   </div>
 </body>
 </html>

acmwebsite/templates/login.xhtml

@@ -1,6 +1,6 @@
 <html py:extends="master.xhtml" py:strip="True">
   <head py:block="head" py:strip="True">
-    <title>Mines ACM - Login</title>
+    <title>${tg.config.get('site.name')} - Login</title>
   </head>
   <body py:block="body" py:strip="True">
     <h1>Login with MultiPass</h1>

acmwebsite/templates/mailinglist.xhtml

@@ -5,7 +5,7 @@
   <py:extends href="master.xhtml" />
 
   <head py:block="head" py:strip="True">
-    <title>Mines ACM - Mailing List</title>
+    <title>${tg.config.get('site.name')} - Mailing List</title>
   </head>
 
   <body py:block="body" py:strip="True">

acmwebsite/templates/master.xhtml

@@ -9,14 +9,15 @@
     <link id='bs-css' rel="stylesheet" type="text/css" media="screen" href="${tg.url('/css/bootstrap.dark.min.css') if tg.session.get('theme', None) == 'dark' else tg.url('/css/bootstrap.light.min.css')}" />
     <link rel="stylesheet" type="text/css" media="screen" href="${tg.url('/css/style.css')}" />
     <link rel="stylesheet" type="text/css" media="screen" href="${tg.url('/css/font-awesome.min.css')}" />
+    <link rel="stylesheet" type="text/css" media="screen" href="${tg.url('/css/site.css')}" />
   </head>
 
   <body>
     <!-- Navbar -->
     <div class="container">
       <div class="header-logo">
         <a href="${tg.url('/')}">
-          <img src="${tg.url('/img/full.svg')}" alt="Mines ACM" class="acm-logo" />
+          <img src="/img/full.svg" alt="${tg.config.get('site.name')}" class="logo" />
         </a>
       </div>
     </div>
@@ -38,6 +39,7 @@
             <li class="${('', 'active')[value_of('page') == 'projects']}"><a href="${tg.url('/projects')}">Projects</a></li>
             <li class="${('', 'active')[value_of('page') == 'mailinglist']}"><a href="${tg.url('/mailinglist')}">Mailing List</a></li>
             <li class="${('', 'active')[value_of('page') == 'contact']}"><a href="${tg.url('/contact')}">Contact</a></li>
+            <li class="${('', 'active')[value_of('page') == 'wiki']}"><a href="${tg.url('/wiki')}">Wiki</a></li>
           </ul>
 
           <ul py:if="not value_of('luser')" class="nav navbar-nav navbar-right">

acmwebsite/templates/message.xhtml

@@ -5,7 +5,7 @@
   <py:extends href="master.xhtml" />
 
   <head py:block="head" py:strip="True">
-    <title>Mines ACM - Post: ${message.subject}</title>
+    <title>${tg.config.get('site.name')} - Post: ${message.subject}</title>
   </head>
 
   <body py:block="body" py:strip="True">

acmwebsite/templates/profile.xhtml

@@ -5,7 +5,7 @@
   <py:extends href="master.xhtml" />
 
   <head py:block="head" py:strip="True">
-      <title>Mines ACM - ${u}</title>
+      <title>${tg.config.get('site.name')} - ${u}</title>
   </head>
 
   <body py:block="body" py:strip="True">

acmwebsite/templates/projects.xhtml

@@ -5,7 +5,7 @@
   <py:extends href="master.xhtml" />
 
   <head py:block="head" py:strip="True">
-    <title>Mines ACM - Projects</title>
+    <title>${tg.config.get('site.name')} - Projects</title>
   </head>
 
   <body py:block="body" py:strip="True">

acmwebsite/templates/schedule.xhtml

@@ -5,7 +5,7 @@
   <py:extends href="master.xhtml" />
 
   <head py:block="head" py:strip="True">
-    <title>Mines ACM - Schedule</title>
+    <title>${tg.config.get('site.name')} - Schedule</title>
   </head>
 
   <body py:block="body" py:strip="True">

acmwebsite/templates/survey.xhtml

@@ -4,7 +4,7 @@
   py:extends="master.xhtml">
 
   <head py:block="head" py:strip="True">
-    <title>Mines ACM - Survey</title>
+    <title>${tg.config.get('site.name')} - Survey</title>
   </head>
 
   <div py:def="unknown_type(ty)">

acmwebsite/templates/survey_results.xhtml

@@ -4,7 +4,7 @@
   py:extends="master.xhtml">
 
   <head py:block="head" py:strip="True">
-    <title>Mines ACM - Survey ${survey_id} Responses</title>
+    <title>${tg.config.get('site.name')} - Survey ${survey_id} Responses</title>
   </head>
 
   <body py:block="body" py:strip="True">

acmwebsite/templates/wiki_history.xhtml

@@ -0,0 +1,40 @@
+<html py:strip=""
+      xmlns:py="http://genshi.edgewall.org/"
+      xmlns:xi="http://www.w3.org/2001/XInclude">
+
+  <py:extends href="master.xhtml" />
+
+  <head py:block="head" py:strip="True">
+    <title>${tg.config.get('site.name')} Wiki - $page History</title>
+  </head>
+
+  <body py:block="body" py:strip="True">
+    <py:def function="revision(item)">
+      <td>
+        ${item["message"]}
+      </td>
+      <td>
+        ${item["author"].name}
+      </td>
+      <td>
+        ${item["time"]}
+      </td>
+    </py:def>  
+
+
+    <h1 class="page-header">History: <a href="${tg.url('/wiki/{}'.format(page))}">$page</a></h1>
+
+    <table class="table table-striped">
+      <thead>
+        <tr>
+          <th>Commit Message</th>
+          <th>Author</th>
+          <th>Commit time</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr py:for="entry in revisions">${revision(entry)}</tr>
+      </tbody>
+    </table>
+  </body>
+</html>