Merge branch '141-switch-to-free-icons' into 'master'

Resolve "switch to free icons"

Closes #141

See merge request !74

portal/templates/portal/public/base.html

@@ -5,7 +5,7 @@
     <li class="nav-item">
         {% if user.is_authenticated %}
             <a class="btn btn-primary" href="{% if user.is_staff %}{% url 'admin.dashboard' %}{% else %}{% url 'dashboard' %}{% endif %}">
-                <i class="fas fa-tachometer-alt"></i>
+                <i class="fa fa-tachometer-alt"></i>
                 <span class="d-none d-sm-inline-flex">&nbsp;{% trans 'Dashboard' %}
             </span>
         {% else %}

portal/templates/portal/secure/admin/base.html

@@ -12,13 +12,13 @@
 
 {% block context_nav %}
     <a class="nav-link {% if active_page == 'dashboard' %}active{% endif %}" href="{% url 'admin.dashboard' %}">
-        <i class="fas fa-tachometer-alt-fast fa-fw"></i>
+        <i class="fa fa-tachometer-alt fa-fw fa-lg"></i>
         {% trans 'Dashboard' %}
         <span class="sr-only">(current)</span>
     </a>
 
     <a class="nav-link {% if active_page == 'users' %}active{% endif %}" href="{% url 'admin.users' %}">
-        <i class="fas fa-users fa-fw"></i>
+        <i class="fas fa-users fa-fw fa-lg"></i>
         {% trans 'Users' %}
     </a>
 
@@ -30,13 +30,13 @@
 <ul class="nav navbar-nav flex-column mb-4 ml-3">
     <li class="nav-item {% if active_page == 'labs' %}active{% endif %}">
         <a class="nav-link" href="{% url 'admin.labs' %}">
-            <i class="fas fa-microscope fa-fw"></i>
+            <i class="fas fa-microscope fa-fw fa-lg"></i>
            {% trans 'Labs' %}
         </a>
     </li>
     <li class="nav-item {% if active_page == 'institutions' %}active{% endif %}">
         <a class="nav-link" href="{% url 'admin.institutions' %}">
-            <i class="fas fa-university fa-fw"></i>
+            <i class="fas fa-university fa-fw fa-lg"></i>
             {% trans 'Institutions' %}
         </a>
     </li>

portal/templates/portal/secure/admin/delete.html

@@ -7,7 +7,7 @@
 
     {% trans 'Deleting an entry is an IRREVERSIBLE action.' as msg %}
     {% trans 'Warning !' as heading %}
-    {% include 'portal/widgets/alert_widget.html' with msg=msg icon='far fa-exclamation-triangle' type='warning' heading=heading %}
+    {% include 'portal/widgets/alert_widget.html' with msg=msg icon='fa fa-exclamation-triangle' type='warning' heading=heading %}
 
     <p class="my-4">{{ confirmation_msg|safe }}</p>
 

portal/templates/portal/secure/user/base.html

@@ -14,7 +14,7 @@
 
 {% block context_nav %}
     <a class="nav-link {% if active_page == 'dashboard' %}active{% endif %}" href="{% url 'dashboard' %}">
-        <i class="fas fa-tachometer-alt-fast fa-fw fa-lg"></i>
+        <i class="fa fa-tachometer-alt fa-fw fa-lg"></i>
         {% trans 'Dashboard' %}
     </a>
     <a class="nav-link"
@@ -35,11 +35,11 @@
             {% trans 'My Files' %}
         </a>
         <a class="nav-link {% if active_page == 'shared-datafiles' %}active{% endif %}" href="{% url 'user.shared-datafiles' %}">
-            <i class="fas fa-file-check fa-fw fa-lg"></i>
+            <i class="fa fa-hand-holding fa-fw fa-lg"></i>
             {% trans 'Files Shared With Me' %}
         </a>
         <a class="nav-link {% if active_page == 'datasets' %}active{% endif %}" href="{% url 'user.datasets' %}">
-            <i class="fas fa-file-archive fa-fw fa-lg"></i>
+            <i class="fa fa-file-archive fa-fw fa-lg"></i>
             {% trans 'DataSets' %}
         </a>
         <a class="nav-link {% if active_page == 'sharegroups' %}active{% endif %}" href="{% url 'user.sharegroups' %}">

portal/templates/portal/secure/user/datafile_list.html

