From: Carl Worth Date: Tue, 22 May 2007 07:07:48 +0000 (-0700) Subject: Add templates to revision control, and configure to use these. X-Git-Url: https://git.cworth.org/git?p=cworth.org;a=commitdiff_plain;h=aa86026ab68bfcc7adeb354bc2805f92ff38034f Add templates to revision control, and configure to use these. This should give us a lot of flexibility by allowing us to edit both the templates and the stylesheets within git and use these version-controlled copies of the files to generate the final content. --- diff --git a/ikiwiki.setup b/ikiwiki.setup index cec65c2..865da28 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -16,7 +16,7 @@ use IkiWiki::Setup::Standard { url => "http://cworth.org", #cgiurl => "http://example.org/ikiwiki.cgi", - #templatedir => "/usr/share/ikiwiki/templates", + templatedir => "/srv/cworth.org/wiki/checkout/templates", underlaydir => "/dev/null", # Git stuff. diff --git a/templates/aggregatepost.tmpl b/templates/aggregatepost.tmpl new file mode 100644 index 0000000..5b0f2f4 --- /dev/null +++ b/templates/aggregatepost.tmpl @@ -0,0 +1,12 @@ + + +[[tag ]] + + +[[meta title=""]] + + +[[meta permalink=""]] + +[[meta author=""]] +[[meta authorurl=""]] diff --git a/templates/archivepage.tmpl b/templates/archivepage.tmpl new file mode 100644 index 0000000..6bc789d --- /dev/null +++ b/templates/archivepage.tmpl @@ -0,0 +1,7 @@ +

+
+ +Posted + + +

diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl new file mode 100644 index 0000000..bdbfe69 --- /dev/null +++ b/templates/atomitem.tmpl @@ -0,0 +1,24 @@ + + <TMPL_VAR TITLE ESCAPE=HTML> + + + + + + + + + + + + + + + + +
+ +
+ + + diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl new file mode 100644 index 0000000..b811b87 --- /dev/null +++ b/templates/atompage.tmpl @@ -0,0 +1,15 @@ + + + +<TMPL_VAR TITLE ESCAPE=HTML> + + + + + + + +ikiwiki + + + diff --git a/templates/blogpost.tmpl b/templates/blogpost.tmpl new file mode 100644 index 0000000..7eeede6 --- /dev/null +++ b/templates/blogpost.tmpl @@ -0,0 +1,16 @@ +
+
+ +RSS + + +Atom + + + + + + + +
+
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl new file mode 100644 index 0000000..08f1608 --- /dev/null +++ b/templates/editpage.tmpl @@ -0,0 +1,93 @@ + + + + + +<TMPL_VAR FORM-TITLE> + + + + + + + + +

+Your changes conflict with other changes made to the page. +

+

+Conflict markers have been inserted into the page content. Reconcile the +conflict and commit again to save your changes. +

+ + +

+Failed to save your changes. +

+

+Your changes were not able to be saved to disk. The system gave the error: +

+ +
+Your changes are preserved below, and you can try again to save them. +

+ + +

+The page you were editing has disappeared. +

+

+Perhaps someone else has deleted it or moved it. If you want to recreate +this page with your text, click "Save Page" again. +

+ + +

+While you were creating this page, someone else independently created a page +with the same name. +

+

+The edit box below contains the page's current content, followed by the +content you entered previously, to allow you to merge the two +together before saving. +

