Merge Split Branch

preview-update-submodules/European-HTCondor-Week.html

@@ -260,6 +260,7 @@ <h1 class="uw-mini-bar mb-4">
 
 <p>To ease travel, the workshop will begin Tuesday morning and end around Friday lunchtime.</p>
 
+<p>View the <a href="https://indico.cern.ch/event/1386170/">event website</a> for more details.</p>
 
         </div>
     </div>

preview-update-submodules/people.html

@@ -585,32 +585,6 @@ <h2 class="uw-mini-bar">
         <div class="img-container" class="overflow-hidden d-flex justify-content-center">
 
 
-            <img src="/web-preview/preview-update-submodules/staff-list/images/emily_yao.jpg" alt="Headshot for Emily Yao">
-
-        </div>
-        <div class="uw-card-copy">
-            <div>
-                <h2 class="uw-mini-bar">
-
-                    Emily Yao
-
-                </h2>
-                <p>Systems Adminstration Intern</p>
-            </div>
-            <div>
-                <span class="institution">University on Wisconsin-Madison</span>
-            </div>
-        </div>
-    </div>
-</div>
-                </div>
-
-                <div class="col-xl-2 col-md-3 col-sm-4 col-6">
-                    <div class="bg-white team-card justify-content-center mb-3 flex-grow-1">
-    <div class="uw-card-content">
-        <div class="img-container" class="overflow-hidden d-flex justify-content-center">
-
-
             <img src="/web-preview/preview-update-submodules/staff-list/images/emma_turetsky.jpg" alt="Headshot for Emma Turetsky">
 
         </div>
@@ -899,32 +873,6 @@ <h2 class="uw-mini-bar">
         <div class="img-container" class="overflow-hidden d-flex justify-content-center">
 
 
-            <img src="/web-preview/preview-update-submodules/staff-list/images/john_parsons.jpeg" alt="Headshot for John Parsons">
-
-        </div>
-        <div class="uw-card-copy">
-            <div>
-                <h2 class="uw-mini-bar">
-
-                    John Parsons
-
-                </h2>
-                <p>Systems Administrator</p>
-            </div>
-            <div>
-                <span class="institution">University of Wisconsin Madison</span>
-            </div>
-        </div>
-    </div>
-</div>
-                </div>
-
-                <div class="col-xl-2 col-md-3 col-sm-4 col-6">
-                    <div class="bg-white team-card justify-content-center mb-3 flex-grow-1">
-    <div class="uw-card-content">
-        <div class="img-container" class="overflow-hidden d-flex justify-content-center">
-
-
             <img src="/web-preview/preview-update-submodules/staff-list/images/john_knoeller.jpg" alt="Headshot for John TJ Knoeller">
 
         </div>
@@ -1394,20 +1342,77 @@ <h2 class="uw-mini-bar">
 </div>
                 </div>
 
+        </div>
+        <h2 class="uw-mini-bar">Previous Staff</h2>
+        <div class="row gx-1">
+
+
                 <div class="col-xl-2 col-md-3 col-sm-4 col-6">
                     <div class="bg-white team-card justify-content-center mb-3 flex-grow-1">
     <div class="uw-card-content">
         <div class="img-container" class="overflow-hidden d-flex justify-content-center">
 
 
-            <img src="/web-preview/preview-update-submodules/staff-list/images/ryan_jacob.jpg" alt="Headshot for Ryan Jacob">
+            <img src="/web-preview/preview-update-submodules/staff-list/images/emily_yao.jpg" alt="Headshot for Emily Yao">
 
         </div>
         <div class="uw-card-copy">
             <div>
                 <h2 class="uw-mini-bar">
 
-                    Ryan Jacob
+                    Emily Yao
+
+                </h2>
+                <p>Systems Adminstration Intern</p>
+            </div>
+            <div>
+                <span class="institution">University on Wisconsin-Madison</span>
+            </div>
+        </div>
+    </div>
+</div>
+                </div>
+
+                <div class="col-xl-2 col-md-3 col-sm-4 col-6">
+                    <div class="bg-white team-card justify-content-center mb-3 flex-grow-1">
+    <div class="uw-card-content">
+        <div class="img-container" class="overflow-hidden d-flex justify-content-center">
+
+
+            <img src="/web-preview/preview-update-submodules/staff-list/images/john_parsons.jpeg" alt="Headshot for John Parsons">
+
+        </div>
+        <div class="uw-card-copy">
+            <div>
+                <h2 class="uw-mini-bar">
+
+                    John Parsons
+
+                </h2>
+                <p>Systems Administrator</p>
+            </div>
+            <div>
+                <span class="institution">University of Wisconsin Madison</span>
+            </div>
+        </div>
+    </div>
+</div>
+                </div>
+
+                <div class="col-xl-2 col-md-3 col-sm-4 col-6">
+                    <div class="bg-white team-card justify-content-center mb-3 flex-grow-1">
+    <div class="uw-card-content">
+        <div class="img-container" class="overflow-hidden d-flex justify-content-center">
+
+
+            <img src="/web-preview/preview-update-submodules/staff-list/images/mihir_manna.jpeg" alt="Headshot for Mihir Manna">
+
+        </div>
+        <div class="uw-card-copy">
+            <div>
+                <h2 class="uw-mini-bar">
+
+                    Mihir Manna
 
                 </h2>
                 <p>System Administrator Intern</p>
@@ -1420,11 +1425,58 @@ <h2 class="uw-mini-bar">
 </div>
                 </div>
 
+                <div class="col-xl-2 col-md-3 col-sm-4 col-6">
+                    <div class="bg-white team-card justify-content-center mb-3 flex-grow-1">
+    <div class="uw-card-content">
+        <div class="img-container" class="overflow-hidden d-flex justify-content-center">
+
+
+            <img src="/web-preview/preview-update-submodules/staff-list/images/rishideep_rallabandi.jpg" alt="Headshot for Rishideep Rallabandi">
+
         </div>
-        <h2 class="uw-mini-bar">Previous Staff</h2>
-        <div class="row gx-1">
+        <div class="uw-card-copy">
+            <div>
+                <h2 class="uw-mini-bar">
+
+                    Rishideep Rallabandi
+
+                </h2>
+                <p>Student Programming Intern</p>
+            </div>
+            <div>
+                <span class="institution">University of Wisconsin-Madison</span>
+            </div>
+        </div>
+    </div>
+</div>
+                </div>
+
+                <div class="col-xl-2 col-md-3 col-sm-4 col-6">
+                    <div class="bg-white team-card justify-content-center mb-3 flex-grow-1">
+    <div class="uw-card-content">
+        <div class="img-container" class="overflow-hidden d-flex justify-content-center">
 
 
+            <img src="/web-preview/preview-update-submodules/staff-list/images/ryan_jacob.jpg" alt="Headshot for Ryan Jacob">
+
+        </div>
+        <div class="uw-card-copy">
+            <div>
+                <h2 class="uw-mini-bar">
+
+                    Ryan Jacob
+
+                </h2>
+                <p>System Administrator Intern</p>
+            </div>
+            <div>
+                <span class="institution">University of Wisconsin-Madison</span>
+            </div>
+        </div>
+    </div>
+</div>
+                </div>
+
                 <div class="col-xl-2 col-md-3 col-sm-4 col-6">
                     <div class="bg-white team-card justify-content-center mb-3 flex-grow-1">
     <div class="uw-card-content">

preview-update-submodules/staff-list/emily_yao.yml

@@ -2,6 +2,6 @@ image: images/emily_yao.jpg
 institution: University on Wisconsin-Madison
 title: Systems Adminstration Intern
 name: Emily Yao
-status: Staff
+status: Past
 organizations:
     - chtc

preview-update-submodules/staff-list/hannah_cheren.yml

@@ -8,4 +8,5 @@ institution: "University of Wisconsin–Madison"
 linkedinurl: ""
 weight: 5
 organizations: 
-    - path
+    - path
+status: Past

preview-update-submodules/staff-list/john_parsons.yml

@@ -2,7 +2,7 @@ image: images/john_parsons.jpeg
 institution: University of Wisconsin Madison
 title: Systems Administrator
 name: John Parsons
-status: Staff
+status: Past
 website: null
 organizations: 
     - chtc

preview-update-submodules/staff-list/ryan_jacobs.yml

@@ -2,7 +2,7 @@ image: images/ryan_jacob.jpg
 institution: University of Wisconsin-Madison
 title: System Administrator Intern
 name: Ryan Jacob
