Added a button for preferences instead of hiding it in the Menu

forcedotcom · Sep 27, 2016 · 7a0a9e9 · 7a0a9e9
1 parent f6fc4a3
commit 7a0a9e9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/src/main/webapp/csvupload.html b/src/main/webapp/csvupload.html
@@ -56,7 +56,6 @@
 				<li><a class="navlink" href="listeners.html" target="_top">Listener List</a></li>
                 <li class="disabled"><a class="navlink" href="#" target="_top">File Upload</a></li>
 				<li><a class="navlink" href="logs.html" target="_top">Process Monitor</a></li>
-				<li><a class="navlink" href="preferences.html" target="_top">Preferences</a></li>
 				<li><a class="navlink" href="logout" target="_top">Logout</a></li>
 				<li><a class="navlink" href="https://github.com/forcedotcom/Analytics-Cloud-Dataset-Utils" target="_ext">GitHub</a></li>
                 </ul>
@@ -67,13 +66,23 @@
 </div>
 
 
-<div class="container">
-	<div id="header" class="row">&nbsp;</div>
-</div>
+	<div class="container-fluid">
+		<div id="header" class="row-fluid">&nbsp;</div>
+		<div id="title2" class="row-fluid"></div>
+	</div>
+
+	<div class="container-fluid">
+		<div class="row-fluid">
+			<div class="span1 pull-right">
+				<button id="createButton" type="button" class="btn  btn-primary" style="background-color: #00c0b7;border: 0;">Preferences</button>
+			</div>
+		</div>
+	</div>
+
 
-<div class="container">
+<div class="container-fluid">
 
-    <div class="row">
+    <div class="row-fluid">
         <div class="col-sm-offset-3 col-sm-6">
             <form method="post" action="upload" enctype="multipart/form-data" id="uploadForm">
 				<div class="form-group">
@@ -156,12 +165,9 @@
         </div>
     </div>
 
-	<div id="title2" class="row">
-	</div>
-
 
-    <div class="row">    
-	<table id="result" class="table">
+    <div class="row-fluid">    
+	<table id="result" class="table-responsive">
 	</table>
 	</div>
 

diff --git a/src/main/webapp/js/validatefunction.js b/src/main/webapp/js/validatefunction.js
@@ -37,6 +37,11 @@ $(document).ready(function() {
 
     $('.input-group input[required], .input-group textarea[required], .input-group select[required]').trigger('change');
 
+    	$('#createButton').click(function() {
+			self.location.href = 'preferences.html'; 
+	});
+
+
     loadlistAndSelectize($('#DatasetName').get(0),/*the 'select' object*/
      		 'list?type=dataset',/*the url of the server-side script*/
      		 '_alias',/*The name of the field in the returned list*/