Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Part 2 of 2 for the fix of Ticket #740. 

svn path=/trunk/boinc/; revision=16077
This commit is contained in:
Janus B. Kristensen 2008-09-27 09:52:28 +00:00
parent 527cb2d6d4
commit 5aa7779aaf
4 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
html/user/forum_thread.php
View File

@ -125,48 +125,49 @@ echo "
<form action=\"forum_thread.php\">
<table width=\"100%\" cellspacing=0 cellpadding=0>
<tr class=\"forum_toplinks\">
<td align=\"left\">
<td align=\"left\"><ul class=\"actionlist\">
";
$reply_url = "";
if (can_reply($thread, $forum, $logged_in_user)) {
$reply_url = "forum_reply.php?thread=".$thread->id."#input";
show_button($reply_url, tra("Post to thread"), "Add a new message to this thread");
show_actionlist_button($reply_url, tra("Post to thread"), "Add a new message to this thread");
}
if ($is_subscribed) {
$type = NOTIFY_SUBSCRIBED_POST;
BoincNotify::delete_aux("userid=$logged_in_user->id and type=$type and opaque=$thread->id");
$url = "forum_subscribe.php?action=unsubscribe&thread=".$thread->id."$tokens";
show_button($url, tra("Unsubscribe"), "You are subscribed to this thread. Click here to unsubscribe.");
show_actionlist_button($url, tra("Unsubscribe"), "You are subscribed to this thread. Click here to unsubscribe.");
} else {
$url = "forum_subscribe.php?action=subscribe&thread=".$thread->id."$tokens";
show_button($url, tra("Subscribe"), "Click to get email when there are new posts in this thread");
show_actionlist_button($url, tra("Subscribe"), "Click to get email when there are new posts in this thread");
}
//If the logged in user is moderator enable some extra features
//
if (is_moderator($logged_in_user, $forum)) {
if ($thread->hidden){
show_button("forum_moderate_thread_action.php?action=unhide&thread=".$thread->id."$tokens", "Unhide", "Unhide this thread");
show_actionlist_button("forum_moderate_thread_action.php?action=unhide&thread=".$thread->id."$tokens", "Unhide", "Unhide this thread");
} else {
show_button("forum_moderate_thread.php?action=hide&thread=".$thread->id, "Hide", "Hide this thread");
show_actionlist_button("forum_moderate_thread.php?action=hide&thread=".$thread->id, "Hide", "Hide this thread");
}
if ($thread->sticky){
show_button("forum_moderate_thread_action.php?action=desticky&thread=".$thread->id."$tokens", "Make unsticky", "Make this thread not sticky");
show_actionlist_button("forum_moderate_thread_action.php?action=desticky&thread=".$thread->id."$tokens", "Make unsticky", "Make this thread not sticky");
} else {
show_button("forum_moderate_thread_action.php?action=sticky&thread=".$thread->id."$tokens", "Make sticky", "Make this thread sticky");
show_actionlist_button("forum_moderate_thread_action.php?action=sticky&thread=".$thread->id."$tokens", "Make sticky", "Make this thread sticky");
}
if ($thread->locked) {
show_button("forum_moderate_thread_action.php?action=unlock&amp;thread=".$thread->id."$tokens", "Unlock", "Unlock this thread");
show_actionlist_button("forum_moderate_thread_action.php?action=unlock&amp;thread=".$thread->id."$tokens", "Unlock", "Unlock this thread");
} else {
show_button("forum_moderate_thread.php?action=lock&thread=".$thread->id."$tokens", "Lock", "Lock this thread");
show_actionlist_button("forum_moderate_thread.php?action=lock&thread=".$thread->id."$tokens", "Lock", "Lock this thread");
}
if ($forum->parent_type == 0) {
show_button("forum_moderate_thread.php?action=move&thread=".$thread->id."$tokens", "Move", "Move this thread to a different forum");
show_actionlist_button("forum_moderate_thread.php?action=move&thread=".$thread->id."$tokens", "Move", "Move this thread to a different forum");
}
show_button("forum_moderate_thread.php?action=title&thread=".$thread->id."$tokens", "Edit title", "Edit thread title");
show_actionlist_button("forum_moderate_thread.php?action=title&thread=".$thread->id."$tokens", "Edit title", "Edit thread title");
}
echo "</ul>"; //End of action list
// Display a box that allows the user to select sorting of the posts
echo "</td><td align=\"right\">

