diff --git a/checkin_notes b/checkin_notes index 9ee796b8cb..7fe864e085 100644 --- a/checkin_notes +++ b/checkin_notes @@ -6136,3 +6136,17 @@ Bruce 5 Aug 2008 sched_send.C handle_request.C +David 5 Aug 2008 + - web: stylesheet fixes + fixes #708 + - sched: slightly revise Bruce's fix + + html/ + inc/ + util.inc + user/ + style2.css + white.css + sched/ + handle_request.C + sched_send.C diff --git a/html/inc/util.inc b/html/inc/util.inc index c0d37fbfc1..c73468313d 100644 --- a/html/inc/util.inc +++ b/html/inc/util.inc @@ -77,9 +77,9 @@ function get_logged_in_user($must_be_logged_in=true) { function show_login($user) { if ($user) { echo "Logged in as %s.\n", $user->name; - echo "
Log in as someone else.\n"; + echo "
Log in as someone else.\n"; } else { - echo "Not logged in"; + echo "Not logged in."; } } @@ -120,9 +120,9 @@ function page_head($title, $java_onload=null, $title_plain=null, $prefix="") { "; if ($java_onload){ - echo ""; + echo ""; } else { - echo ""; + echo ""; } display_cvs_versions(); project_banner($title, $prefix); @@ -158,7 +158,7 @@ function db_error_page() { echo "A database error occurred while handling your request.
Please try again later.
If the error persists, please submit a - problem report. + problem report. "; page_tail(); } @@ -282,12 +282,12 @@ function row2_plain($x, $y) { } function row3($x, $y, $z) { - echo "$x$y$z\n"; + echo "$x$y$z\n"; } function row4($xx, $xy, $yx, $yy) { - echo "$xx$xy" - . "$yx$yy + echo "$xx$xy" + . "$yx$yy "; } @@ -306,7 +306,7 @@ function row_array($x) { function row_heading_array($x) { echo ""; foreach ($x as $h) { - echo "$h"; + echo "$h"; } echo "\n"; } @@ -349,32 +349,32 @@ function valid_tokens($auth) { function check_tokens($auth) { if (valid_tokens($auth)) return; error_page( - "Link has timed out. Please click Back, refresh the page, + "Link has timed out. Please click Back, refresh the page, and try again." ); } function print_login_form_aux($next_url, $user) { echo " -
- + + "; start_table(); row2("Email address:", ''); - row2("Password:
Forgot password?", + row2("Password:
Forgot password?", '' ); row2("Stay logged in on this computer", - "" + '' ); $x = urlencode($next_url); row2("", - "

or create an account" + "

or create an account/." ); if ($user) { row1("Log out"); row2("You are logged in as $user->name", - "authenticator).">Log out" + "authenticator)."\">Log out" ); } end_table(); @@ -449,7 +449,7 @@ function friend_links($user) { if (is_banished($user)) { return ""; } - $x = "
"; + $x = "
"; if ($user->has_profile) { $profile = BoincProfile::lookup_fields("has_picture", "userid=$user->id"); if ($profile && $profile->has_picture) { @@ -457,7 +457,7 @@ function friend_links($user) { } else { $img_url = URL_BASE."img/head_20.png"; } - $x .= ' Profile
'; + $x .= ' Profile
'; } $x .= " id."\">".$user->name.""; if ($user->donated == 1) { @@ -476,7 +476,7 @@ function user_links($user) { $x = ""; if ($user->has_profile) { $img_url = URL_BASE."img/head_20.png"; - $x .= ' Profile'; + $x .= ' Profile'; } $x .= " id."\">".$user->name.""; if ($user->donated == 1) { @@ -488,7 +488,7 @@ function user_links($user) { function host_link($hostid) { if ($hostid) { - return "$hostid"; + return "$hostid"; } else { return "---"; } @@ -668,10 +668,10 @@ function show_button($url, $text, $desc) { $desc_esc = addslashes($desc); echo " "; } @@ -681,7 +681,7 @@ function show_image($src, $title, $alt, $height=null) { if ($height) { $h = "height=\"$height\""; } - echo "\"$alt\""; + echo "\"$alt\""; } function check_web_stopped() { diff --git a/html/user/style2.css b/html/user/style2.css index 851b3a1ff2..9ac163582b 100644 --- a/html/user/style2.css +++ b/html/user/style2.css @@ -56,6 +56,10 @@ img { border: 0px; } +img.userimg { + border: 0px; +} + table { border: 1px solid black; background-color: white; @@ -123,6 +127,12 @@ td.navbar { text-align: center; } +td.friend { + background-color: #ffffff; + text-align: center; + vertical-align: center; +} + a.navbar:link, a.navbar:visited { color: #ff9711; text-decoration: none; diff --git a/html/user/white.css b/html/user/white.css index cd3f9d1f0b..7116638716 100644 --- a/html/user/white.css +++ b/html/user/white.css @@ -71,7 +71,13 @@ td.category { td.navbar { border: 0px; text-align: center; - vertival-align: middle; + vertical-align: middle; +} + +td.friend { + background-color: #e8e8e8; + text-align: center; + vertical-align: center; } a.navbar:link { @@ -136,6 +142,10 @@ img { border: 0px; } +img.userimg { + border: 0px; +} + .title { font-size: small; font-weight: bold; diff --git a/sched/handle_request.C b/sched/handle_request.C index 02cf2cb340..3a228786c9 100644 --- a/sched/handle_request.C +++ b/sched/handle_request.C @@ -1317,6 +1317,9 @@ void process_request( goto leave; } + reply.wreq.core_client_version = + sreq.core_client_major_version*100 + sreq.core_client_minor_version; + handle_global_prefs(sreq, reply); handle_results(sreq, reply); @@ -1324,7 +1327,6 @@ void process_request( reply.wreq.nresults_on_host = sreq.other_results.size(); if (sreq.have_other_results_list) { if (config.resend_lost_results) { - reply.wreq.core_client_version = 100*sreq.core_client_major_version + sreq.core_client_minor_version; if (resend_lost_work(sreq, reply)) { ok_to_send_work = false; } diff --git a/sched/sched_send.C b/sched/sched_send.C index 7b26f2cf0a..b913f29147 100644 --- a/sched/sched_send.C +++ b/sched/sched_send.C @@ -1320,11 +1320,7 @@ void set_trust(SCHEDULER_REPLY& reply) { void send_work(SCHEDULER_REQUEST& sreq, SCHEDULER_REPLY& reply) { if (sreq.work_req_seconds <= 0) return; - reply.wreq.core_client_version = - sreq.core_client_major_version*100 + sreq.core_client_minor_version; reply.wreq.disk_available = max_allowable_disk(sreq, reply); - reply.wreq.core_client_version = sreq.core_client_major_version*100 - + sreq.core_client_minor_version; if (hr_unknown_platform(sreq.host)) { reply.wreq.hr_reject_perm = true;