From d1e66f0427f8e9e7c34eb4d09ac0b170d3a3d40b Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 20 Sep 2010 23:59:25 +0000 Subject: [PATCH] - web: appearance tweaks from Simek; fixes #1012 svn path=/trunk/boinc/; revision=22394 --- checkin_notes | 16 ++++++++++++++++ client/cpu_sched.cpp | 3 ++- html/inc/util.inc | 4 ++-- html/user/edit_email_form.php | 6 +++--- html/user/edit_forum_preferences_form.php | 2 +- html/user/edit_user_info_form.php | 12 ++++++------ html/user/login_form.php | 2 +- html/user/main.css | 14 +++++++++----- html/user/notices.php | 2 ++ html/user/sample_index.php | 2 +- html/user/white.css | 1 + 11 files changed, 44 insertions(+), 20 deletions(-) diff --git a/checkin_notes b/checkin_notes index c7e9dd91e0..04b478da37 100644 --- a/checkin_notes +++ b/checkin_notes @@ -6699,3 +6699,19 @@ David 18 Sept 2010 db/ boinc_db.cpp + +David 20 Sept 2010 + - web: appearance tweaks from Simek; fixes #1012 + + html/ + inc/ + util.inc + user/ + sample_index.php + main.css + edit_email_form.php + white.css + login_form.php + notices.phhp + edit_user_info_form.php + edit_forum_preferences_form.php diff --git a/client/cpu_sched.cpp b/client/cpu_sched.cpp index ce6df58d24..11c25a8233 100644 --- a/client/cpu_sched.cpp +++ b/client/cpu_sched.cpp @@ -1458,7 +1458,8 @@ bool CLIENT_STATE::enforce_schedule() { if (ncpus_used >= ncpus) { if (log_flags.cpu_sched_debug) { msg_printf(rp->project, MSG_INFO, - "[cpu_sched] all CPUs used, skipping %s", + "[cpu_sched] all CPUs used (%.2f > %d), skipping %s", + ncpus_used, ncpus, rp->name ); } diff --git a/html/inc/util.inc b/html/inc/util.inc index ddb2f87196..8139bfd0ad 100644 --- a/html/inc/util.inc +++ b/html/inc/util.inc @@ -439,7 +439,7 @@ function friend_links($user) { } $title = tra("View the profile of %1", $user->name); $alt = tra("Profile"); - $x .= ' '.$alt.'
'; + $x .= ' '.$alt.'
'; } $x .= " id."\">".$user->name.""; if ($user->donated == 1) { @@ -458,7 +458,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) { diff --git a/html/user/edit_email_form.php b/html/user/edit_email_form.php index ab4523445e..5218583a67 100644 --- a/html/user/edit_email_form.php +++ b/html/user/edit_email_form.php @@ -34,8 +34,8 @@ echo "
\n"; start_table(); row1(tra("Change the email address of your account")); row2(tra("New email address"). - "
".tra("Must be a valid address of the form 'name@domain'")."", - "" + "
".tra("Must be a valid address of the form 'name@domain'")."", + "" ); // we need the password here not for verification, @@ -44,7 +44,7 @@ row2(tra("New email address"). row2( tra("Password"). - "
".tra("No password?")."", + "
".tra("No password?")."", "" ); row2("", ""); diff --git a/html/user/edit_forum_preferences_form.php b/html/user/edit_forum_preferences_form.php index 150de7cb4a..80a0435fbf 100644 --- a/html/user/edit_forum_preferences_form.php +++ b/html/user/edit_forum_preferences_form.php @@ -189,10 +189,10 @@ for ($i=0; $iid."\" value=\"Remove\"> ".$filtered_user->id." - ".user_links($filtered_user)."
"; } } + row2("Filtered users". "
Ignore message board posts and private messages from these users.", "$forum_filtered_userlist -
User ID (For instance: 123456789)
" diff --git a/html/user/edit_user_info_form.php b/html/user/edit_user_info_form.php index 52009cffe6..c237a55fa1 100644 --- a/html/user/edit_user_info_form.php +++ b/html/user/edit_user_info_form.php @@ -29,19 +29,19 @@ page_head(tra("Edit account information")); echo ""; echo form_tokens($user->authenticator); start_table(); -row2(tra("Name %1 real name or nickname%2", "
", ""), - "" +row2(tra("Name %1 real name or nickname%2", "
", ""), + "" ); -row2(tra("URL %1 of your web page; optional%2", "
", ""), - "http://" +row2(tra("URL %1 of your web page; optional%2", "
", ""), + "http://" ); row2_init(tra("Country"), "\n"; -row2(tra("Postal (ZIP) code %1 Optional%2", "
", ""), - "" +row2(tra("Postal (ZIP) code %1 Optional%2", "
", ""), + "" ); row2("", ""); diff --git a/html/user/login_form.php b/html/user/login_form.php index 6dc114d19d..491f9567d0 100644 --- a/html/user/login_form.php +++ b/html/user/login_form.php @@ -40,7 +40,7 @@ echo " "; start_table(); row2(tra("Email address:") . '
'.tra("forgot email address?")."", - ""); + ""); row2(tra("Password:") . '
' . tra("forgot password?") . "", '' ); diff --git a/html/user/main.css b/html/user/main.css index 060763b0cc..4eafebef39 100644 --- a/html/user/main.css +++ b/html/user/main.css @@ -76,11 +76,13 @@ td.heading { td.fieldname { text-align: right; padding-right: 10px; + font-size: 14px; margin: 2px 0; } td.fieldvalue { margin: 2px 0; + vertical-align: top; } td.fieldname_error { @@ -118,8 +120,9 @@ input[type="submit"], margin: 2px; border-width: 1px; border-style: solid; - font-size: 12px; + font-size: 13px; font-weight: normal; + cursor: pointer; -moz-border-radius: 5px; -webkit-border-radius: 5px; -khtml-border-radius: 5px; @@ -135,7 +138,7 @@ a.button { margin: 0 4px; border-width: 1px; border-style: solid; - font-size: 12px; + font-size: 13px; font-weight: normal; white-space: nowrap; -moz-border-radius: 5px; @@ -152,12 +155,12 @@ input.btn:hover, text-decoration: none; } -input[type="text"], select, textarea { +input[type="text"], input[type="password"] select, textarea { border-width: 1px; border-style: solid; margin: 2px 4px; padding: 3px; - font-size: 12px; + font-size: 14px; -moz-border-radius: 5px; -webkit-border-radius: 5px; -khtml-border-radius: 5px; @@ -361,11 +364,12 @@ span.page_title { span.note { font-weight: normal; + font-style: italic; font-size: 0.9em; } span.news_date { - font-size: 0.9em; + font-size: 0.8em; } span.news_title, diff --git a/html/user/notices.php b/html/user/notices.php index dd1a307117..b3058807d7 100644 --- a/html/user/notices.php +++ b/html/user/notices.php @@ -16,6 +16,8 @@ // You should have received a copy of the GNU Lesser General Public License // along with BOINC. If not, see . +// Generate RSS feed of notices for this user + require_once("../inc/util.inc"); require_once("../inc/news.inc"); require_once("../inc/notify.inc"); diff --git a/html/user/sample_index.php b/html/user/sample_index.php index bc5903a209..9f31f0810f 100644 --- a/html/user/sample_index.php +++ b/html/user/sample_index.php @@ -49,7 +49,7 @@ function show_nav() { If you're already running BOINC, select Attach to Project. If not, download BOINC.
  • When prompted, enter
    ".$master_url." -
  • If you're running a command-line or pre-5.0 version of BOINC, +
  • If you're running a command-line version of BOINC, create an account first.
  • If you have any problems, get help here. diff --git a/html/user/white.css b/html/user/white.css index b135f5c1df..7eb94fbe9a 100644 --- a/html/user/white.css +++ b/html/user/white.css @@ -42,6 +42,7 @@ td.heading { td.fieldname { background-color: #eee; + color: #333; } td.fieldname_error,