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

ACAS-814: Fix typo and styling on Salt browser/editor #1202

Merged
merged 1 commit into from
Mar 7, 2025
Merged

ACAS-814: Fix typo and styling on Salt browser/editor #1202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 0 additions & 6 deletions modules/ServerAPI/src/client/SaltBrowser.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ class SaltBrowserController extends Backbone.View
"click .bv_cancelCreate": "handleCancelCreateClicked"
"click .bv_okayCreateButton":"handleOkayCreateClicked"
"click .bv_backConfirmCreate":"handleBackConfirmCreateClicked"
"click .bv_cancelConfirmCreate":"handleCancelConfirmCreateClicked"
"click .bv_saveSaltButton":"handleSaveSaltButtonClicked"
# Edit Salt Button Events
"click .bv_editSalt": "handleEditSaltClicked"
Expand Down Expand Up @@ -352,11 +351,6 @@ class SaltBrowserController extends Backbone.View
@$('.bv_createSalt').show()
@$('.bv_createNotifications').hide()

handleCancelConfirmCreateClicked: =>
@$('.bv_confirmCreateSalt').hide()
@$('.bv_saltBrowserCoreContainer').show()
@$('bv_saltBrowserCore').show()

# Non Dry Run Method to Register Salt Reviewed by User
handleSaveSaltButtonClicked: =>
fieldsFilled = true
Expand Down
34 changes: 15 additions & 19 deletions modules/ServerAPI/src/client/SaltBrowser.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ <h3>Register New Salt</h3>
<!-- Input Salt Section-->
<div class="bv_chemicalStructureForm">
</div>
<p><i>Use the sketcher to sepcify the molecular structure of the salt. Pay close attention to charges as they will be used in calculating Lot Molecular Weight. Use the + and - buttons to add positive or negative charges</i></p>
<p><i>Use the sketcher to specify the molecular structure of the salt. Pay close attention to charges as they will be used in calculating Lot Molecular Weight. Use the + and - buttons to add positive or negative charges</i></p>
<br>
<br>
<label for="abbrevName">Abbreviation: </label><br>
Expand All @@ -130,11 +130,11 @@ <h3>Register New Salt</h3>
</div>
<div class="footer">
<span class="bv_createButtons">
<a href="#" class="btn btn-primary bv_cancelCreate">Back</a>
<a href="#" class="btn btn-danger bv_confirmCreateSaltButton">Next</a>
<a href="#" class="btn bv_cancelCreate">Back</a>
<a href="#" class="btn bv_confirmCreateSaltButton">Next</a>
</span>
<span class="bv_okayCreateButton hide">
<a href="#" class="btn btn-primary bv_okayCreate">Okay</a>
<a href="#" class="btn bv_okayCreate">Okay</a>
</span>
</div>
</div>
Expand All @@ -159,9 +159,8 @@ <h3>Confirm Register of New Salt</h3>
</div>
<div class="footer">
<span class="bv_createConfirmButtons">
<a href="#" class="btn btn-primary bv_backConfirmCreate">Back</a>
<a href="#" class="btn btn-danger bv_cancelConfirmCreate">Cancel</a>
<a href="#" class="btn btn-danger bv_saveSaltButton">Save</a>
<a href="#" class="btn bv_backConfirmCreate">Back</a>
<a href="#" class="btn btn-success bv_saveSaltButton">Save</a>
</span>
</div>
</div>
Expand Down Expand Up @@ -195,7 +194,7 @@ <h3>Edit Salt</h3>
<div class="body">
<div class="bv_editChemicalStructureForm">
</div>
<p><i>Use the sketcher to sepcify the molecular structure of the salt. Pay close attention to charges as they will be used in calculating Lot Molecular Weight. Use the + and - buttons to add positive or negative charges</i></p>
<p><i>Use the sketcher to specify the molecular structure of the salt. Pay close attention to charges as they will be used in calculating Lot Molecular Weight. Use the + and - buttons to add positive or negative charges</i></p>
<br>
<label for="abbrevName">Abbreviation: </label>
<input type="text" id="abbrevNameEdit" name="abbrevNameEdit" class="bv_abbrevNameEdit"><br>
Expand All @@ -206,8 +205,8 @@ <h3>Edit Salt</h3>
</div>
<div class="footer">
<span class="bv_createButtons">
<a href="#" class="btn btn-primary bv_cancelEdit">Back</a>
<a href="#" class="btn btn-danger bv_confirmEditSaltButton">Next</a>
<a href="#" class="btn bv_cancelEdit">Back</a>
<a href="#" class="btn bv_confirmEditSaltButton">Next</a>
</span>
</div>
</div>
Expand Down Expand Up @@ -251,12 +250,9 @@ <h4>Editing Salt</h4>
</td>
</tr>
</div>
<div class="footer">
<span class="bv_editConfirmButtons">
<a href="#" class="btn btn-primary bv_backConfirmEdit">Back</a>
<a href="#" class="btn btn-danger bv_cancelConfirmEdit">Cancel</a>
<a href="#" class="btn btn-danger bv_editSaltButton">Update</a>
</span>
<div class="footer span12">
<a href="#" class="btn bv_backConfirmEdit">Back</a>
<a href="#" class="btn btn-success bv_editSaltButton">Update</a>
</div>
</div>
<div class="hide bv_editSaltStatus">
Expand All @@ -273,7 +269,7 @@ <h4>Editing Salt</h4>
</div>
<div class="footer">
<span class="bv_editConfirmButtons">
<a href="#" class="btn btn-danger bv_okayEditButton hide">Okay</a>
<a href="#" class="btn bv_okayEditButton hide">Okay</a>
</span>
</div>
</div>
Expand All @@ -299,7 +295,7 @@ <h4>Deleting Salt</h4>
</tr>
</div>
<span class="bv_deleteButtons">
<a href="#" class="btn btn-primary bv_cancelDelete">Cancel</a>
<a href="#" class="btn bv_cancelDelete">Cancel</a>
<a href="#" class="btn btn-danger bv_confirmDeleteSaltButton">Delete Salt</a>
</span>
</div>
Expand All @@ -321,7 +317,7 @@ <h3>Delete Salt</h3>
</div>
<div class="modal-footer">
<span class="bv_okayDeleteButton">
<a href="#" class="btn btn-primary bv_okayDelete">Okay</a>
<a href="#" class="btn bv_okayDelete">Okay</a>
</span>
</div>
</div>
Expand Down