Skip to content

WIP Update full calendar version 6 #77

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

Open
Chrysweel wants to merge 8 commits into
base: master
Choose a base branch
from
Open

WIP Update full calendar version 6 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
579f656
update to boostrap version 4
Chrysweel Nov 24, 2024
bc24d18
fix launch_dev_server to update dependences automatically
Chrysweel Nov 30, 2024
7474299
fix details to version bootstrap 5
Chrysweel Nov 30, 2024
de74b66
fix toggler design mobile
Chrysweel Nov 30, 2024
0d93cee
wip calendar in section schedules 'work'
Chrysweel Nov 30, 2024
95ef5af
wip work in fullcalendar work in admin
Chrysweel Nov 30, 2024
93f25ce
work move event in calendar by drag and drop
Chrysweel Nov 30, 2024
e6b6a66
remove change of launch_dev_server, it is another PR
Chrysweel Nov 30, 2024
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
8 changes: 4 additions & 4 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "dependencies",
"dependencies": {
"jquery": "2.2.1",
"jqueryui": "1.11.4",
"bootstrap": "3.3.6",
"fullcalendar": "2.8.0"
"jquery": "3.7.1",
"jqueryui": "1.12.1",
"bootstrap": "5.3.3",
"fullcalendar": "6.1.15"
}
}
31 changes: 26 additions & 5 deletions radioco/apps/api/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,36 @@ def clean_timezone(self):


class TransmissionForm(TimezoneForm):
after = forms.DateField()
before = forms.DateField()
after = forms.CharField()
before = forms.CharField()
calendar = forms.CharField(required=False)

def clean(self):
cleaned_data = super(TransmissionForm, self).clean()
if cleaned_data.get('before') and cleaned_data.get('after'):
cleaned_data = super().clean()

# Convierte 'after' a datetime.date si es necesario
after = cleaned_data.get('after')
if after:
try:
# Convertir el string 'after' en una fecha con formato 'YYYY-MM-DD'
cleaned_data['after'] = datetime.datetime.strptime(after.split("T")[0], "%Y-%m-%d").date()
except ValueError:
raise ValidationError("El campo 'after' debe tener el formato correcto 'YYYY-MM-DD'.")

# También puedes validar 'before' de manera similar si es necesario
before = cleaned_data.get('before')
if before:
try:
# Convertir el string 'before' en una fecha con formato 'YYYY-MM-DD'
cleaned_data['before'] = datetime.datetime.strptime(before.split("T")[0], "%Y-%m-%d").date()
except ValueError:
raise ValidationError("El campo 'before' debe tener el formato correcto 'YYYY-MM-DD'.")

# Valida que 'after' no sea posterior a 'before'
if cleaned_data.get('after') and cleaned_data.get('before'):
if cleaned_data['after'] > cleaned_data['before']:
raise ValidationError('after date has to be greater or equals than before date.')
raise ValidationError("La fecha 'after' debe ser menor o igual que 'before'.")

return cleaned_data


Expand Down
10 changes: 5 additions & 5 deletions radioco/apps/programmes/templates/programmes/episode_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@

{% block page_title %}{{ episode }}{% endblock %}

{% block programmes_class %}class="active"{% endblock %}
{% block programmes_class %}active{% endblock %}

{% block content %}
<div class="container mb">
<div class="row">
<div class="col-lg-10 col-lg-offset-1 centered">
<div class="col-lg-10 offset-lg-1 centered">
<img class="center-block img-responsive" src="{{ programme.photo.url }}" alt="...">
</div>

<div class="col-lg-5 col-lg-offset-1 spacing">
<div class="col-lg-5 offset-lg-1 spacing">
<h4>{{ episode|title }}</h4>

<p>{% firstof episode.summary|safe episode.programme.synopsis|safe '' %}</p>
Expand All @@ -41,7 +41,7 @@ <h4>{% trans "Podcast" %}</h4>
</p>
</div>

<div class="col-lg-4 col-lg-offset-1 spacing">
<div class="col-lg-4 offset-lg-1 spacing">
<h4>{% trans 'Programme Details' %}</h4>
<div class="hline"></div>
<p>
Expand Down Expand Up @@ -72,7 +72,7 @@ <h4>{% trans 'Programme Details' %}</h4>
<! --/row -->
{% if settings.DISQUS_ENABLE %}
<div class="row">
<div class="col-lg-10 col-lg-offset-1 centered">
<div class="col-lg-10 offset-lg-1 centered">
{% set_disqus_identifier programme.id|stringformat:"i" %}
{% set_disqus_title programme.name %}
{% set_disqus_url episode.get_absolute_url %}
Expand Down
10 changes: 5 additions & 5 deletions radioco/apps/programmes/templates/programmes/programme_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@

