[geeklog-hg] geeklog: Topic checkboxes to remove in "My Account - Content Tab...

[geeklog-cvs at lists.geeklog.net]

changeset 9484:ea25e78f353d
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/ea25e78f353d
user: Kenji ITO <mystralkk at gmail.com>
date: Sat Feb 08 22:23:18 2014 +0900
description:
Topic checkboxes to remove in "My Account - Content Tab" are now rendered in the form of the tree structure (bug #0001680)

diffstat:

 public_html/layout/denim/css_ltr/style.css                          |   2 +-
 public_html/layout/denim/css_rtl/ie6.css                            |   2 +-
 public_html/layout/denim/css_rtl/style.css                          |   2 +-
 public_html/layout/modern_curve/css/preferences/preferences.css     |   2 +-
 public_html/layout/professional_css/css/preferences/preferences.css |   2 +-
 system/lib-topic.php                                                |  18 +++++----
 6 files changed, 15 insertions(+), 13 deletions(-)

diffs (91 lines):

diff -r efb109096fe7 -r ea25e78f353d public_html/layout/denim/css_ltr/style.css
--- a/public_html/layout/denim/css_ltr/style.css	Sat Feb 08 22:18:14 2014 +0900
+++ b/public_html/layout/denim/css_ltr/style.css	Sat Feb 08 22:23:18 2014 +0900
@@ -2267,7 +2267,7 @@
 
 #exclude_topic > .checkboxes-list > li,
 #boxesblock > .checkboxes-list > li {
-  display: inline;
+/*  display: inline;	*/
   margin-right: 0.5em; /* rtl */
 }
 
diff -r efb109096fe7 -r ea25e78f353d public_html/layout/denim/css_rtl/ie6.css
--- a/public_html/layout/denim/css_rtl/ie6.css	Sat Feb 08 22:18:14 2014 +0900
+++ b/public_html/layout/denim/css_rtl/ie6.css	Sat Feb 08 22:23:18 2014 +0900
@@ -361,7 +361,7 @@
 
 #exclude_topic .checkboxes-list li,
 #boxesblock .checkboxes-list li {
-  display: inline;
+/*  display: inline;	*/
   margin-left: 0.5em; /* rtl */
 }
 
diff -r efb109096fe7 -r ea25e78f353d public_html/layout/denim/css_rtl/style.css
--- a/public_html/layout/denim/css_rtl/style.css	Sat Feb 08 22:18:14 2014 +0900
+++ b/public_html/layout/denim/css_rtl/style.css	Sat Feb 08 22:23:18 2014 +0900
@@ -2267,7 +2267,7 @@
 
 #exclude_topic > .checkboxes-list > li,
 #boxesblock > .checkboxes-list > li {
-  display: inline;
+/*  display: inline;	*/
   margin-left: 0.5em; /* rtl */
 }
 
diff -r efb109096fe7 -r ea25e78f353d public_html/layout/modern_curve/css/preferences/preferences.css
--- a/public_html/layout/modern_curve/css/preferences/preferences.css	Sat Feb 08 22:18:14 2014 +0900
+++ b/public_html/layout/modern_curve/css/preferences/preferences.css	Sat Feb 08 22:23:18 2014 +0900
@@ -46,7 +46,7 @@
 }
 
 form#profile ul.checkboxes-list li {
-  display: inline;
+/*  display: inline;*/
   margin-{right}: 0.5em;
 }
 
diff -r efb109096fe7 -r ea25e78f353d public_html/layout/professional_css/css/preferences/preferences.css
--- a/public_html/layout/professional_css/css/preferences/preferences.css	Sat Feb 08 22:18:14 2014 +0900
+++ b/public_html/layout/professional_css/css/preferences/preferences.css	Sat Feb 08 22:23:18 2014 +0900
@@ -48,7 +48,7 @@
 }
 
 form#profile ul.checkboxes-list li {
-  display: inline;
+/*  display: inline;	*/
   margin-right: 0.5em;
 }
 
diff -r efb109096fe7 -r ea25e78f353d system/lib-topic.php
--- a/system/lib-topic.php	Sat Feb 08 22:18:14 2014 +0900
+++ b/system/lib-topic.php	Sat Feb 08 22:23:18 2014 +0900
@@ -365,17 +365,19 @@
             // Make sure to show topics for proper language and access level only
             if ($archive_tid != $id && $_TOPICS[$count_topic]['access'] > 0 && (($lang_id == '') || ($lang_id != '' && $_TOPICS[$count_topic]['language_id'] == $lang_id))) {
                 $title =  $_TOPICS[$count_topic]['title'];
-                
-                $branch_spaces = "";
-                for ($branch_count = $start_topic; $branch_count <= $_TOPICS[$count_topic]['branch_level'] ; $branch_count++) {
-                    $branch_spaces .= "   ";
-                }
-                $retval .= '<li>' . $branch_spaces . '<input type="checkbox" name="' . $fieldname . '[]" value="' . $id . '"';
-                
+                $retval .= '<li>'
+                        .  str_repeat(
+                                '   ',
+                                $_TOPICS[$count_topic]['branch_level'] - $start_topic + 1
+                           )
+                        .  '<input type="checkbox" id="id-' . $id . '" name="'
+                        .  $fieldname . '[]" value="' . $id . '"';
+
                 if (in_array($id, $selected_ids)) {
                     $retval .= ' checked="checked"';
                 }
-                $retval .= XHTML . '><span>' . $title . '</span></li>' . LB;
+
+                $retval .= XHTML . '><label for="id-' . $id . '">' . $title . '</label></li>' . LB;
             } else {
                 // Cannot pick child as parent so skip
                 $branch_level_skip = $_TOPICS[$count_topic]['branch_level'];