Browse Source

refactor, #26

pull/1/head
Nicolae Claudius 14 years ago
parent
commit
0623a07f05
  1. 3
      app/assets/stylesheets/application.css
  2. 5
      app/assets/stylesheets/pages/help.css.scss
  3. 16
      app/assets/stylesheets/pages/home.css.scss
  4. 2
      app/controllers/pages_controller.rb
  5. 4
      app/views/layouts/public.html.erb
  6. 21
      app/views/pages/help.html.erb
  7. 16
      app/views/pages/home.html.erb

3
app/assets/stylesheets/application.css

@ -6,8 +6,9 @@
*= require theme/base *= require theme/base
*= require theme/default *= require theme/default
*= require theme/error_explanation *= require theme/error_explanation
*= require pages/home
*= require pages/team *= require pages/team
*= require pages/marketing *= require pages/help
*= require active_scaffold *= require active_scaffold
*= require overrides *= require overrides
*= require slides *= require slides

5
app/assets/stylesheets/pages/help.css.scss

@ -0,0 +1,5 @@
.help-page {
p, ul, div {
color: #555;
}
}

16
app/assets/stylesheets/pages/marketing.css.scss → app/assets/stylesheets/pages/home.css.scss

@ -1,13 +1,13 @@
@import "compass/css3/text-shadow"; @import "compass/css3/text-shadow";
@import "ui/buttons"; @import "ui/buttons";
.marketing .header-inner { .home-page .header-inner {
width: 77%; width: 77%;
margin: auto; margin: auto;
position: relative; position: relative;
} }
#main .marketing-block { #main .home-page-block {
background-color: #333333; background-color: #333333;
.content h1 { .content h1 {
//text-align: center; //text-align: center;
@ -28,16 +28,16 @@
} }
} }
.marketing-duo td { .home-page-duo td {
vertical-align: top; vertical-align: top;
} }
#main.marketing-main { #main.home-page-main {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
float: none; float: none;
.block .content .marketing-inner { .block .content .home-page-inner {
background-color: #e5ecf3; background-color: #e5ecf3;
padding: 20px 30px 30px; padding: 20px 30px 30px;
@include border-bottom-radius(6px); @include border-bottom-radius(6px);
@ -51,17 +51,17 @@
color: #555; color: #555;
} }
.marketing-text li { .home-page-text li {
list-style-image: url(image_path('theme/check.png')); list-style-image: url(image_path('theme/check.png'));
font-size: 20px; font-size: 20px;
color: #555; color: #555;
} }
} }
.marketing-text { .home-page-text {
padding-right: 20px; padding-right: 20px;
} }
.marketing-images { .home-page-images {
padding-left: 20px; padding-left: 20px;
} }

2
app/controllers/pages_controller.rb

@ -6,7 +6,7 @@ class PagesController < ApplicationController
elsif user_signed_in? elsif user_signed_in?
'application' 'application'
else else
'marketing' 'public'
end end
} }

4
app/views/layouts/marketing.html.erb → app/views/layouts/public.html.erb

@ -6,12 +6,12 @@
<%= javascript_include_tag "application" %> <%= javascript_include_tag "application" %>
<%= csrf_meta_tag %> <%= csrf_meta_tag %>
</head> </head>
<body class="marketing"> <body class="home-page">
<div id="container"> <div id="container">
<%= render :partial => 'fragments/top' %> <%= render :partial => 'fragments/top' %>
<div id="wrapper" class="wat-cf"> <div id="wrapper" class="wat-cf">
<div id="main" class="marketing-main" data-pjax-container="true"> <div id="main" class="home-page-main" data-pjax-container="true">
<%= flash_display 'flash' %> <%= flash_display 'flash' %>
<%= yield %> <%= yield %>
</div> </div>

21
app/views/pages/help.html.erb

