Changeset 6860

Timestamp:

09/05/2018 04:22:58 PM (7 years ago)

Author:

johnjamesjacoby

Message:

Forums: revert default mark-up back to div's and span's in bbp_list_forums().

This fixes potentially invalid mark-up from attempting to use list elements instead of spans.

Also includes changes to CSS selectors to make them more flexible with different child elements.

See #3217.

Location:

trunk/src

Files:

• includes/forums/template.php (modified) (2 diffs)
• templates/default/css/bbpress.css (modified) (4 diffs)

trunk/src/includes/forums/template.php

@@ -685 +685 @@
  *
  * @param array $args The function supports these args:
- *  - before: To put before the output. Defaults to '<ul class="bbp-forums">'
- *  - after: To put after the output. Defaults to '</ul>'
- *  - link_before: To put before every link. Defaults to '<li class="bbp-forum">'
- *  - link_after: To put after every link. Defaults to '</li>'
- *  - separator: Separator. Defaults to ', '
+ *  - before: To put before the output. Defaults to '<div class="bbp-forums-list">'
+ *  - after: To put after the output. Defaults to '</div>'
+ *  - link_before: To put before every link. Defaults to '<span class="bbp-forum">'
+ *  - link_after: To put after every link. Defaults to '</span>'
+ *  - sep: Separator. Defaults to ', '
+ *  - count_before: String before each count Defaults to ' ('
+ *  - count_after: String before each count Defaults to ')'
+ *  - count_sep: Count separator. Defaults to ', '
  *  - forum_id: Forum id. Defaults to ''
  *  - show_topic_count - To show forum topic count or not. Defaults to true
@@ -698 +701 @@
     // Parse arguments against default values
     $r = bbp_parse_args( $args, array(
-        'before'           => '<ul class="bbp-forums-list">',
-        'after'            => '</ul>',
-        'link_before'      => '<li class="bbp-forum">',
-        'link_after'       => '</li>',
+        'before'           => '<div class="bbp-forums-list">',
+        'after'            => '</div>',
+        'link_before'      => '<span class="bbp-forum">',
+        'link_after'       => '</span>',
+        'sep'              => ', ',
         'count_before'     => ' (',
         'count_after'      => ')',
         'count_sep'        => ', ',
-        'sep'              => ', ',
         'forum_id'         => '',
         'show_topic_count' => true,

trunk/src/templates/default/css/bbpress.css

@@ -150 +150 @@
 
 #bbpress-forums .bbp-forums-list {
-    margin: 0 0 0 5px;
-    padding-left: 15px;
+    margin: 0 0 0 7px;
+    padding-left: 12px;
     border-left: 1px solid #ddd;
 }
 
-#bbpress-forums .bbp-forums-list li {
+#bbpress-forums .bbp-forums-list li,
+#bbpress-forums .bbp-forums-list span {
     display: inline;
     font-size: 11px;
@@ -310 +311 @@
     padding: 12px 12px 12px 0;
     text-align: left;
+    position: relative;
 }
 
@@ -436 +438 @@
 }
 
+#bbpress-forums div.bbp-topic-content iframe.wp-embedded-content,
+#bbpress-forums div.bbp-reply-content iframe.wp-embedded-content {
+    position: relative;
+}
+
 /* =Reply to
 -------------------------------------------------------------- */
@@ -1407 +1414 @@
     }
 
-    #bbpress-forums .bbp-forums-list li {
+    #bbpress-forums .bbp-forums-list li,
+    #bbpress-forums .bbp-forums-list span {
         display: block;
         font-size: 11px;