diff --git a/checkin_notes b/checkin_notes index e5810503da..b903bffcec 100644 --- a/checkin_notes +++ b/checkin_notes @@ -4175,3 +4175,14 @@ David May 20 2008 user.inc user/ cert1.php + +David May 20 2008 + - Add alternative stylesheet for project web + - Tweak error messages in client and server + + client/ + app_start.C + html/user/ + style2.css + sched/ + sched_send.C diff --git a/client/app_start.C b/client/app_start.C index 551f86707b..b0ef31d374 100644 --- a/client/app_start.C +++ b/client/app_start.C @@ -479,6 +479,7 @@ int ACTIVE_TASK::start(bool first_time) { LPVOID environment_block = NULL; char slotdirpath[256]; char error_msg[1024]; + char error_msg2[1024]; memset(&process_info, 0, sizeof(process_info)); memset(&startup_info, 0, sizeof(startup_info)); @@ -553,9 +554,10 @@ int ACTIVE_TASK::start(bool first_time) { if (!pDEB(environment_block)) { if (log_flags.task) { - windows_error_string(error_msg, sizeof(error_msg)); + windows_error_string(error_msg, sizeof(error_msg2)); msg_printf(result->project, MSG_INFO, - "Process environment block cleanup failed: %s", error_msg + "Process environment block cleanup failed: %s", + error_msg2 ); } } diff --git a/html/user/style2.css b/html/user/style2.css new file mode 100644 index 0000000000..635cb10a01 --- /dev/null +++ b/html/user/style2.css @@ -0,0 +1,400 @@ +a:link, a:visited, a:active { + color: #FF5C00; + text-decoration: none; +} + +a:hover { + text-decoration: underline; + color: #00A0E3; +} + +body { + background-color: #F0F8FF; + font-family: Verdana; + font-size: 11px; + margin: 5px 40px; + color: black; + background-image: url(http://img64.imageshack.us/img64/8050/tlopx4.png); + background-repeat: repeat-x; +} + +input, select { + border: 1px solid grey; + background-color: #eeeeee; + padding: 3px; +} + +input:hover, input:active, select:hover { + border: 1px solid #FF5C00; +} + +input.btn { + margin: 3px 0px; + padding: 2px 4px; +} + +h1 { + font-size: x-large; + font-weight: bold; + margin: 0px; + color: white; +} + +h2 { + font-size: large; + font-weight: bold; + margin: 0px; +} + +h3, h4 { + font-size: small; + font-weight: bold; +} + +img { + border: 0px; +} + +table { + border: 1px solid black; + background-color: white; + font-family: Verdana; + font-size: 11px; + margin: 6px 0px; + padding: 2px; +} + +th { + border: 1px solid darkgrey; + background-color: #c8c8c8; + font-weight: bold; +} + +td { + padding: 4px; + border: 0px; + margin-bottom: 0px; +} + +td.bordered { + border: 1px solid gray; +} + +td.indent { + border-left: 4px solid white; +} + +td.heading { + background-color: #D8D8D8; + font-weight: bold; +} + +td.heading2 { + font-weight: bold; + background-color: #eeeeee; + border: 1px solid grey; +} + +td.fieldname { + background-color: #eeeeee; + text-align: right; + vertical-align: top; +} + +td.fieldvalue { + vertical-align: top; + font-weight: bold; +} + +td.fieldname_error { + background-color: #ff8888; + text-align: right; + vertical-align: top; +} + +td.fieldvalue_error { + background-color: #ff8888; + vertical-align: top; + font-weight: bold; +} + +td.category { + background-color: #dddddd; +} + +td.navbar { + border: 0px; + text-align: center; +} + +a.navbar:link, a.navbar:visited { + color: #ff9711; + text-decoration: none; +} + +a.navbar:hover { + color: #ffc060; + text-decoration: underline; +} + +tr.row1 { + text-align: left; +} + +tr.row0 td { + background-color: #eeeeee; + text-align: left; +} + +tr.row0 td.postheader { + background-color: #F0F8FF; +} + +tr.row0 td.postbody { + background-color: white; +} + +tr.row0 .authorcol input { + background-color: white; +} + +tr.row_hd0 { + background-color: #CFFACF; +} + +tr.row_hd1 { + background-color: #DEFADE; +} + +tr.subtitle { + background-color: #eeeeee; + font-weight: bold; +} + +tr.message { + background-color:#E0E0EF; +} + +.title { + font-size: 12px; + font-weight: bold; +} + +.description { + font-size: 80%; + font-weight: normal; +} + +.authorcol { + width: 125px; + overflow: hidden; + padding: 2px; +} + +.authorcol img { + margin: 3px 0px; +} + +.cellwrap { + width: 100%; + overflow: auto; +} + +blockquote { + border-left: 2px solid #00A0E3; + background: #d6eef8; + padding: 3px; + margin-bottom: 0px; + margin-left: 20px; + font-style: italic; +} + +#blockquote.postbody { + border-style: inset; + border-color: blue; + background-color: rgb(240,240,255); + padding-left: 5px; + padding-bottom: 0px; + margin-bottom: 0px; + margin-left: 15px; + margin-right: 140px; + font-style: oblique +} + +#thread { + width: 100%; + table-layout: fixed; + overflow: overflow; +} + +.sigdelim { + width: 60%; + height: 1px; + background-color: black; + color: black; + border: 0; + margin-right: 100%; +} + +td.postheader { + background-color: #F0F8FF; + border-bottom: 1px solid #00A0E3; + border-left: 1px solid #00A0E3; + border-right: none; + padding-left: 6px; +} + +td.postbody { + font-size: 9pt; + border-left: 1px solid #00A0E3; + padding-left: 8px; + padding-bottom: 6px; +} + +td.postfooter{ + background-color: #F0F8FF; + border-top: 1px solid #00A0E3; + border-left: 1px solid #00A0E3; + border-right: none; + border-bottom: none; + padding-left: 6px; +} + +tr.helpdeskseperator{ + height: 10pt; +} + +tr.postseperator td{ + border-top: 1px solid #AAAAAA; + border-bottom: 1px solid #AAAAAA; + background-color: #D3D3D3; +} + +td.threadline { + text-align: left; + color: #0074A4; +} + +td.threadline a, tr.row1 em a { + color: #005477; + font-weight: bold; +} + +td.threadline a:hover, tr.row1 em a:hover { + text-decoration: underline; + color: #00A0E3; +} + +td.running { + background-color: #00ff00; +} + +td.notrunning { + background-color: #ff0000; +} + +td.disabled { + background-color: #ff8800; +} + +span.note{ + font-weight: normal; + font-size: 0.9em; + font-family: padding +} + +span.news_date { + color: #191970; + font-size: 0.9em; +} + +span.news_title { + font-size: 0.9em; + font-weight: bold; +} + +.code { + font-family: "Consolas", "Courier New", courier, monospaace; + display: block; + margin-top: 3px; + margin-left: 5em; + border-left: 3px solid #00A0E3; + padding-left: 1em; + padding-top: 4px; + white-space: nowrap; + overflow: auto; + background-color: #F0F8FF; +} + +* html body .code { + /* IE hack */ + white-space: normal; +} + +#news { + background-color: #E8F8FF; + vertical-align: top; + text-align: justify; + padding: 10px; + border: 1px solid grey; +} + +#news h2, #uotd h2, #mainnav h2 { + font-size: 1.2em; + font-weight: bold; +} + +#news h3 { + font-size: 1em; + margin: 2px 0px; +} + +#news p { + margin-top: 0px; +} + +#uotd { + background-color: #FAF0E6; + vertical-align: top; + padding: 10px; + border: 1px solid grey; +} + +.smalltext { + font-size: 0.8em; +} + +.error { + color: #ff0000; + font-weight: bold; + font-size: 1.1em; +} + +.notice { + color: #009900; + font-weight: bold; + font-size: 1.1em; +} + +#preview { + border: 2px solid #cccccc; + background-color: #eeeeee; + margin: 1em; + padding: 0.2em; +} + +#preview .header { + font-weight: bold; + font-size: 1.3em; + border-bottom: 1px solid #cccccc; +} + +#mainnav { + text-align: justfy; + padding: 6px; +} + +hr { + size: 0px; + border-top: 1px dashed black; +} diff --git a/sched/sched_send.C b/sched/sched_send.C index 0d6285d7d0..a6459a95bd 100644 --- a/sched/sched_send.C +++ b/sched/sched_send.C @@ -1111,7 +1111,7 @@ static void explain_to_user(SCHEDULER_REPLY& reply) { if (reply.wreq.core_client_version>419) { sprintf(helpful, "(won't finish in time) " - "Computer on %.1f%% of time, BOINC on %.1f%% of that", + "BOINC runs %.1f%% of time, computation enabled %.1f%% of that", 100.0*reply.host.on_frac, 100.0*reply.host.active_frac ); } else {