Merge pull request #6231 from BOINC/dpa_buda12

Web: improve appearance of BUDA interface.  No changes in functionality.

Author: AenBleidd

html/user/buda.php

@@ -70,29 +70,28 @@ function app_list($notice=null) {
     text_start();
     echo "
         <p>BUDA (BOINC Universal Docker App)
-        lets you submit Docker jobs using a web interface;
-        you don't need to log into the BOINC server.
-        <p>
+        lets you submit Docker jobs using a web interface.
         <a href=https://github.com/BOINC/boinc/wiki/BUDA-overview>BUDA overview</a>.
     ";
 
-    echo "<h2>Science apps</h2>";
     $dirs = scandir($buda_root);
     foreach ($dirs as $dir) {
         if ($dir[0] == '.') continue;
-        show_app($dir);
+        panel("Science app: <b>$dir</b>",
+            function() use ($dir) {
+                show_app($dir);
+            }
+        );
     }
-    echo '<hr>';
     show_button_small('buda.php?action=app_form', 'Add science app');
     text_end();
     page_tail();
 }
 
 function show_app($dir) {
     global $buda_root;
-    echo "<hr><font size=+3>$dir</font>\n";
     start_table('table-striped');
-    table_header('Variant name<br><small>click for details</small>', 'Submit jobs');
+    table_header('Variant<br><small>click for details</small>', 'Submit jobs');
     $pcs = scandir("$buda_root/$dir");
     foreach ($pcs as $pc) {
         if ($pc[0] == '.') continue;
@@ -107,8 +106,11 @@ function show_app($dir) {
     echo "<p>";
     show_button_small("buda.php?action=variant_form&app=$dir", 'Add variant');
     echo "<p>";
-    show_button_small(
-        "buda.php?action=app_delete&app=$dir", "Delete science app '$dir'"
+    show_button(
+        "buda.php?action=app_delete&app=$dir",
+        "Delete science app '$dir'",
+        null,
+        'btn btn-xs btn-warning'
     );
 }
 
@@ -118,10 +120,16 @@ function variant_view() {
     if (!is_valid_filename($app)) die('bad arg');
     $variant = get_str('variant');
     if (!is_valid_filename($variant)) die('bad arg');
-    page_head("App $app variant $variant");
+    page_head("BUDA: variant '$variant' of science app '$app'");
     $dir = "$buda_root/$app/$variant";
-    start_table();
-    table_header('name', 'size', 'md5');
+    echo "
+        This variant includes the following files.
+        The template files and variant.json
+        were generated when you created the variant.
+        <p>
+    ";
+    start_table('table-striped');
+    table_header('File name', 'size', 'md5');
     foreach(scandir($dir) as $f) {
         if ($f[0] == '.') continue;
         [$md5, $size] = parse_info_file("$dir/.md5/$f");
@@ -132,9 +140,11 @@ function variant_view() {
         );
     }
     end_table();
-    show_button_small(
+    show_button(
         "buda.php?action=variant_delete&app=$app&variant=$variant",
-        'Delete variant'
+        'Delete variant',
+        null,
+        'btn btn-xs btn-warning'
     );
     page_tail();
 }
@@ -339,7 +349,7 @@ function variant_delete() {
         app_list($notice);
     } else {
         page_head("Confirm");
-        echo "Are you sure you want to delete variant $variant of app $app?  <p>";
+        echo "<p>Are you sure you want to delete variant $variant of BUDA app $app?  <p>";
         show_button(
             "buda.php?action=variant_delete&app=$app&variant=$variant&confirmed=yes",
             "Yes"
@@ -368,7 +378,7 @@ function app_delete() {
         app_list($notice);
     } else {
         page_head('Confirm');
-        echo "Are you sure you want to delete app $app?  <p>";
+        echo "<p>Are you sure you want to delete BUDA science app $app?  <p>";
         show_button(
             "buda.php?action=app_delete&app=$app&confirmed=yes",
             "Yes"

html/user/buda_submit.php

@@ -47,7 +47,10 @@ function submit_form($user) {
     form_input_hidden('app', $app);
     form_input_hidden('variant', $variant);
     form_select("Batch zip file $desc", 'batch_file', $sbitems_zip);
-    form_input_text('Command-line arguments', 'cmdline');
+    form_input_text(
+        'Command-line arguments<br><small>Passed to all jobs in the batch</small>',
+        'cmdline'
+    );
     form_checkbox(
         "Enabled debugging output <br><small>Write Docker commands and output to stderr</small>.",
         'wrapper_verbose'

html/user/submit.php

@@ -189,12 +189,17 @@ function show_aborted($batches, $limit, $user, $app) {
 }
 
 // fill in the app and user names in list of batches
+// TODO: speed this up by making list of app and user IDs
+// and doing lookup just once.
 //
 function fill_in_app_and_user_names(&$batches) {
     foreach ($batches as $batch) {
         $app = BoincApp::lookup_id($batch->app_id);
         if ($app) {
             $batch->app_name = $app->name;
+            if ($batch->description) {
+                $batch->app_name .= ": $batch->description";
+            }
         } else {
             $batch->app_name = "unknown";
         }