diff --git a/legistream/act.py b/legistream/act.py index 4bc40a3..a315712 100644 --- a/legistream/act.py +++ b/legistream/act.py @@ -5,6 +5,6 @@ act_urls = [] if(act_stream.lower_is_live): - act_urls.append({'url': act_stream.lower_stream_url, 'title': 'Legislative Assembly', 'safe': 'legislative-assembly-vid'}) + act_urls.append({'url': act_stream.lower_stream_url, 'title': 'Legislative Assembly', 'safe': 'legislative-assembly-vid', 'thumb': 'legistream/img/thumbs/act_la.png'}) parl_title = 'Australian Capital Territory' \ No newline at end of file diff --git a/legistream/fed.py b/legistream/fed.py index de34c6c..68ec264 100644 --- a/legistream/fed.py +++ b/legistream/fed.py @@ -5,10 +5,10 @@ fed_urls = [] if(fed_stream.lower_is_live): - fed_urls.append({'url': fed_stream.lower_stream_url, 'title': 'House of Representatives', 'safe': 'hor-vid'}) + fed_urls.append({'url': fed_stream.lower_stream_url, 'title': 'House of Representatives', 'safe': 'hor-vid', 'thumb': 'legistream/img/thumbs/fed_hor.png'}) if(fed_stream.upper_is_live): - fed_urls.append({'url': fed_stream.upper_stream_url, 'title': 'Senate', 'safe': 'sen-vid'}) + fed_urls.append({'url': fed_stream.upper_stream_url, 'title': 'Senate', 'safe': 'sen-vid', 'thumb': 'legistream/img/thumbs/fed_sen.png'}) if(fed_stream.committee_is_live): - fed_urls.append({'url': fed_stream.committee_stream_url, 'title': 'Committee', 'safe': 'com-vid'}) + fed_urls.append({'url': fed_stream.committee_stream_url, 'title': 'Committee', 'safe': 'com-vid', 'thumb': 'legistream/img/thumbs/fed_com.png'}) parl_title = 'Federal' \ No newline at end of file diff --git a/legistream/nsw.py b/legistream/nsw.py index 647ce4b..e12a5dd 100644 --- a/legistream/nsw.py +++ b/legistream/nsw.py @@ -5,12 +5,12 @@ nsw_urls = [] if(nsw_stream.lower_is_live): - nsw_urls.append({'url': nsw_stream.lower_stream_url, 'title': 'Legislative Assembly', 'safe': 'legislative-assembly-vid'}) + nsw_urls.append({'url': nsw_stream.lower_stream_url, 'title': 'Legislative Assembly', 'safe': 'legislative-assembly-vid', 'thumb': 'legistream/img/thumbs/nsw_la.png'}) if(nsw_stream.upper_is_live): - nsw_urls.append({'url': nsw_stream.upper_stream_url, 'title': 'Legislative Council', 'safe': 'legislative-council-vid'}) + nsw_urls.append({'url': nsw_stream.upper_stream_url, 'title': 'Legislative Council', 'safe': 'legislative-council-vid', 'thumb': 'legistream/img/thumbs/nsw_lc.png'}) if(nsw_stream.committee_is_live): - nsw_urls.append({'url': nsw_stream.committe_stream_url, 'title': 'Committee', 'safe': 'com-vid'}) + nsw_urls.append({'url': nsw_stream.committe_stream_url, 'title': 'Committee', 'safe': 'com-vid', 'thumb': 'legistream/img/thumbs/nsw_com.png'}) if(nsw_stream.jubilee_is_live): - nsw_urls.append({'url': nsw_stream.jubilee_stream_url, 'title': 'Jubilee', 'safe': 'jubilee-vid'}) + nsw_urls.append({'url': nsw_stream.jubilee_stream_url, 'title': 'Jubilee', 'safe': 'jubilee-vid', 'thumb': 'legistream/img/thumbs/nsw_jubilee.png'}) parl_title = 'New South Wales' \ No newline at end of file diff --git a/legistream/nt.py b/legistream/nt.py index c6056a1..0ea1d88 100644 --- a/legistream/nt.py +++ b/legistream/nt.py @@ -5,6 +5,6 @@ nt_urls = [] if(nt_stream.lower_is_live): - nt_urls.append({'url': nt_stream.lower_stream_url, 'title': 'Legislative Assembly', 'safe': 'legislative-assembly-vid'}) + nt_urls.append({'url': nt_stream.lower_stream_url, 'title': 'Legislative Assembly', 'safe': 'legislative-assembly-vid', 'thumb': 'legistream/img/thumbs/nt_la.png'}) parl_title = 'Northern Territory' \ No newline at end of file diff --git a/legistream/qld.py b/legistream/qld.py index 0e3f821..ad6714c 100644 --- a/legistream/qld.py +++ b/legistream/qld.py @@ -5,6 +5,6 @@ qld_urls = [] if(qld_stream.is_live): - qld_urls.append({'url': qld_stream.stream_url, 'title': qld_stream.stream_title, 'safe': 'qld-vid'}) + qld_urls.append({'url': qld_stream.stream_url, 'title': qld_stream.stream_title, 'safe': 'qld-vid', 'thumb': 'legistream/img/thumbs/qld_la.png'}) parl_title = 'Queensland' \ No newline at end of file diff --git a/legistream/static/legistream/img/thumbs/act_la.png b/legistream/static/legistream/img/thumbs/act_la.png new file mode 100644 index 0000000..66e6bbc Binary files /dev/null and b/legistream/static/legistream/img/thumbs/act_la.png differ diff --git a/legistream/static/legistream/img/thumbs/fed_com.png b/legistream/static/legistream/img/thumbs/fed_com.png new file mode 100644 index 0000000..a993999 Binary files /dev/null and b/legistream/static/legistream/img/thumbs/fed_com.png differ diff --git a/legistream/static/legistream/img/thumbs/fed_hor.png b/legistream/static/legistream/img/thumbs/fed_hor.png new file mode 100644 index 0000000..2f8cadb Binary files /dev/null and b/legistream/static/legistream/img/thumbs/fed_hor.png differ diff --git a/legistream/static/legistream/img/thumbs/fed_sen.png b/legistream/static/legistream/img/thumbs/fed_sen.png new file mode 100644 index 0000000..73f9c56 Binary files /dev/null and b/legistream/static/legistream/img/thumbs/fed_sen.png differ diff --git a/legistream/static/legistream/img/thumbs/nsw_com.png b/legistream/static/legistream/img/thumbs/nsw_com.png new file mode 100644 index 0000000..590f728 Binary files /dev/null and b/legistream/static/legistream/img/thumbs/nsw_com.png differ diff --git a/legistream/static/legistream/img/thumbs/nsw_jubilee.png b/legistream/static/legistream/img/thumbs/nsw_jubilee.png new file mode 100644 index 0000000..948e706 Binary files /dev/null and b/legistream/static/legistream/img/thumbs/nsw_jubilee.png differ diff --git a/legistream/static/legistream/img/thumbs/nsw_la.png b/legistream/static/legistream/img/thumbs/nsw_la.png new file mode 100644 index 0000000..ab4b0c9 Binary files /dev/null and b/legistream/static/legistream/img/thumbs/nsw_la.png differ diff --git a/legistream/static/legistream/img/thumbs/nsw_lc.png b/legistream/static/legistream/img/thumbs/nsw_lc.png new file mode 100644 index 0000000..6c2ec0f Binary files /dev/null and b/legistream/static/legistream/img/thumbs/nsw_lc.png differ diff --git a/legistream/static/legistream/img/thumbs/nt_la.png b/legistream/static/legistream/img/thumbs/nt_la.png new file mode 100644 index 0000000..d88cd61 Binary files /dev/null and b/legistream/static/legistream/img/thumbs/nt_la.png differ diff --git a/legistream/static/legistream/img/thumbs/qld_la.png b/legistream/static/legistream/img/thumbs/qld_la.png new file mode 100644 index 0000000..a8f2883 Binary files /dev/null and b/legistream/static/legistream/img/thumbs/qld_la.png differ diff --git a/legistream/static/legistream/img/thumbs/wa_la.png b/legistream/static/legistream/img/thumbs/wa_la.png new file mode 100644 index 0000000..31df6b8 Binary files /dev/null and b/legistream/static/legistream/img/thumbs/wa_la.png differ diff --git a/legistream/static/legistream/img/thumbs/wa_lc.png b/legistream/static/legistream/img/thumbs/wa_lc.png new file mode 100644 index 0000000..d04bd91 Binary files /dev/null and b/legistream/static/legistream/img/thumbs/wa_lc.png differ diff --git a/legistream/templates/legistream/stream_page.html b/legistream/templates/legistream/stream_page.html index 6e6a0bf..daeb9cc 100644 --- a/legistream/templates/legistream/stream_page.html +++ b/legistream/templates/legistream/stream_page.html @@ -41,10 +41,10 @@

{{ parl }} Parliament

{% for stream in stream_urls %}
- {% if stream_amount < 3 %} - + {% if stream_amount <= 2 %} + {% else %} - + {% endif %}

Stream: {{ stream.title }}

diff --git a/legistream/views.py b/legistream/views.py index 9c0f733..cd22b64 100644 --- a/legistream/views.py +++ b/legistream/views.py @@ -22,6 +22,7 @@ def gen_context(): return { 'dropdown_list': statuscheck.check_statuses(), 'live_parls': grammarfy(live_parls), + 'stream_amount': len(live_parls), } def home(request):