-status: Student
+status: Past
 website: null
 organizations: 
     - path

preview-update-submodules/uw-research-computing/howto_overview.html

@@ -233,93 +233,33 @@
 
     <main id="main" style="min-height: 60vh;">
         <main id="main" style="min-height: 60vh;">
-    <div class="container-xxl">
+    <div class="container-xxl mb-5">
     <div class="row justify-content-center">
-        <div class="col mw-1000">
-<h1 class="uw-mini-bar mb-4">
+        <div class="col-12 col-lg-9 mw-1000">
+
+
+            <h1 class="uw-mini-bar mb-4">
     CHTC Tools for Matlab, R, and Python Portability
 </h1>
 
+            <p>This page is deprecated. Please see our guide <a href="software-overview-htc.html">Overview: How to Use 
+Software</a> instead.</p>
+
         </div>
-    </div>
-</div>
+        <div class="col-3 d-none d-lg-block">
+            
 
-<div class="container-xxl">
-	<div class="row justify-content-center">
-		<div class="col mw-1000">
-            <p>
-             Software like Matlab, R, and Python may or may not exist on CHTC-accessible
-             compute hardware (especially on the UW Grid and OS Pool). Even if
-             it is installed, it may not be the version you need. So, in order to get
-             your jobs running on as many computers as possible, we are happy to work with
-             you to create scripts that will bring  along your R, Matlab, or Python dependencies (like libraries and modules).
-            </p>
-		</div>
-	</div>
-</div>
-<div class="bg-light">
-	<div class="container-xxl">
-		<div class="row mw-1000 mx-auto">
-			<div class="uw-card col-4">
-				<div class="uw-card-content">
-					<a href="/web-preview/preview-update-submodules/uw-research-computing/matlab-jobs.html"><img src="/web-preview/preview-update-submodules/images/Matlab_Logo.png" alt="Matlab Logo"></a>
-					<div class="uw-card-copy">
-						<h2 class="uw-mini-bar"><a href="/web-preview/preview-update-submodules/uw-research-computing/matlab-jobs.html">Running Matlab Jobs in CHTC</a></h2>
-					</div>
-				</div>
-			</div>
-			<div class="uw-card  col-4">
-				<div class="uw-card-content">
-					<a href="/web-preview/preview-update-submodules/uw-research-computing/python-jobs.html">
-						<img src="/web-preview/preview-update-submodules/images/Python_Logo.png" alt="Python Logo">
-					</a>
-					<div class="uw-card-copy">
-						<h2 class="uw-mini-bar"><a href="/web-preview/preview-update-submodules/uw-research-computing/python-jobs.html">Running Python Jobs in CHTC</a></h2>
-					</div>
-				</div>
-			</div>
-			<div class="uw-card  col-4">
-				<div class="uw-card-content">
-					<a href="/web-preview/preview-update-submodules/uw-research-computing/r-jobs.html"><img src="/web-preview/preview-update-submodules/images/R_Logo.png" alt="R logo"></a>
-					<div class="uw-card-copy">
-						<h2 class="uw-mini-bar"><a href="/web-preview/preview-update-submodules/uw-research-computing/r-jobs.html">Running R Jobs in CHTC</a></h2>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
 
-<div class="container-xxl">
-	<div class="row justify-content-center">
-		<div class="col mw-1000">
-            <h3>
-                Can't Find What You're Looking For?
-            </h3>
-            <p>
-                If you are using a different software, the following guide will explain how to prepare your code to run your jobs on the CHTC pool
-            </p>
-            <p>
-                <a href="/web-preview/preview-update-submodules/uw-research-computing/inter-submit.html">
-                    General Software Installation Instructions
-                </a>
-            </p>
-        </div>
-    </div>
-</div>
-<div class="container-xxl">
-	<div class="row justify-content-center">
-		<div class="col mw-1000">
-            <p>
-                If your software is complex and hard to setup, please don't hesitate to contact us at <a href="mailto:[email protected]">[email protected]</a> with any questions. 
-            </p>
-        </div>
-    </div>
-</div>
 
+    <div id="guide-sidebar">
+
+    </div>
 
 
 
+        </div>
+    </div>
+</div>
 </main>
     </main>
     <footer id="colophon" class="uw-footer">