Replace #project-loading spinning icon with a .loader-bar

This commit is contained in:
2018-09-07 14:56:38 +02:00
parent 4a4e75ee59
commit 23fbb68cfc
2 changed files with 18 additions and 26 deletions

View File

@@ -278,6 +278,8 @@ html(lang="en")
title="Sign up") Sign up title="Sign up") Sign up
| {% endif %} | {% endif %}
.loader-bar
.page-content .page-content
#search-overlay #search-overlay
| {% block page_overlay %} | {% block page_overlay %}

View File

@@ -99,7 +99,7 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') }
| {% endif %} | {% endif %}
+nav-secondary-link( +nav-secondary-link(
class="px-0", class="px-0 font-weight-bold",
href="{{url_for('projects.view', project_url=project.url, _external=True)}}") href="{{url_for('projects.view', project_url=project.url, _external=True)}}")
| {{ project.name }} | {{ project.name }}
@@ -128,16 +128,6 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') }
#project-side-container #project-side-container
#project_sidebar.bg-white #project_sidebar.bg-white
ul.project-tabs.p-0 ul.project-tabs.p-0
//- li.tabs-thumbnail(class="{% if project.picture_square %}image{% endif %}")
//- a(href="{{url_for('projects.view', project_url=project.url)}}")
//- #project-loading
//- i.pi-spin
//- | {% if project.picture_square %}
//- img(src="{{ project.picture_square.thumbnail('b', api=api) }}")
//- | {% else %}
//- i.pi-home
//- | {% endif %}
li.tabs-browse( li.tabs-browse(
title="Browse", title="Browse",
data-toggle="tooltip", data-toggle="tooltip",
@@ -223,8 +213,8 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') }
ul.dropdown-menu ul.dropdown-menu
| {% if current_user.has_cap('admin') %} | {% if current_user.has_cap('admin') %}
li.dropdown-item li
a( a.dropdown-item(
id="item_featured", id="item_featured",
href="javascript:void(0);", href="javascript:void(0);",
title="Feature on project's homepage", title="Feature on project's homepage",
@@ -233,8 +223,8 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') }
i.pi-star i.pi-star
| Toggle Featured | Toggle Featured
li.dropdown-item li
a( a.dropdown-item(
id="item_toggle_public", id="item_toggle_public",
href="javascript:void(0);", href="javascript:void(0);",
title="Make it accessible to anyone", title="Make it accessible to anyone",
@@ -244,8 +234,8 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') }
| Toggle Public | Toggle Public
| {% endif %} | {% endif %}
li.dropdown-item li
a( a.dropdown-item(
id="item_toggle_projheader", id="item_toggle_projheader",
href="javascript:void(0);", href="javascript:void(0);",
title="Feature as project's header", title="Feature as project's header",
@@ -254,8 +244,8 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') }
i.pi-star i.pi-star
| Toggle Project Header video | Toggle Project Header video
li.dropdown-item.button-move li.button-move
a( a.dropdown-item(
id="item_move", id="item_move",
href="javascript:void(0);", href="javascript:void(0);",
title="Move into a folder...", title="Move into a folder...",
@@ -264,8 +254,8 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') }
i.button-move-icon.pi-move i.button-move-icon.pi-move
| Move | Move
li.dropdown-item.button-delete li.button-delete
a( a.dropdown-item(
id="item_delete", id="item_delete",
href="javascript:void(0);", href="javascript:void(0);",
title="Can be undone within a month", title="Can be undone within a month",
@@ -389,7 +379,7 @@ script.
// TODO: Maybe remove this, now it's also in loadNodeContent(), but double-check // TODO: Maybe remove this, now it's also in loadNodeContent(), but double-check
// it's done like that in all users of updateUi(). // it's done like that in all users of updateUi().
$('#project-loading').removeAttr('class'); $('.loader-bar').removeClass('active');
} }
| {% endblock %} | {% endblock %}
@@ -417,7 +407,7 @@ script.
function loadNodeContent(url, nodeId) { function loadNodeContent(url, nodeId) {
$('#project-loading').addClass('active'); $('.loader-bar').addClass('active');
$.get(url, function(dataHtml) { $.get(url, function(dataHtml) {
// Update the DOM injecting the generate HTML into the page // Update the DOM injecting the generate HTML into the page
$('#project_context').html(dataHtml); $('#project_context').html(dataHtml);
@@ -430,14 +420,14 @@ script.
$('#server_error').attr('src', url); $('#server_error').attr('src', url);
}) })
.always(function(){ .always(function(){
$('#project-loading').removeAttr('class'); $('.loader-bar').removeClass('active');
$('.button-edit-icon').addClass('pi-edit').removeClass('pi-spin spin'); $('.button-edit-icon').addClass('pi-edit').removeClass('pi-spin spin');
}); });
} }
function loadProjectContent(url) { function loadProjectContent(url) {
$('#project-loading').addClass('active'); $('.loader-bar').addClass('active');
$.get(url, function(dataHtml) { $.get(url, function(dataHtml) {
// Update the DOM injecting the generated HTML into the page // Update the DOM injecting the generated HTML into the page
@@ -453,7 +443,7 @@ script.
$('#server_error').attr('src', url); $('#server_error').attr('src', url);
}) })
.always(function(){ .always(function(){
$('#project-loading').removeAttr('class'); $('.loader-bar').removeClass('active');
$('.button-edit-icon').addClass('pi-edit').removeClass('pi-spin spin'); $('.button-edit-icon').addClass('pi-edit').removeClass('pi-spin spin');
}); });
} }