From 64d74fe2f1ceaf8a50de6ddf00950e615a9dab02 Mon Sep 17 00:00:00 2001 From: JohnDamilola Date: Sat, 17 Dec 2022 15:15:31 -0500 Subject: [PATCH 1/3] Add menu dropdown and status button --- .../wo_dash/pages/assignment_page/students.py | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/learning_observer/prototypes/dash_wo_teacher_dashboard/wo_dash/pages/assignment_page/students.py b/learning_observer/prototypes/dash_wo_teacher_dashboard/wo_dash/pages/assignment_page/students.py index 7e99e588..5fbf4bc4 100644 --- a/learning_observer/prototypes/dash_wo_teacher_dashboard/wo_dash/pages/assignment_page/students.py +++ b/learning_observer/prototypes/dash_wo_teacher_dashboard/wo_dash/pages/assignment_page/students.py @@ -52,22 +52,33 @@ def student_dashboard_view(course_id, assignment_id): # open settings button html.Div( [ - settings.open_btn + dbc.Button( + [ + html.I(id=websocket_status), + html.Span('Last Updated: ', className='ms-2'), + html.Span(id=last_updated) + ], + outline=True, color="dark", className="me-2" + ), + settings.open_btn, + dbc.DropdownMenu( + [ + dbc.DropdownMenuItem( + "Logout", + href="/auth/logout", + ), + ], + label="Menu", + className="ms-2" + ) ], - className='float-end' + className='d-flex align-items-center float-end' ), html.Br(), # assignment description html.P(id=assignment_desc) ] ), - html.Small( - [ - html.I(id=websocket_status), - html.Span('Last Updated: ', className='ms-1'), - html.Span(id=last_updated) - ] - ), dbc.Row( [ # settings panel wrapper From d8ceacaaad0aa6887082025fcc09e060ad4d77b2 Mon Sep 17 00:00:00 2001 From: JohnDamilola Date: Fri, 23 Dec 2022 11:24:37 -0500 Subject: [PATCH 2/3] Add settings to dropdown menu --- .../wo_dash/pages/assignment_page/settings.py | 15 +++------------ .../wo_dash/pages/assignment_page/students.py | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/learning_observer/prototypes/dash_wo_teacher_dashboard/wo_dash/pages/assignment_page/settings.py b/learning_observer/prototypes/dash_wo_teacher_dashboard/wo_dash/pages/assignment_page/settings.py index a3483f29..053ca234 100644 --- a/learning_observer/prototypes/dash_wo_teacher_dashboard/wo_dash/pages/assignment_page/settings.py +++ b/learning_observer/prototypes/dash_wo_teacher_dashboard/wo_dash/pages/assignment_page/settings.py @@ -29,18 +29,9 @@ dummy = f'{prefix}-dummy' # settings button -open_btn = dbc.Button( - [ - # font awesome gear icon - html.I(className='fas fa-gear'), - # boostrap with margin on left (s)tart with display set to none except when screen is lg - html.Span('Settings', className='ms-1 d-none d-lg-inline'), - ], - # bootstrap btn styling/coloring - class_name='btn btn-secondary', - id=open_btn, - # hover text - title='Open settings menu to show or hide different student attributes' +open_btn = dbc.DropdownMenuItem( + "Settings", + id=open_btn ) # settings panel itself diff --git a/learning_observer/prototypes/dash_wo_teacher_dashboard/wo_dash/pages/assignment_page/students.py b/learning_observer/prototypes/dash_wo_teacher_dashboard/wo_dash/pages/assignment_page/students.py index 5fbf4bc4..ff4b1086 100644 --- a/learning_observer/prototypes/dash_wo_teacher_dashboard/wo_dash/pages/assignment_page/students.py +++ b/learning_observer/prototypes/dash_wo_teacher_dashboard/wo_dash/pages/assignment_page/students.py @@ -60,9 +60,9 @@ def student_dashboard_view(course_id, assignment_id): ], outline=True, color="dark", className="me-2" ), - settings.open_btn, dbc.DropdownMenu( [ + settings.open_btn, dbc.DropdownMenuItem( "Logout", href="/auth/logout", From fdaf372f78fdd7e947bfc6f684ae18bcbd9d93a8 Mon Sep 17 00:00:00 2001 From: JohnDamilola Date: Fri, 23 Dec 2022 13:35:34 -0500 Subject: [PATCH 3/3] Update top-right button styles --- .../wo_dash/assets/styles.css | 6 +++ .../wo_dash/pages/assignment_page/students.py | 37 +++++++++++-------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/learning_observer/prototypes/dash_wo_teacher_dashboard/wo_dash/assets/styles.css b/learning_observer/prototypes/dash_wo_teacher_dashboard/wo_dash/assets/styles.css index 039c01fb..5c08f3ee 100644 --- a/learning_observer/prototypes/dash_wo_teacher_dashboard/wo_dash/assets/styles.css +++ b/learning_observer/prototypes/dash_wo_teacher_dashboard/wo_dash/assets/styles.css @@ -71,3 +71,9 @@ box-shadow: 0px 0px 5px var(--bs-gray-300); border-radius: 0.4rem; } + +.btn-menu-outline-dark button { + color: #343a40; + background-color: #fff; + border-color: #343a40; +} \ No newline at end of file diff --git a/learning_observer/prototypes/dash_wo_teacher_dashboard/wo_dash/pages/assignment_page/students.py b/learning_observer/prototypes/dash_wo_teacher_dashboard/wo_dash/pages/assignment_page/students.py index ff4b1086..928ca38f 100644 --- a/learning_observer/prototypes/dash_wo_teacher_dashboard/wo_dash/pages/assignment_page/students.py +++ b/learning_observer/prototypes/dash_wo_teacher_dashboard/wo_dash/pages/assignment_page/students.py @@ -52,24 +52,29 @@ def student_dashboard_view(course_id, assignment_id): # open settings button html.Div( [ - dbc.Button( + dbc.ButtonGroup( [ - html.I(id=websocket_status), - html.Span('Last Updated: ', className='ms-2'), - html.Span(id=last_updated) - ], - outline=True, color="dark", className="me-2" - ), - dbc.DropdownMenu( - [ - settings.open_btn, - dbc.DropdownMenuItem( - "Logout", - href="/auth/logout", + dbc.Button( + [ + html.I(id=websocket_status), + html.Span('Last Updated: ', className='ms-2'), + html.Span(id=last_updated) + ], + outline=True, color="dark", className="" ), - ], - label="Menu", - className="ms-2" + dbc.DropdownMenu( + [ + settings.open_btn, + dbc.DropdownMenuItem( + "Logout", + href="/auth/logout", + ), + ], + group=True, + label="Menu", + className="btn-menu-outline-dark" + ) + ] ) ], className='d-flex align-items-center float-end'