Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Search v2 #63

Merged
merged 26 commits into from
Apr 14, 2012
Merged

Search v2 #63

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
c12613f
Initial Search Module implementation.
gugahoi Jan 19, 2012
a9ed850
Styling upgrade
gugahoi Jan 21, 2012
1c32e87
Add to sab function added
gugahoi Jan 22, 2012
7684b79
Styling mods
gugahoi Jan 22, 2012
771a754
Added category filtering
gugahoi Jan 22, 2012
a5b5ed9
Fixed a bug where search module would not show up after activating "r…
gugahoi Jan 22, 2012
ebec17b
Sab module now shows up. DOH!
gugahoi Jan 25, 2012
c4d5d2b
Propperly hiding Search module when going into settings mode.
gugahoi Jan 25, 2012
26328b0
Settings should now be set in the module.
gugahoi Jan 30, 2012
1a4ed0c
Converted Search feature to be an inherent Maraschino feature.
gugahoi Feb 3, 2012
620c59c
Changed to a more expandable system
gugahoi Feb 3, 2012
4c935f2
Added "loading gif" to search form
gugahoi Feb 3, 2012
893325e
Added check for empty query and no sites selected
gugahoi Feb 4, 2012
6e006e8
Sites -> optgroup
gugahoi Feb 19, 2012
7698dc5
Merge remote-tracking branch 'origin/master' into search-v2
Mar 28, 2012
c922047
Added filter to regular scope
Mar 28, 2012
85ab914
Added feedback about missing settings when searching
Mar 28, 2012
b48c2fd
Styling changes and all around fixes
Mar 29, 2012
d953bfd
More table layout fixes
Mar 29, 2012
6fa9665
Default "Enable Search" to YES
Mar 31, 2012
dbba037
Added CSS Transitions
Mar 31, 2012
0b36c22
Merge remote-tracking branch 'upstream/master' into search-v2
Apr 4, 2012
15d5591
Fixed bug where search settings popped up after settings get changed …
Apr 4, 2012
58d931d
changed search tab to sliding motion
Apr 4, 2012
f159f23
Added close button to search tab
Apr 4, 2012
1fe0a2f
Reactivated sab icon
Apr 4, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
changed search tab to sliding motion
  • Loading branch information
Gustavo Hoirisch committed Apr 4, 2012
commit 58d931d456a639379000bb313ef66ac50efcb97c
12 changes: 3 additions & 9 deletions static/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1301,13 +1301,6 @@ $(document).ready(function() {
/********* SEARCH ***********/

var search_enabled = false;

$(document).on('change', '#server_settings select#id_search', function(){
if (!$(this).val()) {
$('#search').remove();
search_enabled = false;
}
});

$(document).on('keydown', 'body', function(e){
alt = (e.altKey) ? true : false;
Expand All @@ -1319,9 +1312,10 @@ $(document).ready(function() {
if(!search_enabled){
$('body').append(data);
search_enabled = true;
$('#search').removeClass('hide');
$('#search').hide();
$('#search').slideDown(300);
} else {
$('#search').toggleClass('hide');
$('#search').slideToggle(300);
}
} else {
$('#search').remove();
Expand Down
15 changes: 1 addition & 14 deletions static/less/module-search.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@
white-space: nowrap;
z-index: 1;
padding-bottom: 5px;
-webkit-transition: top .25s linear;
-moz-transition: top .25s linear;
-o-transition: top .25s linear;
transition: top .25s linear;

.border-radius(2px);
.box-shadow(#222, 0, 0, 10px);

Expand All @@ -28,14 +23,6 @@
padding: 10px 15px 12px;
}

&.hide {
top: -9999px;
-webkit-transition: top 3s linear;
-moz-transition: top 3s linear;
-o-transition: top 3s linear;
transition: top 3s linear;
}

form {
padding: 5px;

Expand Down Expand Up @@ -83,7 +70,7 @@
&.name {
overflow: hidden;
text-overflow: ellipsis;
font: 130% "Lucida Grande";
font-size: 130%;
}

.border-radius(4px);
Expand Down