commit 156994e6cf4dfe76ff317a81d9e445999f0e35db
author humbedooh <humbedooh@apache.org> Tue Nov 10 08:06:24 2015 +0100
committer humbedooh <humbedooh@apache.org> Tue Nov 10 08:06:24 2015 +0100
tree 1e57bbd967ded50bb157a5463f0bce871538bfed
parent d8e8861f695788242d39321c98a55153d9fb2dfe

timespan fixes for search boxes (also, 1k commits!)

- default to 1M instead of 30d
- fix the "N month(s)" string calculation
- fix a variable name in advanced search
- 1000th commit, yaaay!

site/js/dev/ponymail_search.js

diff --git a/site/js/dev/ponymail_search.js b/site/js/dev/ponymail_search.js
index 2cc7a32..c7bc662 100644
--- a/site/js/dev/ponymail_search.js
+++ b/site/js/dev/ponymail_search.js
@@ -97,7 +97,7 @@
         if (howlong >= 365) {
             howlong = "last " + parseInt(howlong/365) + " year" + (howlong>365 ? "s" : "")
         } else if (howlong >= 30) {
-            howlong = "last " + parseInt(howlong/30) + " month" + (howlong>30 ? "s" : "")
+            howlong = "last " + parseInt(howlong/30) + " month" + (howlong>59 ? "s" : "")
         } else {
             howlong = "last " + howlong + " days"
         }
@@ -133,7 +133,7 @@
     GetAsync(url, {
         deep: true
     }, buildPage)
-    var arr = datePickerDouble(d)
+    var arr = datePickerDouble(dspan)
     howlong = arr[3]
     if (isNaN(howlong)) {
         howlong = "custom date range"
@@ -141,7 +141,7 @@
         if (howlong >= 365) {
             howlong = parseInt(howlong/365) + " year"
         } else if (howlong >= 30) {
-            howlong = "last " + parseInt(howlong/30) + " month" + (howlong>30 ? "s" : "")
+            howlong = "last " + parseInt(howlong/30) + " month" + (howlong>59 ? "s" : "")
         } else {
             howlong =  howlong + " day"
         }
@@ -173,7 +173,7 @@
     else if (howlong >= 365) {
         howlong = parseInt(howlong/365) + " year" + (howlong>769 ? "s" : "")
     } else if (howlong >= 30) {
-        howlong = parseInt(howlong/30) + " month" + (howlong>60 ? "s" : "")
+        howlong = parseInt(howlong/30) + " month" + (howlong>59 ? "s" : "")
     } else {
         howlong = howlong + " days"
     }

site/js/ponymail.js

diff --git a/site/js/ponymail.js b/site/js/ponymail.js
index b991988..9cb70c6 100644
--- a/site/js/ponymail.js
+++ b/site/js/ponymail.js
@@ -2712,7 +2712,7 @@
         if (howlong >= 365) {
             howlong = "last " + parseInt(howlong/365) + " year" + (howlong>365 ? "s" : "")
         } else if (howlong >= 30) {
-            howlong = "last " + parseInt(howlong/30) + " month" + (howlong>30 ? "s" : "")
+            howlong = "last " + parseInt(howlong/30) + " month" + (howlong>59 ? "s" : "")
         } else {
             howlong = "last " + howlong + " days"
         }
@@ -2748,7 +2748,7 @@
     GetAsync(url, {
         deep: true
     }, buildPage)
-    var arr = datePickerDouble(d)
+    var arr = datePickerDouble(dspan)
     howlong = arr[3]
     if (isNaN(howlong)) {
         howlong = "custom date range"
@@ -2756,7 +2756,7 @@
         if (howlong >= 365) {
             howlong = parseInt(howlong/365) + " year"
         } else if (howlong >= 30) {
-            howlong = "last " + parseInt(howlong/30) + " month" + (howlong>30 ? "s" : "")
+            howlong = "last " + parseInt(howlong/30) + " month" + (howlong>59 ? "s" : "")
         } else {
             howlong =  howlong + " day"
         }
@@ -2788,7 +2788,7 @@
     else if (howlong >= 365) {
         howlong = parseInt(howlong/365) + " year" + (howlong>769 ? "s" : "")
     } else if (howlong >= 30) {
-        howlong = parseInt(howlong/30) + " month" + (howlong>60 ? "s" : "")
+        howlong = parseInt(howlong/30) + " month" + (howlong>59 ? "s" : "")
     } else {
         howlong = howlong + " days"
     }

site/list.html

diff --git a/site/list.html b/site/list.html
index a381fac..f932fce 100644
--- a/site/list.html
+++ b/site/list.html
@@ -35,7 +35,7 @@
       <form style="padding-top: 8px; float: left; page-break-before: avoid; page-break-after: avoid; id="quickform" action="list.html" method="get" onsubmit="return search(this.elements['q'].value,this.elements['d'].value, false, this.elements['checkall'].checked);">
         <input type="text" name="q" id="q" placeholder="Search list..." style="width: 150px;"/>
         <select name="d" id='dp' onmousedown="datePicker(this);">
-          <option selected="selected" value="30">past month</option>
+          <option selected="selected" value="lte=1M">&lt; 1M ago</option>
         </select>
         <input type="checkbox" value="all" id="checkall"><label for="checkall" id="lcheckall" style='font-weight: normal;'>Check all these lists</label> &nbsp;
         <input type="submit" value="Search!" class="btn btn-primary"/>&nbsp;
@@ -100,7 +100,7 @@
           <div style="width: 120px; float: left;">When:</div>
           <div style="width: 300px; float: left; page-break-after: always;">
             <select name="dp" id='dp' onmousedown="datePicker(this)">
-            <option selected="selected" value="lte=30d">past month</option>
+            <option selected="selected" value="lte=1M">&lt; 1M ago</option>
           </select>
           </div>
         </div>