Skip to content
Snippets Groups Projects
Commit 547ab2c5 authored by Julian Rother's avatar Julian Rother
Browse files

Implemented public service announcements

parent d8ec3c15
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
db_schema.sql
+ 12
− 0
View file @ 547ab2c5
...@@ -183,6 +183,18 @@ CREATE TABLE IF NOT EXISTS `videos_data` ( ...@@ -183,6 +183,18 @@ CREATE TABLE IF NOT EXISTS `videos_data` (
`video_format` INTEGER NOT NULL, `video_format` INTEGER NOT NULL,
`hash` varchar(32) NOT NULL `hash` varchar(32) NOT NULL
); );
CREATE TABLE IF NOT EXISTS `announcements` (
`id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
`text` text NOT NULL,
`internal` text NOT NULL,
`level` INTEGER NOT NULL DEFAULT 0,
`visible` INTEGER NOT NULL DEFAULT 0,
`deleted` INTEGER NOT NULL DEFAULT 0,
`time_created` datetime NOT NULL,
`time_updated` datetime NOT NULL,
`created_by` INTEGER NOT NULL
);
CREATE VIEW IF NOT EXISTS `courses` AS select * from `courses_data` where (not(`courses_data`.`deleted`)); CREATE VIEW IF NOT EXISTS `courses` AS select * from `courses_data` where (not(`courses_data`.`deleted`));
CREATE VIEW IF NOT EXISTS `lectures` AS select * from `lectures_data` where (not(`lectures_data`.`deleted`)); CREATE VIEW IF NOT EXISTS `lectures` AS select * from `lectures_data` where (not(`lectures_data`.`deleted`));
CREATE VIEW IF NOT EXISTS `videos` AS select * from `videos_data` where (not(`videos_data`.`deleted`)); CREATE VIEW IF NOT EXISTS `videos` AS select * from `videos_data` where (not(`videos_data`.`deleted`));
......
server.py
+ 4
− 0
View file @ 547ab2c5
...@@ -115,6 +115,10 @@ def human_date(d): ...@@ -115,6 +115,10 @@ def human_date(d):
def rfc3339(d): def rfc3339(d):
return d.strftime('%Y-%m-%dT%H:%M:%S+02:00') return d.strftime('%Y-%m-%dT%H:%M:%S+02:00')
@app.template_global()
def get_announcements(minlevel=0):
return query('SELECT * FROM announcements WHERE NOT deleted AND (? OR visible) AND level >= ? ORDER BY level DESC', ismod(), minlevel)
@app.route('/') @app.route('/')
@register_navbar('Home', icon='home') @register_navbar('Home', icon='home')
def index(): def index():
......
templates/base.html
+ 6
− 1
View file @ 547ab2c5
{% set page_border = page_border|default(1) -%} {% set page_border = page_border|default(1) %}
{% set min_announcement_level = min_announcement_level|default(1) %}
{% set announcement_levels = {0: 'info', 1: 'info', 2: 'warning', 3: 'danger'} %}
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
...@@ -102,6 +104,9 @@ ...@@ -102,6 +104,9 @@
{% for msg in get_flashed_messages() %} {% for msg in get_flashed_messages() %}
<div class="alert alert-danger" role="alert">{{ msg }}</div> <div class="alert alert-danger" role="alert">{{ msg }}</div>
{% endfor %} {% endfor %}
{% for msg in get_announcements(min_announcement_level) %}
<div class="alert alert-{{announcement_levels.get(msg.level, 'info')}}" role="alert">{{ msg.text|safe }}</div>
{% endfor %}
{% block content %} {% block content %}
<h1>This is a Heading</h1> <h1>This is a Heading</h1>
<p>This is a paragraph.</p> <p>This is a paragraph.</p>
......
templates/index.html
+ 1
− 0
View file @ 547ab2c5
{% from 'macros.html' import preview %} {% from 'macros.html' import preview %}
{% extends "base.html" %} {% extends "base.html" %}
{% set page_border = 0 %} {% set page_border = 0 %}
{% set min_announcement_level = 0 %}
{% block content %} {% block content %}
<div class="row"> <div class="row">
<div class="col-md-6 panel-group"> <div class="col-md-6 panel-group">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment