From df8e2212873acbd4e4e94e16bab27c91bfd3ecf1 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sun, 20 Nov 2016 15:38:19 -0800 Subject: [PATCH] web: various tweaks Please enter the commit message for your changes. Lines starting --- doc/white.css | 10 ++++++++-- html/inc/forum.inc | 6 +++--- html/inc/profile.inc | 5 ++++- html/inc/text_transform.inc | 7 ++++--- html/inc/util.inc | 4 ++-- html/project.sample/project.inc | 4 ++-- html/user/forum_reply.php | 4 ++-- 7 files changed, 25 insertions(+), 15 deletions(-) diff --git a/doc/white.css b/doc/white.css index 9666d23b6d..abc007903f 100644 --- a/doc/white.css +++ b/doc/white.css @@ -10,9 +10,15 @@ pre, code { font-size: medium; } -.emphasize { - font-weight: bold; +.lead { + font-size: 17px; + font-weight: bold; } + +.emphasize { + font-weight: bold; +} + .emphasize2 { color: red; } diff --git a/html/inc/forum.inc b/html/inc/forum.inc index 938691d3c4..61d515686b 100644 --- a/html/inc/forum.inc +++ b/html/inc/forum.inc @@ -129,7 +129,7 @@ function show_forum_header($user) { -
+
".tra("Advanced search")." "; @@ -558,9 +558,9 @@ function show_post( $class = $highlight?' class="bg-info" ':''; echo " - - id\"> + + "; echo user_links($user, 0); diff --git a/html/inc/profile.inc b/html/inc/profile.inc index efdca7f0db..69a7660ac4 100644 --- a/html/inc/profile.inc +++ b/html/inc/profile.inc @@ -217,7 +217,10 @@ 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")."", 1, false); + echo ""; + show_button("create_profile.php", tra("Edit your profile")); + echo " + "; } // 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 64e7d943e6..8bda6d3954 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 ); @@ -243,7 +243,8 @@ function bb2html($text, $export=false) { "
\\1
", "

", "

    \\1

", - " ", + //" ", + " ", " ", "\\2", "\\1

  • \\2\n\\3", @@ -316,7 +317,7 @@ function highlight_terms($text, $terms) { $replace = array(); foreach ($search as $key => $value) { - $replace[$key] = "".$value.""; + $replace[$key] = "".$value.""; } if (substr(phpversion(), 0, 1) > 4) { // PHP 4.x doesn't support str_ireplace return str_ireplace($search, $replace, $text); diff --git a/html/inc/util.inc b/html/inc/util.inc index a68050cda4..2f0a924bfd 100644 --- a/html/inc/util.inc +++ b/html/inc/util.inc @@ -355,7 +355,7 @@ function end_table() { // Table header row with unlimited number of columns function table_header() { - echo "\n"; + echo "\n"; for ($i = 0; $i < func_num_args(); $i++) { if (is_array(func_get_arg($i))) { $col = func_get_arg($i); @@ -364,7 +364,7 @@ function table_header() { echo "".func_get_arg($i)."\n"; } } - echo "\n"; + echo "\n"; } // Table row with unlimited number of columns diff --git a/html/project.sample/project.inc b/html/project.sample/project.inc index bba34f1803..ec610820ce 100644 --- a/html/project.sample/project.inc +++ b/html/project.sample/project.inc @@ -72,12 +72,12 @@ function project_banner($title, $prefix) { // If you include any links, prepend URL with $prefix // if you need to open divs here close them in project_footer() - sample_navbar(secure_url_base(), get_logged_in_user(false), true); + sample_navbar(secure_url_base(), get_logged_in_user(false), false); if ($title) { echo "

    $title

    \n"; } } -$fixed_navbar = true; +//$fixed_navbar = true; function project_footer($show_return, $show_date, $prefix) { // If you include any links, prepend URL with $prefix diff --git a/html/user/forum_reply.php b/html/user/forum_reply.php index 58c564cc15..e13cf64a70 100644 --- a/html/user/forum_reply.php +++ b/html/user/forum_reply.php @@ -166,8 +166,8 @@ function show_message_row($thread, $parent_post) { $enable_signature=""; } $x2 .= "

    - - + +