Commit 3c92c351 authored by Oliver Feldt's avatar Oliver Feldt
Browse files

Moved input to navbar; Fixed label bug on scan input

parent 9a330cb1
......@@ -70,21 +70,16 @@ $("#search_form").on("submit", function(e) {
$("#new_radio_form input[name='radio_id']").val(radio.name);
$("#new_radio").modal("show");
} else {
var current_checkout = checkouts[checkouts.length - 1];
if (current_checkout !== undefined) {
$("#radio_form input[name='angel']").val(current_checkout.angel);
} else {
$("#radio_form input[name='angel']").val("");
}
$("#radio_form input[name='radio_id']").val(radio.name);
$("#radios tr[data-id='"+ radio.id +"']").data("last_scanned_at", new Date());
if (angel === null) {
$("#radio_form button[name='return']").addClass("disabled");
$("#radio_form input[name='angel']").val("");
} else {
$("#radio_form button[name='return']").removeClass("disabled");
$("#radio_form input[name='angel']").val(angel);
}
var switch_button_text = radio.angel === undefined ? "Set Angel" : "Switch Angel";
var switch_button_text = angel === null ? "Set Angel" : "Switch Angel";
$("#radio_form button[name='switch']").html(switch_button_text);
$("#radio_header").html(radio.name);
$("#radio").modal("show");
......
......@@ -103,7 +103,7 @@ html lang="en"
| Oh Boy, do I!
nav.navbar.navbar-inverse.navbar-fixed-top role="navigation"
.container
.container-fluid
.navbar-header
.navbar-brand
span.glyphicon.glyphicon-signal aria-hidden="true"
......@@ -114,21 +114,18 @@ html lang="en"
span.icon-bar
a.navbar-brand href="#"
| CCC:ROC - Radio Checkout
//div#navbar.collapse.navbar-collapse
#navbar.collapse.navbar-collapse
ul.nav.navbar-nav
li.active
a href="#" Home
form#search_form.navbar-form
.form-group
input#radio_id.form-control.col-xs-12 name="radio_id" tabindex="1" placeholder="Radio ID"
.container
.row
.col-xs-10.col-xs-offset-1
h1 Radio List
.row
.col-xs-10.col-xs-offset-1
form#search_form
.form-group
.input-group
label Radio ID
input#radio_id.form-control name="radio_id" tabindex="1"
.row
.col-xs-10.col-xs-offset-1
table#radios.table.table-striped.table-hover
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment