From e6b7b14e0b511215cb3e01b26d56951e4844ebb9 Mon Sep 17 00:00:00 2001
From: Nicolae Claudius <nicolae_claudius@yahoo.com>
Date: Wed, 21 Sep 2011 07:37:33 -0700
Subject: [PATCH] records link on empty, marketing, styles etc

---
 app/assets/stylesheets/marketing.css.scss       | 10 +++++++++-
 app/assets/stylesheets/overrides.css.erb        |  2 +-
 app/views/domains/_list_record_columns.html.erb | 16 ++++++++++++++++
 app/views/fragments/_top.html.erb               |  5 ++---
 app/views/home/_headlines.html.erb              |  2 +-
 app/views/home/index.html.erb                   |  4 ++--
 app/views/layouts/application.html.erb          |  2 +-
 app/views/layouts/marketing.html.erb            |  2 +-
 8 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 app/views/domains/_list_record_columns.html.erb

diff --git a/app/assets/stylesheets/marketing.css.scss b/app/assets/stylesheets/marketing.css.scss
index 6514f24..d42b2e4 100644
--- a/app/assets/stylesheets/marketing.css.scss
+++ b/app/assets/stylesheets/marketing.css.scss
@@ -34,6 +34,10 @@
     position: relative;
 }
 
+.marketing-duo td {
+    vertical-align: top;
+}
+
 #main.marketing-main {
     margin-left: auto;
     margin-right: auto;
@@ -41,7 +45,11 @@
     
     .block .content .marketing-inner {
         padding: 0 30px 30px;
+        h2 {
+            font-size: 25px;
+        }
         p {
+            font-size: 18px;
             line-height: 1em;
             color: #555;
         }
@@ -60,7 +68,7 @@
     }
     
     li {
-        font-size: 16px;
+        font-size: 18px;
     }
     
     .action {
diff --git a/app/assets/stylesheets/overrides.css.erb b/app/assets/stylesheets/overrides.css.erb
index 40cedac..15f1bb7 100644
--- a/app/assets/stylesheets/overrides.css.erb
+++ b/app/assets/stylesheets/overrides.css.erb
@@ -7,7 +7,7 @@
 }
 
 #main .block .content .active-scaffold-header h2 {
-  font-size: 200%;
+  font-size: 160%;
 }
 
 #main .block .content .active-scaffold th a {
diff --git a/app/views/domains/_list_record_columns.html.erb b/app/views/domains/_list_record_columns.html.erb
new file mode 100644
index 0000000..672f49a
--- /dev/null
+++ b/app/views/domains/_list_record_columns.html.erb
@@ -0,0 +1,16 @@
+<% columns.each do |column| %>
+  <% authorized = record.authorized_for?(:crud_type => :read, :column => column.name) -%>
+  <% column_value = authorized ? get_column_value(record, column) : active_scaffold_config.list.empty_field_text -%>
+
+  <% if column.name == :records %>
+    <td class="<%= column_class(column, column_value, record) %>" >
+      <% column_value = 'Manage Records (0)' if column_value == '-' %>
+      <%= authorized ? render_list_column(column_value, column, record) : column_value %>
+    </td>
+  <% else %>
+    <td class="<%= column_class(column, column_value, record) %>" >
+      <%= authorized ? render_list_column(column_value, column, record) : column_value %>
+    </td>
+  <% end %>
+
+<% end -%>
diff --git a/app/views/fragments/_top.html.erb b/app/views/fragments/_top.html.erb
index b2bb7f3..909bec8 100644
--- a/app/views/fragments/_top.html.erb
+++ b/app/views/fragments/_top.html.erb
@@ -5,13 +5,12 @@
       <ul class="wat-cf">
         <% if user_signed_in? %>
           <li><%= link_to('Dashboard', dashboard_path, :data => {:pjax => '#main'}) %></li>
-          <li><%= link_to 'Domains', domains_path, :data => {:pjax => '#main'} %></li>
-          <li><%= link_to('Help & Support', root_path, :data => {:pjax => '#main'}) %></li>
+          <li><%= link_to 'Manage Domains', domains_path, :data => {:pjax => '#main'} %></li>
         <% else %>
           <li><%= link_to('Home', root_path, :data => {:pjax => '#main'}) %></li>
           <li><%= link_to('About us', root_path, :data => {:pjax => '#main'}) %></li>
-          <li><%= link_to('Help & Support', root_path, :data => {:pjax => '#main'}) %></li>
         <% end %>
+        <li><%= link_to('Help & Support', root_path, :data => {:pjax => '#main'}) %></li>
       </ul>
     </div>
     <div id="user-navigation">
diff --git a/app/views/home/_headlines.html.erb b/app/views/home/_headlines.html.erb
index 679adfd..7e9dae2 100644
--- a/app/views/home/_headlines.html.erb
+++ b/app/views/home/_headlines.html.erb
@@ -1,4 +1,4 @@
-<h2>Free, no hassle service you can use right away</h2>
+<h2>Hassle-free service you can use right away</h2>
 
 <p>
   We're System Administrators who built Simple DNS to fill our own needs.
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index b6b5322..bba1a03 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -2,9 +2,9 @@
   <div class="content">
     <div class="inner marketing-inner">
 
-      <h1>A DNS service created by sysadmins for sysadmins</h1>
+      <h1>A free service created by sysadmins for sysadmins</h1>
 
-      <table>
+      <table class="marketing-duo">
         <tr>
           <td class="marketing-text">
             <%= render :partial => 'headlines' %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 27592eb..ecc339c 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -11,11 +11,11 @@
     <div id="container">
       <%= render :partial => 'fragments/top' %>
       <div id="wrapper" class="wat-cf">
-        <%= flash_display 'flash' %>
         <div id="main" style="width: 100%;">
           <div class="block">
             <div class="content">
               <div class="inner" data-pjax-container="true">
+                <%= flash_display 'flash' %>
                 <%= yield %>
               </div>
             </div>
diff --git a/app/views/layouts/marketing.html.erb b/app/views/layouts/marketing.html.erb
index 782a298..c73bd42 100644
--- a/app/views/layouts/marketing.html.erb
+++ b/app/views/layouts/marketing.html.erb
@@ -11,8 +11,8 @@
     <div id="container">
       <%= render :partial => 'fragments/top' %>
       <div id="wrapper" class="wat-cf">
-        <%= flash_display 'flash' %>
         <div id="main" class="marketing-main" data-pjax-container="true">
+          <%= flash_display 'flash' %>
           <%= yield %>
         </div>
       </div>