From 73258fbe77c05623a9b2d4e597ad598f670faa6c Mon Sep 17 00:00:00 2001 From: Nicolae Claudius Date: Thu, 13 Oct 2011 09:56:12 -0700 Subject: [PATCH] pages --- app/assets/stylesheets/application.css | 2 + app/assets/stylesheets/marketing.css.scss | 2 +- .../theme/error_explanation.css.scss | 19 ++++ app/assets/stylesheets/theme/pages.css.scss | 10 ++ app/controllers/pages_controller.rb | 10 +- app/views/pages/contact.html.erb | 7 +- app/views/pages/home.html.erb | 2 +- app/views/pages/privacy.html.erb | 39 +++++++- app/views/pages/team.html.erb | 18 +++- app/views/pages/team/_clyfe.html.erb | 33 +++++++ app/views/pages/team/_zooz.html.erb | 18 ++++ app/views/pages/terms.html.erb | 94 ++++++++++++++++++- 12 files changed, 243 insertions(+), 11 deletions(-) create mode 100644 app/assets/stylesheets/theme/error_explanation.css.scss create mode 100644 app/assets/stylesheets/theme/pages.css.scss create mode 100644 app/views/pages/team/_clyfe.html.erb create mode 100644 app/views/pages/team/_zooz.html.erb diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index b128dcd..d53586d 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -5,6 +5,8 @@ *= require normalize *= require theme/base *= require theme/default +*= require theme/error_explanation +*= require theme/pages *= require marketing *= require active_scaffold *= require overrides diff --git a/app/assets/stylesheets/marketing.css.scss b/app/assets/stylesheets/marketing.css.scss index dc94d49..a35243f 100644 --- a/app/assets/stylesheets/marketing.css.scss +++ b/app/assets/stylesheets/marketing.css.scss @@ -17,7 +17,7 @@ padding-right: 30px; background-color: #261F1F; color: white; - em { + small { font-size: 26px; color: #3e3d4c; font-style: normal; diff --git a/app/assets/stylesheets/theme/error_explanation.css.scss b/app/assets/stylesheets/theme/error_explanation.css.scss new file mode 100644 index 0000000..c8b01d5 --- /dev/null +++ b/app/assets/stylesheets/theme/error_explanation.css.scss @@ -0,0 +1,19 @@ +@import 'compass/css3/border-radius'; + +#main .block .content #error_explanation { + @include border-top-radius(6px); + border-left: 1px solid #993624; + border-right: 1px solid #993624; + border-bottom: 1px solid #993624; + h2 { + background-color: #cc4831; + } + .field_with_errors { + label { + color: #cc4831; + } + input, textarea, select { + border: 1px solid #cc4831; + } + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/theme/pages.css.scss b/app/assets/stylesheets/theme/pages.css.scss new file mode 100644 index 0000000..a5802f9 --- /dev/null +++ b/app/assets/stylesheets/theme/pages.css.scss @@ -0,0 +1,10 @@ +.team .bio { + vertical-align: top; + width: 50%; + padding-right: 50px; + + h2 em { + font-size: 0.8em; + color: grey; + } +} diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 1a11383..4d49cfa 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -1,6 +1,14 @@ class PagesController < ApplicationController skip_before_filter :authenticate_user! - layout proc{|controller| request.xhr? ? false : 'marketing'} + layout proc{|controller| + if request.xhr? + false + elsif user_signed_in? + 'application' + else + 'marketing' + end + } rescue_from ActionView::MissingTemplate do |exception| if exception.message =~ %r{Missing template pages/} diff --git a/app/views/pages/contact.html.erb b/app/views/pages/contact.html.erb index 5520d61..8cee90c 100644 --- a/app/views/pages/contact.html.erb +++ b/app/views/pages/contact.html.erb @@ -1,8 +1,13 @@
+

Contact us

-

Coming soon!

+ +

+ E-Mail address: support@entrydns.net +

+
diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb index dae5a15..fdc411c 100644 --- a/app/views/pages/home.html.erb +++ b/app/views/pages/home.html.erb @@ -1,6 +1,6 @@
-

Totally Free DNS service for Geeks created by Geeks

+

Totally Free DNS service for Geeks created by Geeks

diff --git a/app/views/pages/privacy.html.erb b/app/views/pages/privacy.html.erb index d7133b2..a8ec519 100644 --- a/app/views/pages/privacy.html.erb +++ b/app/views/pages/privacy.html.erb @@ -1,8 +1,43 @@
-

Privacy Statement

-

Coming soon!

+ +

+ Privacy Statement +

+ +

+ Your privacy is very important to us. Accordingly, we have developed this Policy in order for you to understand how we collect, use, communicate and disclose and make use of personal information. The following outlines our privacy policy. +

+ +
    +
  • + Before or at the time of collecting personal information, we will identify the purposes for which information is being collected. +
    • +
  • + We will collect and use of personal information solely with the objective of fulfilling those purposes specified by us and for other compatible purposes, unless we obtain the consent of the individual concerned or as required by law. +
    • +
  • + We will only retain personal information as long as necessary for the fulfillment of those purposes. +
    • +
  • + We will collect personal information by lawful and fair means and, where appropriate, with the knowledge or consent of the individual concerned. +
    • +
  • + Personal data should be relevant to the purposes for which it is to be used, and, to the extent necessary for those purposes, should be accurate, complete, and up-to-date. +
    • +
  • + We will protect personal information by reasonable security safeguards against loss or theft, as well as unauthorized access, disclosure, copying, use or modification. +
    • +
  • + We will make readily available to customers information about our policies and practices relating to the management of personal information. +
    • +
+ +

