Ticket #1020: web.changes.patch

File web.changes.patch, 31.1 KB (added by Simek, 14 years ago)
  • inc/forum.inc

     
    6969define('IMAGE_STICKY', 'img/sticky_post.png');
    7070define('IMAGE_LOCKED', 'img/locked_post.png');
    7171define('IMAGE_STICKY_LOCKED', 'img/sticky_locked_post.png');
     72define('IMAGE_POST', 'img/post.png');
    7273define('NEW_IMAGE_HEIGHT','15');
    7374define('EMPHASIZE_IMAGE', 'img/emphasized_post.png');
    7475define('EMPHASIZE_IMAGE_HEIGHT','15');
     
    146147    } else {
    147148        $is_helpdesk = false;
    148149    }
     150
    149151    $where = $is_helpdesk?tra("Questions and Answers"):tra("Message boards");
    150152    $top_url = $is_helpdesk?"forum_help_desk.php":"forum_index.php";
     153
    151154    if (!$forum && !$thread) {
    152155        echo "<span class=\"title\">$where</span>";
    153156
     
    170173        }
    171174        echo "</span>";
    172175    } else {
    173         echo "Invalid input to show_forum_title<br>";
    174         echo "threadid $thread->id";
    175         // TODO: handle this condition gracefully
     176        echo "Invalid thread ID";
    176177    }
    177178}
    178179
     
    251252            $navbar.='<a href="forum_forum.php?id='.get_int("id").'&start='.(($i-1)*THREADS_PER_PAGE);
    252253            $sort = get_int("sort",true);
    253254            if ($sort) $navbar.='&sort='.$sort;
    254             $navbar.='">'.$i.' |</a> ';
     255            $navbar.='">'.$i.'</a> | ';
    255256            if ($i == $curpage+1){$navbar.="</em>";}
    256257        }
    257258
     
    519520    }
    520521    echo "
    521522        <tr>
    522         <td class=\"".($highlight?"highlighted_":"")."row$n\" rowspan=\"3\">
     523        <td class=\"leftcol ".($highlight?"highlighted_":"")."row$n\" rowspan=\"3\">
    523524        <a name=\"$post->id\"></a>
    524525        <div class=\"authorcol\">
    525526    ";
     
    539540    $url = "pm.php?action=new&userid=".$user->id;
    540541    $name = $user->name;
    541542    show_button($url, "Send&nbsp;message", "Send $name a private message");
    542     echo "<br />Joined: ", gmdate('M j y', $user->create_time), "<br>";
     543    echo "<br />Joined: ", gmdate('j M y', $user->create_time), "<br>";
    543544
    544545    if (!isset($user->nposts)) {
    545546        $user->nposts = BoincPost::count("user=$user->id");
     
    583584    echo " <a href=\"forum_thread.php?id=".$thread->id."&nowrap=true#$post->id\">Message ".$post->id."</a> - ";
    584585    if ($post->hidden) echo "<font color=red>[hidden] </font>";
    585586    echo "
    586         Posted ", pretty_time_str($post->timestamp);
     587        Posted: ", pretty_time_str($post->timestamp);
    587588    ;
    588589
    589590    if ($post->parent_post) {
     
    10991100}
    11001101
    11011102function show_thread_and_context_header() {
    1102     start_forum_table(array(tra("Thread"), tra("Posts"), tra("Author"), tra("Views"), "<nobr>".tra("Last post")."</nobr>"));
     1103    start_forum_table(array(tra("Thread"), tra("Posts"), tra("Author"), tra("Views"), "<nobr>".tra("Last post")."</nobr>"), "id=\"thread\" cellspacing=0");
    11031104}
    11041105
    11051106// show a 1-line summary of thread and its forum.
     
    11221123        break;
    11231124    }
    11241125    echo '
    1125         </td><td>'.($thread->replies+1).'</td>
     1126        </td><td class="numbers">'.($thread->replies+1).'</td>
    11261127        <td>'.user_links($owner).'</td>
    1127         <td>'.$thread->views.'</td>
    1128         <td>'.time_diff_str($thread->timestamp, time()).'</td>
     1128        <td class="numbers">'.$thread->views.'</td>
     1129        <td class="lastpost">'.time_diff_str($thread->timestamp, time()).'</td>
    11291130        </tr>
    11301131    ';
    11311132}
  • inc/profile.inc

     
    8282function offensive_profile_warning($verify_flag) {
    8383    if ($verify_flag == 0) {
    8484        return "
    85             <font size='+2' color='#33cc33'>
     85            <font size='+2' color='#3c3'>
    8686            ".tra("Your profile will be made visible to other people as soon as it has been approved by the project. This may take up to a few days.")."
    8787            </font>
    8888        ";
    8989    } else if ($verify_flag == -1) {
    9090        return "
    91             <font size='+2' color='#ff3333'>
     91            <font size='+2' color='#f33'>
    9292            ".tra("Your profile has been marked as unacceptable. It is not visible to other people. Please change it.")."
    9393            </font>
    9494        ";
     
    184184    $min_credit = parse_config(get_config(), "<profile_min_credit>");
    185185    if (!$logged_in_user && $min_credit && $user->expavg_credit < $min_credit ) {
    186186        error_page(
    187            tra("To prevent spam, profiles of users with an average credit of less than %1 are displayed only to logged-in users.  We apologize for this inconvenience.", $min_credit)
     187           tra("To prevent spam, profiles of users with an average credit of less than %1 are displayed only to logged-in users. We apologize for this inconvenience.", $min_credit)
    188188        );
    189189    }
    190190    if (is_banished($user)) {
     
    224224    if ($show_picture) {
    225225        echo "
    226226            <tr><td colspan=\"2\" align=\"center\">
    227         <img vspace=\"6\" hspace=\"9\" src=\"".profile_image_url($user->id)."\">
     227                        <img vspace=\"6\" hspace=\"9\" src=\"".profile_image_url($user->id)."\">
    228228            </td></tr>
    229229        ";
    230230    }
     
    242242    BoincForumPrefs::lookup($logged_in_user);
    243243    $options = get_output_options($logged_in_user);
    244244
    245     row1(show_profile_heading1());
    246     row1(output_transform($profile->response1, $options), 2, "foobar");
    247     row1(show_profile_heading2());
    248     row1(output_transform($profile->response2, $options), 2, "foobar");
     245        if ( !empty($profile->response1) ) {
     246                row1(show_profile_heading1());
     247                row1(output_transform($profile->response1, $options), 2, "foobar");
     248        }
     249       
     250        if ( !empty($profile->response2) ) {
     251                row1(show_profile_heading2());
     252                row1(output_transform($profile->response2, $options), 2, "foobar");
     253        }
    249254
    250255    if (!$can_edit and !$screen_mode) {
    251256        row1(tra("Your feedback on this profile"));
  • inc/team.inc

     
    3232    start_table();
    3333    row2('<b>'.tra('Search criteria (use one or more)').'</b>', '');
    3434    row2(tra('Key words').'<br><span class="note">'.tra('Find teams with these words in their names or descriptions').'</span>',
    35         '<input name="keywords" value="' . htmlspecialchars($params->keywords) . '">');
     35        '<input type="text" name="keywords" value="' . htmlspecialchars($params->keywords) . '">');
    3636    row2_init(tra('Country'), '');
    3737    echo '<select name="country"><option value="" selected>---</option>';
    3838    $country = $params->country;
     
    8989        }
    9090        row2(tra('Web site'), "<a href=$x>$x</a>");
    9191    }
    92    
     92
    9393    if (!no_computing()) {
    9494        row2(tra('Total credit'), format_credit_large($team->total_credit));
    9595        row2(tra('Recent average credit'), format_credit_large($team->expavg_credit));
     
    196196    } else {
    197197        $sort_clause = "expavg_credit desc";
    198198    }
    199    
     199
    200200    start_table();
    201201    echo '<tr>
    202202        <th>'.tra('Name').'</th>
     
    430430    );
    431431    row2(tra('URL of team web page, if any').':<br><font size=-2>('.tra('without "http://"').')
    432432        '.tra('This URL will be linked to from the team\'s page on this site.'),
    433         "<input name=url size=60 value='$team->url'>"
     433        "<input type=text name=url size=60 value='$team->url'>"
    434434    );
    435435    row2(tra('Description of team').':
    436436        <br><span class="note">
     
    445445        "<select name=country>"
    446446    );
    447447    print_country_select($team->country);
    448    
     448
    449449    echo "</select></td></tr>\n";
    450450    $x = $team->joinable?"checked":"";
    451451    row2(tra("Accept new members?"), "<input type=checkbox name=joinable $x>");
  • inc/user.inc

     
    293293    }
    294294
    295295    $friends = BoincFriend::enum("user_src=$user->id and reciprocated=1");
    296     $x = "<a href=\"user_search.php\">".tra("Find friends")."</a><br\>\n";
     296    $x = "<a href=\"user_search.php\">".tra("Find friends")."</a><br/>\n";
    297297    $n = count($friends);
    298298    if ($n) {
    299299        foreach($friends as $friend) {
  • inc/util.inc

     
    129129 
    130130   
    131131    if (!$title_plain) {
    132         echo "<html><head><title>".strip_tags($title)."</title>\n";
     132        echo "<html><head><title>" . PROJECT . " :: ".strip_tags($title)."</title>\n";
    133133    } else {
    134         echo "<html><head><title>".strip_tags($title_plain)."</title>\n";
     134        echo "<html><head><title>" . PROJECT . " :: ".strip_tags($title_plain)."</title>\n";
    135135    }
    136136    echo "<link rel=stylesheet type=\"text/css\" href=\"main.css\" media=\"all\" />
    137137                <link rel=stylesheet type=\"text/css\" href=\"$stylesheet\">
     
    226226
    227227function time_str($x) {
    228228    if ($x == 0) return "---";
    229     return gmdate('j M Y G:i:s', $x) . " UTC";
     229    return gmdate('j M Y | G:i:s', $x) . " UTC";
    230230}
    231231
    232232function pretty_time_str($x) {
  • user/create_account_form.php

     
    7676if(defined('INVITE_CODES')) {
    7777     row2(
    7878         tra("Invitation Code")."<br><span class=\"description\">".tra("A valid invitation code is required to create an account.")."</span>",
    79          "<input name=\"invite_code\" size=\"30\">"
     79         "<input type=\"text\" name=\"invite_code\" size=\"30\" >"
    8080     );
    8181}
    8282
    8383row2(
    8484    tra("Name")."<br><span class=\"description\">".tra("Identifies you on our web site. Use your real name or a nickname.")."</span>",
    85     "<input name=\"new_name\" size=\"30\">"
     85    "<input type=\"text\" name=\"new_name\" size=\"30\">"
    8686);
    8787row2(
    8888    tra("Email Address")."<br><span class=\"description\">".tra("Must be a valid address of the form 'name@domain'.")."</span>",
    89     "<input name=\"new_email_addr\" size=\"50\">"
     89    "<input type=\"text\" name=\"new_email_addr\" size=\"50\">"
    9090);
    9191$min_passwd_length = parse_element($config, "<min_passwd_length>");
    9292if (!$min_passwd_length) {
     
    107107echo "</select></td></tr>\n";
    108108row2(
    109109    tra("Postal or ZIP Code")."<br><span class=\"description\">".tra("Optional")."</span>",
    110     "<input name=\"postal_code\" size=\"20\">"
     110    "<input type=\"text\" name=\"postal_code\" size=\"20\">"
    111111);
    112112row2("",
    113113    "<input type=\"submit\" value=\"".tra("Create account")."\">"
  • user/forum_forum.php

     
    132132        $gotoStr = "<div align=\"right\">$nav</div><br>";
    133133    }
    134134    echo $gotoStr; // Display the navbar
    135     start_forum_table(array("", tra("Threads"), tra("Posts"), tra("Author"), tra("Views"), "<nobr>".tra("Last post")."</nobr>"));
     135    start_forum_table(array("", tra("Threads"), tra("Posts"), tra("Author"), tra("Views"), "<nobr>".tra("Last post")."</nobr>"), "id=\"catview\" cellspacing=0");
    136136   
    137137    $sticky_first = !$user || !$user->prefs->ignore_sticky_posts;
    138138
     
    163163            echo '<tr class="row'.$n.'">';   
    164164        }
    165165       
    166         echo "<td width=\"1%\" align=\"right\"><nobr>";
     166        echo "<td width=\"1%\" class=\"threadicon\"><nobr>";
    167167        if ($thread->hidden) {
    168             echo "[hidden]";
     168            echo "[".tra("hidden")."]";
    169169        }
    170170        if ($unread) {
    171171            if ($thread->sticky) {
     
    191191            } else {
    192192                if ($thread->locked) {
    193193                    show_image(IMAGE_LOCKED, "This thread is locked", "locked");
    194                 }
     194                } else {
     195                                        show_image(IMAGE_POST, "You read this thread", "read");
     196                                }
    195197            }
    196198        }
    197199        echo "</nobr></td>";
     
    205207        $n = ($n+1)%2;
    206208
    207209        echo '
    208             <td>'.($thread->replies+1).'</td>
     210            <td class="numbers">'.($thread->replies+1).'</td>
    209211            <td>'.user_links($owner).'</td>
    210             <td>'.$thread->views.'</td>
    211             <td class=\"lastpost\">'.time_diff_str($thread->timestamp, time()).'</td>
     212            <td class="numbers">'.$thread->views.'</td>
     213            <td class="lastpost">'.time_diff_str($thread->timestamp, time()).'</td>
    212214            </tr>
    213215        ';
    214216        flush();
  • user/forum_help_desk.php

     
    4040        show_forum_title($category, null, null);
    4141        echo "<p>";
    4242        show_mark_as_read_button($user);
    43         start_forum_table(array("Topic", "# Questions", "Last post"));
     43        start_forum_table(array("Topic", "# Questions", "Last post"),"id=\"catview\" cellspacing=0");
    4444    }
    4545    if (strlen($category->name)) {
    4646        echo "
     
    5656        <tr class=\"row1\">
    5757        <td>
    5858            <b><a href=\"forum_forum.php?id=$forum->id\">$forum->title</a></b>
    59             <br>", $forum->description, "
     59            <br><span class=\"smalltext\">", $forum->description, "</span>
    6060        </td>
    61         <td>", $forum->threads, "</td>
    62         <td>", time_diff_str($forum->timestamp, time()), "</td>
     61        <td class=\"numbers\">", $forum->threads, "</td>
     62        <td class=\"lastpost\">", time_diff_str($forum->timestamp, time()), "</td>
    6363    </tr>
    6464        ";
    6565    }
  • user/forum_index.php

     
    9090        echo "<p>";
    9191        show_mark_as_read_button($user);
    9292        start_forum_table(
    93             array(tra("Topic"), tra("Threads"), tra("Posts"), tra("Last post"))
     93            array(tra("Topic"), tra("Threads"), tra("Posts"), tra("Last post") ), "id=\"catview\" cellspacing=0"
    9494        );
    9595    }
    9696    if (strlen($category->name)) {
  • user/forum_search.php

     
    2828echo "<form action=\"forum_search_action.php\" method=\"post\">";
    2929row1("Search query");
    3030row2("Search for keywords:<br />
    31     <font size=-1>Posts that contain all the specified words will be displayed</font>",
     31    <span class=\"smalltext\">Posts that contain all the specified words will be displayed</span>",
    3232    '<input type="text" style="width: 290px" name="search_keywords" size="30" /><br />
    33     <font size=-1>For example: "screensaver freeze"</font>');
     33    <span class="smalltext">For example: "screensaver freeze"</span>');
    3434row2("Search for author ID:<br />
    35     <font size=-1>Only posts by this author will be displayed</font>",
     35    <span class=\"smalltext\">Only posts by this author will be displayed</span>",
    3636    '<input type="text" style="width: 150px" name="search_author" size="10" /><br />
    37     <font size=-1>For example: "43214"</font>');
     37    <span class="smalltext">For example: "43214"</span>');
    3838
    3939row1("Search options");
    4040row2("Search limits<br />
    41     <font size=-1>Search at most this many days back in time</font>",
     41    <span class=\"smalltext\">Search at most this many days back in time</span>",
    4242    '<select name="search_max_time">
    4343    <option value="1">1 day</option>
    4444    <option value="3">3 days</option>
     
    6767    }
    6868}
    6969row2("Forum<br />
    70     <font size=-1>Only display posts from this forum</font>",
     70    <span class=\"smalltext\">Only display posts from this forum</span>",
    7171    '<select name="search_forum">'.$forumlist.'</select');
    7272
    7373$sortlist = null;
  • user/forum_search_action.php

     
    164164
    165165// Display the threads while we search for posts
    166166if (count($threads)){
    167     echo "<span class=title>Thread titles matching your query:</span>";
     167    echo "<span class=title>" . tra("Thread titles matching your query:") . "</span>";
    168168    show_thread_and_context_header();
    169169    $i = 0;
    170170    foreach ($threads as $thread){
     
    184184);
    185185
    186186if (count($posts)){
    187     echo "<span class=title>Messages matching your query:</span>";
     187    echo "<span class=title>" . tra("Messages matching your query:") . "</span>";
    188188    start_table();
    189189    $n = 1;
    190190    $options = get_output_options($logged_in_user);
  • user/forum_thread.php

     
    3939    $tokens = url_tokens($logged_in_user->authenticator);
    4040}
    4141
     42if ($threadid < 1) {
     43        error_page(tra("Invalid thread ID!"));
     44}
     45
    4246$thread = BoincThread::lookup_id($threadid);
    4347$forum = BoincForum::lookup_id($thread->forum);
    4448
     
    192196// Here is where the actual thread begins.
    193197$headings = array(array(tra("Author"),"authorcol"), array(tra("Message"),""));
    194198
    195 start_forum_table($headings, "id=\"thread\" width=100%");
     199start_forum_table($headings, "id=\"thread\" cellspacing=0");
    196200show_posts($thread, $forum, $sort_style, $filter, $logged_in_user, true);
    197201end_table();
    198202
  • user/get_passwd.php

     
    3232
    3333start_table();
    3434echo "<form method=post action=mail_passwd.php>\n";
    35 row2("Email address","<input size=40 name=email_addr>");
     35row2("Email address","<input type=\"text\" size=40 name=email_addr>");
    3636row2("", "<input type=submit value=OK>");
    3737echo "</form>";
    3838end_table();
     
    7575start_table();
    7676
    7777echo "<form action=login_action.php method=post>\n";
    78 row2("Log in with authenticator", "<input name=authenticator size=40>");
     78row2("Log in with authenticator", "<input type=\"text\" name=authenticator size=40>");
    7979row2("Stay logged in on this computer",
    8080    "<input type=checkbox name=send_cookie checked>"
    8181);
  • user/img/forum_bg.png

    Cannot display: file marked as a binary type.
    svn:mime-type = application/octet-stream
  • user/img/post.png

    Property changes on: user/img/forum_bg.png
    ___________________________________________________________________
    Added: svn:mime-type
    ## -0,0 +1 ##
    +application/octet-stream
    Cannot display: file marked as a binary type.
    svn:mime-type = application/octet-stream
    Cannot display: file marked as a binary type.
    svn:mime-type = application/octet-stream
  • user/main.css

    Property changes on: user/img/post.png
    ___________________________________________________________________
    Added: svn:mime-type
    ## -0,0 +1 ##
    +application/octet-stream
     
    1212        margin: 5px 10px;
    1313}
    1414
     15h1, h2, h3, h4, th {
     16        font-family: Georgia, Times, "Times New Roman", serif;
     17}
     18
    1519h1, h2 {
    16         font-size: x-large;
    1720        font-weight: normal;
    1821}
    1922
     
    3437}
    3538
    3639table {
    37         padding: 4px;
     40        padding: 4px 6px;
    3841        margin: 2px;
    3942}
    4043
     
    4952
    5053th {
    5154        font-weight: bold;
    52         vertical-align: top;
     55        vertical-align: middle;
    5356}
    5457
    5558td {
     
    7174        font-weight: bold;
    7275        margin: 4px 0;
    7376        padding: 8px;
     77        font-family: Georgia, Times, "Times New Roman", serif;
    7478}
    7579
    7680td.fieldname {
    7781        text-align: right;
    7882        padding-right: 10px;
    79     font-size: 14px;
     83        font-size: 14px;
    8084        margin: 2px 0;
    8185}
    8286
     
    111115        text-align: left;
    112116}
    113117
     118#catview img.userimg,
     119#thread img.userimg {
     120        float: left;
     121        padding: 0 2px;
     122}
     123
    114124/*   Buttons etc.   */
    115125
    116126input[type="button"],
     
    149159
    150160input[type="button"]:hover,
    151161input[type="submit"]:hover,
    152 input.btn:hover, 
     162input.btn:hover,
    153163.button:hover ,
    154164.forum_toplinks a:hover {
    155165        text-decoration: none;
    156166}
    157167
    158 input[type="text"], input[type="password"] select, textarea {
     168input[type="text"], input[type="password"], select, textarea {
    159169        border-width: 1px;
    160170        border-style: solid;
    161171        margin: 2px 4px;
     
    222232/*   Forum   */
    223233
    224234td.category , tr.subtitle{
     235        font-family: Georgia, Times, "Times New Roman", serif;
    225236        border: none;
    226237        font-weight: bold;
    227238        margin: 6px 0;
     
    233244        padding: 4px;
    234245}
    235246
    236 td.postheader { 
     247td.postheader {
    237248        font-size: 11px;
    238         height: 24px;
    239249        margin-left: 4px;
    240         padding-left: 8px;
    241         -moz-border-radius: 0 10px;
    242         -webkit-border-radius-bottomleft: 10px;
    243         -webkit-border-radius-bottomright: 10px;
    244         -khtml-border-radius-bottomleft: 10px;
    245         -khtml-border-radius-bottomright: 10px;
    246         border-radius-bottomleft: 10px;
    247         border-radius-bottomright: 10px;
     250        padding-left: 8px;
     251        height: 28px;
     252        -moz-border-radius: 0 10px 0 0;
     253        -webkit-border-radius-topright: 10px;
     254        -khtml-border-radius-topright: 10px;
     255        border-radius-topright: 10px;
    248256}
    249257
    250 td.postbody {
    251         font-size: 9pt;
    252         margin-left: 4px;
     258td.postheader form {
     259        padding: 4px;
    253260}
    254261
     262td.postbody {
     263        font-size: 12px;
     264        line-height: 140%;
     265        padding: 4px 12px;
     266}
     267
    255268td.postfooter {
    256269        font-size: 11px;
    257         height: 26px;
    258         margin-left: 4px;
    259         padding-left: 8px;
    260         -moz-border-radius: 10px 10px 0 0;
    261         -khtml-border-radius-topleft: 10px;
    262         -khtml-border-radius-topright: 10px;
    263         -webkit-border-radius-topleft: 10px;
    264         -webkit-border-radius-topright: 10px;
    265         border-radius-topleft: 10px;
    266         border-radius-topright: 10px;
     270        height: 26px;
     271        margin-left: 4px;
     272        padding-left: 8px;
     273        -moz-border-radius: 0 0 10px 0;
     274        -khtml-border-radius-bottomright: 10px;
     275        -webkit-border-radius-bottomright: 10px;
     276        border-radius-bottomright: 10px;
    267277}
    268278
     279td.postheader .button,
    269280td.postfooter .button {
    270         line-height: 2.2em;
    271         margin: 0 4px;
     281        font-size: 11px;
    272282}
    273283
    274284tr.helpdeskseperator {
     
    276286}
    277287
    278288tr.postseperator {
    279         border-width: 1px;
    280         border-style: solid;
    281289        margin: 4px 0;
    282290}
    283291
    284 td.threadline ,
    285 td.numbers {
     292td.threadline {
    286293        text-align: left;
     294        vertical-align: middle;
    287295}
    288296
    289297td.numbers {
     298        vertical-align: middle;
    290299        text-align: center;
    291300}
    292301
    293 td.lastpost {
     302td.lastpost, td.threadicon {
     303        vertical-align: middle;
    294304}
    295305
    296306.title {
     
    303313        font-weight: normal;
    304314}
    305315
     316td.leftcol {
     317        -moz-border-radius: 10px 0 0 10px;
     318        -khtml-border-radius-topleft: 10px;
     319        -khtml-border-radius-bottomleft: 10px;
     320        -webkit-border-radius-topleft: 10px;
     321        -webkit-border-radius-bottomleft: 10px;
     322        border-radius-topleft: 10px;
     323        border-radius-bottomleft: 10px;
     324}
     325
    306326.authorcol {
    307327        width: 136px;
    308         overflow: hidden;
    309328}
    310329
    311 div.authorcol { 
     330div.authorcol {
    312331        border-width: 1px;
    313         border-style: solid;
    314         padding: 8px 5px;
    315         width: 120px;
    316         margin-left: 2px;
     332        border-style: solid;
     333        padding: 8px 5px;
     334        width: 120px;
     335        margin: 2px 0 2px 2px;
     336        overflow: hidden;
     337        word-wrap: break-word;
    317338        -moz-border-radius: 10px;
    318339        -webkit-border-radius: 10px;
    319340        -khtml-border-radius: 10px;
    320341        border-radius: 10px;
    321 } 
     342}
    322343
    323344.authorinfo {
    324345        font-size: 11px;
    325346}
    326347
    327 img.authorinfo { 
     348img.authorinfo {
    328349        border-width: 1px;
    329350        border-style: solid;
    330         margin: 3px 9px; 
    331 } 
     351        margin: 3px 9px;
     352}
    332353
    333354img.flag {
    334         margin: 2px 1px; 
     355        margin: 2px 1px;
    335356}
    336357
    337358.authorcol .button {
    338         margin: 0 6px;
     359        margin: 0 4px;
    339360        line-height: 2.6em;
    340 } 
     361}
    341362
    342363blockquote.postbody {
    343364        border-left-width: 2px;
     
    345366        padding: 2px 6px;
    346367        margin: 0 6px 0 10px;
    347368        font-style: italic;
    348 } 
     369}
    349370
    350 #thread {
     371#thread, #catview {
    351372        width: 100%;
    352         table-layout: fixed;
    353         overflow: visible;
     373        border: 0;
    354374}
    355375
     376#catview {
     377        padding: 4px 6px 6px;
     378}
     379
    356380.forum_toplinks td {
    357381        vertical-align: middle;
    358382}
     
    393417        display: block;
    394418        margin-left: 5em;
    395419        border-left-width: 3px;
    396         border-left-style: solid; 
     420        border-left-style: solid;
    397421        padding-left: 1em;
    398422        white-space: nowrap;
    399423        overflow: auto;
  • user/pm.php

     
    6262//
    6363function do_inbox($logged_in_user) {
    6464    page_head(tra("Private messages").": ".tra("Inbox"));
    65    
     65
    6666    make_script();
    6767    if (get_int("sent", true) == 1) {
    6868        echo "<div class=\"notice\">".tra("Your message has been sent.")."</div>\n";
    6969    }
    7070    $options = get_output_options($logged_in_user);
    71    
     71
    7272    BoincNotify::delete_aux("userid=$logged_in_user->id and type=".NOTIFY_PM);
    7373
    7474    $msgs = BoincPrivateMessage::enum(
     
    128128    }
    129129    page_head(tra("Private messages")." : ".$message->subject);
    130130    pm_header();
    131    
     131
    132132    $sender = BoincUser::lookup_id($message->senderid);
    133133
    134134    start_table();
     
    143143    echo " | <a href=\"pm.php?action=delete&amp;id=$id\">".tra("Delete")."</a>\n";
    144144    echo " | <a href=\"pm.php?action=inbox\">".tra("Inbox")."</a>\n";
    145145    end_table();
    146    
     146
    147147    if ($message->opened == 0) {
    148148        $message->update("opened=1");
    149149    }
     
    167167function do_send($logged_in_user) {
    168168    check_banished($logged_in_user);
    169169    check_tokens($logged_in_user->authenticator);
    170    
     170
    171171    $to = sanitize_tags(post_str("to", true));
    172172    $subject = post_str("subject", true);
    173173    $content = post_str("content", true);
    174    
     174
    175175    if (post_str("preview", true) == tra("Preview")) {
    176176        pm_form();
    177177    }
     
    186186        }
    187187        $to = str_replace(", ", ",", $to); // Filter out spaces after separator
    188188        $users = explode(",", $to);
    189        
     189
    190190        $userlist = array();
    191191        $userids = array(); // To prevent from spamming a single user by adding it multiple times
    192        
     192
    193193        foreach ($users as $username) {
    194194            $user = explode(" ", $username);
    195195            if (is_numeric($user[0])) { // user ID is gived
     
    215215                $userids[$user->id] = true;
    216216            }
    217217        }
    218        
     218
    219219        foreach ($userlist as $user) {
    220220            if (!is_moderator($logged_in_user, null)) {
    221221                check_pm_count($logged_in_user->id);
    222222            }
    223223            pm_send($user, $subject, $content, true);
    224224        }
    225        
     225
    226226        Header("Location: pm.php?action=inbox&sent=1");
    227227    }
    228228}
     
    237237    echo "<div>".tra("Are you really sure you want to block user %1 from sending you private messages?", $user->name)."<br>\n";
    238238    echo tra("Please note that you can only block a limited amount of users.")."</div>\n";
    239239    echo "<div>".tra("Once the user has been blocked you can unblock it using forum preferences page.")."</div>\n";
    240    
     240
    241241    echo "<form action=\"pm.php\" method=\"POST\">\n";
    242242    echo form_tokens($logged_in_user->authenticator);
    243243    echo "<input type=\"hidden\" name=\"action\" value=\"confirmedblock\">\n";
     
    253253    $blocked_user = BoincUser::lookup_id($id);
    254254    if (!$blocked_user) error_page("no such user");
    255255    add_ignored_user($logged_in_user, $blocked_user);
    256    
     256
    257257    page_head(tra("User %1 blocked", $blocked_user->name));
    258    
     258
    259259    echo "<div>".tra("User %1 has been blocked from sending you private messages.", $blocked_user->name)."\n";
    260260    echo tra("To unblock, visit %1message board preferences%2", "<a href=\"edit_forum_preferences_form.php\">", "</a>")."</div>\n";
    261261}
  • user/profile_menu.php

     
    7171row1(tra("Search profile text"));
    7272rowify("
    7373    <form action=\"profile_search_action.php\" method=\"GET\">
    74     <input name=\"search_string\">
     74    <input type=\"text\" name=\"search_string\">
    7575    <input type=\"submit\" value=\"".tra("Search")."\">
    7676    </form>
    7777");
  • user/server_status.php

     
    238238
    239239// Check for httpd.pid file of upload/download server.
    240240//
    241 $uldl_running = file_exists($uldl_pid);
     241$uldl_running = !file_exists($uldl_pid);
    242242if ($uldl_running == 0) $uldl_running = -1;
    243243show_status($uldl_host, tra("upload/download server"), $uldl_running);
    244244
  • user/team.php

     
    2222
    2323page_head("Teams");
    2424
    25 echo "<p>".tra("%1 participants may form %2teams%3", PROJECT, "<b>", "</b>") ."
     25echo "<p>".tra("%1 participants may form %2teams%3.", PROJECT, "<b>", "</b>") ."
    2626    <p>
    2727    ". tra("You may belong to only one team. You can join or quit a team at any time."). "
    2828    <p>" .
  • user/team_manage.php

     
    8080$user = get_logged_in_user(true);
    8181$teamid = get_int('teamid');
    8282$team = BoincTeam::lookup_id($teamid);
    83 if (!$team) error_page(tra("no such team"));
     83if (!$team) error_page(tra("No such team"));
    8484
    8585$action = get_str('action', true);
    8686if ($action == 'delete') {
  • user/white.css

     
    8686input[type="submit"],
    8787.btn,
    8888a.button {
    89         background: #f2f2f2 url(img/white_grad.png) repeat-x scroll left top;
     89        background: #EDEDED url(img/white_grad.png) repeat-x scroll left top;
    9090        color: black;
    9191        border-color: #ccc;
    9292}
     
    100100        color: #0069A1;
    101101}
    102102
    103 input[type="text"], select, textarea {
    104         border-color: #d8d8d8;
     103input[type="text"], input[type="password"], select, textarea {
     104        border-color: #bbb;
    105105}
    106106
     107input[type="text"]:focus, input[type="password"]:focus, select:focus, textarea:focus {
     108        border-color: #0069A1;
     109}
     110
    107111#news {
    108112        background-color: #dff0ff;
    109113        border-color: #add8e6;
     
    118122        border-color: #eee;
    119123}
    120124
    121 td.category , tr.subtitle{
    122         background-color: #ddd;
     125#thread, #catview {
     126        background: #0069A1 url(./img/forum_bg.png) repeat-x;
    123127}
    124128
     129#thread th, #catview th {
     130        background-color: transparent;
     131        color: #fff;
     132}
     133
     134#catview .row0 {
     135        background-color: #eee;
     136}
     137
     138#catview .row1 {
     139        background-color: #fff;
     140}
     141
     142#catview tr.row0:hover,
     143#catview tr.row1:hover {
     144        background-color: #D1E4EF
     145}
     146
     147td.category {
     148 color: #fff;
     149}
     150
    125151td.postheader {
    126152        background-color: #eee;
     153        color: #333;
    127154}
    128155
    129156td.postbody {
    130         background: transparent url('img/75pct_white.png');
     157        background-color: #fff;
    131158}
    132159
    133160td.postfooter {
    134161        background-color: #eee;
     162        color: #333;
    135163}
    136164
    137165tr.postseperator {
    138         background-color: #c8c8c8;
    139         border-color: #aaa;
     166        background-color: #0069A1;
    140167}
    141168
    142169div.authorcol {
     
    144171        border-color: #c8c8c8;
    145172}
    146173
     174.authorinfo {
     175        color: #333;
     176}
     177
    147178.authorinfo img {
    148179        border-color: #a8a8a8;
    149180}