aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/bugs/disable_sub-discussion_pages.mdwn7
-rw-r--r--doc/bugs/hardcoded___34__Discussion__34___link.mdwn9
-rw-r--r--doc/index/discussion.mdwn14
-rw-r--r--doc/patchqueue/more_class__61____34____34___for_css.mdwn41
4 files changed, 43 insertions, 28 deletions
diff --git a/doc/bugs/disable_sub-discussion_pages.mdwn b/doc/bugs/disable_sub-discussion_pages.mdwn
new file mode 100644
index 000000000..e004e53e1
--- /dev/null
+++ b/doc/bugs/disable_sub-discussion_pages.mdwn
@@ -0,0 +1,7 @@
+Any setting to disable having a discussion of a discussion?
+The [[features]] page says every page, but I don't want every page.
+I do want discussion subpage, but I don't want to have, for example: discussion/ discussion/ discussion.
+-- [[JeremyReed]]
+
+> Discussion pages should clearly be a special case that don't get Discussion
+> links put at the top. --[[Joey]]
diff --git a/doc/bugs/hardcoded___34__Discussion__34___link.mdwn b/doc/bugs/hardcoded___34__Discussion__34___link.mdwn
index 7c7ac1537..fc8406d87 100644
--- a/doc/bugs/hardcoded___34__Discussion__34___link.mdwn
+++ b/doc/bugs/hardcoded___34__Discussion__34___link.mdwn
@@ -21,6 +21,10 @@ or "History".
> link needs to be different if the Discussion page doesn't yet exist.
>> You can always use <tmpl_if> and <tmpl_else> construct in that place ;) --Pawel
+
+>>> Not without duplicating the logic that constructs a link to an
+>>> existing/nonexisting page in two places, one in code in ikiwiki and one
+>>> in the template. Not good design. --[[Joey]]
> As noted in [[patchqueue/l10n]], there are some other places in ikiwiki
> that hard code English strings, and I feel that using standard gettext
@@ -32,4 +36,7 @@ or "History".
>>
>> BTW, is there a chance for configurable name of Discussion page?
>> In my wiki I use only Polish name of pages, so I would like to have
->> dyskusja.html page, instead of discussion.html page. --Pawel \ No newline at end of file
+>> dyskusja.html page, instead of discussion.html page. --Pawel
+
+>>> I have an incomplete i10n patch for such hardcoded strings in the code,
+>>> which I hope to finish up eventually --[[Joey]]
diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn
index 4b3f3b4eb..15a85725a 100644
--- a/doc/index/discussion.mdwn
+++ b/doc/index/discussion.mdwn
@@ -232,21 +232,21 @@ editing a page. Is that an option that can be enabled?
Any setting for limiting how many kilobytes can be submitted via the "edit" form?
-- [[JeremyReed]]
-> Not currently. Worried about abuse? -man -[[Joey]]
+> Not currently. Worried about abuse? --[[Joey]]
>> I didn't want it abused accidently or with malice. I was thinking that Perl's CGI.pm would handle this, but I don't see that.
>> I read that textarea max bytes may be 500 lines or 28000 characters or 30000 characters or 64kB. It seems like it
>> varies and I didn't test myself, because I guess it may depend on different clients and different HTTP servers.
>> This could be checked using javascript on the client side (before submitting) and by checking size on server side (before saving). --[[JeremyReed]]
+>>> The absolute limit varies by browser. If there are web servers that
+>>> also limit it, I don't know of them. --[[Joey]]
+
----
# Disable sub-discussion pages?
-Any setting to disable having a discussion of a discussion?
-The [[features]] page says every page, but I don't want every page.
-I do want discussion subpage, but I don't want to have, for example: discussion/ discussion/ discussion.
--- [[JeremyReed]]
+> Moved to [[bugs]] -- [[Joey]]
----
@@ -261,6 +261,10 @@ What is the correct way to include ,v RCS revision files in my source tree witho
-- [[JeremyReed]]
+> Add the ,v to the $config{wiki_file_prune_regexps} array. This is how we
+> skip equivilant files from other revision control systems too.
+> --[[Joey]]]
+
----
# Textile Plugin
diff --git a/doc/patchqueue/more_class__61____34____34___for_css.mdwn b/doc/patchqueue/more_class__61____34____34___for_css.mdwn
index 4b77a3ebf..c91728633 100644
--- a/doc/patchqueue/more_class__61____34____34___for_css.mdwn
+++ b/doc/patchqueue/more_class__61____34____34___for_css.mdwn
@@ -2,32 +2,25 @@ I'm writing my own CSS for ikiwiki. During this effort I often found the need of
In this patch I plan to collect changes in this direction.
-The first, one-liner, patch is to use a "div" element with a class="actions" attribute for inline page as is done with non-inlined page. This way the same CSS formatting can be applied to div.actions in the CSS, while at the moment it must be duplicated for a span.actions (which I believe is also incorrect, since it will contain a "ul" element, not sure though). In case the markup should be differentiated it will still be possible relying on the fact that a div.actions is contained or not in a div.inlinepage.
+The first, one-liner, patch is to use a "div" element with a
+class="actions" attribute for inline page as is done with non-inlined page.
+This way the same CSS formatting can be applied to div.actions in the CSS,
+while at the moment it must be duplicated for a span.actions (which I
+believe is also incorrect, since it will contain a "ul" element, not sure
+though). In case the markup should be differentiated it will still be
+possible relying on the fact that a div.actions is contained or not in a
+div.inlinepage.
Here's the one-liner:
- --- /usr/share/ikiwiki/templates/inlinepage.tmpl 2006-12-28 16:24:06.000000000 +0100
- +++ inlinepage.tmpl.new 2006-12-28 16:24:04.000000000 +0100
- @@ -31,7 +31,7 @@
- </span>
+> applied --[[Joey]]
- <TMPL_IF NAME="HAVE_ACTIONS">
- -<span class="actions">
- +<div class="actions">
- <ul>
- <TMPL_IF NAME="EDITURL">
- <li><a href="<TMPL_VAR EDITURL>">Edit</a></li>
- @@ -40,7 +40,7 @@
- <li><TMPL_VAR DISCUSSIONLINK></li>
- </TMPL_IF>
- </ul>
- -</span>
- +</div>
- </TMPL_IF>
+The following adds a div element with class="trailer" around the
+meta-information added after an inlined page (namely: the post date, the
+tags, and the actions):
- </div>
-
-The following adds a div element with class="trailer" around the meta-information added after an inlined page (namely: the post date, the tags, and the actions):
+The following adds a div element with class="trailer" around the meta-informati
+on added after an inlined page (namely: the post date, the tags, and the actions):
--- inlinepage.tmpl.orig 2006-12-28 16:56:49.000000000 +0100
+++ inlinepage.tmpl 2006-12-28 17:02:06.000000000 +0100
@@ -47,4 +40,8 @@ The following adds a div element with class="trailer" around the meta-informatio
+
+</div>
-
+> Unfortunately, the inlinepage content passes through markdown, and markdown
+> gets confused by these nested div's and puts p's around one of them, generating
+> broken html. If you can come up with a way to put in the div that passes
+> the test suite, or a fix to markdown, I will accept it, but the above patch
+> fails the test suite. --[[Joey]]