split blogs, added pic

conf.py

@@ -116,7 +116,7 @@ NAVIGATION_LINKS = {
     DEFAULT_LANG: (
 	("/", "Home"),
 	('/who-we-are', 'About'),
-	('/scholarship', 'Scholarship'),
+	('/scholarship/', 'Scholarship'),
 	('/contact', 'Contact')
     ),
 }
@@ -154,12 +154,12 @@ THEME_COLOR = '#8966a0'
 #
 
 POSTS = (
-    ("posts/*.rst", "posts", "post.tmpl"),
+    ("posts/*.rst", "updates", "post.tmpl"),
-    ("posts/*.txt", "posts", "post.tmpl"),
+    ("posts/*.txt", "updates", "post.tmpl"),
-    ("posts/*.html", "posts", "post.tmpl"),
+    ("posts/*.html", "updates", "post.tmpl"),
-    ("posts/scholarship/*.rst", "scholarship", "post.tmpl"),
+    ("scholarship/*.rst", "scholarship", "post.tmpl"),
-    ("posts/scholarship/*.txt", "scholarship", "post.tmpl"),
+    ("scholarship/*.txt", "scholarship", "post.tmpl"),
-    ("posts/scholarship/*.html", "scholarship", "post.tmpl"),
+    ("scholarship/*.html", "scholarship", "post.tmpl"),
 )
 
 PAGES = (
@@ -451,7 +451,7 @@ HIDDEN_AUTHORS = ['Guest']
 
 # Final location for the main blog page and sibling paginated pages is
 # output / TRANSLATION[lang] / INDEX_PATH / index-*.html
-# INDEX_PATH = ""
+INDEX_PATH = ""
 
 # Optional HTML that displayed on “main” blog index.html files.
 # May be used for a greeting. (translatable)

pages/contact.html

@@ -28,7 +28,7 @@
 	    </div>
 	    <button type="reset" class="btn btn-default">Cancel</button>
 	    <button type="submit" class="btn btn-primary">Submit</button>
-	 </form>
+	 </form><br/>
 	</div>
 
   </body>

pages/who-we-are.html

@@ -28,7 +28,7 @@
     
 <tr>
     <td><img src="/images/people/micah.jpg" alt="Micah Vandergrift"/><p><a  href="https://micahvandegrift.github.io/">Micah Vandergrift</a></p></td>
-    <td><img src="/images/people/chealsye.jpg" alt="Chealsye Bowley"/><p><a href="https://twitter.com/chealsye">Chealsye Bowley</a></p></td>
+    <td><img src="/images/people/chealsye.png" alt="Chealsye Bowley"/><p><a href="https://twitter.com/chealsye">Chealsye Bowley</a></p></td>
     <td><img src="/images/people/kevin.jpg" alt="Keving Smith"/><p><a href="https://lib.ku.edu/kevin-l-smith">Kevin Smith</a></p></td>
     <td><img src="/images/people/megan.png" alt="Megan Wacha"/><p><a href="http://www.meganwacha.info/">Megan Wacha</a></p></td>
     <td><img src="/images/people/charlotte.jpg" alt="Charlottet Roh"/><p><a href="https://www.linkedin.com/in/charlotteroh">Charlotte Roh</a></p></td>

plugins/__init__.py

@@ -1 +0,0 @@
-# Plugin modules go here.

plugins/forms/README.md

@@ -1,57 +0,0 @@
-This plugin uses [Alpaca Forms](http://alpacajs.org/) to allow "easy" form creation
-in reStructuredText documents.
-
-Here's an example:
-
-```
-.. form::
-
-   {
-    "schema": {
-        "title": "What do you think of Alpaca?",
-        "type": "object",
-        "properties": {
-            "name": {
-                "type": "string",
-                "title": "Name"
-            },
-            "ranking": {
-                "type": "string",
-                "title": "Ranking",
-                "enum": ['excellent', 'not too shabby', 'alpaca built my hotrod']
-            }
-        }
-    }
-```
-
-Instead of using the form description as content for the directive, you can put it in a separate file
-and load it like this:
-
-```
-.. form::
-   :file: formdescription.json
-```
-
-A description of how Alpaca works is beyond the scope of this README, and you should read
-[their fine docs](http://alpacajs.org/tutorial.html) instead.
-
-You will probably want to add something like this to your config:
-
-
-```
-EXTRA_HEAD_DATA += """
-<link type="text/css" href="//code.cloudcms.com/alpaca/1.5.8/bootstrap/alpaca.min.css" rel="stylesheet" />
-"""
-
-BODY_END += """
-<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/1.3.0/handlebars.js"></script>
-<script type="text/javascript" src="//code.cloudcms.com/alpaca/1.5.8/bootstrap/alpaca.min.js"></script>
-<script>
-$(document).ready(function() {
-    $('div.alpacaform').each(function(index, element) {
-        data = eval(element.id+'_data');
-        Alpaca(element, data);
-    });});
-</script>
-"""
-```

plugins/forms/forms.plugin

@@ -1,14 +0,0 @@
-[Core]
-Name = rest_forms
-Module = forms
-
-[Nikola]
-PluginCategory = CompilerExtension
-Compiler = rest
-
-[Documentation]
-Author = Roberto Alsina
-Version = 0.1
-Website = http://getnikola.com
-Description = Alpaca-based forms for ReST.
-

plugins/forms/forms.py

@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-# This file is public domain according to its author, Brian Hsu
-
-import uuid
-
-from docutils.parsers.rst import Directive, directives
-from docutils import nodes
-
-from nikola.plugin_categories import RestExtension
-
-
-class Plugin(RestExtension):
-
-    name = "rest_form"
-
-    def set_site(self, site):
-        self.site = site
-        directives.register_directive('form', AlpacaForms)
-        return super(Plugin, self).set_site(site)
-
-
-class AlpacaForms(Directive):
-    """ Embed AlpacaForm form
-
-        Usage:
-
-          .. form::
-
-             [Alpaca form description as JSON]
-
-          .. form::
-             :file: formdescription.json
-
-
-    """
-
-    option_spec = {'file': directives.unchanged}
-    has_content = True
-
-    def run(self):
-        formname = 'form_' + uuid.uuid4().hex
-        fname = self.options.get('file')
-        if fname is None:
-            data = '\n'.join(self.content)
-        else:
-            with open(fname, 'rb') as fd:
-                data = fd.read()
-        return [nodes.raw('', '''
-            <div id={formname} class="alpacaform"></div> <script type="text/javascript"> {formname}_data={data};</script>'''.format(formname=formname, data=data), format='html')]

scholarship/coming-soon.html

@@ -0,0 +1,18 @@
+<!--
+.. title: Coming Soon
+.. slug: coming-soon
+.. date: 2017-05-04 14:08:25 UTC-04:00
+.. tags: 
+.. category: 
+.. link: 
+.. description: 
+.. type: text
+-->
+<!DOCTYPE html>
+<html lang="en">
+  <body>
+
+	<p>This will be a feed of new scholarship added to <a href="https://osf.io/preprints/lissa">LISSA</a>. You will be able to add materials during the soft launch, coming soon!</p>
+	
+  </body>
+</html>

themes/custom/templates/index.tmpl

@@ -0,0 +1,54 @@
+## -*- coding: utf-8 -*-
+<%namespace name="helper" file="index_helper.tmpl"/>
+<%namespace name="comments" file="comments_helper.tmpl"/>
+<%namespace name="pagination" file="pagination_helper.tmpl"/>
+<%inherit file="base.tmpl"/>
+
+<%block name="extra_head">
+    ${parent.extra_head()}
+    % if posts and (permalink == '/' or permalink == '/' + index_file):
+        <link rel="prefetch" href="${posts[0].permalink()}" type="text/html">
+    % endif
+</%block>
+
+<%block name="content">
+% if 'main_index' in pagekind:
+    ${front_index_header}
+% endif
+% if page_links:
+    ${pagination.page_navigation(current_page, page_links, prevlink, nextlink, prev_next_links_reversed)}
+% endif
+<div class="postindex">
+% for post in posts:
+    <article class="h-entry post-${post.meta('type')}">
+    <header>
+        <h1 class="p-name entry-title"><a href="${post.permalink()}" class="u-url">${post.title()|h}</a></h1>
+        <div class="metadata">
+            <p class="byline author vcard"><span class="byline-name fn" itemprop="author">
+            % if author_pages_generated:
+                <a href="${_link('author', post.author())}">${post.author()|h}</a>
+            % else:
+                <a href="/who-we-are/">${post.author()|h}</a>
+            % endif
+            </span></p>
+            <p class="dateline"><a href="${post.permalink()}" rel="bookmark"><time class="published dt-published" datetime="${post.formatted_date('webiso')}" title="${post.formatted_date(date_format)|h}">${post.formatted_date(date_format)|h}</time></a></p>
+            % if not post.meta('nocomments') and site_has_comments:
+                <p class="commentline">${comments.comment_link(post.permalink(), post._base_path)}
+            % endif
+        </div>
+    </header>
+    %if index_teasers:
+    <div class="p-summary entry-summary">
+    ${post.text(teaser_only=True)}
+    %else:
+    <div class="e-content entry-content">
+    ${post.text(teaser_only=False)}
+    %endif
+    </div>
+    </article>
+% endfor
+</div>
+${helper.html_pager()}
+${comments.comment_link_script()}
+${helper.mathjax_script(posts)}
+</%block>

themes/custom/templates/sectionindex.tmpl

@@ -0,0 +1,20 @@
+## -*- coding: utf-8 -*-
+<%inherit file="index.tmpl"/>
+
+<%block name="extra_head">
+    ${parent.extra_head()}
+    % if generate_atom:
+        <link rel="alternate" type="application/atom+xml" title="Atom for the ${posts[0].section_name()|h} section" href="${_link('section_index_atom', posts[0].section_slug())}">
+    % endif
+</%block>
+
+<%block name="content">
+<div class="sectionindex">
+    <header>
+        % if generate_atom:
+            <p class="feedlink"><a href="${_link('section_index_atom', posts[0].section_slug())}" type="application/atom+xml">${messages('Updates')}</a></p>
+        % endif
+    </header>    
+    ${parent.content()}
+</div>
+</%block>