Merge branch 'master' of ssh://git.ikiwiki.info

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 285013e49175c8651055bb53e34e71e44115699c..c00bf52752e9326a3ffc40855ed8b130dced74ce 100644 (file)
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -443,10 +443,7 @@ sub editcomment ($$) {
                $content .= " nickname=\"$nickname\"\n";
        }
        elsif (defined $session->remote_addr()) {
-               my $ip = $session->remote_addr();
-               if ($ip =~ m/^([.0-9]+)$/) {
-                       $content .= " ip=\"$1\"\n";
-               }
+               $content .= " ip=\"".$session->remote_addr()."\"\n";
        }
 
        if ($config{comments_allowauthor}) {

diff --git a/debian/changelog b/debian/changelog
index 5a6f7f437fc499a6de8a59bd121aef0026712cc0..8c1c685be33f540a15627907dc1e44de3dc9256e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ikiwiki (3.20120630) UNRELEASED; urgency=low
     Thanks, Genevieve
   * osm: osm_layers can be used to configured the layers displayed on the map.
     Thanks, Antoine Beaupré
+  * comments: Remove ipv6 address specific code.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 19 Jul 2012 13:46:52 -0400
 

diff --git a/doc/bugs/ipv6_address_in_comments.mdwn b/doc/bugs/ipv6_address_in_comments.mdwn
index 55d66e785b346e9bd91c4128806b31414796c8a4..5e535b9196298d0e29f4b3e409ee57fa0e1d256b 100644 (file)
--- a/doc/bugs/ipv6_address_in_comments.mdwn
+++ b/doc/bugs/ipv6_address_in_comments.mdwn
@@ -13,3 +13,5 @@ the problem for me. Not sure if this is the best solution. --[[cstamas]]
 [[patch]]
 
 [[!tag ipv6]]
+
+> [[done]] --[[Joey]] 

diff --git a/doc/style.css b/doc/style.css
index 6e2afce66b97075614b067991833ed578b8b195f..5fb4100324b0c9d5d8d794adfece2caff42a3047 100644 (file)
--- a/doc/style.css
+++ b/doc/style.css
@@ -202,6 +202,10 @@ div.recentchanges {
        margin-top: 1em;
 }
 
+.archivepagedate {
+       font-style: italic;
+}
+
 .error {
        color: #C00;
 }

diff --git a/doc/todo/ease_archivepage_styling.mdwn b/doc/todo/ease_archivepage_styling.mdwn
index 12ae9a3ff1c434209cebc9989f2795c006208ace..67415c17611ca5600e1bff06e1b81562aa4ef7af 100644 (file)
--- a/doc/todo/ease_archivepage_styling.mdwn
+++ b/doc/todo/ease_archivepage_styling.mdwn
@@ -56,3 +56,4 @@ a local CSS:
        -- 
        1.7.10.4
 
+> [[done]] --[[Joey]]

diff --git a/templates/archivepage.tmpl b/templates/archivepage.tmpl
index 93bdd9ce0e50135eec16dd4b7b6a9c5c5969a190..3e0bd9bc20c2d228ce2958ca2d80496c8aec5190 100644 (file)
--- a/templates/archivepage.tmpl
+++ b/templates/archivepage.tmpl
@@ -1,10 +1,10 @@
-<p>
+<div class="archivepage">
 <TMPL_IF PERMALINK>
 <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a><br />
 <TMPL_ELSE>
 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a><br />
 </TMPL_IF>
-<i>
+<span class="archivepagedate">
 Posted <TMPL_VAR CTIME>
 <TMPL_IF AUTHOR>
 by <span class="author">
@@ -15,5 +15,5 @@ by <span class="author">
 </TMPL_IF>
 </span>
 </TMPL_IF>
-</i>
-</p>
+</span>
+</div>