ponymail-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From humbed...@apache.org
Subject [1/3] incubator-ponymail git commit: quick search updates
Date Thu, 08 Sep 2016 04:08:00 GMT
Repository: incubator-ponymail
Updated Branches:
  refs/heads/coffee-and-cake 1c88bbbd9 -> 61793617d


quick search updates

- compact the two search options into a cog button
- add an 'advanced search' link for later


Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/1407273c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/1407273c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/1407273c

Branch: refs/heads/coffee-and-cake
Commit: 1407273c7363cf7b2c96181b7325620616ea5078
Parents: 1c88bbb
Author: Daniel Gruno <humbedooh@apache.org>
Authored: Thu Sep 8 06:07:24 2016 +0200
Committer: Daniel Gruno <humbedooh@apache.org>
Committed: Thu Sep 8 06:07:24 2016 +0200

----------------------------------------------------------------------
 site/css/ponymail2.css       | 25 +++++++++++++++++++++++--
 site/js/coffee/search.coffee | 17 +++++++++++++----
 2 files changed, 36 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/1407273c/site/css/ponymail2.css
----------------------------------------------------------------------
diff --git a/site/css/ponymail2.css b/site/css/ponymail2.css
index 2ebac10..3d2f46e 100644
--- a/site/css/ponymail2.css
+++ b/site/css/ponymail2.css
@@ -560,13 +560,34 @@ a {
     background-size: contain;
     border-top-right-radius: 3px;
     border-bottom-right-radius: 3px;
+    cursor: pointer;
+}
+
+.qs_cog {
+    width: 24px;
+    height: 24px;
+    background-image: url(../images/cog.png);
+    color: rgba(0,0,0,0);
+    border: none;
+    background-size: contain;
+    border-top-left-radius: 3px;
+    border-bottom-left-radius: 3px;
+    cursor: pointer;
 }
 
 .qs_input {
     border: 1px solid rgba(0,0,0, 0.35);
-    border-right: 0px;
+    border-right: none;
+    border-left: none;
     height: 20px;
-    width: 160px;
+    width: 200px;
+    text-indent: 5px;
+}
+
+.qs_link {
+    margin-left: 8px;
+    font-size: 75%;
+    font-family: sans-serif;
 }
 
 .qs_options {

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/1407273c/site/js/coffee/search.coffee
----------------------------------------------------------------------
diff --git a/site/js/coffee/search.coffee b/site/js/coffee/search.coffee
index ea46750..4664ad5 100644
--- a/site/js/coffee/search.coffee
+++ b/site/js/coffee/search.coffee
@@ -20,6 +20,10 @@
 quickSearchBar = () ->
     qs = new HTML('form', { class: "quicksearch", onsubmit: 'quickSearch(); return false;'})
     
+    ### Cog ###
+    ### The blue search button ###
+    cog = new HTML('input', { type: 'submit', class: 'qs_cog', title: "Search settings"})
+    
     ### Options area ###
     options = new HTML('div', { class: 'qs_options'})
     
@@ -28,25 +32,30 @@ quickSearchBar = () ->
     span = new HTML('a', { id: 'qs_span', data: datedata, href: 'javascript:void(0);'}, "Less
than 1 month ago")
     
     ### Lists(s) to search ###
-    listname = 'This list'
+    listname = 'this list'
     listdata = ponymail_listname
     if ponymail_listname.length == 0
-        listname = 'All lists'
+        listname = 'all lists'
         listdata = "*@*"
     list = new HTML('a', { id: 'qs_list', href: 'javascript:void(0);', data: listdata}, listname)
     
     options.inject([span, new HTML('br'), list])
     
     ### Input field for text search ###
-    input = new HTML('input', { type: "text", id: 'qs_input', class: "qs_input", placeholder:
"Type search terms..."})
+    input = new HTML('input', { type: "text", id: 'qs_input', class: "qs_input", placeholder:
"Search #{listname}..."})
     
     ### The blue search button ###
     button = new HTML('input', { type: 'submit', class: 'qs_button'})
     
+    ### Link to advanced search ###
+    advanced = new HTML('a', {href: 'javascript:void(advancedSearch());', class: "qs_link"},
"Advanced...")
+    
     ### Add it all to the form ###
-    qs.inject(options)
+    qs.inject(cog)
+    #qs.inject(options)
     qs.inject(input)
     qs.inject(button)
+    qs.inject(advanced)
     
     return qs
 


Mime
View raw message