diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-05-01 22:27:37 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-05-01 22:27:37 +0000 |
| commit | 819a31ed24cfb95da7e37a7524ecf0655e106903 (patch) | |
| tree | 460885cf688a87b1464b2dd943d0b2849665ff92 /templates | |
| parent | 3de6aab0a42bbcfa5fbf69a417b3f2023f8b684e (diff) | |
| download | ikiwiki-819a31ed24cfb95da7e37a7524ecf0655e106903.tar ikiwiki-819a31ed24cfb95da7e37a7524ecf0655e106903.tar.gz | |
* Rename inlinepage to depends, so that it can be used to refer to more
dependency relationships than just inlining. This will require a rebuild
on upgrade to this version.
* Move the rss link, put it in the blogpost form if there is one and at the
top if not. This is both nicer because easier to find, and it cleans up
the code which had used inlinepage as a flag for adding the link later.
* Allow the depends GlobList to be built up from multiple sources (such as
plugins) during a page render.
* Which means that more than one blog is now supported to appear on a
single page. (With some limitations.)
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/blogpost.tmpl | 3 | ||||
| -rw-r--r-- | templates/page.tmpl | 3 | ||||
| -rw-r--r-- | templates/rsslink.tmpl | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/templates/blogpost.tmpl b/templates/blogpost.tmpl index 22253d60b..1b93adc14 100644 --- a/templates/blogpost.tmpl +++ b/templates/blogpost.tmpl @@ -1,5 +1,8 @@ <form action="<TMPL_VAR CGIURL>" method="get"> <div id="blogform"> +<TMPL_IF NAME="RSSURL"> +<a class="rssbutton" type="application/rss+xml" href="<TMPL_VAR NAME=RSSURL>">RSS</a> +</TMPL_IF> <input type="hidden" name="do" value="blog" /> <input type="hidden" name="from" value="<TMPL_VAR ROOTPAGE>" /> <input type="hidden" name="subpage" value="1" /> diff --git a/templates/page.tmpl b/templates/page.tmpl index c9ec2a34f..4dc8e1139 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -67,9 +67,6 @@ Links: <!-- from <TMPL_VAR NAME=WIKINAME> --> Last edited <TMPL_VAR NAME=MTIME> </span> -<TMPL_IF NAME="RSSURL"> -<a class="rssbutton" type="application/rss+xml" href="<TMPL_VAR NAME=RSSURL>">RSS</a> -</TMPL_IF> </div> </body> diff --git a/templates/rsslink.tmpl b/templates/rsslink.tmpl new file mode 100644 index 000000000..f70c959d6 --- /dev/null +++ b/templates/rsslink.tmpl @@ -0,0 +1,5 @@ +<div id="rsslink"> +<TMPL_IF NAME="RSSURL"> +<a class="rssbutton" type="application/rss+xml" href="<TMPL_VAR NAME=RSSURL>">RSS</a> +</TMPL_IF> +</div> |