You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by gc...@apache.org on 2024/03/01 22:17:02 UTC

(allura) branch gc/8537 updated (e3f0a2462 -> 63f7477d0)

This is an automated email from the ASF dual-hosted git repository.

gcruz pushed a change to branch gc/8537
in repository https://gitbox.apache.org/repos/asf/allura.git


 discard e3f0a2462 fixup! [#8537] moved g analytics further down the page
 discard 86b19c7ab [#8537] moved g analytics further down the page
     add e80a4cae6 [#8536] use Markup's own interpolation
     add 0b90f747e [#8536] remove old unused oembed templates
     add 5fb7c3eca [#8536] move/improve |safe usage
     add f0226ee0d [#8536] remove unnecessary |safe usages
     add 0917b82b7 [#8536] improve safety
     add cc9a338fc [#8536] more move/improve |safe
     add 63f12b9a7 [#8536] don't use jinja for site notifications; add autoescape
     add b5333e288 [#8536] use h.clean_html and |safe_html
     add b3827038c bump cryptography 42.0.4 -> 42.0.5
     new 63f7477d0 [#8537] moved g analytics further down the page

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (e3f0a2462)
            \
             N -- N -- N   refs/heads/gc/8537 (63f7477d0)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Allura/allura/app.py                               |  7 ++---
 Allura/allura/config/app_cfg.py                    |  1 +
 Allura/allura/controllers/search.py                |  2 +-
 .../allura/ext/admin/templates/project_groups.html |  2 +-
 .../allura/ext/admin/templates/project_trove.html  |  2 +-
 .../templates/sections/projects.html               |  4 +--
 .../user_profile/templates/sections/projects.html  |  2 +-
 Allura/allura/lib/app_globals.py                   | 19 +++++--------
 Allura/allura/lib/diff.py                          |  3 ++-
 Allura/allura/lib/helpers.py                       | 31 +++++++++++++++++++---
 Allura/allura/lib/search.py                        |  2 +-
 Allura/allura/lib/utils.py                         | 10 +++----
 Allura/allura/lib/widgets/forms.py                 | 30 ++++++++++-----------
 Allura/allura/lib/widgets/search.py                |  6 +++--
 Allura/allura/public/nf/js/allura-base.js          |  2 +-
 Allura/allura/tasks/mail_tasks.py                  |  2 +-
 Allura/allura/templates/jinja_master/master.html   |  6 ++---
 .../templates/jinja_master/sidebar_menu.html       |  2 +-
 .../templates/jinja_master/theme_macros.html       |  2 +-
 .../templates/neighborhood_project_list.html       |  2 +-
 Allura/allura/templates/oauth_applications.html    |  4 +--
 Allura/allura/templates/oauth_authorize.html       |  2 +-
 Allura/allura/templates/oembed/__init__.py         | 16 -----------
 Allura/allura/templates/oembed/generic.html        | 23 ----------------
 Allura/allura/templates/oembed/html_tpl.html       | 25 -----------------
 Allura/allura/templates/oembed/link.html           | 26 ------------------
 Allura/allura/templates/oembed/link_opera.html     | 27 -------------------
 Allura/allura/templates/oembed/link_twitter.html   | 29 --------------------
 Allura/allura/templates/oembed/photo.html          | 25 -----------------
 Allura/allura/templates/project_list.html          |  4 ---
 Allura/allura/templates/repo/barediff.html         |  2 +-
 Allura/allura/templates/repo/diff.html             |  2 +-
 Allura/allura/templates/repo/merge_request.html    |  2 +-
 Allura/allura/templates/user_prefs.html            |  2 +-
 Allura/allura/templates/widgets/include.html       |  2 +-
 Allura/allura/templates/widgets/lightbox.html      |  2 +-
 Allura/allura/templates/widgets/post_widget.html   |  4 +--
 .../templates_responsive/jinja_master/master.html  |  6 ++---
 .../jinja_master/sidebar_menu.html                 |  2 +-
 .../jinja_master/theme_macros.html                 |  2 +-
 Allura/allura/tests/test_globals.py                |  1 +
 Allura/allura/tests/test_helpers.py                | 24 +++++++++++++++++
 ForgeActivity/forgeactivity/templates/macros.html  |  2 +-
 .../templates/blog_widgets/preview_post.html       |  2 +-
 .../templates/blog_widgets/view_post.html          |  2 +-
 ForgeChat/forgechat/templates/chat/day.html        |  2 +-
 .../templates/discussion_widgets/forum_header.html |  2 +-
 .../templates/discussionforums/admin_forums.html   |  2 +-
 ForgeTracker/forgetracker/model/ticket.py          |  2 +-
 .../forgetracker/templates/tracker/ticket.html     |  2 +-
 .../templates/tracker_widgets/ticket_form.html     | 20 +++++++-------
 ForgeTracker/forgetracker/tracker_main.py          |  6 +++--
 ForgeTracker/forgetracker/widgets/ticket_form.py   |  2 +-
 ForgeWiki/forgewiki/templates/wiki/browse.html     |  2 +-
 ForgeWiki/forgewiki/wiki_main.py                   |  5 ++--
 requirements.txt                                   |  2 +-
 56 files changed, 148 insertions(+), 274 deletions(-)
 delete mode 100644 Allura/allura/templates/oembed/__init__.py
 delete mode 100644 Allura/allura/templates/oembed/generic.html
 delete mode 100644 Allura/allura/templates/oembed/html_tpl.html
 delete mode 100644 Allura/allura/templates/oembed/link.html
 delete mode 100644 Allura/allura/templates/oembed/link_opera.html
 delete mode 100644 Allura/allura/templates/oembed/link_twitter.html
 delete mode 100644 Allura/allura/templates/oembed/photo.html


(allura) 01/01: [#8537] moved g analytics further down the page

Posted by gc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gcruz pushed a commit to branch gc/8537
in repository https://gitbox.apache.org/repos/asf/allura.git

commit 63f7477d0286668be705c5602f0f889ca85ea26b
Author: Guillermo Cruz <gu...@slashdotmedia.com>
AuthorDate: Thu Feb 22 16:59:44 2024 -0700

    [#8537] moved g analytics further down the page
---
 Allura/allura/public/nf/js/jquery.notify.js                 | 5 ++++-
 Allura/allura/templates/jinja_master/master.html            | 2 +-
 Allura/allura/templates_responsive/jinja_master/master.html | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Allura/allura/public/nf/js/jquery.notify.js b/Allura/allura/public/nf/js/jquery.notify.js
index 7e81ff58f..7b4b4bb76 100644
--- a/Allura/allura/public/nf/js/jquery.notify.js
+++ b/Allura/allura/public/nf/js/jquery.notify.js
@@ -107,7 +107,10 @@
                 });
             }
             $('.' + o.messageClass, self).addClass(o.newClass);
-            scanMessages(self, o);
+            var selector = '.' + o.newClass + '.' + o.messageClass;
+            $('body').on("click", selector, function(e) {
+              closer(this, o);
+            });
         });
     };
 
diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html
index 19cb43ca1..95ee01e16 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -72,7 +72,6 @@
     {% endblock %}
     {% block head_bottom -%}
     {% endblock %}
-    {{ g.analytics.display() }}
 </head>
 
 <body{% block body_attrs %}{% endblock %} class="{% block body_css_class %}{% endblock %}" id="forge">
@@ -197,5 +196,6 @@
         });
     });
 </script>
+{{ g.analytics.display() }}
 </body>
 </html>
diff --git a/Allura/allura/templates_responsive/jinja_master/master.html b/Allura/allura/templates_responsive/jinja_master/master.html
index 5d28d00dc..76c470f92 100644
--- a/Allura/allura/templates_responsive/jinja_master/master.html
+++ b/Allura/allura/templates_responsive/jinja_master/master.html
@@ -72,7 +72,6 @@
 
     {% block head %}
     {% endblock %}
-    {{ g.analytics.display() }}
     {% block head_bottom -%}
     {% endblock %}
 </head>
@@ -163,5 +162,7 @@
 {% if flash %}
     <script type="text/javascript">{{ flash | safe }}</script>{# comes from flash.static_template in root.py and escaped by tg.flash allow_html setting #}
 {% endif %}
+{{ g.analytics.display() }}
+
 </body>
 </html>