From 99032361b0cdb8dd0582d00fb0d757fda805ea24 Mon Sep 17 00:00:00 2001
From: Jason McBrayer <jmcbray@carcosa.net>
Date: Thu, 20 Sep 2018 08:23:12 -0400
Subject: [PATCH] Change which element to use for pull-to-refresh

---
 brutaldon/templates/base.html | 216 +++++++++++++++++-----------------
 1 file changed, 107 insertions(+), 109 deletions(-)
diff --git a/brutaldon/templates/base.html b/brutaldon/templates/base.html
index 4bae3da..a03efcf 100644
--- a/brutaldon/templates/base.html
+++ b/brutaldon/templates/base.html
@@ -47,9 +47,9 @@
     <body class="has-navbar-fixed-top"
           ic-global-include='{"csrfmiddlewaretoken": "{{ csrf_token }}"}'>
         <div id="page-load-indicator">&nbsp</div>
-            {% block navbar %}
+        {% block navbar %}
             <nav class="navbar is-fixed-top is-primary" role="navigation"
-                 aria-label="main navigation">
+                 aria-label="main navigation" id="main-nav-bar">
                 <div class="navbar-brand">
                     <a class="navbar-item" href="{% url "home" %}"
                        ic-get-from="{% url "home" %}"
@@ -61,103 +61,103 @@
                        ic-on-success="afterPage('{{ own_acct.username }}', 'Home');"
                        ic-indicator="#page-load-indicator">
                         {% if own_acct %}
-                        <img src="{{ own_acct.avatar_static }}"
-                             class="image is-32x32 avatar"
-                             alt="Brutaldon ('{{ own_acct.username }}')">
+                            <img src="{{ own_acct.avatar_static }}"
+                                 class="image is-32x32 avatar"
+                                 alt="Brutaldon ('{{ own_acct.username }}')">
                         {% else %}
-                        <img src="{% static "images/brutaldon.png" %}"
-                             class="image is-32x32" alt="Brutaldon">
+                            <img src="{% static "images/brutaldon.png" %}"
+                                 class="image is-32x32" alt="Brutaldon">
                         {% endif %}
                     </a>
                 </div>
                 {% if request.session.instance %}
-                {% if request.session.username or request.session.access_token %}
-                <div class="navbar-menu is-active" id="navMenu">
-                    <!-- navbar start, navbar end -->
-                    <div class="navbar-start">
-                        <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>&nbsp; Home</span>
-                        </a>
-                        <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 >&nbsp; Notifications</span>
-                        </a>
-                        <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 >&nbsp; Local</span>
-                        </a>
-                        <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 >&nbsp;Federated</span>
-                        </a>
-                        <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 >&nbsp; New Toot</span>
-                        </a>
-                        <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 >&nbsp; Search</span>
-                        </a>
-                    </div>
-                    <div class="navbar-end" >
-                        <a class="navbar-item" href="{% url "settings" %}"
-                           ic-get-from="{% url "settings" %}"
-                           ic-target="#main"
+                    {% if request.session.username or request.session.access_token %}
+                        <div class="navbar-menu is-active" id="navMenu">
+                            <!-- navbar start, navbar end -->
+                            <div class="navbar-start">
+                                <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>&nbsp; Home</span>
+                                </a>
+                                <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 >&nbsp; Notifications</span>
+                                </a>
+                                <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 >&nbsp; Local</span>
+                                </a>
+                                <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 >&nbsp;Federated</span>
+                                </a>
+                                <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 >&nbsp; New Toot</span>
+                                </a>
+                                <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 >&nbsp; Search</span>
+                                </a>
+                            </div>
+                            <div class="navbar-end" >
+                                <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">
+                                   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 >&nbsp;Settings</span>
                                 </a>
@@ -170,21 +170,19 @@
                     {% endif %}
                 {% endif %}
             </nav>
-            {% endblock %}
-            <div id="main-outer">
-                <section id="main" class="section"  ic-history-elt="true">
-                    <div class="container">
-                        {% block content %}
-                            <h1 class="title">
-                                Title
-                            </h1>
-                            <p class="subtitle">
-                                Brutaldon is totally a thing.
-                            </p>
-                        {% endblock %}
-                    </div>
-                </section>
+        {% endblock %}
+        <section id="main" class="section"  ic-history-elt="true">
+            <div class="container">
+                {% block content %}
+                    <h1 class="title">
+                        Title
+                    </h1>
+                    <p class="subtitle">
+                        Brutaldon is totally a thing.
+                    </p>
+                {% endblock %}
             </div>
+        </section>
 
         <footer class="footer">
             <div class="level">
@@ -215,11 +213,11 @@
             <script type="application/javascript">
              $(document).ready(function () {
                  menuPrepare();
-                 $("#main-outer").pullToRefresh({
+                 $("#main-nav-bar").pullToRefresh({
                      refresh: 200,
                      simulateTouch: false,
                      threshold: 100,
-                     scroll: "#main-outer",
+                     scroll: "main-nav-bar",
                  });
                  $(document).on("refresh.pulltorefresh", function ($element, y){
                      $("page-load-indicator").show();
