Style tweaks

opsb · Mar 19, 2010 · 1a16c32 · 1a16c32
1 parent ab305fe
commit 1a16c32
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 19 deletions.
diff --git a/app/views/databases/show.html.erb b/app/views/databases/show.html.erb
@@ -1,24 +1,22 @@
-<% title "Database" %>
-
-<p>
-  <strong>Name:</strong>
-  <%=h @database.name %>
-</p>
-<p>
-  <strong>Username:</strong>
-  <%=h @database.username %>
-</p>
-<p>
-  <strong>Password:</strong>
-  <%=h @database.password %>
-</p>
+<% title @database.name %>
 <p>
   <strong>Hostname:</strong>
   <%=h @database.hostname %>
 </p>
-
 <p>
-  <%= link_to "Edit", edit_database_path(@database) %> |
-  <%= link_to "Destroy", @database, :confirm => 'Are you sure?', :method => :delete %> |
-  <%= link_to "View All", databases_path %>
+  <strong>Schema:</strong>
+  <%=h @database.schema %>
 </p>
+
+<h2>Reports</h2>
+
+<table>
+  <% for report in @database.reports %>
+    <tr>
+      <td><%= link_to report.name, report %></td>
+      <td><%= link_to "Remove", report, :confirm => 'Are you sure?', :method => :delete %></td>
+    </tr>
+  <% end %>
+</table>
+
+<p><%= link_to "New Report", new_database_report_path(@database) %></p>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -8,6 +8,9 @@
   </head>
   <body>
     <div id="container">
+      <ul class="nav">
+        <li><%= link_to 'Databases', databases_path %></li>
+      </ul>
       <%- flash.each do |name, msg| -%>
         <%= content_tag :div, msg, :id => "flash_#{name}" %>
       <%- end -%>

diff --git a/app/views/reports/show.html.erb b/app/views/reports/show.html.erb
@@ -8,7 +8,7 @@
 <p>
   <%= link_to "Edit", edit_report_path(@report) %> |
   <%= link_to "Remove", @report, :confirm => 'Are you sure?', :method => :delete %> |
-  <%= link_to "#{@report.database.name} reports", database_reports_path(@report.database) %>
+  <%= link_to "#{@report.database.name} reports", database_path(@report.database) %>
 </p>
 
 <table>

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
@@ -79,3 +79,28 @@ a {
   font-size: 12px;
   list-style: disc;
 }
+
+.nav {
+  list-style:none;
+  padding:0;
+  margin:0;
+  float:right;
+}
+
+a {
+  text-decoration:none;
+  color:#0077CC;
+}
+
+a:hover {
+  text-decoration:underline;
+}
+
+
+th {
+  text-align:left;
+}
+
+td {
+  padding:0px 15px 5px 0px;
+}