Skip to content

Commit

Permalink
Change UI
Browse files Browse the repository at this point in the history
  • Loading branch information
asd123cqp committed Oct 24, 2017
1 parent 702f25a commit 18865c4
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 26 deletions.
49 changes: 26 additions & 23 deletions static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,35 @@
</head>
<body>

<h1>TwittMap</h1>
<div id="control-panel">
<form id="params">
<p>Keyword:</p>
<select id="kwDropdown" name="kw" onchange="changeKeyword(this.value)">
<option value="all">all</option>
<option value="apple">apple</option>
<option value="bar">bar</option>
<option value="cat">cat</option>
<option value="dog">dog</option>
<option value="eat">eat</option>
<option value="food">food</option>
</select>

<button type="button" onclick="reset()">Reset</button>
<p>Geospatial search radius:</p>
<select id="radDropdown" name="rad" onchange="changeRadius(this.value)">
<option value="0">Disable</option>
<option value="100">100km</option>
<option value="500">500km</option>
<option value="1000">1000km</option>
</select>
</form>

<form id="params">
<p>Keyword:</p>
<select id="kwDropdown" name="kw" onchange="changeKeyword(this.value)">
<option value="all">all</option>
<option value="apple">apple</option>
<option value="bar">bar</option>
<option value="cat">cat</option>
<option value="dog">dog</option>
<option value="eat">eat</option>
<option value="food">food</option>
</select>
<p><span id="resultNum"></span> results</p>

<button type="button"
style="margin-bottom: 12px"
onclick="reset()">Reset</button>
</div>

<p>Geospatial search radius:</p>
<select id="radDropdown" name="rad" onchange="changeRadius(this.value)">
<option value="0">Disable</option>
<option value="100">100</option>
<option value="500">500</option>
<option value="1000">1000</option>
</select>
</form>
</br>
<p><span id="resultNum"></span> results</p>
<div id="map"></div>
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
<script type="text/javascript" src="static/javascripts/script.js"></script>
Expand Down
31 changes: 28 additions & 3 deletions static/stylesheets/style.css
Original file line number Diff line number Diff line change
@@ -1,14 +1,39 @@
body, html {
height: 100%;
width: 100%;
}

body {
padding: 50px;
padding: 0;
margin: 0;
border: 0;
font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
}

a {
color: #00B7FF;
}

#map {
div#control-panel {
color: white;
background: #111;
background: rgba(0, 0, 0, 0.8);
border: 2px solid black;
width: 150px;
left: 0;
margin: 0;
padding: 0;
position: fixed;
text-align:center;
bottom: 0;
z-index: 20;
}

div#map {
padding: 0;
margin: 0;
border: 0;
width: 100%;
height: 400px;
height: 100%;
background-color: grey;
}

0 comments on commit 18865c4

Please sign in to comment.