Commit 0e3eeac

committed

updating search box styling

1 parent 87eec1f commit 0e3eeacCopy full SHA for 0e3eeac

File tree

+21

-10

lines changed

+21

-10

lines changed

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -824,12 +824,15 @@ def add_canonical_link():`
`824`	`824`
`825`	`825`	`## check if this link exists already`
`826`	`826`	`res = db_session.query(CodeEventCreator, CanonicalEventLink)\`
	`827`	`+ .join(CanonicalEventLink, CodeEventCreator.id == CanonicalEventLink.cec_id)\`
`827`	`828`	`.filter(`
`828`	`829`	`CodeEventCreator.variable == 'link',`
`829`		`- CodeEventCreator.article_id == article_id`
	`830`	`+ CodeEventCreator.article_id == article_id,`
	`831`	`+ CanonicalEventLink.canonical_id == canonical_event_id`
`830`	`832`	`).first()`
`831`	`833`
`832`		`- ## if the CEC and CEL are not null, this exists already`
	`834`	`+ ## if the CEC and CEL are not null,`
	`835`	`+ ## and CEL matches canonical event, then link this.`
`833`	`836`	`if res and res[0] and res[1]:`
`834`	`837`	`return make_response("Link already exists.", 400)`
`835`	`838`
`@@ -949,7 +952,8 @@ def del_canonical_link():`
`949`	`952`	`for cec in cecs:`
`950`	`953`	`## get the CELs for this CEC`
`951`	`954`	`cel = db_session.query(CanonicalEventLink).filter(CanonicalEventLink.cec_id == cec.id).first()`
`952`		`- db_session.delete(cel)`
	`955`	`+ if cel:`
	`956`	`+ db_session.delete(cel)`
`953`	`957`
`954`	`958`	`## commit these deletes first to avoid foreign key error`
`955`	`959`	`db_session.commit()`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -732,7 +732,10 @@ $(function () {`
`732`	`732`	`});`
`733`	`733`
`734`	`734`	`// Listener for search button.`
`735`		`- $('#adj_search_button').click(loadSearch);`
	`735`	`+ $('#adj_search_button').click(function(e) {`
	`736`	`+ e.preventDefault();`
	`737`	`+ loadSearch();`
	`738`	`+ });`
`736`	`739`
`737`	`740`	`// Listener for clear button.`
`738`	`741`	`$('.clear-values').each(function() {`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,12 @@ footer {`
`377`	`377`	`Adjudication variables`
`378`	`378`	`*/`
`379`	`379`	`.adj-variable-group, .event-group {`
`380`		`- padding: 6px 0;`
	`380`	`+ padding: 2px 0;`
	`381`	`+}`
	`382`	`+`
	`383`	`+.adj-variable-group select,`
	`384`	`+.adj-variable-group input {`
	`385`	`+ font-size: 0.9em;;`
`381`	`386`	`}`
`382`	`387`
`383`	`388`	`.event-group {`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,32 +52,31 @@ <h4>Event Selection</h4>`
`52`	`52`	`<h5>Search</h5>`
`53`	`53`	`<form id="adj_search_form">`
`54`	`54`	`<div class="row form-row">`
`55`		`- <div class="col-sm-11">`
	`55`	`+ <div class="col-sm-9">`
`56`	`56`	`<input class="form-control"`
`57`	`57`	`name="adj_search_input"`
`58`	`58`	`id="adj_search_input"`
`59`	`59`	`type="text"`
`60`	`60`	`placeholder = "Example: Mizzou OR Missouri, Quebec AND students"/>`
`61`	`61`	`</div>`
	`62`	`+ <div class="col-sm-3">`
	`63`	`+ <button id="adj_search_button" class="btn btn-primary">Search</button>`
	`64`	`+ </div>`
`62`	`65`	`</div>`
`63`	`66`	`</form>`
`64`	`67`	`</div>`
`65`		`- <hr/>`
`66`	`68`	`<div class="adj-variable-group">`
`67`	`69`	`<h5>Filter</h5>`
`68`	`70`	`<form id="adj_filter_form">`
`69`	`71`	`{% include 'adj-filter.html' %}`
`70`	`72`	`</form>`
`71`	`73`	`</div>`
`72`		`- <hr/>`
`73`	`74`	`<div class="adj-variable-group">`
`74`	`75`	`<h5>Sort</h5>`
`75`	`76`	`<form id="adj_sort_form">`
`76`	`77`	`{% include 'adj-sort.html' %}`
`77`	`78`	`</form>`
`78`	`79`	`</div>`
`79`		`- <hr/>`
`80`		`- <button id="adj_search_button" class="btn btn-primary">Search</button>`
`81`	`80`	`</div>`
`82`	`81`	`<div class="tab-pane" id="cand_block">`
`83`	`82`	`<ul class="nav nav-pills nav-justified">`

Comments

(0)