Merge pull request #493 from CuBoulder/Issue/default-pages/484

User and 404 page changes
CuBoulder · Oct 10, 2023 · b3dbf3d · b3dbf3d
2 parents c35652d + a9aaa02
commit b3dbf3d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/boulder_base.libraries.yml b/boulder_base.libraries.yml
@@ -408,4 +408,13 @@ ucb-people-list-block:
     js/ucb-people-list-block.js: {}
   css:
     theme:
-      css/block/ucb-people-list-block.css: {}
+      css/block/ucb-people-list-block.css: {}
+
+ucb-user-page:
+  version: 1.x
+  js:
+    js/ucb-status-page-block.js: {}
+  css:
+    theme:
+      css/ucb-status-page-block.css: {}
+      css/ucb-user-page.css: {}
diff --git a/css/ucb-user-page.css b/css/ucb-user-page.css
@@ -0,0 +1,11 @@
+.user-profile-wrapper {
+    display: flex;
+    flex-direction: row;
+    padding-top: 20px;
+}
+.user-profile-wrapper div{
+   flex-grow: 1;
+}
+.ucb-user-documentation {
+    padding-bottom: 10px;
+}
diff --git a/images/img-ucb-404.jpeg b/images/img-ucb-404.jpeg
diff --git a/templates/layout/page--user.html.twig b/templates/layout/page--user.html.twig
@@ -48,6 +48,8 @@
 {#  {{ attach_library('ucb2021_base/ucb-alerts') }}#}
 {#{% endif %}#}
 
+{# Adds js file necessary for status bar #}
+{{ attach_library('boulder_base/ucb-user-page') }}
 
 <div class="layout-container ucb-page-container">
 	{{ block("page_header", "page.html.twig") }}
@@ -59,11 +61,19 @@
 			<div class="ucb-above-content-region container">
 				{{ page.above_content }}
 			</div>
-			<div class="layout-content container">
+			<div class="layout-content container user-profile-wrapper">
 				<div class="ucb-user-profile-container">
 					{{ page.content }}
 				</div>
-			</div>{# /.layout-content #}
+				<div class = "ucb-user-web-status-div">
+					<h2>System Status</h2>
+    				<status-page-block page-id='9sm03v9xr9m6'></status-page-block>
+					<div class = "ucb-user-documentation">
+						<h2> Documentation </h2>
+						<a href = "https://www.colorado.edu/webcentral/">User Documentation </a>
+					</div>
+				</div>
+			</div>
 		</main>
 	</div>
 	{{ block("page_footer", "page.html.twig") }}