Skip to content

Commit

Permalink
Merge pull request #2127 from BOINC/dpa_muted
Browse files Browse the repository at this point in the history 
web: use "small" instead of "muted"; fixes color problem
  • Loading branch information
@davidpanderson
davidpanderson authored Sep 23, 2017
2 parents 54f75c8 + 3999381 commit 692e625
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 18 deletions.
16 changes: 8 additions & 8 deletions html/user/submit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ function show_in_progress($batches, $limit, $user, $app) {
"# jobs",
"Progress",
"Submitted",
"Logical end time<br><p class=\"text-muted\">Determines priority</p>"
"Logical end time<br><small>Determines priority</small>"
);
}
$pct_done = (int)($batch->fraction_done*100);
Expand Down Expand Up @@ -333,15 +333,15 @@ function handle_query_batch($user) {
}
switch ($batch->state) {
case BATCH_STATE_IN_PROGRESS:
echo "<br>";
echo "<p></p>";
show_button(
"submit.php?action=abort_batch_confirm&batch_id=$batch_id",
"Abort batch"
);
break;
case BATCH_STATE_COMPLETE:
case BATCH_STATE_ABORTED:
echo "<br>";
echo "<p></p>";
show_button(
"submit.php?action=retire_batch_confirm&batch_id=$batch_id",
"Retire batch"
Expand All @@ -352,9 +352,9 @@ function handle_query_batch($user) {
echo "<h2>Jobs</h2>\n";
start_table();
table_header(
"Job ID and name<br><p class=\"text-muted\">click for details or to get output files</p>",
"Job ID and name<br><small>click for details or to get output files</small>",
"status",
"Canonical instance<br><p class=\"text-muted\">click to see result page on BOINC server</p>",
"Canonical instance<br><small>click to see result page on BOINC server</smallp>",
"Download Results"
);
foreach($wus as $wu) {
Expand Down Expand Up @@ -406,7 +406,7 @@ function handle_query_job($user) {
$x = "<in>".$wu->xml_doc."</in>";
$x = simplexml_load_string($x);
start_table();
table_header("Logical name<br><p class=\"text-muted\">(click to view)</p>",
table_header("Logical name<br><small>(click to view)</small>",
"Size (bytes)", "MD5"
);
foreach ($x->workunit->file_ref as $fr) {
Expand All @@ -428,8 +428,8 @@ function handle_query_job($user) {
echo "<h2>Instances</h2>\n";
start_table();
table_header(
"Instance ID<br><p class=\"text-muted\">click for result page</p>",
"State", "Output files<br><p class=\"text-muted\">click to view the file</p>"
"Instance ID<br><small>click for result page</small>",
"State", "Output files<br><small>click to view the file</small>"
);
$results = BoincResult::enum("workunitid=$wuid");
$upload_dir = parse_config(get_config(), "<upload_dir>");
Expand Down
1 change: 1 addition & 0 deletions html/user/submit_status.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
// along with BOINC. If not, see <http://www.gnu.org/licenses/>.

// web interfaces for viewing and controlling batches
// DEPRECATED: replaced by submit.php

ini_set('display_errors', 'stdout');
error_reporting(E_ALL);
Expand Down
18 changes: 8 additions & 10 deletions html/user/team_manage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ function show_admin_page($user, $team) {
echo "
<ul>
<li><a href=team_edit_form.php?teamid=$team->id>".tra("Edit team info")."</a>
<br><p class=\"text-muted\">".tra("Change team name, URL, description, type, or country")."</p>
<br><small>".tra("Change team name, URL, description, type, or country")."</small>
<li><a href=pm.php?action=new&teamid=$team->id>".tra("Send message to team")."</a>
<li>
".tra("Member list:")."
<a href=team_email_list.php?teamid=$team->id>".tra("HTML")."</a>
&middot; <a href=team_email_list.php?teamid=$team->id&plain=1>".tra("text")."</a>
&middot; <a href=team_email_list.php?teamid=$team->id&xml=1>".tra("XML")."</a>
<br><p class=\"text-muted\">".tra("View member info")."</p>
<br><small>".tra("View member info")."</small>
<li>".tra("View change history:")."
<a href=team_delta.php?teamid=$team->id>".tra("HTML")."</a>
&middot; <a href=team_delta.php?teamid=$team->id&xml=1>".tra("XML")."</a>
<br><p class=\"text-muted\">".tra("See when members joined or quit this team")."</p>
<br><small>".tra("See when members joined or quit this team")."</small>
";

// founder-only stuff follows
Expand All @@ -56,21 +56,19 @@ function show_admin_page($user, $team) {
}
echo "
<li><a href=team_remove_inactive_form.php?teamid=$team->id>".tra("Remove members")."</a>
<br><p class=\"text-muted\">".tra("Remove inactive or unwanted members from this team")."</p>
<br><small>".tra("Remove inactive or unwanted members from this team")."</small>
<li><a href=team_change_founder_form.php?teamid=$team->id>".tra("Change founder")."</a>
<br><p class=\"text-muted\">".tra("Transfer foundership to another member")."</p>
<br><small>".tra("Transfer foundership to another member")."</small>
<li><a href=team_admins.php?teamid=$team->id>".tra("Add/remove Team Admins")."</a>
<br><p class=\"text-muted\">".tra("Give selected team members Team Admin privileges")."</p>
<br><small>".tra("Give selected team members Team Admin privileges")."</small>
<li><a href=team_manage.php?teamid=$team->id&action=delete&$tokens>".tra("Remove team")."</a>
<br><p class=\"text-muted\">".tra("Allowed only if team has no members")."</p>
<br><small>".tra("Allowed only if team has no members")."</small>
<li><a href=team_forum.php?teamid=$team->id&cmd=manage>".tra("Message board")."</a>
<br><p class=\"text-muted\">".tra("Create or manage a team message board")."</p>
<br><small>".tra("Create or manage a team message board")."</small>
";
}
echo "
<p>
<li>
".tra("To have this team created on all BOINC projects (current and future) you can make it into a %1 BOINC-wide team %2.", "<a href=https://boinc.berkeley.edu/teams/>", "</a>")."
<li>
Expand Down

0 comments on commit 692e625

Please sign in to comment.