Ticket #872: many.changes.2.patch

File many.changes.2.patch, 23.1 KB (added by Simek, 15 years ago)

updated patch for latest trunk

  • inc/forum.inc

     
    108108// show a banner with search form on left and PM info on right
    109109//
    110110function show_forum_header($user) {
    111     echo "<form action=\"forum_search_action.php\" method=\"POST\">
    112     ";
    113     start_table_noborder();
    114     echo "<tr>
    115     ";
    116    
    117     // Search
    118     echo "
    119         <td>
    120         <input type=\"hidden\" name=\"search_max_time\" value=\"30\">
    121         <input type=\"hidden\" name=\"search_forum\" value=\"-1\">
    122         <input type=\"hidden\" name=\"search_sort\" value=\"5\">
    123         <input type=\"text\" name=\"search_keywords\">
    124         <input class=\"btn\" title=\"".tra("Search for words in forum messages")."\" type=\"submit\" value=\"".tra("Search forums")."\"><br>
    125         <span class=\"smalltext\"><a href=\"forum_search.php\">".tra("Advanced search")."</a></span>
    126         </td>
    127     ";
    128    
    129     if ($user) {
    130         echo "<td align=\"right\">\n";
    131         echo "<p>".tra("Private messages").": ", pm_notification($user);
    132         echo "</td>\n";
    133     }
    134     echo "</tr>
    135     ";
    136     end_table();
    137     echo "</form>
    138     ";
     111
     112        start_table_noborder();
     113        // Search
     114        ?>
     115        <tr><td>
     116        <form action="forum_search_action.php" method="POST">
     117                <input type="hidden" name="search_max_time" value="30">
     118                <input type="hidden" name="search_forum" value="-1">
     119                <input type="hidden" name="search_sort" value="5">
     120                <div class="bordered" id="searchbox">
     121                        <input type="text" name="search_keywords">
     122                        <input class="btn" title="<?php echo tra("Search for words in forum messages") ?>" type="submit" value="<?php echo tra("Search forums") ?>"><br />
     123                        <span class="smalltext"><a href="forum_search.php"><?php echo tra("Advanced search") ?></a></span>
     124                </div>
     125        </form>
     126        <?php
     127
     128        // Private Messages
     129        if ($user) {
     130                echo "<div class=\"bordered\" id=\"pmbox\">".tra("Private messages").": ", pm_notification($user);
     131                echo "</div></td></tr>\n";
     132        }
     133        end_table();
     134
    139135}
    140136
    141137// Output the forum/thread title.
    … …  
    198194
    199195// Start the forum table, output the proper headings and such.
    200196//
    201 function start_forum_table($headings, $extra="width=\"100%\"") {
     197function start_forum_table($headings, $extra="width=\"100%\" id=\"forum_main\"") {
    202198    $span = null;
    203199   
    204200    start_table($extra);
    … …  
    213209            }
    214210        } else {
    215211            $title = $headings[$i];
    216             $class = "heading";
     212            $class = "heading_forum";
    217213            $span="";
    218214        }
    219215        echo "<th class=$class$span>$title</th>";

  • 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            Your profile will be made visible to other people<br>
    8787            as soon as it has been approved by the project.<br>
    8888            This may take up to a few days.<br>
    … …  
    9090        ";
    9191    } else if ($verify_flag == -1) {
    9292        return "
    93             <font size='+2' color='#ff3333'>
     93            <font size='+2' color='#f33'>
    9494            Your profile has been marked as unacceptable.<br>
    9595            It is not visible to other people. Please change it.<br>
    9696            </font>
    … …  
    245245    BoincForumPrefs::lookup($logged_in_user);
    246246    $options = get_output_options($logged_in_user);
    247247
    248     row1(show_profile_heading1());
     248    row1_top(show_profile_heading1());
    249249    row1(output_transform($profile->response1, $options), 2, "foobar");
    250250    row1(show_profile_heading2());
    251251    row1(output_transform($profile->response2, $options), 2, "foobar");

  • 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;
    … …  
    7777    echo sanitize_html($team->name_html);
    7878    echo "<p>";
    7979    start_table();
    80     row1(tra('Team info'));
     80    row1_top(tra('Team info'));
    8181    if (strlen($team->description)) {
    8282        row2(tra('Description'), sanitize_html($team->description));
    8383    }

  • inc/user.inc

     
    194194        $email_text = "Verification pending";
    195195    }
    196196
    197     row1(tra("Account information"));
     197    row1_top(tra("Account information"));
    198198    row2(tra("Name"), $user->name);
    199199    row2(tra("Email address"), $email_text);
    200200    if (strlen($user->url)) {
    … …  
    231231}
    232232
    233233function show_community_private($user) {
    234     row1(tra("Community"));
     234    row1_top(tra("Community"));
    235235
    236236    if ($user->has_profile) {
    237237        $x = "<a href=\"view_profile.php?userid=$user->id\">".tra("View")."</a> | <a href=\"delete_profile.php\">".tra("Delete")."</a>";

  • inc/util.inc

     
    123123 
    124124   
    125125    if (!$title_plain) {
    126         echo "<html><head><title>".strip_tags($title)."</title>\n";
     126        echo "<html><head><title>". PROJECT." :: ".strip_tags($title)."</title>\n";
    127127    } else {
    128         echo "<html><head><title>".strip_tags($title_plain)."</title>\n";
     128        echo "<html><head><title>". PROJECT." :: ".strip_tags($title_plain)."</title>\n";
    129129    }
    130130    echo "<link rel=stylesheet type=\"text/css\" href=\"main.css\" media=\"all\" />
    131131                <link rel=stylesheet type=\"text/css\" href=\"$stylesheet\">
    … …  
    274274    echo "<tr><td class=\"$class\" colspan=\"$ncols\">$x</td></tr>\n";
    275275}
    276276
     277function row1_top($x, $ncols=2, $class="heading") {
     278    echo "<tr><td class=\"$class ontop\" colspan=\"$ncols\">$x</td></tr>\n";
     279}
     280
    277281function row2($x, $y, $show_error=false) {
    278282    if ($x=="") $x="<br>";
    279283    if ($y=="") $y="<br>";

  • project.sample/project.inc

     
    4242
    4343function project_footer($show_return, $show_date, $prefix) {
    4444    // If you include any links, prepend URL with $prefix
    45     echo "<br><hr noshade size=1><center>";
     45    echo "<br><hr /><center>";
    4646    if ($show_return) {
    4747        echo "<a href=".$prefix."index.php>Home</a> | <a href=".$prefix."home.php>My Account</a> | <a href=".$prefix."forum_index.php>Message Boards</a><br>\n";
    4848    }
    … …  
    5454}
    5555
    5656function show_profile_heading1() {
    57     return "Your personal background.";
     57    return "Your personal background";
    5858}
    5959
    6060function show_profile_question1() {

  • user/apps.php

     
    4242        echo "    <name>$app->user_friendly_name</name>\n";
    4343    } else {
    4444        echo "
    45             <tr><th colspan=4>$app->user_friendly_name</th></tr>
     45            <tr><th class=\"heading\" colspan=4>$app->user_friendly_name</th></tr>
    4646            <tr>
    47                 <th>".tra("Platform")."</th>
    48                 <th>".tra("Version")."</th>
    49                 <th>".tra("Installation time")."</th>
     47                <th class=\"apphead\">".tra("Platform")."</th>
     48                <th class=\"apphead\">".tra("Version")."</th>
     49                <th class=\"apphead\">".tra("Installation time")."</th>
    5050            </tr>
    5151        ";
    5252    }
    … …  
    8181                }
    8282                echo "<tr>
    8383                    <td>$platform->user_friendly_name</td>
    84                     <td>$version_num_f</td>
     84                    <td class=\"numbers\">$version_num_f</td>
    8585                    <td>$create_time_f</td>
    8686                    </tr>
    8787                ";

  • user/create_profile.php

     
    173173        $response2 = $profile->response2;
    174174    }
    175175
    176     row1(show_profile_heading1());
     176    row1_top(show_profile_heading1());
    177177    rowify(show_profile_question1().html_info());
    178178    show_textarea("response1", $response1);
    179179    row1( show_profile_heading2());

  • user/edit_email_form.php

     
    3131
    3232echo "<form method=post action=edit_email_action.php>\n";
    3333start_table();
    34 row1("Change the email address of your account");
     34row1_top("Change the email address of your account");
    3535row2("New email address
    3636    <br><font size=-2>Must be a valid address of the form 'name@domain'</font>",
    3737    "<input name=email_addr size=50 value='$email_text'>"

  • user/edit_forum_preferences_form.php

     
    190190    }
    191191}
    192192row2("Filtered users".
    193     "<br><span class=note>Ignore message board posts and private messages from these  users.</span>",
     193    "<br><span class=note>Ignore message board posts and private messages from these users.</span>",
    194194    "$forum_filtered_userlist
    195195    <br>
    196196        <input type=\"text\" name=\"forum_filter_user\" size=12> User ID (For instance: 123456789)

  • user/edit_passwd_form.php

     
    5252        "<input name=auth size=40>"
    5353    );
    5454}
    55 row2("New password", "<input type=password name=passwd size=40>");
    56 row2("New password, again", "<input type=password name=passwd2 size=40>");
     55row2("New password", "<input type=text type=password name=passwd size=40>");
     56row2("New password, again", "<input type=text type=password name=passwd2 size=40>");
    5757row2("", "<input type=submit value='Change password'>");
    5858end_table();
    5959echo "</form>\n";

  • user/edit_user_info_form.php

     
    3030echo form_tokens($user->authenticator);
    3131start_table();
    3232row2("Name<br><font size=-2>real name or nickname</font>",
    33     "<input name=user_name size=30 value='$user->name'>"
     33    "<input type=text name=user_name size=30 value='$user->name'>"
    3434);
    3535row2("URL<br><font size=-2>of your web page; optional</font>",
    36     "http://<input name=url size=50 value='$user->url'>"
     36    "http://<input type=text name=url size=50 value='$user->url'>"
    3737);
    3838row2_init("Country",
    3939    "<select name=country>"
    … …  
    4141print_country_select($user->country);
    4242echo "</select></td></tr>\n";
    4343row2("Postal (ZIP) code<br><font size=-2>Optional</font>",
    44     "<input name=postal_code size=20 value='$user->postal_code'>"
     44    "<input type=text name=postal_code size=20 value='$user->postal_code'>"
    4545);
    4646
    4747row2("", "<input type=submit value='Update info'>");

  • user/forum_forum.php

     
    106106echo "
    107107    <p>
    108108    This message board is available as an
    109     <a href=forum_rss.php?forumid=$forum->id&setup=1>RSS feed
     109    <a href=forum_rss.php?forumid=$forum->id&amp;setup=1>RSS feed
    110110    <img src=img/feed_logo.png></a>
    111111";
    112112
    … …  
    155155            echo '<tr class="row'.$n.'">';   
    156156        }
    157157       
    158         echo "<td width=\"1%\" align=\"right\"><nobr>";
     158        echo "<td width=\"1%\"><nobr>";
    159159        if ($user && ($thread->rating()>$user->prefs->high_rating_threshold)) {
    160160            show_image(EMPHASIZE_IMAGE, "This message has a high average rating", "Highly rated");
    161161        }
    … …  
    204204        $n = ($n+1)%2;
    205205
    206206        echo '
    207             <td>'.($thread->replies+1).'</td>
    208             <td>'.user_links($owner).'</td>
    209             <td>'.$thread->views.'</td>
    210             <td class=\"lastpost\">'.time_diff_str($thread->timestamp, time()).'</td>
     207            <td class="numbers leftborder">'.($thread->replies+1).'</td>
     208            <td class="author leftborder">'.user_links($owner).'</td>
     209            <td class="numbers leftborder">'.$thread->views.'</td>
     210            <td class="lastpost leftborder">'.time_diff_str($thread->timestamp, time()).'</td>
    211211            </tr>
    212212        ';
    213213        flush();

  • user/forum_index.php

     
    6060            </em>
    6161            <br><span class=\"smalltext\">$d</span>
    6262        </td>
    63         <td class=\"numbers\">$forum->threads</td>
    64         <td class=\"numbers\">$forum->posts</td>
    65         <td class=\"lastpost\">".time_diff_str($forum->timestamp, time())."</td>
     63        <td class=\"numbers leftborder\">$forum->threads</td>
     64        <td class=\"numbers leftborder\">$forum->posts</td>
     65        <td class=\"lastpost leftborder\">".time_diff_str($forum->timestamp, time())."</td>
    6666    </tr>";
    6767}
    6868

  • user/forum_post.php

     
    8888
    8989echo "<form action=\"forum_post.php?id=".$forum->id."\" method=\"POST\">\n";
    9090echo form_tokens($logged_in_user->authenticator);
     91echo "<br />";
    9192
    9293start_table();
    9394
    94 row1(tra("Create a new thread")); //New thread
     95row1_top(tra("Create a new thread")); //New thread
    9596$submit_help = "";
    9697$body_help = "";
    9798

  • user/forum_search.php

     
    2626
    2727start_table();
    2828echo "<form action=\"forum_search_action.php\" method=\"post\">";
    29 row1("Search query");
     29row1_top("Search query");
    3030row2("Search for keywords:<br />
    3131    <font size=-1>Posts that contain all the specified words will be displayed</font>",
    3232    '<input type="text" style="width: 290px" name="search_keywords" size="30" /><br />

  • user/main.css

     
    1313}
    1414
    1515h1, h2 {
     16        font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
    1617        font-size: x-large;
    1718        font-weight: normal;
    1819}
    … …  
    2425h3, h4 { font-weight: bold; }
    2526
    2627hr {
     28        border-top-width: 2px;
     29        border-top-style: solid;
    2730        size: 0;
    2831        margin: 8px 2px;
    2932}
    … …  
    3841        margin: 2px;
    3942}
    4043
    41 table.bordered {
     44.bordered {
    4245        border-width: 2px;
    4346        border-style: solid;
    4447        -moz-border-radius: 6px;
    … …  
    5356}
    5457
    5558td {
     59        padding: 4px;
    5660        vertical-align: top;
    57         padding: 4px;
    5861}
    5962
    6063td.bordered {
    … …  
    6770        border-left-style: solid;
    6871}
    6972
    70 td.heading {
     73.heading {
     74        font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
    7175        font-weight: bold;
    7276        margin: 4px 0;
    7377        padding: 8px;
    … …  
    104108        vertical-align: middle;
    105109}
    106110
     111.ontop {
     112        -moz-border-radius: 6px 6px 0 0;
     113        -khtml-border-radius-topleft: 6px;
     114        -khtml-border-radius-topright: 6px;
     115        -webkit-border-radius-topleft: 6px;
     116        -webkit-border-radius-topright: 6px;
     117        border-radius-topleft: 6px;
     118        border-radius-topright: 6px;
     119}
     120
    107121.row0,
    108122.row1 ,
    109123.highlighted_row0,
    … …  
    131145        /* IE6 doesn't understand [type=XXXX] so we use class "button" */
    132146
    133147a.button {
    134 
    135148        line-height: 2.4em;
    136149        padding: 4px 8px;
    137150        margin: 0 4px;
    … …  
    154167        text-decoration: none;
    155168}
    156169
    157 input[type="text"], select, textarea {
     170input[type="text"], input[type="file"], select, textarea {
    158171        border-width: 1px;
    159172        border-style: solid;
    160173        margin: 2px 4px;
    161174        padding: 3px;
    162         font-size: 12px;
     175        font-size: 11px;
    163176        -moz-border-radius: 5px;
    164177        -webkit-border-radius: 5px;
    165178        -khtml-border-radius: 5px;
    … …  
    237250        height: 24px;
    238251        margin-left: 4px;
    239252        padding-left: 8px;
    240         -moz-border-radius: 0 10px;
     253        -moz-border-radius: 0 0 10px 10px;
    241254        -webkit-border-radius-bottomleft: 10px;
    242255        -webkit-border-radius-bottomright: 10px;
    243256        -khtml-border-radius-bottomleft: 10px;
    … …  
    280293        margin: 4px 0;
    281294}
    282295
    283 td.threadline ,
    284 td.numbers {
     296td.threadline  {
    285297        text-align: left;
    286298}
    287299
    288300td.numbers {
    289301        text-align: center;
     302        vertical-align: middle;
    290303}
    291304
    292305td.lastpost {
     306        vertical-align: middle;
    293307}
    294308
    295309.title {
     310        font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
    296311        font-size: 14px;
    297312        font-weight: bold;
    298313}
    … …  
    332347.authorcol .button {
    333348        margin: 0 6px;
    334349        line-height: 2.6em;
    335 } 
     350}
    336351
     352.leftborder {
     353        border-left-width: 1px;
     354        border-left-style: solid;
     355}
     356
    337357blockquote.postbody {
    338358        border-left-width: 2px;
    339359        border-left-style: solid;
    … …  
    348368        overflow: visible;
    349369}
    350370
     371#thread th,
     372.heading_forum,
     373.heading_pm  {
     374        font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
     375}
     376
     377#forum_main {
     378        border: none;
     379        padding: 6px;
     380        border-spacing: 0 1px;
     381}
     382
     383#pmbox  {
     384        height: 24px;
     385        float: right;
     386        text-align: center;
     387        padding: 7px 8px 0 8px;
     388}
     389
     390#searchbox {
     391    height: 48px;
     392    float: left;
     393    padding: 6px 8px 2px 8px
     394}
     395
     396#searchbox  input[type="text"]{
     397        margin-left: 0;
     398}
     399
     400#searchbox .btn {
     401        padding: 3px 8px;
     402}
     403
    351404.forum_toplinks td {
    352405        vertical-align: middle;
    353406}
    354407
    355408span.page_title {
    356409        font-size: 24px;
    357         margin: 20px;
     410        margin: 10px 16px;
    358411}
    359412
    360413span.note {
    … …  
    394447.notice  {
    395448        font-weight: bold;
    396449        font-size: 1.1em;
     450        padding: 4px;
     451        border-width: 2px;
     452        border-style: solid;
     453        -moz-border-radius: 6px;
     454        -webkit-border-radius: 6px;
     455        -khtml-border-radius: 6px;
     456        border-radius: 6px;
    397457}
    398458
    399459#preview {
    400460        border-width: 2px;
    401461        border-style: solid;
    402462        margin: 1em;
    403         padding: 0.2em;
     463        padding: 10px;
     464        -moz-border-radius: 6px;
     465        -webkit-border-radius: 6px;
     466        -khtml-border-radius: 6px;
     467        border-radius: 6px;
    404468}
    405469
    406470#preview .header {
     471        font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
    407472        font-weight: bold;
    408         font-size: 1.3em;
    409         border-bottom-width: 1px;
     473        font-size: 16px;
     474        margin-bottom: 5px;
     475        border-bottom-width: 2px;
    410476        border-bottom-style: solid;
    411477}
    412478

  • user/pm.php

     
    6565   
    6666    make_script();
    6767    if (get_int("sent", true) == 1) {
    68         echo "<div class=\"notice\">".tra("Your message has been sent.")."</div>\n";
     68        echo "<div class=\"notice\">".tra("Your message has been sent.")."</div><br />\n";
    6969    }
    7070    $options = get_output_options($logged_in_user);
    7171   
    … …  
    8282        ";
    8383        echo form_tokens($logged_in_user->authenticator);
    8484        start_table();
    85         echo "<tr><th>".tra("Subject")."</th><th>".tra("Sender and date")."</th><th>".tra("Message")."</th></tr>\n";
     85        echo "<tr><th class=\"heading_pm\">".tra("Subject")."</th><th class=\"heading_pm\">".tra("Sender and date")."</th><th class=\"heading_pm\">".tra("Message")."</th></tr>\n";
    8686        $i = 0;
    8787        foreach($msgs as $msg) {
    8888            $i++;

  • user/prefs_edit.php

     
    1616// You should have received a copy of the GNU Lesser General Public License
    1717// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
    1818
    19 
    20 
    2119include_once("../inc/db.inc");
    2220include_once("../inc/util.inc");
    2321include_once("../inc/prefs.inc");

  • user/profile_menu.php

     
    5151        echo sub_sentence(output_transform(strip_tags($profile->response1)), ' ', 150, true);
    5252    }
    5353
    54 echo "</td></tr>";
     54echo "</td></tr><br />";
    5555
    5656row1(tra("User Profile Explorer"));
    5757echo "<tr><td>
    … …  
    7171row1(tra("Search profile text"));
    7272rowify("
    7373    <form action=\"profile_search_action.php\" method=\"GET\">
    74     <input name=\"search_string\">
     74    <input type=\"text\" type=\menu\" name=\"search_string\">
    7575    <input type=\"submit\" value=\"".tra("Search")."\">
    7676    </form>
    7777");

  • user/project.inc.sample

     
    3939// project-specific information that needs to be set by the project administrators.
    4040
    4141function show_profile_heading1() {
    42     row1("Your personal background.");
     42    row1("Your personal background");
    4343}
    4444
    4545function show_profile_question1() {

  • user/white.css

     
    1212}
    1313
    1414hr {
    15         border-top: 2px solid #e8e8e8;
     15        border-top-color: #e8e8e8;
    1616}
    1717
    18 table.bordered {
     18.bordered {
    1919        border-color: #e8e8e8;
     20        background-color: #fff;
    2021}
    2122
    2223th {
    … …  
    4950}
    5051
    5152.row0 {
    52         background-color: #d9d9d9;
     53        background-color: #ededed;
    5354}
    5455
    5556.row1 {
    56         background-color: #eee;
     57        background-color: #f5f5f5;
    5758}
    5859
    5960.highlighted_row0 {
    … …  
    7273        background-color: #defade;
    7374}
    7475
    75 tr.message {
     76tr.message,
     77th.apphead {
    7678        background-color: #e0e0e0;
    7779}
    7880
    … …  
    112114        border-color: #eee;
    113115}
    114116
    115 td.category , tr.subtitle{
     117#forum_main {
     118        background: #666 url("img/forum_gradient.png") repeat-x;
     119}
     120
     121#forum_main .row0:hover, #forum_main .row1:hover {
     122        background: #ddd;
     123}
     124
     125.heading_forum {
     126        background-color: #666;
     127        color: #fff;
     128}
     129
     130td.category, tr.subtitle{
    116131        background-color: #ddd;
    117132}
    118133
    119 td.postheader {
     134td.postheader ,
     135td.postfooter {
    120136        background-color: #eee;
    121137}
    122138
    123139td.postbody {
    124         background: transparent url('img/75pct_white.png');
     140        background-color: #fff;
    125141}
    126142
    127 td.postfooter {
    128         background-color: #eee;
    129 }
    130 
    131143tr.postseperator {
    132144        background-color: #c8c8c8;
    133145        border-color: #aaa;
    … …  
    142154        border-color: #a8a8a8;
    143155}
    144156
     157.leftborder {
     158        border-left-color: #fff;
     159}
     160
    145161blockquote.postbody {
    146162        border-left-color: #0089e1;
    147163        background-color: #f5fffa;
    … …  
    161177
    162178.error {
    163179        color: #f00;
     180        border-color: #cd2020;
     181        background-color: #fdbdbd;
    164182}
    165183
    166184.notice {
    167185        color: #090;
     186        border-color: #67bc13;
     187        background-color: #e4ffc9;
    168188}
    169189
    170190#preview {