diff options
| author | Gustav Eek <gustav@fripost.org> | 2015-01-19 13:22:10 +0100 |
|---|---|---|
| committer | Gustav Eek <gustav@fripost.org> | 2015-01-19 13:26:28 +0100 |
| commit | 99fe89e305b6853b4af5a1189c30bf874bb0f0f8 (patch) | |
| tree | 639bc345829363f0bb3cbe22800cc1581531ca3e /tracker | |
| parent | 6b463d03d9aa67552c1663d5d6dc94554d56d393 (diff) | |
Website merge, certificate pages merged
The certificate pages *certs.asc* and *certs.mdwn* are added. Links to
certificates are added to the main navigation bar in *page.tmpl*.
Diffstat (limited to 'tracker')
| -rw-r--r-- | tracker/Merge_wiki_website_and_website.mdwn | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tracker/Merge_wiki_website_and_website.mdwn b/tracker/Merge_wiki_website_and_website.mdwn index 4923e60..b208de3 100644 --- a/tracker/Merge_wiki_website_and_website.mdwn +++ b/tracker/Merge_wiki_website_and_website.mdwn @@ -9,8 +9,9 @@ Regarding redesign, the following are requirements: * Visitors of [https://fripost.org] should be brought to the "Hem" page * Visitors of [https://wiki.fripost.org] should be bought to the wiki index page. -* The pages "Hem", "Om", "Gå med", and "Kontakt" should be locked from - external edits, and edit buttons and navigation should be hidden. +* The pages "Hem", "Om", "Gå med", "Kontakt", and "Certifikat" should + be locked from external edits, and edit buttons and navigation + should be hidden. * The "FAQ" page should shared between the website and the wiki: It should be editable but still displayed as if it was part of the website. @@ -32,9 +33,9 @@ Regarding merging, the following is the checklist: * *årsmöte.txt* (what to do?) * In *sites* the following pages should be attended and possibly be added to the wiki - * *certs* (what to do?) - * *certs.asc* (what to do?) - * *default.css* (what to do?) + * *certs* -- Added as a page, *certs.mdwn*, which is accessed from the main navigation bar + * *certs.asc* -- Added as a file, accessed from *certs.mdwn* + * *default.css* -- Dropped * *faq.org* (what to do?) * *gnutiken.org* (what to do?) * *index.en.org* (what to do?) @@ -55,7 +56,6 @@ Regarding merging, the following is the checklist: * Check whether the content in *material* is available from the *propaganda* git repository. If it isn't, do something about it - - - - +Consider to get back to how the certificate pages are accessed. It +would be more natural to access a certificate page from a side note on +the "Hem" page, the way it was done in the org-mode based website. |