From 6b1c0573eaff7d22f625452cfbfe2967c0647ea2 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@schwinge.name>
Date: Tue, 8 Jun 2010 10:34:13 +0000
Subject: Update to ikiwiki b10d353490197b576ef7bf2e8bf8016039efbd2d.

---
 .templates/editpage.tmpl | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to '.templates/editpage.tmpl')

diff --git a/.templates/editpage.tmpl b/.templates/editpage.tmpl
index 45060ffe..53ce934e 100644
--- a/.templates/editpage.tmpl
+++ b/.templates/editpage.tmpl
@@ -1,4 +1,3 @@
-<br />
 <TMPL_VAR JAVASCRIPT>
 <TMPL_VAR MESSAGE>
 <TMPL_VAR FORM-START>
@@ -7,19 +6,26 @@
 <TMPL_VAR FIELD-FROM>
 <TMPL_VAR FIELD-RCSINFO>
 <TMPL_VAR FIELD-NEWFILE>
+<ol class="form">
 <TMPL_IF NAME="PAGE_SELECT">
-Page location: <TMPL_VAR FIELD-PAGE>
-Page type: <TMPL_VAR FIELD-TYPE>
+<li>
+<label for="page" class="inline">Page location:</label><TMPL_VAR FIELD-PAGE>
+<label for="type" class="inline">Page type:</label><TMPL_VAR FIELD-TYPE>
+</li>
 <TMPL_ELSE>
-<br />
 <TMPL_VAR FIELD-PAGE>
 <TMPL_VAR FIELD-TYPE>
 </TMPL_IF>
+<li>
 <TMPL_VAR FIELD-EDITCONTENT><br />
+</li>
 <TMPL_IF NAME="CAN_COMMIT">
-Optional comment about this change:<br />
+<li>
+<label for="comments" class="block">Optional comment about this change:</label>
 <TMPL_VAR FIELD-COMMENTS><br />
+</li>
 </TMPL_IF>
+</ol>
 
 <div class="copyright_assignment_notice">
 
@@ -66,3 +72,12 @@ if there are questions.</p>
 <TMPL_VAR PAGE_PREVIEW>
 </div>
 </TMPL_IF>
+<TMPL_IF NAME="PAGE_DIFF">
+<hr />
+<div class="header">
+<span>Diff:</span>
+</div>
+<div id="diff">
+<TMPL_VAR PAGE_DIFF>
+</div>
+</TMPL_IF>
-- 
cgit v1.2.3


From ceafdbd492684b8545c9b944e2b0aaec84994c5c Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@schwinge.name>
Date: Thu, 10 Jun 2010 22:27:54 +0200
Subject: Update to ikiwiki a31ce0e97d1e1c476a1fcdb52a2d78cadb845557.

---
 .templates/editpage.tmpl |  2 ++
 .templates/page.tmpl     |  4 ++++
 local.css                | 14 --------------
 3 files changed, 6 insertions(+), 14 deletions(-)

(limited to '.templates/editpage.tmpl')

diff --git a/.templates/editpage.tmpl b/.templates/editpage.tmpl
index 53ce934e..237a6c92 100644
--- a/.templates/editpage.tmpl
+++ b/.templates/editpage.tmpl
@@ -17,7 +17,9 @@
 <TMPL_VAR FIELD-TYPE>
 </TMPL_IF>
 <li>
+<div class="editcontentdiv">
 <TMPL_VAR FIELD-EDITCONTENT><br />
+</div>
 </li>
 <TMPL_IF NAME="CAN_COMMIT">
 <li>
diff --git a/.templates/page.tmpl b/.templates/page.tmpl
index 45d28697..4ec3b4bf 100644
--- a/.templates/page.tmpl
+++ b/.templates/page.tmpl
@@ -118,6 +118,8 @@
 <TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
+<div id="pagebody">
+
 <TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF>
 <TMPL_VAR CONTENT>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
