From b33c463cf3f50358c8b8e99f4f9bc1f98abb3fa8 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 11 Nov 2016 19:11:57 -0800 Subject: [PATCH] web: various bug fixes - fix "jump to first unread post" feature - use 
 for bbcode [code]
- don't use table-responsive class for tables.
  It does bad/funky things, especially on small displays
- remove start_table_noborder()
---
 html/inc/forum.inc           | 10 ++++++----
 html/inc/news.inc            |  2 +-
 html/inc/profile.inc         |  2 +-
 html/inc/text_transform.inc  |  6 +++---
 html/inc/util.inc            | 12 +++---------
 html/user/create_profile.php |  2 +-
 html/user/forum_thread.php   |  2 +-
 html/user/sample_index.php   |  2 ++
 8 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/html/inc/forum.inc b/html/inc/forum.inc
index d1167ecc45..938691d3c4 100644
--- a/html/inc/forum.inc
+++ b/html/inc/forum.inc
@@ -377,6 +377,8 @@ function show_posts(
                 }
                 $i++;
             }
+            // if jump to post, figure out what page to show
+            //
             if ($jump_to_post) {
                 $start = $ibest - ($ibest % $num_to_show);
             } else {
@@ -557,9 +559,8 @@ function show_post(
 
     echo "
         
-        
+        
         id\">
-        

     ";
 
     echo user_links($user, 0);
@@ -609,7 +610,7 @@ function show_post(
         }
         echo badges_string(true, $user, BADGE_HEIGHT_SMALL);
     }
-    echo "
";
+    echo "";
 
     echo "";
     if ($controls == FORUM_CONTROLS) {
@@ -642,9 +643,10 @@ function show_post(
     if ($controls == FORUM_CONTROLS) {
         echo "\n";
     }
+    $class = $highlight?' class="bg-info" ':'';
     echo "
         
-        
+        
         
     ";
 
diff --git a/html/inc/news.inc b/html/inc/news.inc
index 45eb3480eb..f842710704 100644
--- a/html/inc/news.inc
+++ b/html/inc/news.inc
@@ -43,7 +43,7 @@ function news_item($date, $title, $post) {
     }
     echo "
         

-        

+        

     ";
 }
 
diff --git a/html/inc/profile.inc b/html/inc/profile.inc
index 98c60ea6fb..efdca7f0db 100644
--- a/html/inc/profile.inc
+++ b/html/inc/profile.inc
@@ -217,7 +217,7 @@ function show_profile($user, $logged_in_user, $screen_mode = false) {
     $can_edit = $logged_in_user && $user->id == $logged_in_user->id;
 
     if ($can_edit) {
-        row1("".tra("Edit your profile")."");
+        row1("".tra("Edit your profile")."", 1, false);
     }
 
     // If screening is enabled, only show picture in certain situations
diff --git a/html/inc/text_transform.inc b/html/inc/text_transform.inc
index d1a6fcd914..64e7d943e6 100644
--- a/html/inc/text_transform.inc
+++ b/html/inc/text_transform.inc
@@ -144,7 +144,7 @@ function replace_pre_code($text, $export) {
                 $x = remove_br(substr($matches[0], 6, -7));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "[", $x);
-                return "$x";
+                return "
$x
";
             },
             $text
         );
@@ -239,8 +239,8 @@ function bb2html($text, $export=false) {
             "http://\\2",
             "\\3",
             "http://\\2",
-            "
\\1 wrote:
\\2
",
-            "
\\1
",
+            "\\1 wrote:
\\2
",
+            "
\\1
",
             "
",
             "
    \\1
",
             " ",
diff --git a/html/inc/util.inc b/html/inc/util.inc
index 50fc830736..a68050cda4 100644
--- a/html/inc/util.inc
+++ b/html/inc/util.inc
@@ -202,7 +202,7 @@ function page_head(
     echo '
         
         
-        
+        
     ';
     if ($head_extra) {
         echo "\n$head_extra\n";
@@ -341,15 +341,9 @@ function pretty_time_str($x) {
 }
 
 function start_table($class="") {
-    echo '

-      
+    echo '

+      

     ';
-
-}
-
-// TODO: currently no call uses the arguments, styling should only happen through CSS clases so $extra could be dropped in the future
-function start_table_noborder($extra="width=\"100%\"", $class="noborder") {
-    echo "
";
 }
 
 function end_table() {
diff --git a/html/user/create_profile.php b/html/user/create_profile.php
index 9b1b2e3968..f3310c8754 100644
--- a/html/user/create_profile.php
+++ b/html/user/create_profile.php
@@ -326,7 +326,7 @@ function show_profile_form($profile, $warning=null) {
     echo "
         
     ";
-    start_table_noborder();
+    start_table();
     show_description();
     show_questions($profile);
     show_picture_option($profile);
diff --git a/html/user/forum_thread.php b/html/user/forum_thread.php
index 7ca09b52bc..985d2ca15f 100644
--- a/html/user/forum_thread.php
+++ b/html/user/forum_thread.php
@@ -99,7 +99,7 @@ if ($temp_sort_style) {
     }
 }
 
-page_head($title, 'jumpToUnread();');
+page_head($title, 'onload="jumpToUnread();"');
 
 $is_subscribed = $logged_in_user && BoincSubscription::lookup($logged_in_user->id, $thread->id);
 
diff --git a/html/user/sample_index.php b/html/user/sample_index.php
index a837c1b302..a586435b0c 100644
--- a/html/user/sample_index.php
+++ b/html/user/sample_index.php
@@ -85,6 +85,7 @@ function left(){
         'Join ',
         function() {
             global $no_computing, $no_web_account_creation, $master_url;
+            echo "\n";
         }
     );
 }