+ We are committed to conducting our business in accordance with these principles in order to ensure that the confidentiality of personal information is protected and maintained. +

+
diff --git a/app/views/pages/team.html.erb b/app/views/pages/team.html.erb index 84f7f91..6ac063f 100644 --- a/app/views/pages/team.html.erb +++ b/app/views/pages/team.html.erb @@ -1,8 +1,20 @@
-
-

We are two people passionate about technology

-

Coming soon!

+
+ +

Meet the founders

+ +
+ + + + +
+ <%= render :partial => 'pages/team/zooz' %> + + <%= render :partial => 'pages/team/clyfe' %> +
+
diff --git a/app/views/pages/team/_clyfe.html.erb b/app/views/pages/team/_clyfe.html.erb new file mode 100644 index 0000000..52ec1ac --- /dev/null +++ b/app/views/pages/team/_clyfe.html.erb @@ -0,0 +1,33 @@ +

Claudius Nicolae Programmer

+ +

+ He is a software developer from Romania. He has a + Bachelors in Mathematics and Computer Science from the + University of Bucharest and also started a Masters in Software Development. +

+

+ He worked with many programming languages and technologies from web applications to + kernel-mode code on both Linux and Windows platforms, and generally, he favors using + open source software for most problems. +

+

+ You can find him online at:
+

+ + diff --git a/app/views/pages/team/_zooz.html.erb b/app/views/pages/team/_zooz.html.erb new file mode 100644 index 0000000..2cd97bc --- /dev/null +++ b/app/views/pages/team/_zooz.html.erb @@ -0,0 +1,18 @@ +

Vaidas Jablonskis System Administrator

+ +

+ He began his career as a Linux systems user and quickly became involved with + open source technologies. Vaidas currently works as a Linux Systems Administrator + for a London based company. He is greatly involved in Linux and free software + community and is always interested in giving something back. +

+ +

+ He blogs at:
+

+ + diff --git a/app/views/pages/terms.html.erb b/app/views/pages/terms.html.erb index b7be747..11b94af 100644 --- a/app/views/pages/terms.html.erb +++ b/app/views/pages/terms.html.erb @@ -1,8 +1,98 @@
-

Terms & Conditions

-

Coming soon!

+ +

+ Terms and Conditions of Use +

+ +

+ 1. Terms +

+ +

+ By accessing this web site, you are agreeing to be bound by these + web site Terms and Conditions of Use, all applicable laws and regulations, + and agree that you are responsible for compliance with any applicable local + laws. If you do not agree with any of these terms, you are prohibited from + using or accessing this site. The materials contained in this web site are + protected by applicable copyright and trade mark law. +

+ +

+ 2. Use License +

+ +
    +
  1. + Permission is granted to temporarily download one copy of the materials + (information or software) on EntryDNS's web site for personal, + non-commercial transitory viewing only. This is the grant of a license, + not a transfer of title, and under this license you may not: + +
      +
    1. modify or copy the materials;
      2. +
    2. use the materials for any commercial purpose, or for any public display (commercial or non-commercial);
      3. +
    3. attempt to decompile or reverse engineer any software contained on EntryDNS's web site;
      4. +
    4. remove any copyright or other proprietary notations from the materials; or
      5. +
    5. transfer the materials to another person or "mirror" the materials on any other server.
      6. +
    +
    2. +
  2. + This license shall automatically terminate if you violate any of these restrictions and may be terminated by EntryDNS at any time. Upon terminating your viewing of these materials or upon the termination of this license, you must destroy any downloaded materials in your possession whether in electronic or printed format. +
    3. +
+ +

+ 3. Disclaimer +

+ +
    +
  1. + The materials on EntryDNS's web site are provided "as is". EntryDNS makes no warranties, expressed or implied, and hereby disclaims and negates all other warranties, including without limitation, implied warranties or conditions of merchantability, fitness for a particular purpose, or non-infringement of intellectual property or other violation of rights. Further, EntryDNS does not warrant or make any representations concerning the accuracy, likely results, or reliability of the use of the materials on its Internet web site or otherwise relating to such materials or on any sites linked to this site. +
    2. +
+ +

+ 4. Limitations +

+ +

+ In no event shall EntryDNS or its suppliers be liable for any damages (including, without limitation, damages for loss of data or profit, or due to business interruption,) arising out of the use or inability to use the materials on EntryDNS's Internet site, even if EntryDNS or a EntryDNS authorized representative has been notified orally or in writing of the possibility of such damage. Because some jurisdictions do not allow limitations on implied warranties, or limitations of liability for consequential or incidental damages, these limitations may not apply to you. +

+ +

+ 5. Revisions and Errata +

+ +

+ The materials appearing on EntryDNS's web site could include technical, typographical, or photographic errors. EntryDNS does not warrant that any of the materials on its web site are accurate, complete, or current. EntryDNS may make changes to the materials contained on its web site at any time without notice. EntryDNS does not, however, make any commitment to update the materials. +

+ +

+ 6. Links +

+ +

+ EntryDNS has not reviewed all of the sites linked to its Internet web site and is not responsible for the contents of any such linked site. The inclusion of any link does not imply endorsement by EntryDNS of the site. Use of any such linked web site is at the user's own risk. +

+ +

+ 7. Site Terms of Use Modifications +

+ +

+ EntryDNS may revise these terms of use for its web site at any time without notice. By using this web site you are agreeing to be bound by the then current version of these Terms and Conditions of Use. +

+ +

+ 8. Governing Law +

+ +

+ Any claim relating to EntryDNS's web site shall be governed by the laws of the State of United Kingdom without regard to its conflict of law provisions. +

+