summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-01-22Reapply 'Fix strip edit and prefs actions.'allinone-nonedit-daJonas Smedegaard
2009-01-22Merge branch 'clean-da' into allinone-nonedit-daJonas Smedegaard
2009-01-22Revert "Fix strip edit and prefs actions."clean-daJonas Smedegaard
This reverts commit 90401bdc7cb46bc15e522cddaf1d22a4deb56e0b.
2008-11-17Merge branch 'wian-da' into allinone-nonedit-daJonas Smedegaard
2008-11-17Merge branch 'scs-da' into allinone-nonedit-daJonas Smedegaard
2008-11-17Merge branch 'clean-da' into allinone-nonedit-daJonas Smedegaard
2008-11-17Merge branch 'master-da' into wian-dawian-daJonas Smedegaard
2008-11-17Merge branch 'master-da' into scs-dascs-daJonas Smedegaard
2008-11-17Fix strip edit and prefs actions.master-daJonas Smedegaard
2008-11-01Merge branch 'wian-da' into allinone-nonedit-daJonas Smedegaard
2008-11-01Merge branch 'wian' into wian-daJonas Smedegaard
2008-11-01Rely on branding_logo_text (not branding_logo). Add branding_logo_tagline.wianJonas Smedegaard
2008-11-01Merge branch 'wian-da' into allinone-nonedit-daJonas Smedegaard
2008-11-01Merge branch 'wian' into wian-daJonas Smedegaard
2008-11-01Add branding divs above header.Jonas Smedegaard
2008-10-23Merge branch 'wian-da' into allinone-nonedit-daJonas Smedegaard
2008-10-23Merge branch 'scs-da' into allinone-nonedit-daJonas Smedegaard
2008-10-23Merge branch 'clean-da' into allinone-nonedit-daJonas Smedegaard
2008-10-23Merge branch 'master-da' into wian-daJonas Smedegaard
2008-10-23Merge branch 'master-da' into scs-daJonas Smedegaard
2008-10-23Merge branch 'master' into wianJonas Smedegaard
2008-10-23Merge branch 'master' into master-da + translateJonas Smedegaard
Conflicts (replaced with updated PO-based translation): renamesummary.tmpl
2008-10-22Sync with ikiwiki 2.67.HEADmastercleanJonas Smedegaard
2008-08-30Merge branch 'master' into wianJonas Smedegaard
2008-08-30Sync with ikiwiki 2.62.1.Jonas Smedegaard
2008-08-11Merge branch 'wian-da' into allinone-nonedit-daJonas Smedegaard
2008-08-11Merge branch 'wian' into wian-daJonas Smedegaard
2008-08-11Add container and wrapper div to misc.tmpl.Jonas Smedegaard
2008-08-09Merge branch 'master-nonedit-da' into allinone-nonedit-daJonas Smedegaard
2008-08-09Strip EDITURL and PREFSURL from actions.Jonas Smedegaard
2008-08-08Merge branches 'clean-da', 'scs-da' and 'wian-da' into allinone-daJonas Smedegaard
2008-08-08Merge branch 'master-da' into wian-daJonas Smedegaard
2008-08-08Merge branch 'master-da' into scs-daJonas Smedegaard
2008-08-08Translate Modified -> Ændret. Fix typp aog -> og.Jonas Smedegaard
2008-08-06Merge branch 'wian-da' into allinone-daJonas Smedegaard
2008-08-06Merge branch 'wian' into wian-daJonas Smedegaard
2008-08-06Add topbar (above content wrapper).Jonas Smedegaard
2008-08-02Merge branch 'wian-da' into allinone-daJonas Smedegaard
2008-08-02Merge branch 'wian' into wian-daJonas Smedegaard
2008-08-02Layout Gala, source order and "What's in a name".Jonas Smedegaard
The website http://blog.html.it/layoutgala/ present a simple yet flexible html structure allowing 40 different visualisations by changing only CSS. As of 2.56, ikiwiki use this DIV structure: .header #sidebar #content #footer Layout Gala use the following DIV structure: #container #header #wrapper #content #navigation #extra #footer With this patch (and previous ones) the following DIV structure is used: #container .header #wrapper #content #sidebar #farbar #footer Specifically, the following is changed: * container added around whole body + needed for Layout Gala + allows setting cosmetic outer space/coloring around whole body * sidebar moved below content + needed for Layout Gala + considered by some to improve accessibility + considered by some as part of Search Engine Optimization (SEO) * farbar added (needs a clone on sidebar plugin to be of any use) + no grand benefit - but hurts noone if unused either The following continues to not match Layout Gala: * header is a class, not an id + too intrusive to change: many iki sites may rely on current class + too ugly to add: technically possible to extend .pageheader to also be # header and still preserve .header, but too confusing with both .header and #header meaning different things. * sidebar instead of navigation + too intrusive to change... * farbar instead of extra + when sidebar is kept, extend it - inspired by http://green-beast.com/seabeast/ as mentioned at the discussion at http://green-beast.com/blog/?p=117 As a bonus, this fits pretty well with the proposed naming scheme at http://www.stuffandnonsense.co.uk/archives/whats_in_a_name_pt2.html (is it did already with plain ikiwik - thanks for that, Joey!)
2008-08-02Better source order: sidebar below content.Jonas Smedegaard
2008-08-02Add container div framing whole body.Jonas Smedegaard
2008-08-02Merge branches 'clean-da' and 'scs-da' into allinone-daJonas Smedegaard
2008-08-02Merge branch 'master-da' into scs-daJonas Smedegaard
2008-08-02Merge branch 'master' into master-daJonas Smedegaard
Conflicts (manually resolved): atomitem.tmpl atompage.tmpl estseek.conf Also dropped the following (changed earlier than 2.56 but missed): estseek.conf estseek.help
2008-08-02Sync with ikiwiki 2.56.Jonas Smedegaard
2008-08-01Merge branch 'master-da' into scs-daJonas Smedegaard
Conflicts (merged manually): page.tmpl
2008-08-01Merge branch 'master' into master-daJonas Smedegaard
Conflicts (merged manually): editpage.tmpl searchquery.tmpl Pages translated as part of the merge: editconflict.tmpl editcreationconflict.tmpl editfailedsave.tmpl editpagegone.tmpl renamesummary.tmpl
2008-08-01Sync with ikiwiki 2.55.Jonas Smedegaard
2008-06-14Merge branch 'master-da' into scs-daJonas Smedegaard