From 0623a07f05ea66f9427779def6af5cf5d28574e2 Mon Sep 17 00:00:00 2001 From: Nicolae Claudius Date: Sat, 15 Oct 2011 05:33:51 -0700 Subject: [PATCH] refactor, #26 --- app/assets/stylesheets/application.css | 3 ++- app/assets/stylesheets/pages/help.css.scss | 5 +++++ .../{marketing.css.scss => home.css.scss} | 16 +++++++------- app/controllers/pages_controller.rb | 2 +- .../{marketing.html.erb => public.html.erb} | 4 ++-- app/views/pages/help.html.erb | 21 ++++++++++++------- app/views/pages/home.html.erb | 16 +++++++------- 7 files changed, 39 insertions(+), 28 deletions(-) create mode 100644 app/assets/stylesheets/pages/help.css.scss rename app/assets/stylesheets/pages/{marketing.css.scss => home.css.scss} (90%) rename app/views/layouts/{marketing.html.erb => public.html.erb} (84%) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 7848110..49a088c 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -6,8 +6,9 @@ *= require theme/base *= require theme/default *= require theme/error_explanation +*= require pages/home *= require pages/team -*= require pages/marketing +*= require pages/help *= require active_scaffold *= require overrides *= require slides diff --git a/app/assets/stylesheets/pages/help.css.scss b/app/assets/stylesheets/pages/help.css.scss new file mode 100644 index 0000000..2b89242 --- /dev/null +++ b/app/assets/stylesheets/pages/help.css.scss @@ -0,0 +1,5 @@ +.help-page { + p, ul, div { + color: #555; + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/pages/marketing.css.scss b/app/assets/stylesheets/pages/home.css.scss similarity index 90% rename from app/assets/stylesheets/pages/marketing.css.scss rename to app/assets/stylesheets/pages/home.css.scss index 7a2de79..392743e 100644 --- a/app/assets/stylesheets/pages/marketing.css.scss +++ b/app/assets/stylesheets/pages/home.css.scss @@ -1,13 +1,13 @@ @import "compass/css3/text-shadow"; @import "ui/buttons"; -.marketing .header-inner { +.home-page .header-inner { width: 77%; margin: auto; position: relative; } -#main .marketing-block { +#main .home-page-block { background-color: #333333; .content h1 { //text-align: center; @@ -28,16 +28,16 @@ } } -.marketing-duo td { +.home-page-duo td { vertical-align: top; } -#main.marketing-main { +#main.home-page-main { margin-left: auto; margin-right: auto; float: none; - .block .content .marketing-inner { + .block .content .home-page-inner { background-color: #e5ecf3; padding: 20px 30px 30px; @include border-bottom-radius(6px); @@ -51,17 +51,17 @@ color: #555; } - .marketing-text li { + .home-page-text li { list-style-image: url(image_path('theme/check.png')); font-size: 20px; color: #555; } } - .marketing-text { + .home-page-text { padding-right: 20px; } - .marketing-images { + .home-page-images { padding-left: 20px; } diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 4d49cfa..0a104a3 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -6,7 +6,7 @@ class PagesController < ApplicationController elsif user_signed_in? 'application' else - 'marketing' + 'public' end } diff --git a/app/views/layouts/marketing.html.erb b/app/views/layouts/public.html.erb similarity index 84% rename from app/views/layouts/marketing.html.erb rename to app/views/layouts/public.html.erb index 170cbc6..412ba07 100644 --- a/app/views/layouts/marketing.html.erb +++ b/app/views/layouts/public.html.erb @@ -6,12 +6,12 @@ <%= javascript_include_tag "application" %> <%= csrf_meta_tag %> - +
<%= render :partial => 'fragments/top' %>
-
+
<%= flash_display 'flash' %> <%= yield %>
diff --git a/app/views/pages/help.html.erb b/app/views/pages/help.html.erb index f3ec8e2..e9aab89 100644 --- a/app/views/pages/help.html.erb +++ b/app/views/pages/help.html.erb @@ -1,30 +1,35 @@
-
+

Help & Support

We are working hard on creating a support system. In the mean time please bear with us! -

1. What support can I expect?

+

I have an idea for an EntryDNS feature, who can I tell about it?

+

+ We’d love to hear your idea. Please send an email to support@entrydns.net +

+ +

What support can I expect?

Since the service is totally free and we both have full time jobs, we do our best to answer your questions and address your suggestions.

-

2. How can I contact you if I have a question?

+

How can I contact you if I have a question?

-

3. What are your name servers?

+

What are your name servers?

  • ns1.entrydns.net
  • ns2.entrydns.net
-

4. How can I update my domain record dynamically?

+

How can I update my domain record dynamically?

We offer two API's: Complete REST API and Simple API.
Using the simple API you can update your records using the following shell commands:
@@ -37,13 +42,13 @@ 
curl -X PUT -d "" http://entrydns.net/records/modify/TOKEN
-

5. What domain record types do you currently support?

+

What domain record types do you currently support?

SOA, NS, A, CNAME, TXT (more coming soon)

-

6. Can I set individual TTL for each record?

+

Can I set individual TTL for each record?

Yes, you certainly can.

-

7. What is a minimum TTL for a domain record?

+

What is a minimum TTL for a domain record?

60 seconds

diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb index 196e068..4464f4a 100644 --- a/app/views/pages/home.html.erb +++ b/app/views/pages/home.html.erb @@ -1,14 +1,14 @@ -
+

Totally Free DNS service for Geeks created by Geeks

-
+
- +
- - @@ -22,15 +22,15 @@
-
+ <%= render :partial => 'pages/home/headlines' %> + <%= render :partial => 'pages/home/slides' %>
+
- -
+

Benefits

<%= render 'pages/fragments/benefits' %>



<%= render :partial => 'pages/fragments/action' %> 		+

Features

<%= render 'pages/fragments/features' %>