Skip to content

Commit

Permalink
I have made the website look a bit nicer and fixxed issues moving bet…
Browse files Browse the repository at this point in the history
…ween validation and solving proofs
  • Loading branch information
joshuazeltser committed Apr 7, 2017
1 parent 588c1e9 commit afca92b
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 4 deletions.
1 change: 1 addition & 0 deletions src/main/resources/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
<!-- /.container -->
</nav>

<h1 class="jumbotron" align="center">Logic Assistant</h1>

</body>

Expand Down
5 changes: 5 additions & 0 deletions src/main/resources/templates/propositional.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
<!-- Navigation -->
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">



<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
Expand Down Expand Up @@ -71,6 +74,8 @@
<!-- Page Content -->
<div class="container">

<h1 class="jumbotron" align="center">Proof Checker</h1>

<div class="col-md-2">
<p class="lead" align="center">Key</p>
<table class="table">
Expand Down
29 changes: 25 additions & 4 deletions src/main/resources/templates/validity.html
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@

<div class="container">

<h1 class="jumbotron" align="center">Validity Checker</h1>

<div class="col-md-2">
<p class="lead" align="center">Key</p>
<table class="table">
Expand Down Expand Up @@ -121,18 +123,37 @@
<div class="input-group">
<p class="lead" align="center">Premises</p>
<textarea class="lined" th:field="*{ttPremises}" id="Text1" cols="20" rows="5"></textarea>
<style>
.linedtextarea textarea {
padding-right:0.3em;
padding-top:0.3em;
border: 0;
height: 240px;
width: 300px;
}
</style>

</div>
<p></p>
<div class="input-group">
<p class="lead" align="center">Result</p>
<textarea class="form-control custom-control" th:field="*{ttResults}" rows="1" style="resize:none"></textarea>
<p>

</div>
<p></p>
<div>
<input id="submit2" class="btn btn-primary" type="submit" value="Check Validity" />
</p>
</div>

<p></p>
<div id="error" class="panel panel-default">
<div class="panel-body">
<output th:name="result2" th:utext="${truthTable.frontEndFunctionality(truthTable.ttPremises, truthTable.ttResults)}"></output>
<output id="errorBox" th:name="result2" th:utext="${truthTable.frontEndFunctionality(truthTable.ttPremises, truthTable.ttResults)}"></output>
<script>
var x = document.getElementById('errorBox');
if (x.value == 'Proof is Valid' ) {
window.location.replace('/propositional');
}
</script>
</div>

</div>
Expand Down

0 comments on commit afca92b

Please sign in to comment.