diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js index 91ee77ada206afb41ea6aaddac148e9e890cc927..b5941cd1c1debce65de8fe0419743183dfbe017d 100644 --- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js +++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js @@ -55,7 +55,7 @@ function SampleForm(serverFacade, inspector, containerId, profile, sampleTypeCod this.isFormDirty = false; this.isFormLoaded = false; - this.formColumClass = 'col-md-12' + this.formColumnClass = 'col-md-12' this.labelColumnClass = 'col-md-2'; this.controlColumnClass = 'col-md-5'; @@ -352,7 +352,7 @@ function SampleForm(serverFacade, inspector, containerId, profile, sampleTypeCod var component = ""; component += "<div class='row'>"; - component += "<div class='" + this.formColumClass + "'>"; + component += "<div class='" + this.formColumnClass + "'>"; var message = null; var pinButton = ""; diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SampleLinksWidget.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SampleLinksWidget.js index e5f51d14530e22397c3d6a4eefa34211bf070aa6..bdd99c086d6e02c6a97233b9f044587e17ead424 100644 --- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SampleLinksWidget.js +++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SampleLinksWidget.js @@ -37,6 +37,10 @@ function SampleLinksWidget(containerId, profile, serverFacade, title, sampleType this.samplesRemoved = {}; this.stateObj = {}; + this.formColumnClass = 'col-md-12'; + this.labelColumnClass = 'col-md-2'; + this.dataColumnClass = 'col-md-6'; + this._lastUsedId = null; this._lastIndex = 0; @@ -185,8 +189,8 @@ function SampleLinksWidget(containerId, profile, serverFacade, title, sampleType var _this = this; var tableId = id + "-table"; var sampleId = id + "-sample"; - var $component = $("<div>", {"id" : id , "class" : "control-group", "sample-type-code" : sampleTypeHint["TYPE"], "sample-min-count" : sampleTypeHint["MIN_COUNT"] } ); - $component.css({"border-radius" : "10px", "padding-left" : "10px"}); + var $component = $("<div>", {"id" : id , "class" : "control-group row", "sample-type-code" : sampleTypeHint["TYPE"], "sample-min-count" : sampleTypeHint["MIN_COUNT"] } ); + $component.css({"border-radius" : "10px", "padding-left" : "10px", "margin-top" : "10px"}); var requiredText = ""; if(sampleTypeHint["MIN_COUNT"] > 0) { @@ -197,8 +201,8 @@ function SampleLinksWidget(containerId, profile, serverFacade, title, sampleType if(sampleTypeHint["LABEL"] === null) { labelText = ""; } - var $label = $("<label>", { "class" : "control-label" }).text(labelText); - var $controls = $("<div>", { "class" : "controls"}); + var $label = $("<label>", { "class" : "control-label " + this.labelColumnClass }).text(labelText); + var $controls = $("<div>", { "class" : "controls " + this.dataColumnClass}); var $buttonTextField = $("<a>", {"class" : "btn btn-default", "type" : "button", "id" : sampleId}); $buttonTextField.css({ @@ -239,12 +243,12 @@ function SampleLinksWidget(containerId, profile, serverFacade, title, sampleType annotationComponents.push($propertyField); } - var $buttonPlusOne = $("<a>", {"class" : "btn btn-default" }); + var $buttonPlusOne = $("<a>", {"class" : "btn btn-default"}); $buttonPlusOne.append($("<span>", { "class" : "glyphicon glyphicon-plus-sign"})); $controls.append($buttonPlusOne); $controls.append(" "); - var $buttonDelete = $("<a>", {"class" : "btn btn-default" }); + var $buttonDelete = $("<a>", {"class" : "btn btn-default"}); $buttonDelete.append($("<span>", { "class" : "glyphicon glyphicon-minus-sign"})); $controls.append($buttonDelete);