Commits

Don Park committed 6f017c0

front page layout update

  • Participants
  • Parent commits 8e02310

Comments (0)

Files changed (3)

File sinatra/public/css/style.css

 
 #headerbox {
   background: #DDDDDD;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
+    border-bottom-left-radius: 5px;
+    -moz-border-bottom-left-radius: 5px;
+    -webkit-border-bottor-left-radius: 5px;
 }
 
 #logobox {
-  border-radius: 5px;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
+  padding: 0.8em;
+    border-bottom-left-radius: 5px;
+    -moz-border-bottom-left-radius: 5px;
+    -webkit-border-bottor-left-radius: 5px;
+    border-bottom-right-radius: 5px;
+    -moz-border-bottom-right-radius: 5px;
+    -webkit-border-bottor-right-radius: 5px;
 }
 
 #licence {
 }
 
 header h2 {
-  display: inline;
+  display: block;
+    margin: 0px;
 }
 
 header h2 a {
 }
 
 nav {
-  margin-left: 10%;
+  padding: 0.6em;
 }
 
 nav ul {
 nav li {
   display: inline;
   margin-left: 1em;
+  padding: 0.3em;
+  background: #EEEEEE;
+  border-radius: 0.5em;
+  -moz-border-radius:0.5em;
+  -webkit-border-radius: 0.5em;
 }
 
 nav a {
-  background: #EEEEEE;
-  padding-left: 1em;
-  padding-right: 1em;
   text-decoration: none;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
 }
 
 nav a:hover {
   color: white;
+  text-decoration: underline;
+}
+
+#ocount {
+    clear: left;
+}
+
+#apsearch {
+    border-style: solid;
+    float: left;
+    margin: 1em;
+    padding: 0.5em;
 }
 
 #apsearch #legend {
+    background: #EEEEEE;
+}
+
+#apsearch .example {
+    color: brown;
 }
 
 #searchmsg {

File sinatra/views/index.erb

   <div id="apsearch">
-   <span id="legend" title="example: 00:01:0a:22:3f:a1">Look up an access point.</span>
-   <br/>
-   <span> Example: homenetwork or 00:01:0a:22:3f:a1</span>
+   <div>Search by network name: <span class="example">homenetwork</span></div>
+   <div>or by MAC address: <span class="example">00:01:0a:22:3f:a1</span></div>
    <form action="/search">
     <input id="mac" type="text" name="q">
     <input type="submit" value="Search">
    </form>
   </div>
 
-  <p>
+  <p id="ocount">
    There are <%= ocount %> observations in the database.
   </p>
 

File sinatra/views/layout.erb

   <script src="/scripts/jquery-1.4.2.min.js" type="text/javascript"></script>
   <script src="/scripts/application.js" type="text/javascript"></script>
  </head>
+
  <body id="home">
   <div id="headerbox">
   <header>
-   <h2>
-    <a href="/">Geomena.org</a>
-    <a href="http://twitter.com/geomena"><img src="/images/twitter.png"></a>
-    <a href="http://groups.google.com/group/geomena"><img src="/images/google_groups.png" alt="google group"></a>
-   </h2>
     <nav>
      <ul>
       <li><a href="/api">API</a></li>
      </ul>
     </nav>
    <div id="logobox">
+     <h2>
+      <a href="/">Geomena.org</a>
+     </h2>
     <object data="/images/logo.svg" type="image/svg+xml" width="200" height="200"> </object>
     <span id="license">
     The <a href="http://en.wikipedia.org/wiki/Wikipedia:Text_of_Creative_Commons_Attribution-ShareAlike_3.0_Unported_License">creative-commons</a> licenced access point location database.
   <div id="content">
     <%= yield %>
   </div>
-
  </body>
 </html>