seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* wip

This commit is contained in:
Seth Call 2015-08-17 16:09:35 -05:00
parent 9402d55d21
commit 9a73bec85b
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/assets/javascripts/checkout_utils.js.coffee
View File

@ -29,7 +29,7 @@ class CheckoutUtils
@logger.debug("deleted preserve billing");
unless $.cookie(@cookie_name)?
if $.cookie(@cookie_name)?
@logger.error("after deleting the preserve billing cookie, it still exists!")

18
web/app/assets/javascripts/react-components/JamTrackLandingScreen.js.jsx.coffee
View File

@ -36,11 +36,11 @@ MIX_MODES = context.JK.MIX_MODES
</div>
<h2 className="browse-jamtracks">search jamtracks</h2>
<div className="search-area">
<div className="search-help"> To search by the name of the original artist, band, or song name, enter your search words below:</div>
<div className="search-help para"> To search by the name of the original artist, band, or song name, enter your search words below:</div>
<div className="search-controls">
<input className="search-by-string" type="text" placeholder="Search for JamTracks" /><button onClick={this.searchByString} onKeyDown={this.searchKeyDown} className="search-by-string-btn button-orange ">SEARCH</button>
<JamTrackAutoComplete onSearch={this.search} /><button onClick={this.searchByString} className="search-by-string-btn button-orange ">SEARCH</button>
</div>
<div className="filter-help">To search by genre and instrument, make your selections below:</div>
<div className="filter-help para">To search by genre and instrument, make your selections below:</div>
<div className="search-controls">
<select className="genre-list easydropdown" name="genres">
<option value="">Any Genre</option>
@ -80,19 +80,13 @@ MIX_MODES = context.JK.MIX_MODES
componentDidMount: () ->
$root = $(@getDOMNode())
searchKeyDown: (e) ->
e.preventDefault();
if e.keyCode == 13
@searchByString(e)
search: (searchType, searchData) ->
context.JamTrackActions.requestSearch(searchType, searchData)
searchByString: (e) ->
e.preventDefault()
$root = $(@getDOMNode())
value = $root.find('input.search-by-string').val()
value = '' unless value?
context.JamTrackActions.requestSearch('user-input', value)
context.JamTrackActions.requestSearch('user-input', window.JamTrackSearchInput)
searchByFilter: (e) ->
e.preventDefault()

13
web/app/assets/stylesheets/client/jamtrack_landing.css.scss
View File

@ -5,9 +5,6 @@
div[data-react-class="JamTrackLandingScreen"], .content-body-scroller {
height:100%;
}
input.search-by-string {
width:calc(100% - 96px);
}
.search-by-string-btn {
float: right;
margin-top: 2px;
@ -25,6 +22,13 @@
margin:20px 0 10px 0;
line-height:150%;
}
.autocompleter {
width: calc(100% - 90px);
margin-bottom: 20px;
display:inline-block;
}
.search-area {
.easydropdown-wrapper{
max-width:350px;
@ -138,8 +142,9 @@
margin: 4px;
}
div {
.para {
color: #cccccc;
}
h2.browse-jamtracks {