-
Notifications
You must be signed in to change notification settings - Fork 77
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[DONE] General fixes for 3.5.x (#1037)
* * Correct some english typos
* Add missing aria-hidden attributes
* Rename js function TriggerAlertClose-> triggerAlertClose
* Replace JQ scrollTop by `form.scrollIntoView();`
* Add missing fieldset legends
* Use page_title in some templates
* Code formatting
* Remove redundants titles
* + Replace MESRI by MESR + Correct Marianne img (previous was raising 404)
+ Add typography guides in contributing.md
+ `make starts`now run on :9090
+ Add colored border color for each enrichment type
+ Set page_title for edit_enrichment, event_delete
+ Move scripts to {% block more_script %} (edit_enrichment & live/event)
+ Replace `list-group-item` by fieldset border in event_edit, meeting_edit and playlist_edit
+ Code formatting (indent)
+ CSS : more contrasted bs-orange
* Reduce Marianne img size
* remove js debug
+ correct html typo- Loading branch information
Showing
47 changed files
with
963 additions
and
947 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 13 additions & 13 deletions
26
pod/enrichment/templates/enrichment/enrichment_informations_card_aside.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| {% load i18n %} | ||
|
|
||
| <h2 class="card-header card-title pod-card__title h4"> | ||
| <i class="bi bi-info-circle" aria-hidden="true"></i> {% trans 'Informations' %} | ||
| <i class="bi bi-info-circle" aria-hidden="true"></i> {% trans 'Informations' %} | ||
| </h2> | ||
| <div class="card-body card-text"> | ||
| <p>{% trans 'To help you, the different types of enrichments have specific colors:' %}</p> | ||
| <p> | ||
| <ul> | ||
| <li class="enrich_image">{% trans 'Image' %}</li> | ||
| <li class="enrich_document">{% trans 'Document' %}</li> | ||
| <li class="enrich_richtext">{% trans 'Richtext' %}</li> | ||
| <li class="enrich_weblink">{% trans 'Weblink' %}</li> | ||
| <li class="enrich_embed">{% trans 'Embed' %}</li> | ||
| </ul> | ||
| </p> | ||
| <p>{% trans 'They are visible on the video playback bar.' %}</p> | ||
| <div class="card-body card-text bg-body"> | ||
| <p>{% trans 'To help you, the different types of enrichments have specific colors:' %}</p> | ||
| <p> | ||
| <ul> | ||
| <li class="enrich_image">{% trans 'Image' %}</li> | ||
| <li class="enrich_document">{% trans 'Document' %}</li> | ||
| <li class="enrich_richtext">{% trans 'Richtext' %}</li> | ||
| <li class="enrich_weblink">{% trans 'Weblink' %}</li> | ||
| <li class="enrich_embed">{% trans 'Embed' %}</li> | ||
| </ul> | ||
| </p> | ||
| <p>{% trans 'They are visible on the video playback bar.' %}</p> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,42 @@ | ||
| {# HTML for enrichment list. Don't use this file alone it must be integrated into another template! #} | ||
| {% load i18n %} | ||
| <div class="container"> | ||
| <div class="panel-heading"> | ||
| <h4 class="card-title pod-card__title">{% trans 'List of the enrichments' %} ({{list_enrichment|length}})</h4> | ||
| </div> | ||
| <table class="table table-striped table-condensed scroll" id="table_list_enrich"> | ||
| <thead> | ||
| <tr> | ||
| <th scope="col">{% trans 'Title' %}</th> | ||
| <th scope="col">{% trans 'Type' %}</th> | ||
| <th scope="col" class="enrich_start">{% trans 'Start' %}</th> | ||
| <th scope="col" class="enrich_end">{% trans 'End' %}</th> | ||
| <th scope="col">{% trans 'Actions' %}</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| {% for enrich in list_enrichment %} | ||
| <tr> | ||
| <td class="enrich_title">{{enrich.title}}</td> | ||
| <td class="enrich_type enrich_{{enrich.type}}">{% if enrich.type %}{% trans enrich.type %}{% endif %}</td> | ||
| <td class="enrich_start">{{enrich.start}}</td> | ||
| <td class="enrich_end">{{enrich.end}}</td> | ||
| <td> | ||
| <form class="get_form" action="{% url 'enrichment:video_enrichment' slug=video.slug %}" method="POST"> | ||
| {% csrf_token %} | ||
| <input type="hidden" name="action" value="modify"> | ||
| <input type="hidden" name="id" value="{{enrich.id}}"> | ||
| <input type="submit" title="{% blocktrans with enrich_title=enrich.title %}Modify the enrichment “{{ enrich_title }}”{% endblocktrans %}" value="{% trans 'Modify' %}" class="btn btn-primary btn-sm"> | ||
| </form> | ||
| <form class="get_form" action="{% url 'enrichment:video_enrichment' slug=video.slug %}" method="POST"> | ||
| {% csrf_token %} | ||
| <input type="hidden" name="action" value="delete"> | ||
| <input type="hidden" name="id" value="{{enrich.id}}"> | ||
| <input type="submit" title="{% blocktrans with enrich_title=enrich.title %}Delete the enrichment “{{ enrich_title }}”{% endblocktrans %}" value="{% trans 'Delete' %}" class="btn btn-danger btn-sm"> | ||
| </form> | ||
| </td> | ||
| </tr> | ||
| {% endfor %} | ||
| </tbody> | ||
| </table> | ||
| <div class="panel-heading"> | ||
| <h2 class="h3">{% trans 'List of the enrichments' %} ({{list_enrichment|length}})</h2> | ||
| </div> | ||
| <table class="table table-striped table-condensed scroll" id="table_list_enrich"> | ||
| <thead> | ||
| <tr> | ||
| <th scope="col">{% trans 'Title' %}</th> | ||
| <th scope="col">{% trans 'Type' %}</th> | ||
| <th scope="col" class="enrich_start">{% trans 'Start' %}</th> | ||
| <th scope="col" class="enrich_end">{% trans 'End' %}</th> | ||
| <th scope="col">{% trans 'Actions' %}</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| {% for enrich in list_enrichment %} | ||
| <tr> | ||
| <td class="enrich_title">{{enrich.title}}</td> | ||
| <td class="enrich_type enrich_{{enrich.type}}">{% if enrich.type %}{% trans enrich.type %}{% endif %}</td> | ||
| <td class="enrich_start">{{enrich.start}}</td> | ||
| <td class="enrich_end">{{enrich.end}}</td> | ||
| <td> | ||
| <form class="get_form d-inline" action="{% url 'enrichment:video_enrichment' slug=video.slug %}" method="POST"> | ||
| {% csrf_token %} | ||
| <input type="hidden" name="action" value="modify"> | ||
| <input type="hidden" name="id" value="{{enrich.id}}"> | ||
| <input type="submit" title="{% blocktrans with enrich_title=enrich.title %}Modify the enrichment “{{ enrich_title }}”{% endblocktrans %}" value="{% trans 'Modify' %}" class="btn btn-primary btn-sm"> | ||
| </form> | ||
| <form class="get_form d-inline" action="{% url 'enrichment:video_enrichment' slug=video.slug %}" method="POST"> | ||
| {% csrf_token %} | ||
| <input type="hidden" name="action" value="delete"> | ||
| <input type="hidden" name="id" value="{{enrich.id}}"> | ||
| <input type="submit" title="{% blocktrans with enrich_title=enrich.title %}Delete the enrichment “{{ enrich_title }}”{% endblocktrans %}" value="{% trans 'Delete' %}" class="btn btn-danger btn-sm"> | ||
| </form> | ||
| </td> | ||
| </tr> | ||
| {% endfor %} | ||
| </tbody> | ||
| </table> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.