update html file

green-cabbage · May 2, 2017 · 305ee27 · 305ee27
1 parent ffc3f12
commit 305ee27
Show file tree

Hide file tree

Showing 4 changed files with 127 additions and 12 deletions.
diff --git a/static/index.html b/static/index.html
@@ -1,43 +1,67 @@
 <!DOCTYPE html>
+
 <html>
+
 	<head>
+
 		<script type="text/javascript" src="indexScript.js"></script>
+
 		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+
 		<link rel="stylesheet" href="indexStyle.css" >
+
 	</head>
+
 	<body background="RallyBackground.jpg">
+
 		<nav id="mainNav" class="navbar navbar-default navbar-fixed-top navbar-custom">
+
 			<div class="container">
+
             <div class="navbar-header page-scroll">
+
                 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+
                     <span class="sr-only">Toggle navigation</span> Menu <i class="fa fa-bars"></i>
+
                 </button>
-                <a class="navbar-brand" >Fact Detector</a>
+
+                <a href="index.html" class="navbar-brand" >Fact Detector</a>
+
             </div>
+
 		</nav>
 
+
+
 		<div class="topDiv">
+
 			<center>
+
 			<h1>Fact <br>Detector</h1>
+
 			<form method=post enctype=multipart/form-data>
+
 		<p><input type=file name=file>
+
 		<input type=file name=twofile>
+
 		<input type=submit value="Upload Both Files">
+
 	  </form>
+
 				<input  type="file" id="fileID" name=file style="visibility: hidden; size: 50;" />
+
 				<input  type="file" id="fileID" name=twofile style="visibility: hidden; size: 50;" />
+
 			</center>
-		</div>
 
-		<div class="bottomDiv">
-			<div>
-			<br>
-			<h1>Overview</h1>
-  	<p>Do you want to <a href="{{ url_for('login') }}">log in?</a>
-			<p class = "infoText"> </p>
-			</div>
 		</div>
 
+
+
 	</body>
 
+
+
 </html>
diff --git a/static/result.html b/static/result.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<html>
+   <body>
+
+      <table border = 1>
+         {% for key, value in result.iteritems() %}
+
+            <tr>
+               <th> {{ result['mean'] }} </th>
+               <td> {{ result['mode'] }} </td>
+            </tr>
+
+         {% endfor %}
+      </table>
+
+   </body>
+</html>
diff --git a/templates/layout.html b/templates/layout.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<head>
+  <script type="text/javascript" src="indexScript.js"></script>
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+  <link rel="stylesheet" href="indexStyle.css" >
+</head>
+<title>Error</title>
+
+<div class=page>
+  <h1>Flaskr</h1>
+  <div class=metanav>
+
+  {{ Please go back to the original page by clicking the button}}
+<input type="button" onclick="index.html">
+</div>
diff --git a/templates/result.html b/templates/result.html
@@ -1,18 +1,77 @@
-<!doctype html>
+<!DOCTYPE html>
+
 <html>
-   <body>
 
-      <table border = 1>
+   <head>
+
+      <script type="text/javascript" src="../static/indexScript.js"></script>
+
+      <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+
+      <link rel="stylesheet" href="../static/indexStyle.css" >
+
+   </head>
+
+   <body background="../static/RallyBackground.jpg">
+
+      <nav id="mainNav" class="navbar navbar-default navbar-fixed-top navbar-custom">
+
+         <div class="container">
+
+            <div class="navbar-header page-scroll">
+
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+
+                    <span class="sr-only">Toggle navigation</span> Menu <i class="fa fa-bars"></i>
+
+                </button>
+
+                <a href="../static/index.html" class="navbar-brand" >Fact Detector</a>
+
+            </div>
+
+      </nav>
+
+
+
+      <div class="topDiv2">
+
+      <center>
+
+         <h2> Results </h2>
+
+         <br>
+
+      </center>
+
+          <table style="background-color:rgba(0,0,0,0.15)" border = 1>
+
+
 
             <tr>
+
                <th> {{ "# of fllipflops"  }} </th>
+
                <td> {{ result["# of fllipflops"] }} </td>
+
                <th> {{ "# of consistencies"}} </th>
+
                <td> {{ result[ "# of consistencies"] }} </td>
+
             </tr>
 
 
+
+
+
       </table>
 
+      </div>
+
+
+
    </body>
+
+
+
 </html>