fixing for demo

green-cabbage · May 3, 2017 · 1bf5636 · 1bf5636
1 parent e081699
commit 1bf5636
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 45 deletions.
diff --git a/static/index.html b/static/index.html
@@ -25,37 +25,53 @@
                     <span class="sr-only">Toggle navigation</span> Menu <i class="fa fa-bars"></i>
 
                 </button>
-
+                <li style="list-style-type:none">
                 <a href="index.html" class="navbar-brand" >Fact Detector</a>
-
+                </li>
             </div>
 
 		</nav>
 
 
 
 		<div class="topDiv">
+			<div class= "innerDiv">
 
-			<center>
+				<center>
 
-			<h1>Fact <br>Detector</h1>
+				<h1>Fact <br>Detector</h1>
+				<br>
 
-			<form method=post enctype=multipart/form-data>
+				<form method=post enctype=multipart/form-data>
+				<div>
 
-		<p><input type=file name=file>
 
-		<input type=file name=twofile>
+				<label style="display:inline-block;float:center;" class="btn btn-primary btn-file btn-lg">
+    				Select First Text File<input style="display:none;" type=file name=file>
+				</label>
 
-		<input type=submit value="Upload Both Files">
+				<label style="display:inline-block;clear: both;" class="btn btn-primary btn-file btn-lg">
+    				Select Second Text File <input style= "display:none" type=file name=twofile>
+				</label>
 
-	  </form>
+
+
 
-				<input  type="file" id="fileID" name=file style="visibility: hidden; size: 50;" />
+	  			</div>
 
+	  			<br>
+	  			<label style="float:center;" class="btn btn-success btn-file btn-lg">
+    				Submit Both Files<input style= "display:none" type=submit value="Upload Both Files">
+				</label>
+				</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>
+					
 
+				</center>
+			</div>
 		</div>
 
 

diff --git a/static/indexStyle.css b/static/indexStyle.css
@@ -18,30 +18,26 @@ h1 {
     color: white;
 }
 .topDiv {
-    height: 200px;
-    width: 400px;
-    background: transparent;
+    height: 50%;
+    width: 40%;
+background: rgba(0,0,0,.40);
+    border-radius: 25px;
 
     position: fixed;
     top: 25%;
     left: 50%;
     margin-top: -100px;
-    margin-left: -200px;
+    margin-left: -260px;
 }
 
-.bottomDiv {
-    height: 300px;
-    width: 400px;
-    background: rgba(0,0,0,.40);
-    border-radius: 25px;
+.nav > a:hover, .nav > a:focus{
+    background-color: red;
+    text-decoration: none;
+}
+
+
 
-    position: fixed;
-    top: 63%;
-    left: 50%;
-    margin-top: -100px;
-    margin-left: -200px;
 
-}
 .infoText {
 
     position: fixed;

diff --git a/templates/result.html b/templates/result.html
@@ -8,7 +8,7 @@
 
       <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="resultStyle.css" >
+      <link rel="stylesheet" href="resultStyle.css">
 
    </head>
 
@@ -26,7 +26,7 @@
 
                 </button>
 
-                <a href="http://198.199.65.210/" class="navbar-brand" >Fact Detector</a>
+                <a href="../static/index.html" class="navbar-brand" >Fact Detector</a>
 
             </div>
 
@@ -38,21 +38,26 @@
 
       <center>
 
-         <h1> Results </h1>
 
+
+         <br>
+         <br>
+         <br>
+         <br>
+         <br>
          <br>
 
       </center>
 
-      <table style="background-color:rgba(0,0,0,0.15)" border = 1>
-        {% for key, value in result.items() %}
+      <table class="table table-bordered table-hover">
+        <!-- {% for key, value in result.items() %} -->
 
         <tr>
            <th> {{ key }} </th>
            <td> {{ value }} </td>
         </tr>
 
-     {% endfor %}
+     <!-- {% endfor %} -->
 
       </table>
 

diff --git a/templates/resultStyle.css b/templates/resultStyle.css
@@ -1,5 +1,5 @@
 body {
-    background-color: white;
+    background-color: grey;
     background-size:  cover;
     background-repeat:no-repeat;
     height: 100%;
@@ -23,7 +23,7 @@ h1 {
     background: transparent;
 
     position: fixed;
-    top: 25%;
+    top: 30%;
     left: 50%;
     margin-top: -100px;
     margin-left: -200px;
@@ -42,12 +42,3 @@ h1 {
     margin-left: -200px;
 
 }
-.infoText {
-
-    position: fixed;
-    top: 61%;
-    left: 51%;
-    margin-top: -100px;
-    margin-left: -200px;
-    margin-right: 470px;
-}
diff --git a/upload/testing.txt b/upload/testing.txt
@@ -1 +1 @@
-the sky is blue
+It's great to have China as our ally. I have made some business mistakes that lost many jobs.I honor those who were brave to go through many tortures as prisoners of war.
diff --git a/upload/testing2.txt b/upload/testing2.txt
@@ -1 +1 @@
-the sky is green
+I believe created thousands of jobs. I hate prisoners. China's our new enemy.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		the sky is blue
		It's great to have China as our ally. I have made some business mistakes that lost many jobs.I honor those who were brave to go through many tortures as prisoners of war.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		the sky is green
		I believe created thousands of jobs. I hate prisoners. China's our new enemy.