@@ -200,7 +200,7 @@ $(function() {
                         <br>
                         <a onclick="deleteBulkClick()" id="sel-delete-bulk" href="#"><i class="fa fa-trash mr-1"></i>{% trans 'Delete selected files' %}</a>
                         <br>
-                        <a onclick="createDatasetClick()" id="sel-create-dataset" href="#"><i class="fa fa-cloud-upload mr-1"></i>{% trans 'Create Dataset' %}</a>`,
+                        <a onclick="createDatasetClick()" id="sel-create-dataset" href="#"><i class="fa fa-upload mr-1"></i>{% trans 'Create Dataset' %}</a>`,
                     0: "",
                     1: "Selected 1 row"
                 }

portal/templates/portal/secure/user/delete.html

@@ -7,7 +7,7 @@
 
     {% trans 'Deleting an entry is an IRREVERSIBLE action.' as msg %}
     {% trans 'Warning !' as heading %}
-    {% include 'portal/widgets/alert_widget.html' with msg=msg icon='far fa-exclamation-triangle' type='warning' heading=heading %}
+    {% include 'portal/widgets/alert_widget.html' with msg=msg icon='fa fa-exclamation-triangle' type='warning' heading=heading %}
 
     <p class="my-4">{{ confirmation_msg|safe }}</p>
 

portal/templates/portal/secure/user/list.html

@@ -6,7 +6,7 @@
     <div class="col">
         <div id="create-button">
             <a href="{{ create_url }}" class="btn btn-primary btn-sm" >
-                <i class="fas fa-cloud-upload"></i>
+                <i class="fa fa-upload"></i>
                 <span class="ml-1">{{ create_label }}</span>
             </a>
         </div>

portal/views/secure/datafile.py

@@ -113,7 +113,7 @@ class DataFilesJSONListView(LoginRequiredMixin, JSONListView):
                     {'buttons': [
                         (reverse('user.datafile-update-iric-data-id', args=[o.iric_data_id]), 'fas fa-pencil-alt', ugettext('Edit')),
                         (reverse('user.datafile-download-iric-data-id', args=[o.iric_data_id]), 'fas fa-file-download', ugettext('Download File'), 'info', 'download'),
-                        (reverse('user.datafile-annotation-download-iric-data-id', args=[o.iric_data_id]), 'fas fa-brackets-curly', ugettext('Download Annotation'), 'info', 'download'),
+                        (reverse('user.datafile-annotation-download-iric-data-id', args=[o.iric_data_id]), 'fa fa-code', ugettext('Download Annotation'), 'info', 'download'),
                         (reverse('user.datafile-delete-iric-data-id', args=[o.iric_data_id]), 'fas fa-trash-alt', ugettext('Delete'), 'danger')
                     ]})
             }
@@ -164,7 +164,7 @@ class SharedWithMeDataFilesJSONListView(LoginRequiredMixin, JSONListView):
                     'portal/templates/portal/widgets/action_buttons.html',
                     {'buttons': [
                         (reverse('user.datafile-download-iric-data-id', args=[o.iric_data_id]), 'fas fa-file-download', ugettext('Download File'), 'info', 'download'),
-                        (reverse('user.datafile-annotation-download-iric-data-id', args=[o.iric_data_id]), 'fas fa-brackets-curly', ugettext('Download Annotation'), 'info', 'download')
+                        (reverse('user.datafile-annotation-download-iric-data-id', args=[o.iric_data_id]), 'fa fa-code', ugettext('Download Annotation'), 'info', 'download')
                     ]})
             }
 

portal/views/secure/dataset.py

@@ -82,7 +82,7 @@ class DataSetJSONListView(LoginRequiredMixin, JSONListView):
                     'portal/templates/portal/widgets/action_buttons.html',
                     {'buttons': [
                         (reverse('user.dataset-update-iric-data-id', args=[o.iric_data_id]), 'fas fa-pencil-alt', ugettext('Edit')),
-                        (reverse('user.dataset-display_fields-update-iric-data-id', args=[o.iric_data_id]), 'far fa-tv-retro', ugettext('Manage Display Fields'), 'info'),
+                        (reverse('user.dataset-display_fields-update-iric-data-id', args=[o.iric_data_id]), 'fa fa-tv', ugettext('Manage Display Fields'), 'info'),
                         (reverse('user.dataset-download-iric-data-id', args=[o.iric_data_id]), 'far fa-file-archive', ugettext('Download zip'), 'info'),
                         (reverse('user.dataset-delete-iric-data-id', args=[o.iric_data_id]), 'fas fa-trash-alt', ugettext('Delete'), 'danger')
                     ]})