diff options
| author | Gustav Eek <gustav@fripost.org> | 2015-01-19 20:22:47 +0100 |
|---|---|---|
| committer | Gustav Eek <gustav@fripost.org> | 2015-01-19 20:26:33 +0100 |
| commit | 5e6c50f25786707f59b56862632231ce2ef5c0d6 (patch) | |
| tree | a2a4c0bf26194cf5d788536349db0bdbeb24cda1 /tracker | |
| parent | e87b8d6c24915f4bc50f3c08b9a7201a74743541 (diff) | |
Merge website, the English text incorporated
All content of *index.en.org*, *kontakt.en.org*, and
*medlemskap.en.org* is combined into one single English page,
*english.mdwn*, that should be part of the website. The template
*page.tmpl* is updated accordingly.
Diffstat (limited to 'tracker')
| -rw-r--r-- | tracker/Merge_wiki_website_and_website.mdwn | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tracker/Merge_wiki_website_and_website.mdwn b/tracker/Merge_wiki_website_and_website.mdwn index fbd569e..cdf3c78 100644 --- a/tracker/Merge_wiki_website_and_website.mdwn +++ b/tracker/Merge_wiki_website_and_website.mdwn @@ -9,9 +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", "Kontakt", and "Certifikat" should - be locked from external edits, and edit buttons and navigation - should be hidden. +* The pages "Hem", "Om", "Gå med", "Kontakt", "Certifikat", and + "English" 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. @@ -37,13 +37,13 @@ Regarding merging, the following is the checklist: * *certs.asc* -- Added as a file, accessed from *certs.mdwn* * *default.css* -- Dropped * *faq.org* -- Merged with *faq.mdwn* - * *gnutiken.org* (what to do?) - * *index.en.org* (what to do?) - * *index.org* (what to do?) - * *kontakt.en.org* (what to do?) + * *gnutiken.org* -- Dropped + * *index.en.org* -- Information added as *english.mdwn* + * *index.org* -- Text available as *hem.mdwn* + * *kontakt.en.org* -- Information added as *english.mdwn* * *kontakt.org* (what to do?) * *logo2011.eps* (what to do?) - * *medlemskap.en.org* (what to do?) + * *medlemskap.en.org* -- Information added as *english.mdwn* * *medlemskap.org* (what to do?) * *organisation.org* (what to do?) * *progressbar-example.html* (what to do?) |