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 @@
+ <%= render :partial => 'pages/team/zooz' %> + | ++ <%= render :partial => 'pages/team/clyfe' %> + | +
+ 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:
+
+ 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:
+
Coming soon!
+ ++ 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. +
+ ++ 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. +
+ ++ 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. +
+ ++ 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. +
+ ++ 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. +
+ ++ 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. +
+