{% block page_title %}{{ programme.name }}{% endblock %}

{% block programmes_class %}class="active"{% endblock %}
{% block programmes_class %}active{% endblock %}

{% block content %}
<div class="container mb">
<div class="row">
<div class="col-lg-10 col-lg-offset-1 centered">
<div class="col-lg-10 offset-lg-1 centered">
<img class="center-block img-responsive" src="{{ programme.photo.url }}" alt="...">
</div>

<div class="col-lg-5 col-lg-offset-1 spacing">
<div class="col-lg-5 offset-lg-1 spacing">
<h4>{{ programme.name }}</h4>
<p>{{ programme.synopsis|safe }}</p>
</div>

<div class="col-lg-4 col-lg-offset-1 spacing">
<div class="col-lg-4 offset-lg-1 spacing">
<h4>{% trans 'Programme Details' %}</h4>
<div class="hline"></div>
<p><b>Language:</b> {{ language }}</p>
Expand All @@ -38,7 +38,7 @@ <h4>{% trans 'Programme Details' %}</h4>
</div>
{% if settings.DISQUS_ENABLE %}
<div class="row mhb">
<div class="col-lg-10 col-lg-offset-1 centered">
<div class="col-lg-10 offset-lg-1 centered">
{% set_disqus_identifier programme.id|stringformat:"i" %}
{% set_disqus_title programme.name %}
{% set_disqus_url programme.get_absolute_url %}
Expand Down
2 changes: 1 addition & 1 deletion radioco/apps/programmes/templates/programmes/programme_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion radioco/apps/radioco/static/radioco/css/calendar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
25 changes: 19 additions & 6 deletions radioco/apps/radioco/static/radioco/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,38 +96,51 @@ 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;
padding-top: 14px;
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;
}
Expand Down
52 changes: 23 additions & 29 deletions radioco/apps/radioco/templates/radioco/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
<link rel="shortcut icon" href="{% static "radioco/img/favicon.ico" %}">

<link rel="stylesheet" href="{% static "bower/bootstrap/dist/css/bootstrap.min.css" %}">
<link rel="stylesheet" href="{% static "bower/fullcalendar/dist/fullcalendar.min.css" %}" type="text/css" />
<link rel="stylesheet" href="{% static "bower/fullcalendar/dist/fullcalendar.print.css" %}" type="text/css" media='print'/>
<link href="{% static "radioco/css/font-awesome.min.css" %}" rel="stylesheet" type="text/css"/>
<link href="{% static "radioco/css/style.css" %}" rel="stylesheet">

Expand All @@ -44,40 +42,36 @@
<body>
{% block intro %} {% endblock %}

<div class="navbar navbar-default navbar-fixed-top" role="navigation">
<nav class="navbar navbar-expand-lg navbar-light fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle Navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{% url 'home' %}">{{ site_config.site_name }}</a>
</div>

<div class="navbar-collapse collapse navbar-right">
<ul class="nav navbar-nav">
<li {% block index_class %}{% endblock %}>
<a href="{% url 'home' %}">{% trans "home"|title %}</a>
<a class="navbar-brand" href="{% url 'home' %}">{{ site_config.site_name }}</a>
<button class="navbar-toggler custom-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav ms-auto">
<li class="nav-item {% block index_class %}{% endblock %}">
<a class="nav-link" href="{% url 'home' %}">{% trans "home"|title %}</a>
</li>
<li {% block schedules_class %}{% endblock %}>
<a href="{% url 'schedules:list' %}">{% trans "schedules"|title %}</a>
<li class="nav-item {% block schedules_class %}{% endblock %}">
<a class="nav-link" href="{% url 'schedules:list' %}">{% trans "schedules"|title %}</a>
</li>
<li {% block programmes_class %}{% endblock %}>
<a href="{% url 'programmes:list' %}">{% trans "programmes"|title %}</a>
<li class="nav-item {% block programmes_class %}{% endblock %}">
<a class="nav-link" href="{% url 'programmes:list' %}">{% trans "programmes"|title %}</a>
</li>
<li {% block users_class %}{% endblock %}>
<a href="{% url 'users:list' %}">{% trans "people"|title %}</a>
<li class="nav-item {% block users_class %}{% endblock %}">
<a class="nav-link" href="{% url 'users:list' %}">{% trans "people"|title %}</a>
</li>
<li class="separator"></li>
<li>
<a href="{% url 'admin:index' %}">{% trans "admin area"|title %}</a>
<li class="nav-item">
<a class="nav-link" href="{% url 'admin:index' %}">{% trans "admin area"|title %}</a>
</li>
</ul>
</div>
</div>
</div>
</nav>


