Skip to content
This repository has been archived by the owner on Jan 15, 2019. It is now read-only.

Issues 78-80, 25 #81

Open
wants to merge 76 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
83cb9cc
Added site name and short site name to dev.ini and updated templates …
nklonne Jun 1, 2018
3ad8517
Merge branch 'Field_Session' of https://github.com/ColoradoSchoolOfMi…
Jun 1, 2018
69855ec
Image alt and class fixed.
murchison Jun 1, 2018
62b42e1
Set up custom logo loading: Relative path only
Jun 1, 2018
652e5b4
Resolved merge conflict by changing alt to 'Club Logo' and class to '…
Jun 1, 2018
c450a00
Commented out site_name and short_site_name in development.ini to mak…
nklonne Jun 2, 2018
23a2341
Implemented custom logo loading.
Jun 2, 2018
f1f6012
Simplified custom logo loading.
Jun 2, 2018
263c1d8
Implemented custom CSS loading
JadElClemens Jun 2, 2018
447f01c
Documented new config options
JadElClemens Jun 2, 2018
f9b1b39
Fixed documentation on static assets config
JadElClemens Jun 2, 2018
ef1eddb
Really fixed documentation this time
JadElClemens Jun 2, 2018
93220e9
Changes to development.ini items
JadElClemens Jun 6, 2018
a788600
Added site name to config defaults
JadElClemens Jun 6, 2018
9c82e5b
Default value for site.name is now Mozzarella.
Jun 6, 2018
aae73d2
There is now a default image name for the site logo.
Jun 6, 2018
e467d68
Shows site name in place of logo if the file for the logo cannot be f…
Jun 6, 2018
140e84c
Site no longer requires custom_assets config options to be set
JadElClemens Jun 6, 2018
f2fa2ff
Commented out custom assets directory in development.ini.sample and r…
Jun 8, 2018
52a1b9c
Fixed up master.xhtml - no longer uses config-based file locations
JadElClemens Jun 8, 2018
8fe387a
Created basic views and controller for wiki
JadElClemens Jun 8, 2018
d644c3e
Added a link to wiki page
Jun 8, 2018
eafcdfe
Beginning of wiki functionality
JadElClemens Jun 10, 2018
5135258
Merge branch 'fs-wiki' of https://github.com/ColoradoSchoolOfMines/mo…
JadElClemens Jun 10, 2018
382434a
Added wiki location config to development.ini.sample
JadElClemens Jun 10, 2018
c20008e
Wiki now adds .rst extension automatically, properly errors when file…
JadElClemens Jun 10, 2018
302e734
Added example config for site.custom_assets
JadElClemens Jun 11, 2018
11cb19e
Added wiki view template
JadElClemens Jun 11, 2018
b3fcb5d
Site now initializes a wiki at the specified location if none exists
JadElClemens Jun 11, 2018
90c2a4f
Removed unnecessary edit and save functions from wiki.py
Jun 11, 2018
a282a02
Wiki repository is now bare
JadElClemens Jun 11, 2018
fa1681d
Merge branch 'fs-wiki' of https://github.com/ColoradoSchoolOfMines/mo…
JadElClemens Jun 11, 2018
d590c31
Wiki now accepts positional parameters in URL (/wiki/[pagename] is va…
JadElClemens Jun 11, 2018
5ed344b
Changed wiki controller and template to be in line with running conve…
JadElClemens Jun 11, 2018
0a4a1d4
Partially implemented parsing.
Jun 13, 2018
a4a2d2d
Wiki page now displays in page title
JadElClemens Jun 13, 2018
dec0bb1
removed wiki directory
JadElClemens Jun 13, 2018
8651e63
Cleaned up wiki controller code
JadElClemens Jun 13, 2018
870a305
Added a front page to the wiki.
Jun 16, 2018
8adc66e
Added to the main page a panel about the wiki.
Jun 16, 2018
df096eb
Added info about wiki to README
JadElClemens Jun 16, 2018
bf5c080
Further expanded wiki section in README
JadElClemens Jun 16, 2018
20a6590
Created instructions for Wiki contribution.
Jun 16, 2018
3ad61a4
Wiki revision history now live at /wiki/history/[pagename]
JadElClemens Jun 16, 2018
e988169
Merge branch 'fs-wiki' of https://github.com/ColoradoSchoolOfMines/mo…
JadElClemens Jun 16, 2018
d596a6c
Removed wiki dir
JadElClemens Jun 16, 2018
c8ea21b
History page now links back to content page
JadElClemens Jun 16, 2018
539698c
Wiki pages now have a 'links' panel, only includes history page for now
JadElClemens Jun 16, 2018
f115332
revision history page now shows edits in reverse order
JadElClemens Jun 16, 2018
366f0b9
The folder 'wiki' is now ignored.
Jun 16, 2018
81b39f5
Merge branch 'fs-wiki' of https://github.com/ColoradoSchoolOfMines/mo…
Jun 16, 2018
3ce08e7
Wiki pages now take their title from the ReST document
JadElClemens Jun 16, 2018
c79b3a2
Index now redirects to FrontPage. FrontPage is now copied from filesy…
JadElClemens Jun 16, 2018
41f1ded
Added a skeleton page for the Page List.
Jun 16, 2018
9385621
Implemented the Page List. TODO: It only lists the name, it doesn't g…
Jun 16, 2018
8ce0381
Slight changes to default wiki frontpage
JadElClemens Jun 17, 2018
ee9c098
Merge branch 'fs-wiki' of https://github.com/ColoradoSchoolOfMines/mo…
JadElClemens Jun 17, 2018
0fba5fb
Made wiki pagelist link to pages, files with spaces now supported
JadElClemens Jun 17, 2018
a7fc457
Changed page list to use XML templating rather than filling out a ReS…
JadElClemens Jun 17, 2018
d030827
Cleaned up wiki controller code
JadElClemens Jun 17, 2018
5b761f7
Fixed the auto-initializing an extra PageList page.
Jun 17, 2018
56bb645
Homepage no longer reserves space for banner if banner does not exist
JadElClemens Jun 17, 2018
dfd8763
wiki view page no longer uses containers
JadElClemens Jun 17, 2018
72d81e5
Merge branch 'fs-wiki' of https://github.com/ColoradoSchoolOfMines/mo…
JadElClemens Jun 17, 2018
36f5ee8
Removed unnecessary PageList.rst from the wiki-assets directory.
Jun 17, 2018
db1c91e
Merge branch 'fs-wiki' of https://github.com/ColoradoSchoolOfMines/mo…
Jun 17, 2018
de04840
Merge branch 'fs-wiki' into Field_Session
JadElClemens Jun 17, 2018
f1c95ae
Deleted assets dir
JadElClemens Jun 17, 2018
615b2ac
Site configuration values in development.ini.sample are now together.
Jun 21, 2018
93a3ba9
Changed acm-logo CSS class to logo
JadElClemens Jun 21, 2018
a1141bb
Wiki not enabled now results in a 404, imports fixed up, external lin…
JadElClemens Jun 21, 2018
442381b
Merge branch 'fs-wiki' into Field_Session
JadElClemens Jun 21, 2018
a8190ec
Wiki pages no longer use old-style formatting
JadElClemens Jun 21, 2018
f30995d
Began implementing wiki controller in OO manner
JadElClemens Jun 21, 2018
31c0537
Change wiki initialization method
jackrosenthal Oct 23, 2018
3f9090c
fixed initialization of wiki controller
jordannewport Oct 23, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added a skeleton page for the Page List.
  • Loading branch information
Levi Petty committed Jun 16, 2018
commit 41f1ded3b3bb47e05e693c9b6eb908a31617d537
4 changes: 4 additions & 0 deletions acmwebsite/controllers/wiki.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ def _init_wiki_repo(self):
filepath = resource_filename('acmwebsite', 'wiki-assets/FrontPage.rst')
blobid = self.repo.create_blob_fromdisk(filepath)
tb.insert(filename, blobid, pg.GIT_FILEMODE_BLOB)
filename = "PageList.rst"
filepath = resource_filename('acmwebsite', 'wiki-assets/PageList.rst')
blobid = self.repo.create_blob_fromdisk(filepath)
tb.insert(filename, blobid, pg.GIT_FILEMODE_BLOB)
tree = tb.write()

# Commit the change
Expand Down
22 changes: 0 additions & 22 deletions acmwebsite/templates/wiki_front.xhtml

This file was deleted.

3 changes: 3 additions & 0 deletions acmwebsite/templates/wiki_view.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
<li class="nav-item">
<a class="nav-link" href="${tg.url('/wiki/history/%s' % pagename)}">History</a>
</li>
<li class="nav-item">
<a class="nav-link" href="${tg.url('/wiki/PageList')}">Page List</a>
</li>
</ul>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions acmwebsite/wiki-assets/PageList.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Filler stuff for now.