Skip to content

fixed the nav bar search and made some formatting changes #169

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

Merged
aperdec merged 1 commit into from
Nov 24, 2016
Merged

fixed the nav bar search and made some formatting changes #169

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
1 change: 0 additions & 1 deletion WebContent/WEB-INF/jsps/default.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">


<script src="scripts/script.js"></script>
<script src="../scripts/script.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion WebContent/WEB-INF/jsps/header.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</ul>
<form class="navbar-form navbar-left" role="search" action="workOrderDisplayUnitDeficiencies">
<div class="form-group">
<input id="homeEnrollmentNumberNav" name="homeEnrollmentNumber" type="text" class="form-control" placeholder="Home Enrollment Number" required="required">
<input id="homeEnrollmentNumberNav" name="homeEnrollmentNumber" onkeypress='return event.charCode >= 48 && event.charCode <= 57' type="text" class="form-control" placeholder="Home Enrollment Number" required="required">
</div>
<button type="submit" class="btn btn-default">Submit</button>
</form>
Expand Down
5 changes: 1 addition & 4 deletions WebContent/WEB-INF/jsps/home.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ Extra Large Button CSS
<c:url value="/workOrderHome" var="workOrderHome" />
<c:url value="/help" var="help" />
<c:url value="/buildInspection" var="buildInspection" />


</div>

Expand All @@ -61,11 +60,9 @@ Extra Large Button CSS

<div class="row row-centered">
<div class="col-sm-2 text-center"></div>
<!-- <a href="${help}" class="col-sm-4 btn-xl btn-inverse btn-xl">Help</a> -->
<!-- <a href="${Placeholder}" class="col-sm-4 btn-xl btn-inverse btn-xl">Confirm Repairs</a> -->

</div>
<br />
<br />

<legend> </legend>
</div>
3 changes: 0 additions & 3 deletions WebContent/scripts/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ $( "#saveBtn" ).prop( "disabled", true );
$( "#nextBtn" ).prop( "disabled", false );
$( "#nextBtn" ).prop( "disabled", true );

//document.getElementById("nextBtn").style.visibility = 'visible';
//document.getElementById("saveBtn").style.visibility = 'visible';

if (used === ""){
//alert(used);
document.getElementById("nextBtn").style.visibility = 'visible';
Expand Down
51 changes: 0 additions & 51 deletions WebContent/scripts/signing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@ var sigCapture = null;
var canvas = document.getElementById("signature");

$(document).ready(function(e) {

sigCapture = new SignatureCapture( "signature" );

});


function to_image(){
var canvas = document.getElementById("signature");

document.getElementById("theimage").src = canvas.toDataURL();
Canvas2Image.saveAsPNG(canvas);

}

function clearSig() {
Expand All @@ -39,50 +35,3 @@ function accept2(){
showSave();
//alert("hi");
}

/*

function download() {
var dt = canvas.toDataURL('image/jpeg');
this.href = dt;
};
downloadLnk.addEventListener('click', download, false);


$(function() {
$("#acc").click(function() {
html2canvas(document.body, {
onrendered: function(sigCapture) {
return Canvas2Image.saveAsPNG(sigCapture);
}
});
})
});


//link on displayunit jsp commented out because not working
function dlCanvas() {
var dt = canvas.toDataURL();
//Change MIME type to trick the browser to downlaod the file instead of displaying it
//dt = dt.replace(/^data:image\/[^;], 'data:application/octet-stream');

//In addition to <a>'s "download" attribute, you can define HTTP-style headers
//dt = dt.replace(/^data:application\/octet-stream/, 'data:application/octet-stream;headers=Content-Disposition%3A%20attachment%3B%20filename=Canvas.png');

this.href = dt;
this.download = 'sig.png';
};
document.getElementById("dl").addEventListener('click', dlCanvas, false);


//these 2 func together do not work
document.getElementById('download').addEventListener('click', function() {
downloadCanvas(this, 'signature', 'test.png');
}, false);

function downloadCanvas(link, canvasId, filename) {
link.href = document.getElementById(canvasId).toDataURL();
link.download = filename;
}

*/