{% block page_title_wrapper %}
<div id="blue">
Expand Down Expand Up @@ -162,9 +156,9 @@ <h4>{% trans 'Our Address' %}</h4>
<script src="{% static "radioco/js/jquery.prettyPhoto.js" %}"></script>
<script src="{% static "radioco/js/jquery.isotope.min.js" %}"></script>
<script src="{% static "bower/bootstrap/dist/js/bootstrap.min.js" %}"></script>
<script src="{% static "bower/moment/min/moment.min.js" %}" type="text/javascript"></script>
<script src="{% static "bower/fullcalendar/dist/fullcalendar.js" %}" type="text/javascript"></script>
<script src="{% static "bower/fullcalendar/dist/lang-all.js" %}" type="text/javascript"></script>
<!-- <script src="{% static "bower/moment/min/moment.min.js" %}" type="text/javascript"></script> -->
<script src='https://cdn.jsdelivr.net/npm/fullcalendar/index.global.min.js'></script>
<script src='https://cdn.jsdelivr.net/npm/@fullcalendar/core@6.1.15/locales-all.global.js'></script>

<script src="{% static "radioco/js/custom.js" %}"></script>
<script>
Expand Down
16 changes: 8 additions & 8 deletions radioco/apps/radioco/templates/radioco/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<div class="container">
<div class="row">
{% if transmission %}
<div class="col-lg-8 col-lg-offset-2">
<div class="col-lg-8 offset-lg-2">
<h1>{% trans "On air"|upper %}</h1>
<h3>
<a href="{% url 'programmes:detail' transmission.slug %}">
Expand All @@ -28,21 +28,21 @@ <h5>
<strong>{{ transmission.start|date:"G:i" }} - {{ transmission.end|date:"G:i" }}</strong>
</h5>

<div class="progress">
<div class="progress-bar progress-bar-success" role="progressbar"
<div class="progress mb-3">
<div class="progress-bar bg-success" role="progressbar"
aria-valuenow="{{ percentage }}" aria-valuemin="0" aria-valuemax="100"
style="width: {{ percentage }}%">
<span class="sr-only">{{ percentage }}% Complete (success)</span>
<span class="visually-hidden">{{ percentage }}% Complete (success)</span>
</div>
</div>
</div>
<div class="col-lg-8 col-lg-offset-2 himg">
<div class="col-lg-8 offset-lg-2 himg">
<a href="{% url 'programmes:detail' transmission.slug %}">
<img src="{{ transmission.programme.photo.url }}" class="img-responsive img-thumbnail">
</a>
</div>
{% else %}
<div class="col-lg-8 col-lg-offset-2">
<div class="col-lg-8 offset-lg-2">
<h3>{% trans 'There are currently no programmes on air' %}</h3>
<h1>{% trans 'Check all our programmes' %}</h1>
<h5><a href="{% url 'programmes:list' %}" class="btn btn-theme">{% trans 'See all' %}</a></h5>
Expand Down Expand Up @@ -140,12 +140,12 @@ <h5 class="a1" data-animate="fadeInUp">{{ programme.get_category_display }}</h5>

<div class="container mtb">
<div class="row">
<div class="col-lg-4 col-lg-offset-1">
<div class="col-lg-4 offset-lg-1">
<h4>{% trans 'More About Us.' %}</h4>
<p> {{ site_config.more_about_us }}</p>
</div>

<div class="col-lg-4 col-lg-offset-1">
<div class="col-lg-4 offset-lg-1">
<h4>{% trans 'Latest Episodes' %}</h4>
<div class="hline"></div>
{% for episode in latest_episodes %}
Expand Down
Loading