Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

User and 404 page changes #493

Merged
merged 3 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion boulder_base.libraries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
11 changes: 11 additions & 0 deletions css/ucb-user-page.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.user-profile-wrapper {
display: flex;
flex-direction: row;
padding-top: 10px;
}
.user-profile-wrapper div{
flex-grow: 1;
}
.ucb-user-documentation {
padding-bottom: 10px;
}
Binary file added images/img-ucb-404.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 12 additions & 2 deletions templates/layout/page--user.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -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") }}
Expand All @@ -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") }}
Expand Down