diff --git a/conf.py b/conf.py index d2c73f6..2ffeeef 100644 --- a/conf.py +++ b/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/*.txt", "posts", "post.tmpl"), - ("posts/*.html", "posts", "post.tmpl"), - ("posts/scholarship/*.rst", "scholarship", "post.tmpl"), - ("posts/scholarship/*.txt", "scholarship", "post.tmpl"), - ("posts/scholarship/*.html", "scholarship", "post.tmpl"), + ("posts/*.rst", "updates", "post.tmpl"), + ("posts/*.txt", "updates", "post.tmpl"), + ("posts/*.html", "updates", "post.tmpl"), + ("scholarship/*.rst", "scholarship", "post.tmpl"), + ("scholarship/*.txt", "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) diff --git a/images/people/chealsye.jpg b/images/people/chealsye.jpg deleted file mode 100644 index fa306dc..0000000 Binary files a/images/people/chealsye.jpg and /dev/null differ diff --git a/images/people/chealsye.png b/images/people/chealsye.png new file mode 100644 index 0000000..f17d3cd Binary files /dev/null and b/images/people/chealsye.png differ diff --git a/pages/contact.html b/pages/contact.html index 82f6834..c2ff4cc 100644 --- a/pages/contact.html +++ b/pages/contact.html @@ -28,7 +28,7 @@ - +
diff --git a/pages/who-we-are.html b/pages/who-we-are.html index 057a070..9b6f076 100644 --- a/pages/who-we-are.html +++ b/pages/who-we-are.html @@ -28,7 +28,7 @@ Micah Vandergrift

Micah Vandergrift

- Chealsye Bowley

Chealsye Bowley

+ Chealsye Bowley

Chealsye Bowley

Keving Smith

Kevin Smith

Megan Wacha

Megan Wacha

Charlottet Roh

Charlotte Roh

diff --git a/plugins/__init__.py b/plugins/__init__.py deleted file mode 100644 index fd7e25d..0000000 --- a/plugins/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# Plugin modules go here. \ No newline at end of file diff --git a/plugins/forms/README.md b/plugins/forms/README.md deleted file mode 100644 index cfdb856..0000000 --- a/plugins/forms/README.md +++ /dev/null @@ -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 += """ - -""" - -BODY_END += """ - - - -""" -``` diff --git a/plugins/forms/forms.plugin b/plugins/forms/forms.plugin deleted file mode 100644 index 4d04df0..0000000 --- a/plugins/forms/forms.plugin +++ /dev/null @@ -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. - diff --git a/plugins/forms/forms.py b/plugins/forms/forms.py deleted file mode 100644 index 8dc5ef9..0000000 --- a/plugins/forms/forms.py +++ /dev/null @@ -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('', ''' -
'''.format(formname=formname, data=data), format='html')] diff --git a/posts/announcement.html b/posts/announcement.html index 023d883..f017954 100644 --- a/posts/announcement.html +++ b/posts/announcement.html @@ -3,7 +3,7 @@ .. slug: cos-lissa .. date: 2017-05-01 14:08:25 UTC-04:00 .. tags: -.. category: +.. category: .. link: .. description: .. type: text diff --git a/scholarship/coming-soon.html b/scholarship/coming-soon.html new file mode 100644 index 0000000..162b4de --- /dev/null +++ b/scholarship/coming-soon.html @@ -0,0 +1,18 @@ + + + + + +

This will be a feed of new scholarship added to LISSA. You will be able to add materials during the soft launch, coming soon!

+ + + diff --git a/themes/custom/templates/index.tmpl b/themes/custom/templates/index.tmpl new file mode 100644 index 0000000..832dc93 --- /dev/null +++ b/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): + + % endif + + +<%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 +
+% for post in posts: +
+
+

${post.title()|h}

+ +
+ %if index_teasers: +
+ ${post.text(teaser_only=True)} + %else: +
+ ${post.text(teaser_only=False)} + %endif +
+
+% endfor +
+${helper.html_pager()} +${comments.comment_link_script()} +${helper.mathjax_script(posts)} + diff --git a/themes/custom/templates/sectionindex.tmpl b/themes/custom/templates/sectionindex.tmpl new file mode 100644 index 0000000..dd755be --- /dev/null +++ b/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: + + % endif + + +<%block name="content"> +
+
+ % if generate_atom: + + % endif +
+ ${parent.content()} +
+