Skip to content

radius: add page titles #211

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.

Sign up for GitHub

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

Merged
theyoyojo merged 1 commit into from
Jan 28, 2025
Merged

radius: add page titles #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion orbit/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="manifest" href="/assets/site.webmanifest" />
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>KDLP</title>
<title>{title}</title>
</head>
<body>
<div class="logo">
Expand Down
38 changes: 23 additions & 15 deletions orbit/radius.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,10 +252,11 @@ def retire(self):
self._session.end()
self.headers += self._session.mk_cookie_header()

def format_html(self, doc):
def format_html(self, doc, title):
# loads cookie if exists
self.session
return html_header + doc + f"""
page_header = html_header.format(title=title)
return page_header + doc + f"""
<hr>
<code>msg = {self._msg}</code><br>
<code>whoami = {self.username}</code><br>
Expand All @@ -270,9 +271,11 @@ def raw_respond(self, response_code, body=b''):
self.headers)
return [body]

def respond(self, response_document):
def respond(self, response_document, title=None):
if title is None:
title = 'KDLP'
self.headers += [('Content-Type', 'text/html')]
response_document = self.format_html(response_document)
response_document = self.format_html(response_document, title)
return self.raw_respond(HTTPStatus.OK, response_document.encode())


Expand Down Expand Up @@ -329,11 +332,11 @@ def respond(welcome):
rocket.headers += [('Location', target)]
return rocket.raw_respond(HTTPStatus.SEE_OTHER)
elif target:
return rocket.respond(login_form(target_location=target))
return rocket.respond(login_form(target_location=target), 'Login')
elif welcome:
return rocket.respond(mk_form_welcome(rocket.session))
return rocket.respond(mk_form_welcome(rocket.session), 'Welcome')
else:
return rocket.respond(login_form())
return rocket.respond(login_form(), 'Login')

if rocket.session:
rocket.msg(f'{rocket.username} authenticated by token')
Expand Down Expand Up @@ -410,7 +413,7 @@ def submission_fields(sub):
</tr>
<tr>{table_content}</tr>
</table>
""")
""", "Activity Log")


class OopsStatus:
Expand Down Expand Up @@ -560,7 +563,7 @@ def handle_dashboard(rocket):
<button type="submit" name="confirm" value="y">Confirm</button>
<br><br>
</form>
''')
''', 'Are you sure?')
try:
db.Oopsie.create(user=rocket.session.username, assignment=asn,
timestamp=int(now))
Expand Down Expand Up @@ -592,7 +595,7 @@ def handle_dashboard(rocket):
final = asn_gradeables.where(grd_tbl.component == 'final').first()
ret += str(AsmtTable(assignment, oopsieness, peer1, peer2, init, rev1,
rev2, final))
return rocket.respond(ret + '</form>')
return rocket.respond(ret + '</form>', 'Dashboard')


def find_creds_for_registration(student_id):
Expand All @@ -618,7 +621,7 @@ def form_respond():
<label for="student_id">Student ID:</label>
<input name="student_id" type="text" id="student_id" /><br />
<button type="submit">Submit</button>
</form>''')
</form>''', 'Register')

if rocket.method != 'POST':
return form_respond()
Expand All @@ -633,7 +636,7 @@ def form_respond():
return rocket.respond(f'''
<h1>Save these credentials, you will not be able to access them again</h1><br>
<h3>Username: {username}</h3><br>
<h3>Password: {password}</h3><br>''')
<h3>Password: {password}</h3><br>''', 'Welcome to the classroom')


def determine_cache_entry(cred_str):
Expand Down Expand Up @@ -708,7 +711,7 @@ def cgit_internal_server_error(msg):
if raw_return:
return rocket.raw_respond(status, raw_body)
outstring = raw_body.decode()
return rocket.respond(outstring)
return rocket.respond(outstring, 'CGit') # TODO: get real title? (file issue upstream)
except (UnicodeDecodeError, ValueError, IndexError) as ex:
return cgit_internal_server_error(type(ex))

Expand All @@ -723,7 +726,7 @@ def handle_error(rocket):
return rocket.raw_respond(HTTPStatus.INTERNAL_SERVER_ERROR)
error_description = (f'<h1>HTTP ERROR {error.value}: '
f'{error.name.upper().replace("_", " ")}</h1>')
return rocket.respond(error_description)
return rocket.respond(error_description, f'ERROR {error.value}')


def handle_try_md(rocket):
Expand All @@ -736,7 +739,12 @@ def handle_try_md(rocket):
md = file.read()
html = markdown.markdown(md, extensions=['tables', 'fenced_code',
'footnotes', 'toc'])
return rocket.respond(html)
# Use the first line of the document as the title, sans #
if (title_end := md.find('\n')) != -1:
title = md[0:title_end].lstrip('#').strip()
else:
title = 'KDLP'
return rocket.respond(html, title)


def application(env, SR):
Expand Down