From 99fe89e305b6853b4af5a1189c30bf874bb0f0f8 Mon Sep 17 00:00:00 2001 From: Gustav Eek Date: Mon, 19 Jan 2015 13:22:10 +0100 Subject: 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*. --- tracker/Merge_wiki_website_and_website.mdwn | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tracker') 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. -- cgit v1.2.3 From e87b8d6c24915f4bc50f3c08b9a7201a74743541 Mon Sep 17 00:00:00 2001 From: Gustav Eek Date: Mon, 19 Jan 2015 14:13:44 +0100 Subject: Merge website, FAQ incorporated Some restructuring has happened with the FAQ's. The org-mode based *faq.org* was mostly available as a general FAQ page, *faq.mdwn*, already. The specific *faq-medlemskap.mdwn* together with some parts of the technical FAQ, *e-post.mdwn* is merged with the general FAQ. Finally the wiki index page is updated accordingly. --- tracker/Merge_wiki_website_and_website.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tracker') diff --git a/tracker/Merge_wiki_website_and_website.mdwn b/tracker/Merge_wiki_website_and_website.mdwn index b208de3..fbd569e 100644 --- a/tracker/Merge_wiki_website_and_website.mdwn +++ b/tracker/Merge_wiki_website_and_website.mdwn @@ -21,7 +21,7 @@ Regarding merging, the following is the checklist: * In *from_wiki*, the following pages should be attended and possibly added to the wiki. * *budget.txt* (what to do?) - * *faq.txt* (what to do?) + * *faq.txt* -- Content already in *faq.org* * *fscons.txt* (what to do?) * *index.txt* (what to do?) * *ordlista.txt* (what to do?) @@ -36,7 +36,7 @@ Regarding merging, the following is the checklist: * *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?) + * *faq.org* -- Merged with *faq.mdwn* * *gnutiken.org* (what to do?) * *index.en.org* (what to do?) * *index.org* (what to do?) -- cgit v1.2.3 From 5e6c50f25786707f59b56862632231ce2ef5c0d6 Mon Sep 17 00:00:00 2001 From: Gustav Eek Date: Mon, 19 Jan 2015 20:22:47 +0100 Subject: 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. --- tracker/Merge_wiki_website_and_website.mdwn | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tracker') 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?) -- cgit v1.2.3 From 992dd7f7f04983ffa5498398cfb49d5c4074ab93 Mon Sep 17 00:00:00 2001 From: Gustav Eek Date: Mon, 19 Jan 2015 23:05:35 +0100 Subject: Website merge, membership page incorporated The content of the page *medlemskap.org* is added as *medlemskap.mdwn*, and the link in the template *page.tmpl* is updated. --- tracker/Merge_wiki_website_and_website.mdwn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tracker') diff --git a/tracker/Merge_wiki_website_and_website.mdwn b/tracker/Merge_wiki_website_and_website.mdwn index cdf3c78..70a748b 100644 --- a/tracker/Merge_wiki_website_and_website.mdwn +++ b/tracker/Merge_wiki_website_and_website.mdwn @@ -41,10 +41,9 @@ Regarding merging, the following is the checklist: * *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?) + * *kontakt.org* -- Added as *kontakt.mdwn* * *medlemskap.en.org* -- Information added as *english.mdwn* - * *medlemskap.org* (what to do?) + * *medlemskap.org* -- Added as *medlemskap.mdwn* * *organisation.org* (what to do?) * *progressbar-example.html* (what to do?) * *robots.txt* (what to do?) @@ -55,6 +54,7 @@ Regarding merging, the following is the checklist: * *images/press/fripost_fria_tidningen_2011_2.jpg* * Check whether the content in *material* is available from the *propaganda* git repository. If it isn't, do something about it +* Check where *logo2011.eps* is available elsewhere. 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 -- cgit v1.2.3 From 1ef2963fa18e3063e0ae071feffee4f6661961d9 Mon Sep 17 00:00:00 2001 From: Gustav Eek Date: Mon, 19 Jan 2015 23:42:25 +0100 Subject: Website merge, The about page is finetuned. Most of the about page, *organisation.org*, was migrated already, available as *om.mdwn*. Minor modifications are made to *om.mdwn*. A notification page *notice.mdwn* is added, containing some notes from various org-mode pages. The notice page is orphan at this point. --- tracker/Merge_wiki_website_and_website.mdwn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tracker') diff --git a/tracker/Merge_wiki_website_and_website.mdwn b/tracker/Merge_wiki_website_and_website.mdwn index 70a748b..b54a1d1 100644 --- a/tracker/Merge_wiki_website_and_website.mdwn +++ b/tracker/Merge_wiki_website_and_website.mdwn @@ -44,10 +44,10 @@ Regarding merging, the following is the checklist: * *kontakt.org* -- Added as *kontakt.mdwn* * *medlemskap.en.org* -- Information added as *english.mdwn* * *medlemskap.org* -- Added as *medlemskap.mdwn* - * *organisation.org* (what to do?) - * *progressbar-example.html* (what to do?) - * *robots.txt* (what to do?) - * *sitemap.org* (what to do?) + * *organisation.org* -- Available as *om.mdwn* + * *progressbar-example.html* -- Droped + * *robots.txt* -- Dropped + * *sitemap.org* -- Dropped * Describe the press presence according to the following files * *images/press/spionen2011_liten.jpg* * *images/press/fripost_fria_tidningen_2011_1.jpg* -- cgit v1.2.3 From 4bc5505ee19ca0b66bdaf375d0af9f77e1daa790 Mon Sep 17 00:00:00 2001 From: Gustav Eek Date: Tue, 20 Jan 2015 20:03:18 +0100 Subject: Website merge, ideological texts added Two ideologically important texts were found in the org-mode based website's *from_wiki* directory: *princip.txt* and *fscons.txt*, a suggestion to declaration of principals for Fripost and an article text for FSCONS 2010. An *ideology* category (directory) is created with an overview page, *ideology.mdwn* and to content pages *princip.mdwn* and *fscons-2010.mdwn*. The index, *index.mdwn* is updated accordingly. --- tracker/Merge_wiki_website_and_website.mdwn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tracker') diff --git a/tracker/Merge_wiki_website_and_website.mdwn b/tracker/Merge_wiki_website_and_website.mdwn index b54a1d1..fe8572d 100644 --- a/tracker/Merge_wiki_website_and_website.mdwn +++ b/tracker/Merge_wiki_website_and_website.mdwn @@ -20,12 +20,12 @@ Regarding merging, the following is the checklist: * In *from_wiki*, the following pages should be attended and possibly added to the wiki. - * *budget.txt* (what to do?) + * *budget.txt* -- Dropped * *faq.txt* -- Content already in *faq.org* - * *fscons.txt* (what to do?) - * *index.txt* (what to do?) + * *fscons.txt* -- Added as *ideology/fscons-2010.mdwn* + * *index.txt* -- Dropped * *ordlista.txt* (what to do?) - * *princip.txt* (what to do?) + * *princip.txt* -- Added as *ideology/princip.mdwn* * *protokoll.txt* (what to do?) * *sidospår.txt* (what to do?) * *stadgar.txt* (what to do?) -- cgit v1.2.3 From be626309907f15772051bdccc1f7c5bd8d53cea5 Mon Sep 17 00:00:00 2001 From: Gustav Eek Date: Tue, 20 Jan 2015 21:17:35 +0100 Subject: Website merge, dictionary and idea added MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In *from_wiki* a list with language tips and translations was found, which is now added as *dictionary.mdwn*. Also the idea *sidospår.txt* is brought up under *hjalpa_till.mdwn* --- tracker/Merge_wiki_website_and_website.mdwn | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tracker') diff --git a/tracker/Merge_wiki_website_and_website.mdwn b/tracker/Merge_wiki_website_and_website.mdwn index fe8572d..dc43a47 100644 --- a/tracker/Merge_wiki_website_and_website.mdwn +++ b/tracker/Merge_wiki_website_and_website.mdwn @@ -24,13 +24,13 @@ Regarding merging, the following is the checklist: * *faq.txt* -- Content already in *faq.org* * *fscons.txt* -- Added as *ideology/fscons-2010.mdwn* * *index.txt* -- Dropped - * *ordlista.txt* (what to do?) + * *ordlista.txt* -- Added as *dictionary.mdwn* * *princip.txt* -- Added as *ideology/princip.mdwn* - * *protokoll.txt* (what to do?) - * *sidospår.txt* (what to do?) - * *stadgar.txt* (what to do?) - * *teknik.txt* (what to do?) - * *årsmöte.txt* (what to do?) + * *protokoll.txt* -- Avaliable among minutes already + * *sidospår.txt* -- Incorporated in *hjalpa_till.mdwn* + * *stadgar.txt* -- Dropped. Statues exists in the *meetings* git repository + * *teknik.txt* -- Dropped + * *årsmöte.txt* -- Dropped * In *sites* the following pages should be attended and possibly be added to the wiki * *certs* -- Added as a page, *certs.mdwn*, which is accessed from the main navigation bar -- cgit v1.2.3 From 26e3fe80f2981d86ab04acc70976d46894875f44 Mon Sep 17 00:00:00 2001 From: Gustav Eek Date: Tue, 20 Jan 2015 22:56:57 +0100 Subject: Website merge, some structure added to the ticket Some structure is added to the tracker ticket, and some concerns are raised. --- tracker/Merge_wiki_website_and_website.mdwn | 45 ++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) (limited to 'tracker') diff --git a/tracker/Merge_wiki_website_and_website.mdwn b/tracker/Merge_wiki_website_and_website.mdwn index dc43a47..6ea8553 100644 --- a/tracker/Merge_wiki_website_and_website.mdwn +++ b/tracker/Merge_wiki_website_and_website.mdwn @@ -5,6 +5,9 @@ and merge the content of the org-mode based into the wiki. [[gustav]] is working on the branch *fripost-wiki#ge-move-website*. +Requirements +============ + Regarding redesign, the following are requirements: * Visitors of [https://fripost.org] should be brought to the "Hem" page @@ -16,6 +19,9 @@ Regarding redesign, the following are requirements: should be editable but still displayed as if it was part of the website. +Checklist +========= + Regarding merging, the following is the checklist: * In *from_wiki*, the following pages should be attended and possibly @@ -55,7 +61,44 @@ 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 * Check where *logo2011.eps* is available elsewhere. - + +Doubts +====== + +There are still some doubts about how to proceed: + +**1.** How shall the becoming *fripost.org* be prepared for +publications from other sources, like the *fripost-meetings* Git +repository? Currently publication happens through + + rsync -ruvp --chmod=Dugo+rx,Fugo+r $(send-files) fripost@fripost.org:fripost.org/minutes/ + +and access through + + https://fripost.org/minutes/ + +**2.** I assume press images and similar can be published according to +the same structure: + + https://fripost.org/images/ + +**3.** Regarding how to enforce the soft separation between the wiki +and the website content, I don't know how to achieve that. + +I tried the following idea that did not work. The wiki content is left +untouched. All website content (apart from *hem.mdwn*) is moved into a +directory, *website*, and *hem.mdwn* is named *website.mdwn*. Then the +website is reached through *https://fripost.org* simply by making the +web server point those request to +*/website*. The *website.mdwn* will be +*/website/index.html* and default target. + +The problem was that links to shared static content (style sheets and +similar) with relative paths did not work. + +Other ideas to track +==================== + 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. -- cgit v1.2.3