mirror of
https://gitlab.com/brutaldon/brutaldon.git
synced 2024-12-04 14:46:24 -05:00
Strip out all the PJAX to make notifications work
This commit is contained in:
parent
5ced45c50b
commit
ea1f9bdbb8
@ -56,15 +56,7 @@
|
|||||||
<nav class="navbar is-fixed-top is-primary" role="navigation"
|
<nav class="navbar is-fixed-top is-primary" role="navigation"
|
||||||
aria-label="main navigation" id="main-nav-bar">
|
aria-label="main navigation" id="main-nav-bar">
|
||||||
<div class="navbar-brand">
|
<div class="navbar-brand">
|
||||||
<a class="navbar-item" href="{% url "home" %}"
|
<a class="navbar-item" href="{% url "home" %}">
|
||||||
ic-get-from="{% url "home" %}"
|
|
||||||
ic-target="#main"
|
|
||||||
ic-scroll-to-target="true"
|
|
||||||
ic-select-from-response="#main"
|
|
||||||
ic-push-url="true"
|
|
||||||
ic-on-beforeSend="savePlace"
|
|
||||||
ic-on-success="afterPage('{{ own_acct.username }}', 'Home');"
|
|
||||||
ic-indicator="#page-load-indicator">
|
|
||||||
{% if own_acct %}
|
{% if own_acct %}
|
||||||
<img src="{{ own_acct.avatar_static }}"
|
<img src="{{ own_acct.avatar_static }}"
|
||||||
class="image is-32x32 avatar"
|
class="image is-32x32 avatar"
|
||||||
@ -80,37 +72,20 @@
|
|||||||
<div class="navbar-menu is-active" id="navMenu">
|
<div class="navbar-menu is-active" id="navMenu">
|
||||||
<!-- navbar start, navbar end -->
|
<!-- navbar start, navbar end -->
|
||||||
<div class="navbar-start">
|
<div class="navbar-start">
|
||||||
<a href="{% url "home" %}" class="navbar-item"
|
<a href="{% url "home" %}" class="navbar-item">
|
||||||
ic-get-from="{% url "home" %}"
|
|
||||||
ic-target="#main"
|
|
||||||
ic-scroll-to-target="true"
|
|
||||||
ic-select-from-response="#main"
|
|
||||||
ic-push-url="true"
|
|
||||||
ic-on-beforeSend="savePlace"
|
|
||||||
ic-on-success="afterPage('{{ own_acct.username }}', 'Home');"
|
|
||||||
ic-indicator="#page-load-indicator">
|
|
||||||
<span class="fa fa-home"></span>
|
<span class="fa fa-home"></span>
|
||||||
<span> Home</span>
|
<span> Home</span>
|
||||||
</a>
|
</a>
|
||||||
<a class="navbar-item" href="{% url "note" %}"
|
<a class="navbar-item" href="{% url "note" %}"
|
||||||
ic-get-from="{% url "note" %}"
|
>
|
||||||
ic-target="#main"
|
|
||||||
ic-scroll-to-target="true"
|
|
||||||
ic-select-from-response="#main"
|
|
||||||
ic-push-url="true"
|
|
||||||
ic-on-beforeSend="savePlace"
|
|
||||||
ic-on-success="afterPage('{{ own_acct.username }}', 'Notifications');"
|
|
||||||
ic-indicator="#page-load-indicator">
|
|
||||||
<span class="fa fa-bell-o"></span>
|
<span class="fa fa-bell-o"></span>
|
||||||
{% if not preferences.theme.is_brutalist %}
|
{% if not preferences.theme.is_brutalist %}
|
||||||
<span ic-src="{% url 'notes_count' %}"
|
<span ic-src="{% url 'notes_count' %}"
|
||||||
ic-poll="60s"
|
ic-poll="60s"
|
||||||
ic-target="find span"
|
ic-target="this">
|
||||||
id="notes-count"
|
|
||||||
ic-push-url="false">
|
|
||||||
<span
|
<span
|
||||||
{% if notifications != '0' %}
|
{% if notifications and notifications != '0' %}
|
||||||
class="badge is-badge-warning"
|
class="badge"
|
||||||
{% endif %}
|
{% endif %}
|
||||||
data-badge="{{ notifications }}">
|
data-badge="{{ notifications }}">
|
||||||
Notifications</span>
|
Notifications</span>
|
||||||
@ -121,65 +96,25 @@
|
|||||||
<span > Notifications</span>
|
<span > Notifications</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</a>
|
</a>
|
||||||
<a class="navbar-item" href="{% url "local" %}"
|
<a class="navbar-item" href="{% url "local" %}">
|
||||||
ic-get-from="{% url "local" %}"
|
|
||||||
ic-target="#main"
|
|
||||||
ic-scroll-to-target="true"
|
|
||||||
ic-select-from-response="#main"
|
|
||||||
ic-push-url="true"
|
|
||||||
ic-on-beforeSend="savePlace"
|
|
||||||
ic-on-success="afterPage('{{ own_acct.username }}', 'Local timeline');"
|
|
||||||
ic-indicator="#page-load-indicator">
|
|
||||||
<span class="fa fa-community"></span>
|
<span class="fa fa-community"></span>
|
||||||
<span > Local</span>
|
<span > Local</span>
|
||||||
</a>
|
</a>
|
||||||
<a class="navbar-item" href="{% url "fed" %}"
|
<a class="navbar-item" href="{% url "fed" %}">
|
||||||
ic-get-from="{% url "fed" %}"
|
|
||||||
ic-target="#main"
|
|
||||||
ic-scroll-to-target="true"
|
|
||||||
ic-select-from-response="#main"
|
|
||||||
ic-push-url="true"
|
|
||||||
ic-on-beforeSend="savePlace"
|
|
||||||
ic-on-success="afterPage('{{ own_acct.username }}', 'Federated timeline');"
|
|
||||||
ic-indicator="#page-load-indicator">
|
|
||||||
<span class="fa fa-globe"></span>
|
<span class="fa fa-globe"></span>
|
||||||
<span > Federated</span>
|
<span > Federated</span>
|
||||||
</a>
|
</a>
|
||||||
<a class="navbar-item" href="{% url "toot" %}"
|
<a class="navbar-item" href="{% url "toot" %}">
|
||||||
ic-get-from="{% url "toot" %}"
|
|
||||||
ic-target="#main"
|
|
||||||
ic-scroll-to-target="true"
|
|
||||||
ic-select-from-response="#main"
|
|
||||||
ic-push-url="true"
|
|
||||||
ic-on-beforeSend="savePlace"
|
|
||||||
ic-on-success="afterPage('{{ own_acct.username }}', 'New toot');"
|
|
||||||
ic-indicator="#page-load-indicator">
|
|
||||||
<span class="fa fa-edit"> </span>
|
<span class="fa fa-edit"> </span>
|
||||||
<span > New Toot</span>
|
<span > New Toot</span>
|
||||||
</a>
|
</a>
|
||||||
<a class="navbar-item" href="{% url "search" %}"
|
<a class="navbar-item" href="{% url "search" %}">
|
||||||
ic-get-from="{% url "search" %}"
|
|
||||||
ic-target="#main"
|
|
||||||
ic-scroll-to-target="true"
|
|
||||||
ic-select-from-response="#main"
|
|
||||||
ic-push-url="true"
|
|
||||||
ic-on-beforeSend="savePlace"
|
|
||||||
ic-on-success="afterPage('{{ own_acct.username }}', 'Search');"
|
|
||||||
ic-indicator="#page-load-indicator">
|
|
||||||
<span class="fa fa-search"> </span>
|
<span class="fa fa-search"> </span>
|
||||||
<span > Search</span>
|
<span > Search</span>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="navbar-end" >
|
<div class="navbar-end" >
|
||||||
<a class="navbar-item" href="{% url "settings" %}"
|
<a class="navbar-item" href="{% url "settings" %}">
|
||||||
ic-get-from="{% url "settings" %}"
|
|
||||||
ic-target="#main"
|
|
||||||
|
|
||||||
ic-scroll-to-target="true" ic-select-from-response="#main"
|
|
||||||
ic-push-url="true"
|
|
||||||
ic-on-beforeSend="savePlace"
|
|
||||||
ic-on-success="afterPage('{{ own_acct.username }}', 'Settings');"
|
|
||||||
ic-indicator="#page-load-indicator">
|
|
||||||
<span class="fa fa-gear"></span>
|
<span class="fa fa-gear"></span>
|
||||||
<span > Settings</span>
|
<span > Settings</span>
|
||||||
</a>
|
</a>
|
||||||
@ -198,7 +133,7 @@
|
|||||||
<span class="fa fa-bars"></span>
|
<span class="fa fa-bars"></span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<section id="main" class="section" ic-history-elt="true">
|
<section id="main" class="section">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<h1 class="title">
|
<h1 class="title">
|
||||||
@ -240,19 +175,7 @@
|
|||||||
<script type="application/javascript">
|
<script type="application/javascript">
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
menuPrepare();
|
menuPrepare();
|
||||||
$("#before-main").pullToRefresh({
|
|
||||||
refresh: 200,
|
|
||||||
simulateTouch: false,
|
|
||||||
threshold: 100,
|
|
||||||
scroll: "before-main",
|
|
||||||
});
|
});
|
||||||
$(document).on("refresh.pulltorefresh", function ($element, y){
|
|
||||||
$("page-load-indicator").show();
|
|
||||||
window.location.reload();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
$(document).on('handle.onpopstate.ic',
|
|
||||||
restorePlace);
|
|
||||||
if (navigator.serviceWorker.controller) {
|
if (navigator.serviceWorker.controller) {
|
||||||
console.log('[PWA Builder] active service worker found, no need to register')
|
console.log('[PWA Builder] active service worker found, no need to register')
|
||||||
} else {
|
} else {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<span
|
<span
|
||||||
{% if notifications != '0' %}
|
{% if notifications and notifications != '0' %}
|
||||||
class="badge is-badge-warning"
|
class="badge"
|
||||||
{% endif %}
|
{% endif %}
|
||||||
data-badge="{{ notifications }}">
|
data-badge="{{ notifications }}">
|
||||||
Notifications</span>
|
Notifications</span>
|
||||||
|
@ -143,15 +143,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
{{ toot.visibility }}
|
{{ toot.visibility }}
|
||||||
|
|
||||||
<a class="level-item" href="{% url "thread" toot.id %}"
|
<a class="level-item" href="{% url "thread" toot.id %}">
|
||||||
ic-get-from="{% url "thread" toot.id %}"
|
|
||||||
ic-target="#main"
|
|
||||||
ic-scroll-to-target="true"
|
|
||||||
ic-select-from-response="#main"
|
|
||||||
ic-push-url="true"
|
|
||||||
ic-on-success="afterPage('{{ own_acct.username }}', 'thread')"
|
|
||||||
ic-indicator="#page-load-indicator"
|
|
||||||
ic-on-beforeSend="savePlace">
|
|
||||||
thread
|
thread
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user