Merge branch 'ubccr:master' into master

Author: dsajdak

ondemand/README.md

@@ -70,6 +70,8 @@ logins work. OnDemand supports many formats, and the one shown is in markdown.
 Lastly you'll see panels for [XDMoD](../xdmod/README.md). OnDemand integrates
 with XDMoD to show pertinant information about the jobs you've recently ran.
 
+![landing page demo](imgs/landing_page_demo.gif)
+
 ### File management
 
 In the navigation bar you'll see a dropdown menu entitled `Files`. The first
@@ -96,6 +98,8 @@ Go ahead and:
 Now that you know how to create files, go ahead and create a file and in the next
 section we'll edit it.
 
+![file manager demo](imgs/file_manager_demo.gif)
+
 ### File viewing and editing
 
 If you haven't already created a new file to edit, please do so now. It doesn't

ondemand/config/dashboard/widgets/_welcome.html.erb

@@ -0,0 +1,6 @@
+<!-- /home/hpcadmin/ondemand/config/views/widgets/_welcome.html.erb -->
+<div class='alert alert-info text-center'>
+    <p class='h2'>Thank you for attending the Open OnDemand Tutorial!</p>
+    <br>
+    <p class='small text-muted'>This is a custom panel that you can add to your own site.</p>
+</div>

ondemand/config/dashboard/widgets/_welcome_isc.html.erb

@@ -5,7 +5,7 @@ dashboard_layout:
     - columns:
       - width: 12
         widgets:
-          - welcome_isc
+          - welcome
       - width: 12
         widgets:
           - recently_used_apps
@@ -84,7 +84,7 @@ custom_pages:
       - columns:
         - width: 6
           widgets:
-            - welcome_isc
+            - welcome
             - custom_page_description
         - width: 6
           widgets: chemistry_notes

ondemand/config/ondemand.yml

@@ -42,7 +42,7 @@ dnf install -y \
 # be installed in the same container.  In a production deployment they may be installed
 # on separate hosts.
 #------------------------
-dnf install -y https://github.com/ubccr/xdmod/releases/download/v10.0.2-beta1-el8/xdmod-10.0.2-1.0.el8.noarch.rpm \
+dnf install -y https://github.com/ubccr/xdmod/releases/download/v10.0.2-2-el8/xdmod-10.0.2-2.0.el8.noarch.rpm \
                https://github.com/ubccr/xdmod-ondemand/releases/download/v10.0.0/xdmod-ondemand-10.0.0-1.0.beta1.el8.noarch.rpm \
                https://github.com/ubccr/xdmod/releases/download/v10.0.0-beta4-el8/xdmod-supremm-10.0.0-1.4.beta4.el8.noarch.rpm \
                https://github.com/ubccr/xdmod-appkernels/releases/download/v10.0.0/xdmod-appkernels-10.0.0-1.0.beta1.el8.noarch.rpm