From commits-return-1119-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org Mon Jul 16 20:47:26 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 21561180657 for ; Mon, 16 Jul 2018 20:47:25 +0200 (CEST) Received: (qmail 55205 invoked by uid 500); 16 Jul 2018 18:47:25 -0000 Mailing-List: contact commits-help@ponymail.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ponymail.incubator.apache.org Delivered-To: mailing list commits@ponymail.incubator.apache.org Received: (qmail 55196 invoked by uid 99); 16 Jul 2018 18:47:25 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Jul 2018 18:47:25 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id AB64380828; Mon, 16 Jul 2018 18:47:24 +0000 (UTC) Date: Mon, 16 Jul 2018 18:47:24 +0000 To: "commits@ponymail.apache.org" Subject: [incubator-ponymail] branch master updated: Enh: display buttons even if no mails are found in a month MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <153176684464.1395.18267257885307559536@gitbox.apache.org> From: sebb@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-ponymail X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: ca020eb972a1e1b8bd336444b500fafb046277a3 X-Git-Newrev: 5d44184cea3892931cc5a68e7410a8e76affc52d X-Git-Rev: 5d44184cea3892931cc5a68e7410a8e76affc52d X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail.git The following commit(s) were added to refs/heads/master by this push: new 5d44184 Enh: display buttons even if no mails are found in a month 5d44184 is described below commit 5d44184cea3892931cc5a68e7410a8e76affc52d Author: Sebb AuthorDate: Mon Jul 16 19:47:22 2018 +0100 Enh: display buttons even if no mails are found in a month This fixes #470 --- CHANGELOG.md | 1 + site/js/dev/ponymail_pagebuilder.js | 3 ++- site/js/ponymail.js | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fa930a..9d0140b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ## Changes in 0.11-SNAPSHOT +- Enh: display buttons even if no mails are found in a month (#470) - Bug: Javascript URLs must always use URL_BASE (#469) - Bug: setup.py uses ES library version to decide what features the database supports (#464) - Various tidyups suggested by Pylint diff --git a/site/js/dev/ponymail_pagebuilder.js b/site/js/dev/ponymail_pagebuilder.js index fd50f53..9696fda 100644 --- a/site/js/dev/ponymail_pagebuilder.js +++ b/site/js/dev/ponymail_pagebuilder.js @@ -314,7 +314,8 @@ function buildPage(json, state) { viewModes[prefs.displayMode].list(json, 0, 0, state ? state.deep : false); if (!json.emails || !json.emails.length || json.emails.length == 0) { - document.getElementById('emails').innerHTML = "

No emails found that fit the search criteria

" + // prepend the message rather than replacing the buttons + document.getElementById('emails').innerHTML = "

No emails found that fit the search criteria

" + document.getElementById('emails').innerHTML } if (json.private && json.private == true) { document.getElementById('emails').innerHTML += "

Looks like you don't have access to this archive. Maybe you need to be logged in?

" diff --git a/site/js/ponymail.js b/site/js/ponymail.js index b4f23a3..284e47b 100644 --- a/site/js/ponymail.js +++ b/site/js/ponymail.js @@ -3959,7 +3959,8 @@ function buildPage(json, state) { viewModes[prefs.displayMode].list(json, 0, 0, state ? state.deep : false); if (!json.emails || !json.emails.length || json.emails.length == 0) { - document.getElementById('emails').innerHTML = "

No emails found that fit the search criteria

" + // prepend the message rather than replacing the buttons + document.getElementById('emails').innerHTML = "

No emails found that fit the search criteria

" + document.getElementById('emails').innerHTML } if (json.private && json.private == true) { document.getElementById('emails').innerHTML += "

Looks like you don't have access to this archive. Maybe you need to be logged in?

"