Merge branch 'website-separation'

Conflicts:
	templates/page.tmpl

1 files changed, 73 insertions, 30 deletions

diff --git a/tracker/Merge_wiki_website_and_website.mdwn b/tracker/Merge_wiki_website_and_website.mdwn
index 4923e60..6ea8553 100644
--- a/tracker/Merge_wiki_website_and_website.mdwn
+++ b/tracker/Merge_wiki_website_and_website.mdwn
@@ -5,57 +5,100 @@ 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
 * 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", "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.
 
+Checklist
+=========
+
 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?)
-  * *fscons.txt* (what to do?)
-  * *index.txt* (what to do?)
-  * *ordlista.txt* (what to do?)
-  * *princip.txt* (what to do?)
-  * *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?)
+  * *budget.txt* -- Dropped
+  * *faq.txt* -- Content already in *faq.org*
+  * *fscons.txt* -- Added as *ideology/fscons-2010.mdwn*
+  * *index.txt* -- Dropped
+  * *ordlista.txt* -- Added as *dictionary.mdwn*
+  * *princip.txt* -- Added as *ideology/princip.mdwn*
+  * *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* (what to do?)
-  * *certs.asc* (what to do?)
-  * *default.css* (what to do?)
-  * *faq.org* (what to do?)
-  * *gnutiken.org* (what to do?)
-  * *index.en.org* (what to do?)
-  * *index.org* (what to do?)
-  * *kontakt.en.org* (what to do?)
-  * *kontakt.org* (what to do?)
-  * *logo2011.eps* (what to do?)
-  * *medlemskap.en.org* (what to do?)
-  * *medlemskap.org* (what to do?)
-  * *organisation.org* (what to do?)
-  * *progressbar-example.html* (what to do?)
-  * *robots.txt* (what to do?)
-  * *sitemap.org* (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* -- Merged with *faq.mdwn*
+  * *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* -- Added as *kontakt.mdwn*
+  * *medlemskap.en.org* -- Information added as *english.mdwn*
+  * *medlemskap.org* -- Added as *medlemskap.mdwn*
+  * *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*
   * *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.
+
+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/<whatever-asked-for>
+
+**2.** I assume press images and similar can be published according to
+the same structure:
+
+    https://fripost.org/images/<whatever-asked-for>
+
+**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
+*<path-to-fripost-wiki>/website*. The *website.mdwn* will be
+*<path-to-fripost-wiki>/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.