diff --git a/bower.json b/bower.json index 005cf29..fb068df 100644 --- a/bower.json +++ b/bower.json @@ -1,9 +1,9 @@ { "name": "dependencies", "dependencies": { - "jquery": "2.2.1", - "jqueryui": "1.11.4", - "bootstrap": "3.3.6", + "jquery": "3.7.1", + "jqueryui": "1.14.1", + "bootstrap": "5.3.3", "fullcalendar": "2.8.0" } } \ No newline at end of file diff --git a/docker/scripts/launch_dev_server.sh b/docker/scripts/launch_dev_server.sh index 2719a3a..6967ffc 100755 --- a/docker/scripts/launch_dev_server.sh +++ b/docker/scripts/launch_dev_server.sh @@ -3,6 +3,7 @@ script_full_path=$(dirname "$0") $script_full_path/wait_for.sh postgres 5432 +rm -rf /radioco/radioco/apps/radioco/static/bower mv -f /tmp_bower /radioco/radioco/apps/radioco/static/bower python3 manage.py migrate python3 manage.py runserver 0.0.0.0:8000 \ No newline at end of file diff --git a/radioco/apps/programmes/templates/programmes/episode_detail.html b/radioco/apps/programmes/templates/programmes/episode_detail.html index ca8c8ca..28517f0 100755 --- a/radioco/apps/programmes/templates/programmes/episode_detail.html +++ b/radioco/apps/programmes/templates/programmes/episode_detail.html @@ -8,16 +8,16 @@ {% block page_title %}{{ episode }}{% endblock %} -{% block programmes_class %}class="active"{% endblock %} +{% block programmes_class %}active{% endblock %} {% block content %}
-
+
...
-
+

{{ episode|title }}

{% firstof episode.summary|safe episode.programme.synopsis|safe '' %}

@@ -41,7 +41,7 @@

{% trans "Podcast" %}

-
+

{% trans 'Programme Details' %}

@@ -72,7 +72,7 @@

{% trans 'Programme Details' %}

{% if settings.DISQUS_ENABLE %}
-
+
{% set_disqus_identifier programme.id|stringformat:"i" %} {% set_disqus_title programme.name %} {% set_disqus_url episode.get_absolute_url %} diff --git a/radioco/apps/programmes/templates/programmes/programme_detail.html b/radioco/apps/programmes/templates/programmes/programme_detail.html index 50335dc..8eed8ab 100755 --- a/radioco/apps/programmes/templates/programmes/programme_detail.html +++ b/radioco/apps/programmes/templates/programmes/programme_detail.html @@ -8,21 +8,21 @@ {% block page_title %}{{ programme.name }}{% endblock %} -{% block programmes_class %}class="active"{% endblock %} +{% block programmes_class %}active{% endblock %} {% block content %}
-
+
...
-
+

{{ programme.name }}

{{ programme.synopsis|safe }}

-
+

{% trans 'Programme Details' %}

Language: {{ language }}

@@ -38,7 +38,7 @@

{% trans 'Programme Details' %}

{% if settings.DISQUS_ENABLE %}
-
+
{% set_disqus_identifier programme.id|stringformat:"i" %} {% set_disqus_title programme.name %} {% set_disqus_url programme.get_absolute_url %} diff --git a/radioco/apps/programmes/templates/programmes/programme_list.html b/radioco/apps/programmes/templates/programmes/programme_list.html index 958fb59..7223961 100755 --- a/radioco/apps/programmes/templates/programmes/programme_list.html +++ b/radioco/apps/programmes/templates/programmes/programme_list.html @@ -4,7 +4,7 @@ {% block page_title %}{% trans "Programme list" %}{% endblock %} -{% block programmes_class %}class="active"{% endblock %} +{% block programmes_class %}active{% endblock %} {% block content %} {% for programme in programme_list %} diff --git a/radioco/apps/radioco/static/radioco/css/calendar.css b/radioco/apps/radioco/static/radioco/css/calendar.css index 4e253ba..e7c5814 100755 --- a/radioco/apps/radioco/static/radioco/css/calendar.css +++ b/radioco/apps/radioco/static/radioco/css/calendar.css @@ -1,4 +1,4 @@ -#col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main { +#col-sm-9 offset-sm-3 col-md-10 offset-md-2 main { margin-top: 40px; text-align: center; font-size: 14px; diff --git a/radioco/apps/radioco/static/radioco/css/style.css b/radioco/apps/radioco/static/radioco/css/style.css index 606b548..a4a80c0 100755 --- a/radioco/apps/radioco/static/radioco/css/style.css +++ b/radioco/apps/radioco/static/radioco/css/style.css @@ -96,17 +96,17 @@ a:focus { font-weight: 900; } -.navbar-header .navbar-brand { +.navbar-light .navbar-brand { color: white; } -.navbar-default .navbar-nav > li > a { +.navbar-light .navbar-nav .nav-link { color: white; font-weight: 700; font-size: 12px; } -.navbar-default .navbar-nav > .separator { +.navbar-light .navbar-nav > .separator { color: white; font-weight: 700; font-size: 12px; @@ -114,20 +114,33 @@ a:focus { line-height: 20px; } -.navbar-default .navbar-nav > li > a:hover { +.navbar-light .navbar-nav .nav-link:hover { color: #00b3fe; } -.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus { +.navbar-light .navbar-nav > .active > .nav-link, .navbar-light .navbar-nav > .active > .nav-link:hover, .navbar-light .navbar-nav > .active > .nav-link:focus { color: #00b3fe; background-color: transparent; } -.navbar-default { +.navbar-light { background-color: #384452; border-color: transparent; } +.custom-toggler .navbar-toggler-icon { + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(136,136,136, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E"); +} + +.custom-toggler { + border-color: #ddd; +} + +.custom-toggler:focus { + box-shadow: initial; + background-color: #ddd; +} + .dropdown-menu { background: #384452; } diff --git a/radioco/apps/radioco/templates/radioco/base.html b/radioco/apps/radioco/templates/radioco/base.html index 647e698..5e405c0 100755 --- a/radioco/apps/radioco/templates/radioco/base.html +++ b/radioco/apps/radioco/templates/radioco/base.html @@ -44,40 +44,36 @@ {% block intro %} {% endblock %} -