Ticket #1020: web.changes.patch
File web.changes.patch, 31.1 KB (added by , 14 years ago) |
---|
-
inc/forum.inc
69 69 define('IMAGE_STICKY', 'img/sticky_post.png'); 70 70 define('IMAGE_LOCKED', 'img/locked_post.png'); 71 71 define('IMAGE_STICKY_LOCKED', 'img/sticky_locked_post.png'); 72 define('IMAGE_POST', 'img/post.png'); 72 73 define('NEW_IMAGE_HEIGHT','15'); 73 74 define('EMPHASIZE_IMAGE', 'img/emphasized_post.png'); 74 75 define('EMPHASIZE_IMAGE_HEIGHT','15'); … … 146 147 } else { 147 148 $is_helpdesk = false; 148 149 } 150 149 151 $where = $is_helpdesk?tra("Questions and Answers"):tra("Message boards"); 150 152 $top_url = $is_helpdesk?"forum_help_desk.php":"forum_index.php"; 153 151 154 if (!$forum && !$thread) { 152 155 echo "<span class=\"title\">$where</span>"; 153 156 … … 170 173 } 171 174 echo "</span>"; 172 175 } 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"; 176 177 } 177 178 } 178 179 … … 251 252 $navbar.='<a href="forum_forum.php?id='.get_int("id").'&start='.(($i-1)*THREADS_PER_PAGE); 252 253 $sort = get_int("sort",true); 253 254 if ($sort) $navbar.='&sort='.$sort; 254 $navbar.='">'.$i.' |</a>';255 $navbar.='">'.$i.'</a> | '; 255 256 if ($i == $curpage+1){$navbar.="</em>";} 256 257 } 257 258 … … 519 520 } 520 521 echo " 521 522 <tr> 522 <td class=\" ".($highlight?"highlighted_":"")."row$n\" rowspan=\"3\">523 <td class=\"leftcol ".($highlight?"highlighted_":"")."row$n\" rowspan=\"3\"> 523 524 <a name=\"$post->id\"></a> 524 525 <div class=\"authorcol\"> 525 526 "; … … 539 540 $url = "pm.php?action=new&userid=".$user->id; 540 541 $name = $user->name; 541 542 show_button($url, "Send message", "Send $name a private message"); 542 echo "<br />Joined: ", gmdate(' M jy', $user->create_time), "<br>";543 echo "<br />Joined: ", gmdate('j M y', $user->create_time), "<br>"; 543 544 544 545 if (!isset($user->nposts)) { 545 546 $user->nposts = BoincPost::count("user=$user->id"); … … 583 584 echo " <a href=\"forum_thread.php?id=".$thread->id."&nowrap=true#$post->id\">Message ".$post->id."</a> - "; 584 585 if ($post->hidden) echo "<font color=red>[hidden] </font>"; 585 586 echo " 586 Posted ", pretty_time_str($post->timestamp);587 Posted: ", pretty_time_str($post->timestamp); 587 588 ; 588 589 589 590 if ($post->parent_post) { … … 1099 1100 } 1100 1101 1101 1102 function 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"); 1103 1104 } 1104 1105 1105 1106 // show a 1-line summary of thread and its forum. … … 1122 1123 break; 1123 1124 } 1124 1125 echo ' 1125 </td><td >'.($thread->replies+1).'</td>1126 </td><td class="numbers">'.($thread->replies+1).'</td> 1126 1127 <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> 1129 1130 </tr> 1130 1131 '; 1131 1132 } -
inc/profile.inc
82 82 function offensive_profile_warning($verify_flag) { 83 83 if ($verify_flag == 0) { 84 84 return " 85 <font size='+2' color='#3 3cc33'>85 <font size='+2' color='#3c3'> 86 86 ".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.")." 87 87 </font> 88 88 "; 89 89 } else if ($verify_flag == -1) { 90 90 return " 91 <font size='+2' color='#f f3333'>91 <font size='+2' color='#f33'> 92 92 ".tra("Your profile has been marked as unacceptable. It is not visible to other people. Please change it.")." 93 93 </font> 94 94 "; … … 184 184 $min_credit = parse_config(get_config(), "<profile_min_credit>"); 185 185 if (!$logged_in_user && $min_credit && $user->expavg_credit < $min_credit ) { 186 186 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. 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) 188 188 ); 189 189 } 190 190 if (is_banished($user)) { … … 224 224 if ($show_picture) { 225 225 echo " 226 226 <tr><td colspan=\"2\" align=\"center\"> 227 227 <img vspace=\"6\" hspace=\"9\" src=\"".profile_image_url($user->id)."\"> 228 228 </td></tr> 229 229 "; 230 230 } … … 242 242 BoincForumPrefs::lookup($logged_in_user); 243 243 $options = get_output_options($logged_in_user); 244 244 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 } 249 254 250 255 if (!$can_edit and !$screen_mode) { 251 256 row1(tra("Your feedback on this profile")); -
inc/team.inc
32 32 start_table(); 33 33 row2('<b>'.tra('Search criteria (use one or more)').'</b>', ''); 34 34 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) . '">'); 36 36 row2_init(tra('Country'), ''); 37 37 echo '<select name="country"><option value="" selected>---</option>'; 38 38 $country = $params->country; … … 89 89 } 90 90 row2(tra('Web site'), "<a href=$x>$x</a>"); 91 91 } 92 92 93 93 if (!no_computing()) { 94 94 row2(tra('Total credit'), format_credit_large($team->total_credit)); 95 95 row2(tra('Recent average credit'), format_credit_large($team->expavg_credit)); … … 196 196 } else { 197 197 $sort_clause = "expavg_credit desc"; 198 198 } 199 199 200 200 start_table(); 201 201 echo '<tr> 202 202 <th>'.tra('Name').'</th> … … 430 430 ); 431 431 row2(tra('URL of team web page, if any').':<br><font size=-2>('.tra('without "http://"').') 432 432 '.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'>" 434 434 ); 435 435 row2(tra('Description of team').': 436 436 <br><span class="note"> … … 445 445 "<select name=country>" 446 446 ); 447 447 print_country_select($team->country); 448 448 449 449 echo "</select></td></tr>\n"; 450 450 $x = $team->joinable?"checked":""; 451 451 row2(tra("Accept new members?"), "<input type=checkbox name=joinable $x>"); -
inc/user.inc
293 293 } 294 294 295 295 $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"; 297 297 $n = count($friends); 298 298 if ($n) { 299 299 foreach($friends as $friend) { -
inc/util.inc
129 129 130 130 131 131 if (!$title_plain) { 132 echo "<html><head><title>" .strip_tags($title)."</title>\n";132 echo "<html><head><title>" . PROJECT . " :: ".strip_tags($title)."</title>\n"; 133 133 } else { 134 echo "<html><head><title>" .strip_tags($title_plain)."</title>\n";134 echo "<html><head><title>" . PROJECT . " :: ".strip_tags($title_plain)."</title>\n"; 135 135 } 136 136 echo "<link rel=stylesheet type=\"text/css\" href=\"main.css\" media=\"all\" /> 137 137 <link rel=stylesheet type=\"text/css\" href=\"$stylesheet\"> … … 226 226 227 227 function time_str($x) { 228 228 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"; 230 230 } 231 231 232 232 function pretty_time_str($x) { -
user/create_account_form.php
76 76 if(defined('INVITE_CODES')) { 77 77 row2( 78 78 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\" >" 80 80 ); 81 81 } 82 82 83 83 row2( 84 84 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\">" 86 86 ); 87 87 row2( 88 88 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\">" 90 90 ); 91 91 $min_passwd_length = parse_element($config, "<min_passwd_length>"); 92 92 if (!$min_passwd_length) { … … 107 107 echo "</select></td></tr>\n"; 108 108 row2( 109 109 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\">" 111 111 ); 112 112 row2("", 113 113 "<input type=\"submit\" value=\"".tra("Create account")."\">" -
user/forum_forum.php
132 132 $gotoStr = "<div align=\"right\">$nav</div><br>"; 133 133 } 134 134 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"); 136 136 137 137 $sticky_first = !$user || !$user->prefs->ignore_sticky_posts; 138 138 … … 163 163 echo '<tr class="row'.$n.'">'; 164 164 } 165 165 166 echo "<td width=\"1%\" align=\"right\"><nobr>";166 echo "<td width=\"1%\" class=\"threadicon\"><nobr>"; 167 167 if ($thread->hidden) { 168 echo "[ hidden]";168 echo "[".tra("hidden")."]"; 169 169 } 170 170 if ($unread) { 171 171 if ($thread->sticky) { … … 191 191 } else { 192 192 if ($thread->locked) { 193 193 show_image(IMAGE_LOCKED, "This thread is locked", "locked"); 194 } 194 } else { 195 show_image(IMAGE_POST, "You read this thread", "read"); 196 } 195 197 } 196 198 } 197 199 echo "</nobr></td>"; … … 205 207 $n = ($n+1)%2; 206 208 207 209 echo ' 208 <td >'.($thread->replies+1).'</td>210 <td class="numbers">'.($thread->replies+1).'</td> 209 211 <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> 212 214 </tr> 213 215 '; 214 216 flush(); -
user/forum_help_desk.php
40 40 show_forum_title($category, null, null); 41 41 echo "<p>"; 42 42 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"); 44 44 } 45 45 if (strlen($category->name)) { 46 46 echo " … … 56 56 <tr class=\"row1\"> 57 57 <td> 58 58 <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> 60 60 </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> 63 63 </tr> 64 64 "; 65 65 } -
user/forum_index.php
90 90 echo "<p>"; 91 91 show_mark_as_read_button($user); 92 92 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" 94 94 ); 95 95 } 96 96 if (strlen($category->name)) { -
user/forum_search.php
28 28 echo "<form action=\"forum_search_action.php\" method=\"post\">"; 29 29 row1("Search query"); 30 30 row2("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>", 32 32 '<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>'); 34 34 row2("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>", 36 36 '<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>'); 38 38 39 39 row1("Search options"); 40 40 row2("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>", 42 42 '<select name="search_max_time"> 43 43 <option value="1">1 day</option> 44 44 <option value="3">3 days</option> … … 67 67 } 68 68 } 69 69 row2("Forum<br /> 70 < font size=-1>Only display posts from this forum</font>",70 <span class=\"smalltext\">Only display posts from this forum</span>", 71 71 '<select name="search_forum">'.$forumlist.'</select'); 72 72 73 73 $sortlist = null; -
user/forum_search_action.php
164 164 165 165 // Display the threads while we search for posts 166 166 if (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>"; 168 168 show_thread_and_context_header(); 169 169 $i = 0; 170 170 foreach ($threads as $thread){ … … 184 184 ); 185 185 186 186 if (count($posts)){ 187 echo "<span class=title> Messages matching your query:</span>";187 echo "<span class=title>" . tra("Messages matching your query:") . "</span>"; 188 188 start_table(); 189 189 $n = 1; 190 190 $options = get_output_options($logged_in_user); -
user/forum_thread.php
39 39 $tokens = url_tokens($logged_in_user->authenticator); 40 40 } 41 41 42 if ($threadid < 1) { 43 error_page(tra("Invalid thread ID!")); 44 } 45 42 46 $thread = BoincThread::lookup_id($threadid); 43 47 $forum = BoincForum::lookup_id($thread->forum); 44 48 … … 192 196 // Here is where the actual thread begins. 193 197 $headings = array(array(tra("Author"),"authorcol"), array(tra("Message"),"")); 194 198 195 start_forum_table($headings, "id=\"thread\" width=100%");199 start_forum_table($headings, "id=\"thread\" cellspacing=0"); 196 200 show_posts($thread, $forum, $sort_style, $filter, $logged_in_user, true); 197 201 end_table(); 198 202 -
user/get_passwd.php
32 32 33 33 start_table(); 34 34 echo "<form method=post action=mail_passwd.php>\n"; 35 row2("Email address","<input size=40 name=email_addr>");35 row2("Email address","<input type=\"text\" size=40 name=email_addr>"); 36 36 row2("", "<input type=submit value=OK>"); 37 37 echo "</form>"; 38 38 end_table(); … … 75 75 start_table(); 76 76 77 77 echo "<form action=login_action.php method=post>\n"; 78 row2("Log in with authenticator", "<input name=authenticator size=40>");78 row2("Log in with authenticator", "<input type=\"text\" name=authenticator size=40>"); 79 79 row2("Stay logged in on this computer", 80 80 "<input type=checkbox name=send_cookie checked>" 81 81 ); -
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
12 12 margin: 5px 10px; 13 13 } 14 14 15 h1, h2, h3, h4, th { 16 font-family: Georgia, Times, "Times New Roman", serif; 17 } 18 15 19 h1, h2 { 16 font-size: x-large;17 20 font-weight: normal; 18 21 } 19 22 … … 34 37 } 35 38 36 39 table { 37 padding: 4px ;40 padding: 4px 6px; 38 41 margin: 2px; 39 42 } 40 43 … … 49 52 50 53 th { 51 54 font-weight: bold; 52 vertical-align: top;55 vertical-align: middle; 53 56 } 54 57 55 58 td { … … 71 74 font-weight: bold; 72 75 margin: 4px 0; 73 76 padding: 8px; 77 font-family: Georgia, Times, "Times New Roman", serif; 74 78 } 75 79 76 80 td.fieldname { 77 81 text-align: right; 78 82 padding-right: 10px; 79 83 font-size: 14px; 80 84 margin: 2px 0; 81 85 } 82 86 … … 111 115 text-align: left; 112 116 } 113 117 118 #catview img.userimg, 119 #thread img.userimg { 120 float: left; 121 padding: 0 2px; 122 } 123 114 124 /* Buttons etc. */ 115 125 116 126 input[type="button"], … … 149 159 150 160 input[type="button"]:hover, 151 161 input[type="submit"]:hover, 152 input.btn:hover, 162 input.btn:hover, 153 163 .button:hover , 154 164 .forum_toplinks a:hover { 155 165 text-decoration: none; 156 166 } 157 167 158 input[type="text"], input[type="password"] select, textarea {168 input[type="text"], input[type="password"], select, textarea { 159 169 border-width: 1px; 160 170 border-style: solid; 161 171 margin: 2px 4px; … … 222 232 /* Forum */ 223 233 224 234 td.category , tr.subtitle{ 235 font-family: Georgia, Times, "Times New Roman", serif; 225 236 border: none; 226 237 font-weight: bold; 227 238 margin: 6px 0; … … 233 244 padding: 4px; 234 245 } 235 246 236 td.postheader { 247 td.postheader { 237 248 font-size: 11px; 238 height: 24px;239 249 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; 248 256 } 249 257 250 td.postbody { 251 font-size: 9pt; 252 margin-left: 4px; 258 td.postheader form { 259 padding: 4px; 253 260 } 254 261 262 td.postbody { 263 font-size: 12px; 264 line-height: 140%; 265 padding: 4px 12px; 266 } 267 255 268 td.postfooter { 256 269 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; 267 277 } 268 278 279 td.postheader .button, 269 280 td.postfooter .button { 270 line-height: 2.2em; 271 margin: 0 4px; 281 font-size: 11px; 272 282 } 273 283 274 284 tr.helpdeskseperator { … … 276 286 } 277 287 278 288 tr.postseperator { 279 border-width: 1px;280 border-style: solid;281 289 margin: 4px 0; 282 290 } 283 291 284 td.threadline , 285 td.numbers { 292 td.threadline { 286 293 text-align: left; 294 vertical-align: middle; 287 295 } 288 296 289 297 td.numbers { 298 vertical-align: middle; 290 299 text-align: center; 291 300 } 292 301 293 td.lastpost { 302 td.lastpost, td.threadicon { 303 vertical-align: middle; 294 304 } 295 305 296 306 .title { … … 303 313 font-weight: normal; 304 314 } 305 315 316 td.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 306 326 .authorcol { 307 327 width: 136px; 308 overflow: hidden;309 328 } 310 329 311 div.authorcol { 330 div.authorcol { 312 331 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; 317 338 -moz-border-radius: 10px; 318 339 -webkit-border-radius: 10px; 319 340 -khtml-border-radius: 10px; 320 341 border-radius: 10px; 321 } 342 } 322 343 323 344 .authorinfo { 324 345 font-size: 11px; 325 346 } 326 347 327 img.authorinfo { 348 img.authorinfo { 328 349 border-width: 1px; 329 350 border-style: solid; 330 margin: 3px 9px; 331 } 351 margin: 3px 9px; 352 } 332 353 333 354 img.flag { 334 margin: 2px 1px; 355 margin: 2px 1px; 335 356 } 336 357 337 358 .authorcol .button { 338 margin: 0 6px;359 margin: 0 4px; 339 360 line-height: 2.6em; 340 } 361 } 341 362 342 363 blockquote.postbody { 343 364 border-left-width: 2px; … … 345 366 padding: 2px 6px; 346 367 margin: 0 6px 0 10px; 347 368 font-style: italic; 348 } 369 } 349 370 350 #thread {371 #thread, #catview { 351 372 width: 100%; 352 table-layout: fixed; 353 overflow: visible; 373 border: 0; 354 374 } 355 375 376 #catview { 377 padding: 4px 6px 6px; 378 } 379 356 380 .forum_toplinks td { 357 381 vertical-align: middle; 358 382 } … … 393 417 display: block; 394 418 margin-left: 5em; 395 419 border-left-width: 3px; 396 border-left-style: solid; 420 border-left-style: solid; 397 421 padding-left: 1em; 398 422 white-space: nowrap; 399 423 overflow: auto; -
user/pm.php
62 62 // 63 63 function do_inbox($logged_in_user) { 64 64 page_head(tra("Private messages").": ".tra("Inbox")); 65 65 66 66 make_script(); 67 67 if (get_int("sent", true) == 1) { 68 68 echo "<div class=\"notice\">".tra("Your message has been sent.")."</div>\n"; 69 69 } 70 70 $options = get_output_options($logged_in_user); 71 71 72 72 BoincNotify::delete_aux("userid=$logged_in_user->id and type=".NOTIFY_PM); 73 73 74 74 $msgs = BoincPrivateMessage::enum( … … 128 128 } 129 129 page_head(tra("Private messages")." : ".$message->subject); 130 130 pm_header(); 131 131 132 132 $sender = BoincUser::lookup_id($message->senderid); 133 133 134 134 start_table(); … … 143 143 echo " | <a href=\"pm.php?action=delete&id=$id\">".tra("Delete")."</a>\n"; 144 144 echo " | <a href=\"pm.php?action=inbox\">".tra("Inbox")."</a>\n"; 145 145 end_table(); 146 146 147 147 if ($message->opened == 0) { 148 148 $message->update("opened=1"); 149 149 } … … 167 167 function do_send($logged_in_user) { 168 168 check_banished($logged_in_user); 169 169 check_tokens($logged_in_user->authenticator); 170 170 171 171 $to = sanitize_tags(post_str("to", true)); 172 172 $subject = post_str("subject", true); 173 173 $content = post_str("content", true); 174 174 175 175 if (post_str("preview", true) == tra("Preview")) { 176 176 pm_form(); 177 177 } … … 186 186 } 187 187 $to = str_replace(", ", ",", $to); // Filter out spaces after separator 188 188 $users = explode(",", $to); 189 189 190 190 $userlist = array(); 191 191 $userids = array(); // To prevent from spamming a single user by adding it multiple times 192 192 193 193 foreach ($users as $username) { 194 194 $user = explode(" ", $username); 195 195 if (is_numeric($user[0])) { // user ID is gived … … 215 215 $userids[$user->id] = true; 216 216 } 217 217 } 218 218 219 219 foreach ($userlist as $user) { 220 220 if (!is_moderator($logged_in_user, null)) { 221 221 check_pm_count($logged_in_user->id); 222 222 } 223 223 pm_send($user, $subject, $content, true); 224 224 } 225 225 226 226 Header("Location: pm.php?action=inbox&sent=1"); 227 227 } 228 228 } … … 237 237 echo "<div>".tra("Are you really sure you want to block user %1 from sending you private messages?", $user->name)."<br>\n"; 238 238 echo tra("Please note that you can only block a limited amount of users.")."</div>\n"; 239 239 echo "<div>".tra("Once the user has been blocked you can unblock it using forum preferences page.")."</div>\n"; 240 240 241 241 echo "<form action=\"pm.php\" method=\"POST\">\n"; 242 242 echo form_tokens($logged_in_user->authenticator); 243 243 echo "<input type=\"hidden\" name=\"action\" value=\"confirmedblock\">\n"; … … 253 253 $blocked_user = BoincUser::lookup_id($id); 254 254 if (!$blocked_user) error_page("no such user"); 255 255 add_ignored_user($logged_in_user, $blocked_user); 256 256 257 257 page_head(tra("User %1 blocked", $blocked_user->name)); 258 258 259 259 echo "<div>".tra("User %1 has been blocked from sending you private messages.", $blocked_user->name)."\n"; 260 260 echo tra("To unblock, visit %1message board preferences%2", "<a href=\"edit_forum_preferences_form.php\">", "</a>")."</div>\n"; 261 261 } -
user/profile_menu.php
71 71 row1(tra("Search profile text")); 72 72 rowify(" 73 73 <form action=\"profile_search_action.php\" method=\"GET\"> 74 <input name=\"search_string\">74 <input type=\"text\" name=\"search_string\"> 75 75 <input type=\"submit\" value=\"".tra("Search")."\"> 76 76 </form> 77 77 "); -
user/server_status.php
238 238 239 239 // Check for httpd.pid file of upload/download server. 240 240 // 241 $uldl_running = file_exists($uldl_pid);241 $uldl_running = !file_exists($uldl_pid); 242 242 if ($uldl_running == 0) $uldl_running = -1; 243 243 show_status($uldl_host, tra("upload/download server"), $uldl_running); 244 244 -
user/team.php
22 22 23 23 page_head("Teams"); 24 24 25 echo "<p>".tra("%1 participants may form %2teams%3 ", PROJECT, "<b>", "</b>") ."25 echo "<p>".tra("%1 participants may form %2teams%3.", PROJECT, "<b>", "</b>") ." 26 26 <p> 27 27 ". tra("You may belong to only one team. You can join or quit a team at any time."). " 28 28 <p>" . -
user/team_manage.php
80 80 $user = get_logged_in_user(true); 81 81 $teamid = get_int('teamid'); 82 82 $team = BoincTeam::lookup_id($teamid); 83 if (!$team) error_page(tra(" no such team"));83 if (!$team) error_page(tra("No such team")); 84 84 85 85 $action = get_str('action', true); 86 86 if ($action == 'delete') { -
user/white.css
86 86 input[type="submit"], 87 87 .btn, 88 88 a.button { 89 background: # f2f2f2url(img/white_grad.png) repeat-x scroll left top;89 background: #EDEDED url(img/white_grad.png) repeat-x scroll left top; 90 90 color: black; 91 91 border-color: #ccc; 92 92 } … … 100 100 color: #0069A1; 101 101 } 102 102 103 input[type="text"], select, textarea {104 border-color: # d8d8d8;103 input[type="text"], input[type="password"], select, textarea { 104 border-color: #bbb; 105 105 } 106 106 107 input[type="text"]:focus, input[type="password"]:focus, select:focus, textarea:focus { 108 border-color: #0069A1; 109 } 110 107 111 #news { 108 112 background-color: #dff0ff; 109 113 border-color: #add8e6; … … 118 122 border-color: #eee; 119 123 } 120 124 121 td.category , tr.subtitle{122 background -color: #ddd;125 #thread, #catview { 126 background: #0069A1 url(./img/forum_bg.png) repeat-x; 123 127 } 124 128 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 147 td.category { 148 color: #fff; 149 } 150 125 151 td.postheader { 126 152 background-color: #eee; 153 color: #333; 127 154 } 128 155 129 156 td.postbody { 130 background : transparent url('img/75pct_white.png');157 background-color: #fff; 131 158 } 132 159 133 160 td.postfooter { 134 161 background-color: #eee; 162 color: #333; 135 163 } 136 164 137 165 tr.postseperator { 138 background-color: #c8c8c8; 139 border-color: #aaa; 166 background-color: #0069A1; 140 167 } 141 168 142 169 div.authorcol { … … 144 171 border-color: #c8c8c8; 145 172 } 146 173 174 .authorinfo { 175 color: #333; 176 } 177 147 178 .authorinfo img { 148 179 border-color: #a8a8a8; 149 180 }