[geeklog-hg] geeklog: Fixed comments not indenting correctly when nested (bug...

[geeklog-cvs at lists.geeklog.net]

changeset 9046:baf7baae5c3b
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/baf7baae5c3b
user: dengen
date: Tue Apr 09 01:37:25 2013 +0900
description:
Fixed comments not indenting correctly when nested (bug #0001581)
Set the maximum indentation level to 16.

diffstat:

 public_html/layout/denim/css_ltr/style.css                  |  21 ++-
 public_html/layout/denim/css_rtl/style.css                  |  21 ++-
 public_html/layout/modern_curve/css/comment/comment.css     |  61 ++++++++++--
 public_html/layout/professional_css/css/comment/comment.css |  59 ++++++++++--
 system/lib-comment.php                                      |   4 +
 5 files changed, 127 insertions(+), 39 deletions(-)

diffs (279 lines):

diff -r a3b9787c6cfa -r baf7baae5c3b public_html/layout/denim/css_ltr/style.css
--- a/public_html/layout/denim/css_ltr/style.css	Mon Apr 08 23:25:00 2013 +0900
+++ b/public_html/layout/denim/css_ltr/style.css	Tue Apr 09 01:37:25 2013 +0900
@@ -1928,13 +1928,20 @@
 .level-0   { margin-left: 0; } /* rtl */
 .level-25  { margin-left: 16px; } /* rtl */
 .level-50  { margin-left: 32px; } /* rtl */
-.level-100 { margin-left: 48px; } /* rtl */
-.level-125 { margin-left: 64px; } /* rtl */
-.level-150 { margin-left: 80px; } /* rtl */
-.level-175 { margin-left: 96px; } /* rtl */
-.level-200 { margin-left: 112px; } /* rtl */
-.level-225 { margin-left: 128px; } /* rtl */
-.level-250 { margin-left: 144px; } /* rtl */
+.level-75  { margin-left: 48px; } /* rtl */
+.level-100 { margin-left: 64px; } /* rtl */
+.level-125 { margin-left: 80px; } /* rtl */
+.level-150 { margin-left: 96px; } /* rtl */
+.level-175 { margin-left: 112px; } /* rtl */
+.level-200 { margin-left: 128px; } /* rtl */
+.level-225 { margin-left: 144px; } /* rtl */
+.level-250 { margin-left: 160px; } /* rtl */
+.level-275 { margin-left: 176px; } /* rtl */
+.level-300 { margin-left: 192px; } /* rtl */
+.level-325 { margin-left: 208px; } /* rtl */
+.level-350 { margin-left: 224px; } /* rtl */
+.level-375 { margin-left: 240px; } /* rtl */
+.level-400 { margin-left: 256px; } /* rtl */
 
 /* Comment Information  */
 .comment_status {
diff -r a3b9787c6cfa -r baf7baae5c3b public_html/layout/denim/css_rtl/style.css
--- a/public_html/layout/denim/css_rtl/style.css	Mon Apr 08 23:25:00 2013 +0900
+++ b/public_html/layout/denim/css_rtl/style.css	Tue Apr 09 01:37:25 2013 +0900
@@ -1928,13 +1928,20 @@
 .level-0   { margin-right: 0; } /* rtl */
 .level-25  { margin-right: 16px; } /* rtl */
 .level-50  { margin-right: 32px; } /* rtl */
-.level-100 { margin-right: 48px; } /* rtl */
-.level-125 { margin-right: 64px; } /* rtl */
-.level-150 { margin-right: 80px; } /* rtl */
-.level-175 { margin-right: 96px; } /* rtl */
-.level-200 { margin-right: 112px; } /* rtl */
-.level-225 { margin-right: 128px; } /* rtl */
-.level-250 { margin-right: 144px; } /* rtl */
+.level-75  { margin-right: 48px; } /* rtl */
+.level-100 { margin-right: 64px; } /* rtl */
+.level-125 { margin-right: 80px; } /* rtl */
+.level-150 { margin-right: 96px; } /* rtl */
+.level-175 { margin-right: 112px; } /* rtl */
+.level-200 { margin-right: 128px; } /* rtl */
+.level-225 { margin-right: 144px; } /* rtl */
+.level-250 { margin-right: 160px; } /* rtl */
+.level-275 { margin-right: 176px; } /* rtl */
+.level-300 { margin-right: 192px; } /* rtl */
+.level-325 { margin-right: 208px; } /* rtl */
+.level-350 { margin-right: 224px; } /* rtl */
+.level-375 { margin-right: 240px; } /* rtl */
+.level-400 { margin-right: 256px; } /* rtl */
 
 /* Comment Information  */
 .comment_status {
diff -r a3b9787c6cfa -r baf7baae5c3b public_html/layout/modern_curve/css/comment/comment.css
--- a/public_html/layout/modern_curve/css/comment/comment.css	Mon Apr 08 23:25:00 2013 +0900
+++ b/public_html/layout/modern_curve/css/comment/comment.css	Tue Apr 09 01:37:25 2013 +0900
@@ -127,8 +127,8 @@
 }
 
 /* Individual Comment Level(Nested | Tree) */
-div.comments div.level-25,
-div.comments ul.level-25 {
+div.comments div.level-0,
+div.comments ul.level-0 {
   margin-{left}: 0;
 }
 
@@ -142,39 +142,74 @@
   margin-{left}: 32px;
 }
 
+div.comments div.level-75,
+div.comments ul.level-75 {
+  margin-{left}: 48px;
+}
+
 div.comments div.level-100,
 div.comments ul.level-100 {
-  margin-{left}: 48px;
+  margin-{left}: 64px;
 }
 
 div.comments div.level-125,
 div.comments ul.level-125 {
-  margin-{left}: 64px;
-}
-
-div.comments div.level-150
-div.comments ul.level-150 {
   margin-{left}: 80px;
 }
 
-div.comments div.level-175
+div.comments div.level-150,
+div.comments ul.level-150 {
+  margin-{left}: 96px;
+}
+
+div.comments div.level-175,
 div.comments ul.level-175 {
-  margin-{left}: 96px;
+  margin-{left}: 112px;
 }
 
 div.comments div.level-200,
 div.comments ul.level-200 {
-  margin-{left}: 112px;
+  margin-{left}: 128px;
 }
 
 div.comments div.level-225,
 div.comments ul.level-225 {
-  margin-{left}: 128px;
+  margin-{left}: 144px;
 }
 
 div.comments div.level-250,
 div.comments ul.level-250 {
-  margin-{left}: 144px;
+  margin-{left}: 160px;
+}
+
+div.comments div.level-275,
+div.comments ul.level-275 {
+  margin-{left}: 176px;
+}
+
+div.comments div.level-300,
+div.comments ul.level-300 {
+  margin-{left}: 192px;
+}
+
+div.comments div.level-325,
+div.comments ul.level-325 {
+  margin-{left}: 208px;
+}
+
+div.comments div.level-350,
+div.comments ul.level-350 {
+  margin-{left}: 224px;
+}
+
+div.comments div.level-375,
+div.comments ul.level-375 {
+  margin-{left}: 240px;
+}
+
+div.comments div.level-400,
+div.comments ul.level-400 {
+  margin-{left}: 256px;
 }
 
 /* Comment Information  */
diff -r a3b9787c6cfa -r baf7baae5c3b public_html/layout/professional_css/css/comment/comment.css
--- a/public_html/layout/professional_css/css/comment/comment.css	Mon Apr 08 23:25:00 2013 +0900
+++ b/public_html/layout/professional_css/css/comment/comment.css	Tue Apr 09 01:37:25 2013 +0900
@@ -130,52 +130,87 @@
 /* Individual Comment Level(Nested | Tree) */
 div.comments div.level-0,
 div.comments ul.level-0 {
-  margin-left: 0;
+  margin-{left}: 0;
 }
 
 div.comments div.level-25,
 div.comments ul.level-25 {
-  margin-left: 16px;
+  margin-{left}: 16px;
 }
 
 div.comments div.level-50,
 div.comments ul.level-50 {
-  margin-left: 32px;
+  margin-{left}: 32px;
+}
+
+div.comments div.level-75,
+div.comments ul.level-75 {
+  margin-{left}: 48px;
 }
 
 div.comments div.level-100,
 div.comments ul.level-100 {
-  margin-left: 48px;
+  margin-{left}: 64px;
 }
 
 div.comments div.level-125,
 div.comments ul.level-125 {
-  margin-left: 64px;
+  margin-{left}: 80px;
 }
 
-div.comments div.level-150
+div.comments div.level-150,
 div.comments ul.level-150 {
-  margin-left: 80px;
+  margin-{left}: 96px;
 }
 
-div.comments div.level-175
+div.comments div.level-175,
 div.comments ul.level-175 {
-  margin-left: 96px;
+  margin-{left}: 112px;
 }
 
 div.comments div.level-200,
 div.comments ul.level-200 {
-  margin-left: 112px;
+  margin-{left}: 128px;
 }
 
 div.comments div.level-225,
 div.comments ul.level-225 {
-  margin-left: 128px;
+  margin-{left}: 144px;
 }
 
 div.comments div.level-250,
 div.comments ul.level-250 {
-  margin-left: 144px;
+  margin-{left}: 160px;
+}
+
+div.comments div.level-275,
+div.comments ul.level-275 {
+  margin-{left}: 176px;
+}
+
+div.comments div.level-300,
+div.comments ul.level-300 {
+  margin-{left}: 192px;
+}
+
+div.comments div.level-325,
+div.comments ul.level-325 {
+  margin-{left}: 208px;
+}
+
+div.comments div.level-350,
+div.comments ul.level-350 {
+  margin-{left}: 224px;
+}
+
+div.comments div.level-375,
+div.comments ul.level-375 {
+  margin-{left}: 240px;
+}
+
+div.comments div.level-400,
+div.comments ul.level-400 {
+  margin-{left}: 256px;
 }
 
 /* Comment Information  */
diff -r a3b9787c6cfa -r baf7baae5c3b system/lib-comment.php
--- a/system/lib-comment.php	Mon Apr 08 23:25:00 2013 +0900
+++ b/system/lib-comment.php	Tue Apr 09 01:37:25 2013 +0900
@@ -327,6 +327,10 @@
         // determines indentation for current comment
         if ($mode == 'threaded' || $mode == 'nested') {
             $indent = ($A['indent'] - $A['pindent']) * $_CONF['comment_indent'];
+            // set the maximum indentation level to 16
+            if ($indent > 400) {
+                $indent = 400;
+            }
         }
 
         // Filemgmt plugin is doing special processing.