19
html/user/friend.php
View File

@ -136,13 +136,10 @@ function handle_query($user) {
echo "<p>$srcuser->name says: $friend->message<p>";
}
echo "
<p>
<a href=friend.php?action=accept&userid=$srcid>Accept</a>
(click if $srcuser->name is in fact a friend)
<p>
<a href=friend.php?action=ignore&userid=$srcid>Decline</a>
(click if $srcuser->name is not a friend)
<p>
<p><ul class=\"actionlist\">";
show_actionlist_button("friend.php?action=accept&userid=".$srcid, tra("Accept friendship"), tra("Click accept if %1 is in fact a friend", $srcuser->name));
show_actionlist_button("friend.php?action=ignore&userid=".$srcid, tra("Decline"), tra("Click decline if %1 is not a friend", $srcuser->name));
echo " <p>
";
page_tail();
}
@ -236,10 +233,10 @@ function handle_cancel_confirm($user) {
echo "
Are you sure you want to cancel your friendship with $destuser->name?
<p>
";
show_button("friend.php?action=cancel&userid=$destid", "Yes", "Cancel friendship");
echo "<p>";
show_button("home.php", "No", "Don't cancel friendship");
<ul class=\"actionlist\">";
show_actionlist_button("friend.php?action=cancel&userid=$destid", tra("Yes"), "Cancel friendship");
show_actionlist_button("home.php", tra("No"), "Stay friends");
echo "</ul>";
page_tail();
}

10
html/user/pm.php
View File

@ -100,9 +100,10 @@ function do_inbox($logged_in_user) {
echo "<br>".time_str($msg->date)."</td>\n";
echo "<td valign=top>".output_transform($msg->content, $options)."<p>";
$tokens = url_tokens($logged_in_user->authenticator);
show_button("pm.php?action=delete&id=$msg->id&$tokens", tra("Delete"), "Delete this message");
show_button("pm.php?action=new&replyto=$msg->id", tra("Reply"), "Reply to this message");
echo "</td></tr>\n";
echo "<ul class=\"actionlist\">";
show_actionlist_button("pm.php?action=delete&id=$msg->id&$tokens", tra("Delete"), "Delete this message");
show_actionlist_button("pm.php?action=new&replyto=$msg->id", tra("Reply"), "Reply to this message");
echo "</ul></td></tr>\n";
}
echo "
<tr><td>
@ -111,8 +112,7 @@ function do_inbox($logged_in_user) {
<a href=\"javascript:set_all(0)\">Unselect all</a>
</td>
<td colspan=2>
<input type=\"submit\" name=\"action_select\" value=\"".tra("Delete")."\">
selected messages
<input type=\"submit\" name=\"action_select\" value=\"".tra("Delete selected messages")."\">
</td></tr>
";
end_table();

16
html/user/white.css
View File

@ -132,7 +132,7 @@ input, select, textarea, .button {
input[type="button"], input[type="submit"], input.btn {
margin: 2px 0px;
background: #d4d0c8;
margin-right: 0.5em;
margin-right: 0.6em;
color: #203C66;
border: 1px solid #a8a8a8;
font-size: 12px;
@ -143,7 +143,8 @@ input[type="button"], input[type="submit"], input.btn {
.button {
margin: 2px 0px;
background: #d4d0c8;
margin-right: 0.5em;
margin-right: 0.6em;
white-space: nowrap;
color: #203C66;
border: 1px solid #a8a8a8;
font-size: 0.9em;
@ -160,6 +161,17 @@ input[type="button"]:hover, input[type="submit"]:hover, input.btn:hover, .forum_
background: #edece8;
}
.actionlist {
display: inline;
list-style: none;
margin: 0;
padding: 0;
}
.actionlist li {
display: inline;
}
img { border: 0px; }
img.userimg { border: 0px; }