@ -1,30 +1,35 @@
<div class="block"> <div class="block">
<div class="content"> <div class="content">
<div class="inner"> <div class="inner help-page">
<h1>Help & Support</h1> <h1>Help & Support</h1>
<em>We are working hard on creating a support system. In the mean time please bear with us!</em> <em>We are working hard on creating a support system. In the mean time please bear with us!</em>
<h3>1. What support can I expect?</h3> <h3>I have an idea for an EntryDNS feature, who can I tell about it?</h3>
<p>
We’d love to hear your idea. Please send an email to support@entrydns.net
</p>
<h3>What support can I expect?</h3>
<p> <p>
Since the service is totally free and we both have full time jobs, 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. we do our best to answer your questions and address your suggestions.
</p> </p>
<h3>2. How can I contact you if I have a question?</h3> <h3>How can I contact you if I have a question?</h3>
<ul> <ul>
<li>E-Mail: <a href="mailto:support@entrydns.net">support@entrydns.net</a></li> <li>E-Mail: <a href="mailto:support@entrydns.net">support@entrydns.net</a></li>
<li>IRC: #entrydns on irc.freenode.net</li> <li>IRC: #entrydns on irc.freenode.net</li>
</ul> </ul>
<h3>3. What are your name servers?</h3> <h3>What are your name servers?</h3>
<ul> <ul>
<li>ns1.entrydns.net</li> <li>ns1.entrydns.net</li>
<li>ns2.entrydns.net</li> <li>ns2.entrydns.net</li>
</ul> </ul>
<h3>4. How can I update my domain record dynamically?</h3> <h3>How can I update my domain record dynamically?</h3>
<div> <div>
We offer two API's: Complete REST API and Simple API.<br /> We offer two API's: Complete REST API and Simple API.<br />
Using the simple API you can update your records using the following shell commands:<br /> Using the simple API you can update your records using the following shell commands:<br />
@ -37,13 +42,13 @@
<pre style="margin-top: 0;">curl -X PUT -d "" http://entrydns.net/records/modify/TOKEN</pre> <pre style="margin-top: 0;">curl -X PUT -d "" http://entrydns.net/records/modify/TOKEN</pre>
</div> </div>
<h3>5. What domain record types do you currently support?</h3> <h3>What domain record types do you currently support?</h3>
<p>SOA, NS, A, CNAME, TXT (more coming soon)</p> <p>SOA, NS, A, CNAME, TXT (more coming soon)</p>
<h3>6. Can I set individual TTL for each record?</h3> <h3>Can I set individual TTL for each record?</h3>
<p>Yes, you certainly can.</p> <p>Yes, you certainly can.</p>
<h3>7. What is a minimum TTL for a domain record?</h3> <h3>What is a minimum TTL for a domain record?</h3>
<p>60 seconds</p> <p>60 seconds</p>
</div> </div>

16
app/views/pages/home.html.erb

@ -1,14 +1,14 @@
<div class="block marketing-block"> <div class="block home-page-block">
<div class="content"> <div class="content">
<h1>Totally Free DNS service for Geeks <small>created by Geeks</small></h1> <h1>Totally Free DNS service for Geeks <small>created by Geeks</small></h1>
<div class="inner marketing-inner"> <div class="inner home-page-inner">
<table class="marketing-duo"> <table class="home-page-duo">
<tr> <tr>
<td class="marketing-text"> <td class="home-page-text">
<%= render :partial => 'pages/home/headlines' %> <%= render :partial => 'pages/home/headlines' %>
</td> </td>
<td class="marketing-images"> <td class="home-page-images">
<%= render :partial => 'pages/home/slides' %> <%= render :partial => 'pages/home/slides' %>
</td> </td>
</tr> </tr>
@ -22,15 +22,15 @@
<div class="content"> <div class="content">
<div class="inner"> <div class="inner">
<table class="marketing-duo"> <table class="home-page-duo">
<tr> <tr>
<td class="marketing-text"> <td class="home-page-text">
<h2>Benefits</h2> <h2>Benefits</h2>
<%= render 'pages/fragments/benefits' %> <%= render 'pages/fragments/benefits' %>
<br /><br /><br /><br /> <br /><br /><br /><br />
<%= render :partial => 'pages/fragments/action' %> <%= render :partial => 'pages/fragments/action' %>
</td> </td>
<td class="marketing-images"> <td class="home-page-images">
<h2>Features</h2> <h2>Features</h2>
<%= render 'pages/fragments/features' %> <%= render 'pages/fragments/features' %>
</td> </td>

Loading…
Cancel
Save