@@ -135,6 +137,8 @@
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
+</div>
+
 <TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
 <TMPL_UNLESS DYNAMIC>
 <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
diff --git a/local.css b/local.css
index d705f3b4..8669e5e3 100644
--- a/local.css
+++ b/local.css
@@ -51,7 +51,6 @@ pre
   margin-left: 3em;
   font-weight: bold;
   padding: 0.5em;
-  overflow: auto;
 }
 
 a
@@ -286,16 +285,3 @@ a:hover
   padding-top: 0.3em;
   padding-bottom: 0.3em;
 }
-
-div.recentchanges
-{
-  clear: none;
-  width: auto;
-}
-
-/* Stop inlined pages (in news, tag/*, and so on) from running into the
-   sidebar.  */
-.inlinepage
-{
-  overflow: auto;
-}
-- 
cgit v1.2.3


From ef7ff40ebd0fc909ef14b66a32028c44c3e575af Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@schwinge.name>
Date: Sun, 20 Jun 2010 20:28:11 +0200
Subject: Update to ikiwiki 31fa7714e7a3eba6e34b601426047f2aa2f8db01.

---
 .templates/editpage.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.templates/editpage.tmpl')

diff --git a/.templates/editpage.tmpl b/.templates/editpage.tmpl
index 237a6c92..0798695e 100644
--- a/.templates/editpage.tmpl
+++ b/.templates/editpage.tmpl
@@ -23,8 +23,8 @@
 </li>
 <TMPL_IF NAME="CAN_COMMIT">
 <li>
-<label for="comments" class="block">Optional comment about this change:</label>
-<TMPL_VAR FIELD-COMMENTS><br />
+<label for="editmessage" class="block">Optional comment about this change:</label>
+<TMPL_VAR FIELD-EDITMESSAGE><br />
 </li>
 </TMPL_IF>
 </ol>
-- 
cgit v1.2.3


From cf215973be27997514a2b9360b3c54cff7ad0649 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@schwinge.name>
Date: Sun, 20 Jun 2010 20:32:55 +0200
Subject: Update to ikiwiki ec3cadb0659e747e66c1cfd48a0475ee8bbe5bcb.

---
 .templates/editpage.tmpl | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to '.templates/editpage.tmpl')

diff --git a/.templates/editpage.tmpl b/.templates/editpage.tmpl
index 0798695e..1ecbd0a9 100644
--- a/.templates/editpage.tmpl
+++ b/.templates/editpage.tmpl
@@ -1,33 +1,26 @@
 <TMPL_VAR JAVASCRIPT>
 <TMPL_VAR MESSAGE>
+<br />
 <TMPL_VAR FORM-START>
 <TMPL_VAR FIELD-DO>
 <TMPL_VAR FIELD-SID>
 <TMPL_VAR FIELD-FROM>
 <TMPL_VAR FIELD-RCSINFO>
 <TMPL_VAR FIELD-NEWFILE>
-<ol class="form">
 <TMPL_IF NAME="PAGE_SELECT">
-<li>
 <label for="page" class="inline">Page location:</label><TMPL_VAR FIELD-PAGE>
 <label for="type" class="inline">Page type:</label><TMPL_VAR FIELD-TYPE>
-</li>
 <TMPL_ELSE>
 <TMPL_VAR FIELD-PAGE>
 <TMPL_VAR FIELD-TYPE>
 </TMPL_IF>
-<li>
 <div class="editcontentdiv">
 <TMPL_VAR FIELD-EDITCONTENT><br />
 </div>
-</li>
 <TMPL_IF NAME="CAN_COMMIT">
-<li>
 <label for="editmessage" class="block">Optional comment about this change:</label>
 <TMPL_VAR FIELD-EDITMESSAGE><br />
-</li>
 </TMPL_IF>
-</ol>
 
 <div class="copyright_assignment_notice">
 
-- 
cgit v1.2.3