+ + +
+/ +
+ + + + + +Page location: +Page type: + +
+ + + +
+ +Optional comment about this change:
+
+ + + + + +
+
+Page preview: +
+
+ +
+ + + + diff --git a/templates/estseek.conf b/templates/estseek.conf new file mode 100644 index 0000000..43bd303 --- /dev/null +++ b/templates/estseek.conf @@ -0,0 +1,31 @@ +indexname: +tmplfile: +topfile: /dev/null +logfile: +logformat: +replace: ^file://{{!}} +showreal: false +perpage: 10,20,30,40,50,100 +attrselect: false +showscore: false +extattr: date|Date +snipwwidth: 480 +sniphwidth: 96 +snipawidth: 96 +condgstep: 2 +dotfidf: true +scancheck: false +smplphrase: true +phraseform: 2 +candetail: true +smlrvnum: 0 +smlrtune: 16 1024 4096 +clipview: 2 +relkeynum: 0 +spcache: +wildmax: 256 +qxpndcmd: +helpfile: estseek.help +deftitle: +attrwidth: 80 +dispproxy: diff --git a/templates/feedlink.tmpl b/templates/feedlink.tmpl new file mode 100644 index 0000000..2963156 --- /dev/null +++ b/templates/feedlink.tmpl @@ -0,0 +1,8 @@ + diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl new file mode 100644 index 0000000..e1943ba --- /dev/null +++ b/templates/inlinepage.tmpl @@ -0,0 +1,46 @@ +
+ + + + + + + + + + + + + + + + + + + +Posted + + + + +Tags: + + + + + + + +
+ +
+ + +
diff --git a/templates/misc.tmpl b/templates/misc.tmpl new file mode 100644 index 0000000..32e2c93 --- /dev/null +++ b/templates/misc.tmpl @@ -0,0 +1,31 @@ + + + + + +<TMPL_VAR TITLE> + + + + + + + + +
+ +/ + +
+ +
+ +
+ + + + + diff --git a/templates/notifymail.tmpl b/templates/notifymail.tmpl new file mode 100644 index 0000000..e3a1dd3 --- /dev/null +++ b/templates/notifymail.tmpl @@ -0,0 +1,4 @@ +The following change was made by : + + + diff --git a/templates/page.tmpl b/templates/page.tmpl new file mode 100644 index 0000000..fd44a53 --- /dev/null +++ b/templates/page.tmpl @@ -0,0 +1,101 @@ + + + + +<TMPL_VAR TITLE> + + + + + + + + + + +
+ + +/ + + + + + + +
+ + +
+ +
+ + + + + + +
+ +
+ + + + + diff --git a/templates/passwordmail.tmpl b/templates/passwordmail.tmpl new file mode 100644 index 0000000..8484d39 --- /dev/null +++ b/templates/passwordmail.tmpl @@ -0,0 +1,10 @@ +Someone[1], possibly you, requested that you be emailed the password for user + on [2]. + +The password is: + +-- +ikiwiki + +[1] The user requesting the password was at IP address +[2] Located at diff --git a/templates/recentchanges.tmpl b/templates/recentchanges.tmpl new file mode 100644 index 0000000..e954503 --- /dev/null +++ b/templates/recentchanges.tmpl @@ -0,0 +1,71 @@ + + + + + +<TMPL_VAR TITLE> + + + + + + + + +
+ +/ + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + +
usertimechanges
+ + + "> + diff + + + + + + +
+ + +
+ + +
+
+ + + + + diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl new file mode 100644 index 0000000..0fab42e --- /dev/null +++ b/templates/rssitem.tmpl @@ -0,0 +1,21 @@ + + + <TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE ESCAPE=HTML> + + + <TMPL_VAR TITLE ESCAPE=HTML> + + + + + + + + + + + + + ]]> + + diff --git a/templates/rsspage.tmpl b/templates/rsspage.tmpl new file mode 100644 index 0000000..38f9b16 --- /dev/null +++ b/templates/rsspage.tmpl @@ -0,0 +1,9 @@ + + + +<TMPL_VAR TITLE ESCAPE=HTML> + + + + + diff --git a/templates/searchform.tmpl b/templates/searchform.tmpl new file mode 100644 index 0000000..7c4fdb0 --- /dev/null +++ b/templates/searchform.tmpl @@ -0,0 +1,7 @@ +
+
+ + + +
+
diff --git a/templates/titlepage.tmpl b/templates/titlepage.tmpl new file mode 100644 index 0000000..f5cd5bc --- /dev/null +++ b/templates/titlepage.tmpl @@ -0,0 +1 @@ +