From 2d5344572050a206553b2f02127f028b707dfd42 Mon Sep 17 00:00:00 2001 From: Julian Dehm Date: Thu, 20 Apr 2023 16:50:39 +0200 Subject: [PATCH] update to fontawesome v6 * rename icons to new v6 names * rename fas -> fa-solid * rename fa -> fa-solid * rename far -> fa-regular --- .../scss/components/_dashboard_nav.scss | 4 +- .../a4ckeditor/collapsible_fragment.html | 2 +- .../templates/a4dashboard/base_dashboard.html | 6 +- .../a4dashboard/base_dashboard_project.html | 20 +-- .../templates/a4dashboard/blueprint_list.html | 2 +- .../a4dashboard/includes/preview.html | 2 +- .../a4dashboard/includes/progress_line.html | 26 +-- .../includes/progress_line_done.html | 2 +- .../includes/project_list_item.html | 12 +- .../a4dashboard/organisation_form_base.html | 4 +- .../a4dashboard/project_create_form.html | 2 +- .../a4filters/widgets/dropdown_link.html | 2 +- .../a4filters/widgets/free_text_filter.html | 2 +- .../a4forms/includes/inline_form.html | 4 +- .../a4images/image_upload_widget.html | 4 +- .../a4images/image_upload_widget_simple.html | 4 +- .../templates/a4modules/module_detail.html | 10 +- .../includes/header_language_switch.html | 2 +- .../project_header_mobile_toggle.html | 2 +- .../includes/userdashboard_mobile_toggle.html | 2 +- apps/account/sedHHO3pu | 0 .../a4_candy_account/account_dashboard.html | 10 +- apps/actions/apps.py | 12 +- .../a4_candy_actions/includes/reaction.html | 6 +- .../includes/proposal_list_item.html | 8 +- .../proposal_create_form.html | 2 +- .../proposal_moderate_form.html | 4 +- .../proposal_update_form.html | 4 +- .../blocks/accordeon_block.html | 2 +- .../blocks/download_block.html | 2 +- .../includes/homepage_hero.html | 2 +- .../use_case_index_page.html | 2 +- .../a4_candy_contrib/component_library.html | 166 +++++++++--------- .../includes/map_filter_and_sort.html | 4 +- .../a4_candy_contrib/includes/pagination.html | 4 +- .../a4_candy_contrib/item_detail.html | 4 +- apps/contrib/templatetags/contrib_tags.py | 2 +- .../a4_candy_dashboard/includes/progress.html | 2 +- .../includes/subject_dashboard_list_item.html | 6 +- .../a4_candy_debate/subject_detail.html | 2 +- apps/documents/assets/ChapterForm.jsx | 2 +- apps/documents/assets/ChapterNav.jsx | 2 +- apps/documents/assets/ChapterNavItem.jsx | 6 +- apps/documents/assets/ParagraphForm.jsx | 6 +- .../a4_candy_documents/chapter_detail.html | 4 +- .../a4_candy_documents/includes/nextprev.html | 8 +- .../a4_candy_documents/paragraph_detail.html | 2 +- .../a4_candy_ideas/idea_create_form.html | 2 +- .../a4_candy_ideas/idea_moderate_form.html | 4 +- .../a4_candy_ideas/idea_update_form.html | 4 +- .../includes/idea_list_item.html | 6 +- apps/interactiveevents/assets/Filters.jsx | 8 +- apps/interactiveevents/assets/InfoBox.jsx | 6 +- apps/interactiveevents/assets/QuestionBox.jsx | 6 +- .../assets/QuestionModerator.jsx | 8 +- .../interactiveevents/assets/QuestionUser.jsx | 4 +- .../includes/module_affiliations_form.html | 2 +- .../livequestion_module_detail.html | 2 +- .../module_detail.html | 2 +- .../includes/mapidea_list_item.html | 8 +- .../mapidea_create_form.html | 2 +- .../a4_candy_mapideas/mapidea_detail.html | 2 +- .../mapidea_moderate_form.html | 4 +- .../mapidea_update_form.html | 4 +- .../assets/map_choose_polygon_with_preset.js | 6 +- .../includes/popover_remark.html | 6 +- .../includes/offlineevent_list_item.html | 6 +- .../assets/react_language_choice.jsx | 4 +- .../communication_form_social_media.html | 2 +- .../includes/form_field.html | 2 +- .../organisation_landing_page.html | 2 +- .../includes/project_list_tile.html | 10 +- .../includes/removeable_invite_list.html | 2 +- .../includes/removeable_user_list.html | 2 +- .../a4_candy_projects/project_detail.html | 4 +- .../includes/topic_dashboard_list_item.html | 6 +- .../includes/topic_list_item.html | 6 +- .../a4_candy_topicprio/topic_detail.html | 2 +- .../js/a4_candy_userdashboard/Filter.jsx | 2 +- .../ModerationFeedback.jsx | 2 +- .../ModerationNotification.jsx | 4 +- .../ModerationNotificationActionsBar.jsx | 8 +- .../ModerationNotificationList.jsx | 4 +- .../ModerationProjects.jsx | 8 +- .../base_userdashboard.html | 14 +- .../userdashboard_activities.html | 2 +- .../userdashboard_following.html | 2 +- .../userdashboard_moderation_detail.html | 2 +- .../templates/a4_candy_users/indicator.html | 2 +- .../templates/a4_candy_users/user_detail.html | 4 +- package.json | 2 +- 91 files changed, 289 insertions(+), 289 deletions(-) create mode 100644 apps/account/sedHHO3pu diff --git a/adhocracy-plus/assets/scss/components/_dashboard_nav.scss b/adhocracy-plus/assets/scss/components/_dashboard_nav.scss index 838062998..da6d2bdbb 100644 --- a/adhocracy-plus/assets/scss/components/_dashboard_nav.scss +++ b/adhocracy-plus/assets/scss/components/_dashboard_nav.scss @@ -11,7 +11,7 @@ padding: 0.7 * $spacer 2.7 * $spacer 0.7 * $spacer 1.8 * $spacer; .fa-exclamation-circle, - .fa-check-circle { + .fa-circle-check { position: absolute; left: 0.5 * $spacer; top: $spacer; @@ -61,7 +61,7 @@ } .fa-exclamation-circle, - .fa-check-circle { + .fa-circle-check { position: absolute; left: 0.3 * $spacer; top: $spacer; diff --git a/adhocracy-plus/templates/a4ckeditor/collapsible_fragment.html b/adhocracy-plus/templates/a4ckeditor/collapsible_fragment.html index 15c7a2b28..f205a3c89 100644 --- a/adhocracy-plus/templates/a4ckeditor/collapsible_fragment.html +++ b/adhocracy-plus/templates/a4ckeditor/collapsible_fragment.html @@ -12,7 +12,7 @@ >

{{ title|safe }} - +

diff --git a/adhocracy-plus/templates/a4dashboard/base_dashboard.html b/adhocracy-plus/templates/a4dashboard/base_dashboard.html index bad492da4..ff58d58c2 100644 --- a/adhocracy-plus/templates/a4dashboard/base_dashboard.html +++ b/adhocracy-plus/templates/a4dashboard/base_dashboard.html @@ -14,7 +14,7 @@ {% else %}
- +
{% endif %} @@ -31,7 +31,7 @@ id="organisation-selection" > {{ view.organisation.name }} - +
{% for organisation in view.other_organisations_of_user %} @@ -87,7 +87,7 @@ {% else %} {% translate 'Organisation settings' %} {% endif %} - +
  • - + {% translate 'All projects' %}
    • @@ -33,12 +33,12 @@ data-bs-target="#dashboardCollapseProj" > {% if project_progress.project_is_complete %} - + {% else %} - + {% endif %} {{ project.name }} - +
    diff --git a/adhocracy-plus/templates/a4images/image_upload_widget_simple.html b/adhocracy-plus/templates/a4images/image_upload_widget_simple.html index e35048efb..d74082071 100644 --- a/adhocracy-plus/templates/a4images/image_upload_widget_simple.html +++ b/adhocracy-plus/templates/a4images/image_upload_widget_simple.html @@ -8,13 +8,13 @@ {% else %} {% endif %} diff --git a/adhocracy-plus/templates/a4modules/module_detail.html b/adhocracy-plus/templates/a4modules/module_detail.html index 5b57039d5..a9947f3f3 100644 --- a/adhocracy-plus/templates/a4modules/module_detail.html +++ b/adhocracy-plus/templates/a4modules/module_detail.html @@ -82,7 +82,7 @@

    {{ project.name }}

    {% if module.previous_module_in_cluster %} - + {% translate 'Previous' %} {% endif %} @@ -90,7 +90,7 @@

    {{ project.name }}

    {% if module.next_module_in_cluster %} {% translate 'Next' %} - + {% endif %}
    {% endif %} @@ -101,7 +101,7 @@

    {{ project.name }}

     diff --git a/apps/contrib/templates/a4_candy_contrib/item_detail.html b/apps/contrib/templates/a4_candy_contrib/item_detail.html index 6e0c7b298..3e26f3979 100644 --- a/apps/contrib/templates/a4_candy_contrib/item_detail.html +++ b/apps/contrib/templates/a4_candy_contrib/item_detail.html @@ -18,7 +18,7 @@
    • - + {% translate 'go back' %}
      • @@ -95,7 +95,7 @@

      {{ object.name }}

      aria-expanded="false" id="idea-{{ object.pk }}-actions" > - +
      {% if user_may_change %} diff --git a/apps/contrib/templatetags/contrib_tags.py b/apps/contrib/templatetags/contrib_tags.py index a2e52bf42..bbf581dbd 100644 --- a/apps/contrib/templatetags/contrib_tags.py +++ b/apps/contrib/templatetags/contrib_tags.py @@ -81,7 +81,7 @@ def classify(value): @register.filter def fa_class(icon): if hasattr(icon, "startswith") and not icon.startswith("fa"): - return "fas fa-{icon}".format(icon=icon) + return "fa-solid fa-{icon}".format(icon=icon) return icon diff --git a/apps/dashboard/templates/a4_candy_dashboard/includes/progress.html b/apps/dashboard/templates/a4_candy_dashboard/includes/progress.html index 3b11ccaab..03464f67e 100644 --- a/apps/dashboard/templates/a4_candy_dashboard/includes/progress.html +++ b/apps/dashboard/templates/a4_candy_dashboard/includes/progress.html @@ -36,7 +36,7 @@

      {% endif %}
      diff --git a/apps/debate/templates/a4_candy_debate/includes/subject_dashboard_list_item.html b/apps/debate/templates/a4_candy_debate/includes/subject_dashboard_list_item.html index aad3bb72c..d33b813fa 100644 --- a/apps/debate/templates/a4_candy_debate/includes/subject_dashboard_list_item.html +++ b/apps/debate/templates/a4_candy_debate/includes/subject_dashboard_list_item.html @@ -10,17 +10,17 @@

      {{ object.name }}

      {% spaceless %} - + {% translate 'View' %} - + {% translate 'Edit'%} - + {% translate 'Delete'%} {% endspaceless %} diff --git a/apps/debate/templates/a4_candy_debate/subject_detail.html b/apps/debate/templates/a4_candy_debate/subject_detail.html index 9747179e5..a2ef0fb08 100644 --- a/apps/debate/templates/a4_candy_debate/subject_detail.html +++ b/apps/debate/templates/a4_candy_debate/subject_detail.html @@ -18,7 +18,7 @@
      • - + {% translate 'go back' %}
        • diff --git a/apps/documents/assets/ChapterForm.jsx b/apps/documents/assets/ChapterForm.jsx index caa0bdf2d..18b00aaae 100644 --- a/apps/documents/assets/ChapterForm.jsx +++ b/apps/documents/assets/ChapterForm.jsx @@ -52,7 +52,7 @@ const ChapterForm = (props) => { onClick={props.onParagraphAppend} type="button" > - {django.gettext('Add a new paragraph')} + {django.gettext('Add a new paragraph')} ) diff --git a/apps/documents/assets/ChapterNav.jsx b/apps/documents/assets/ChapterNav.jsx index c46a2c2f0..d350c0ac7 100644 --- a/apps/documents/assets/ChapterNav.jsx +++ b/apps/documents/assets/ChapterNav.jsx @@ -35,7 +35,7 @@ const ChapterNav = (props) => { onClick={props.onChapterAppend} type="button" > - {django.gettext('Add a new chapter')} + {django.gettext('Add a new chapter')}

        diff --git a/apps/documents/assets/ChapterNavItem.jsx b/apps/documents/assets/ChapterNavItem.jsx index bef6ad61a..53b842351 100644 --- a/apps/documents/assets/ChapterNavItem.jsx +++ b/apps/documents/assets/ChapterNavItem.jsx @@ -34,7 +34,7 @@ const ChapterNavItem = (props) => { type="button" > @@ -46,7 +46,7 @@ const ChapterNavItem = (props) => { type="button" > @@ -58,7 +58,7 @@ const ChapterNavItem = (props) => { type="button" > diff --git a/apps/documents/assets/ParagraphForm.jsx b/apps/documents/assets/ParagraphForm.jsx index a4206e310..fe0fbe19d 100644 --- a/apps/documents/assets/ParagraphForm.jsx +++ b/apps/documents/assets/ParagraphForm.jsx @@ -111,7 +111,7 @@ class ParagraphForm extends React.Component { type="button" > @@ -123,7 +123,7 @@ class ParagraphForm extends React.Component { type="button" > @@ -134,7 +134,7 @@ class ParagraphForm extends React.Component { type="button" > diff --git a/apps/documents/templates/a4_candy_documents/chapter_detail.html b/apps/documents/templates/a4_candy_documents/chapter_detail.html index 65a2bc546..6b81e8110 100644 --- a/apps/documents/templates/a4_candy_documents/chapter_detail.html +++ b/apps/documents/templates/a4_candy_documents/chapter_detail.html @@ -16,7 +16,7 @@ aria-expanded="{{ object.prev|yesno:'false,true' }}" aria-controls="doc-toc__content">

        {% translate 'Table of Contents' %}

        - +
          @@ -49,7 +49,7 @@

          class="btn btn--primary" href="{{ paragraph.get_absolute_url }}" > - + {% blocktranslate count count=paragraph.comments.all|length %}{{ count }} Comment{% plural %}{{ count }} Comments{% endblocktranslate %}

        diff --git a/apps/documents/templates/a4_candy_documents/includes/nextprev.html b/apps/documents/templates/a4_candy_documents/includes/nextprev.html index 804f6e65d..64266b94f 100644 --- a/apps/documents/templates/a4_candy_documents/includes/nextprev.html +++ b/apps/documents/templates/a4_candy_documents/includes/nextprev.html @@ -6,12 +6,12 @@
        {% if object.prev %} - + {% translate "Previous Chapter" %} {% else %} - + {% translate "Previous Chapter" %} {% endif %} @@ -19,12 +19,12 @@ {% if object.next %} {% translate "Next Chapter" %} - + {% else %} {% translate "Next Chapter" %} - + {% endif %}
        diff --git a/apps/documents/templates/a4_candy_documents/paragraph_detail.html b/apps/documents/templates/a4_candy_documents/paragraph_detail.html index 2912e1485..5880b6de0 100644 --- a/apps/documents/templates/a4_candy_documents/paragraph_detail.html +++ b/apps/documents/templates/a4_candy_documents/paragraph_detail.html @@ -12,7 +12,7 @@ diff --git a/apps/ideas/templates/a4_candy_ideas/idea_create_form.html b/apps/ideas/templates/a4_candy_ideas/idea_create_form.html index 94291b314..cc4a2f226 100644 --- a/apps/ideas/templates/a4_candy_ideas/idea_create_form.html +++ b/apps/ideas/templates/a4_candy_ideas/idea_create_form.html @@ -17,7 +17,7 @@ diff --git a/apps/ideas/templates/a4_candy_ideas/idea_moderate_form.html b/apps/ideas/templates/a4_candy_ideas/idea_moderate_form.html index 476e52173..8685e5ed8 100644 --- a/apps/ideas/templates/a4_candy_ideas/idea_moderate_form.html +++ b/apps/ideas/templates/a4_candy_ideas/idea_moderate_form.html @@ -17,12 +17,12 @@ diff --git a/apps/ideas/templates/a4_candy_ideas/idea_update_form.html b/apps/ideas/templates/a4_candy_ideas/idea_update_form.html index 969452fe4..ca815949f 100644 --- a/apps/ideas/templates/a4_candy_ideas/idea_update_form.html +++ b/apps/ideas/templates/a4_candy_ideas/idea_update_form.html @@ -17,12 +17,12 @@ diff --git a/apps/ideas/templates/a4_candy_ideas/includes/idea_list_item.html b/apps/ideas/templates/a4_candy_ideas/includes/idea_list_item.html index 7f5d62f51..40c8c5bc4 100644 --- a/apps/ideas/templates/a4_candy_ideas/includes/idea_list_item.html +++ b/apps/ideas/templates/a4_candy_ideas/includes/idea_list_item.html @@ -6,17 +6,17 @@ {% if object|has_feature:"rate" %} - + {{ object.positive_rating_count }} - + {{ object.negative_rating_count }} {% endif %} - + {{ object.comment_count }} {% endspaceless %} diff --git a/apps/interactiveevents/assets/Filters.jsx b/apps/interactiveevents/assets/Filters.jsx index 88a106122..736d1e15a 100644 --- a/apps/interactiveevents/assets/Filters.jsx +++ b/apps/interactiveevents/assets/Filters.jsx @@ -44,7 +44,7 @@ export default class Filter extends React.Component { aria-expanded="false" > {this.props.currentCategoryName} -