brighter_planet_layout 0.2.48 → 0.3.0

data/Rakefile

@@ -13,6 +13,7 @@ begin
     gem.add_dependency 'ultraviolet', '>=0.10.2'
     gem.add_dependency 'simple-rss', '>=1.2.3'
     gem.files.reject! { |fn| fn.downcase =~ /\.ai$/ }
+    gem.files.reject! { |fn| fn.downcase =~ /\.psd$/ }
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.48
+0.3.0

data/app/helpers/brighter_planet_helper.rb

@@ -22,7 +22,7 @@ module BrighterPlanetHelper
   end
   
   def brighter_planet_layout_cdn_url(path)
-    if ::Rails.env.production?
+    if ::Rails.env.production? and not ::ENV['DISABLE_BRIGHTER_PLANET_LAYOUT_CDN'] == 'true'
       [ request.protocol, ::BrighterPlanetLayout::CDN, "/#{::BrighterPlanetLayout::VERSION}", path ].join
     else
       path

data/app/views/layouts/_elsewhere.html.erb

@@ -24,8 +24,9 @@
         <% if blog_post %>
           <div id="blog" class="<%= blog_post.author.downcase.dasherize %>">
             <p>
+              <span><%= blog_post.author %> posted</span>
               <%= link_to blog_post.title, blog_post.link %>
-              <span>by <%= blog_post.author %> <%= time_ago_in_words blog_post.updated %> ago on <%= link_to 'Safety in Numbers', 'http://numbers.brighterplanet.com' %>, our blog</span>
+              <span><%= time_ago_in_words blog_post.updated %> ago on <%= link_to 'Safety in Numbers', 'http://numbers.brighterplanet.com' %>, our blog</span>
             </p>
           </div>
         <% else %>

data/app/views/layouts/_footer.html.erb

@@ -15,27 +15,16 @@
   </div>
   <div id="map">
     <div id="slogan">
-      <h1>Brighter Planet</h1>
-      <p class="slogan">Carbon is everywhere</p>
-      <p class="description">Enterprise-grade cloud technology for carbon intelligence.</p>
-      <p class="description"><%= link_to_homesite 'About us', 'about' %></p>
-      <p class="terms"><%= link_to_homesite 'Terms', 'terms' %></p>
-    </div>
-    <div id="middleware">
-      <div class="main">
-        <h3>Carbon Middleware</h3>
-        <p>Real-time, scalable web services to enhance your business applications. <%= link_to_homesite 'Learn more', 'middleware' %></p>
-      </div>
-      <ul class="links">
-        <li><%= link_to_homesite 'Information for executives', 'tour' %> Industry solutions and case studies</li>
-        <li><%= link_to 'Information for developers', 'http://brighterplanet.github.com' %> Documentation, code samples, and libraries</li>
-      </ul>
+      <h1>Brighter Planet™</h1>
+      <p class="slogan">Bringing carbon to life</p>
+      <p class="description">Easy, flexible on-demand carbon calculations in the cloud.</p>
+      <p class="description"><%= link_to_homesite 'About us', 'about' %> &middot; <%= link_to_homesite 'Terms', 'terms' %></p>
+      <p class="description">&copy;2010 Brighter Planet</p>
     </div>
     <div id="applications">
       <h3>Live applications</h3>
       <ul>
-        <li class="cards"><%= link_to 'Visa credit and debit cards', 'http://giving.bankofamerica.com/brighterplanet?cm_mmc=DEP-Affinity-_-brighterplanet-PAR-_-DA05LT005Y_partnersite_BrighterPlanet_ABE_Productlink-_-MyExpression' %> with rewards powered by Carbon Middleware</li>
-        <li class="profiler"><%= link_to_homesite 'Carbon footprint profiles', 'users/me/footprint' %> powered by Carbon Middleware technology</li>
+        <li class="cards"><%= link_to 'Visa® credit and debit cards', 'http://giving.bankofamerica.com/brighterplanet?cm_mmc=DEP-Affinity-_-brighterplanet-PAR-_-DA05LT005Y_partnersite_BrighterPlanet_ABE_Productlink-_-MyExpression' %> from Bank of America® with rewards powered by Brighter Planet</li>
       </ul>
     </div>
 <%= render :partial => 'layouts/elsewhere' %>

data/app/views/layouts/_header.html.erb

@@ -2,11 +2,11 @@
   <h1><span>Brighter Planet</span></h1>
   <ul>
     <li><%= link_to_homesite 'Home' %></li>
-    <li><%= link_to_homesite 'About us', 'about' %></li>
-    <li><%= link_to_homesite 'Tour', 'tour' %></li>
-    <li><%= link_to 'Developers', 'http://brighterplanet.github.com' %></li>
-    <li><%= link_to 'Blog', 'http://numbers.brighterplanet.com/' %></li>
+    <li><%= link_to_homesite 'About', 'about' %></li>
+    <li><%= link_to_homesite 'Services', 'services' %></li>
+    <li><%= link_to_homesite 'Research', 'research' %></li>
   </ul>
+  <p><%= link_to 'Developer site', 'http://brighterplanet.github.com' %> &middot; <%= link_to 'Blog', 'http://numbers.brighterplanet.com/' %></p>
 </div>
 
 <div id="title">

data/brighter_planet_layout.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{brighter_planet_layout}
-  s.version = "0.2.48"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Rossmeissl", "Seamus Abshere"]
-  s.date = %q{2010-12-10}
+  s.date = %q{2011-01-04}
   s.description = %q{Layouts, partials, stylesheets, and images}
   s.email = %q{andy@rossmeissl.net}
   s.extra_rdoc_files = [
@@ -76,6 +76,7 @@ Gem::Specification.new do |s|
      "public/stylesheets/images/cards.png",
      "public/stylesheets/images/derek.jpg",
      "public/stylesheets/images/gears.png",
+     "public/stylesheets/images/glow.png",
      "public/stylesheets/images/ian.jpg",
      "public/stylesheets/images/logo.png",
      "public/stylesheets/images/matt.jpg",

data/public/stylesheets/brighter_planet.css

@@ -1,7 +1,16 @@
+/* Fixed-width hints */
+#header, #footer { max-width: 990px; }
+#title { max-width: 975px; }
+#content { max-width: 960px; }
+#header, #title, #content, #footer {
+  margin: 0 auto;
+}
+/* end fixed-width hints */
+
 body {
   margin: 0;
   font-size: 13px;
-  background: #111;
+  background: #ccc url(images/glow.png) repeat-y 50% 0;
 }
 
 body, input, select, button {
@@ -41,6 +50,7 @@ a img {
 }
 
 #header {
+  position: relative;
   background-image:
     -webkit-gradient(
       linear,
@@ -67,7 +77,7 @@ a img {
   float: left;
   width: 129px;
   margin: 13px;
-  background: url(images/logo.png) no-repeat
+  background: url(images/logo.png) no-repeat;
 }
 
 #header h1 span {
@@ -111,6 +121,58 @@ a img {
   background: rgba(0,0,0,0.1);
 }
 
+#header p {
+  position: absolute;
+  right: 15px;
+  top: 0;
+  width: 200px;
+  line-height: 58px;
+  color: #aaa;
+  text-align: right;
+}
+
+#header p a {
+  color: inherit;
+  font-size: 12px;
+  text-shadow: -1px -1px 0 black;
+}
+
+#header p a:hover {
+  color: silver;
+}
+
+
+/* full-width #header fixes */
+
+#header {
+  max-width: none;
+}
+
+#header h1 {
+  display: none;
+}
+
+#header ul {
+  background: url(images/logo.png) no-repeat 10px 50%;
+  margin: 0 auto;
+  width: 825px;
+  padding: 0 0 0 165px;
+}
+
+#header ul li {
+  position: relative;
+  z-index: 10;
+}
+
+#header p {
+  left: 50%;
+  right: auto;
+  width: 485px;
+  padding: 0 10px 0 0;
+}
+
+/* end full-width #header fixed */
+
 #nav {
   background-image:
     -webkit-gradient(
@@ -185,7 +247,7 @@ a img {
   background-color: #5FBBFF;
   background-repeat: no-repeat;
   background-position: 20px 20%;
-  padding: 20px 0 0 165px;
+  padding: 20px 0 0 15px;
   height: 70px;
   border-bottom: 1px solid #0070C4;
   -moz-box-shadow: inset 0 10px 10px rgba(0,0,0,0.1);
@@ -196,6 +258,7 @@ a img {
 #title h1, #title h2 {
   font-size: 18px;
   text-shadow: 1px 1px 0px rgba(255,255,255,0.5);
+  margin: 0 0 0 150px;
 }
 
 #title h1 a {
@@ -220,6 +283,7 @@ a img {
 
 #content {
   padding: 15px 15px 50px;
+  position: relative;
 }
 
 #content>p {
@@ -437,6 +501,10 @@ p.flash.error:before {
   color: #F16262;
 }
 
+#footer {
+  background: #111;
+}
+
 #footer #shortcuts {
   background-image:
     -webkit-gradient(
@@ -454,6 +522,7 @@ p.flash.error:before {
     );
   overflow: auto;
   font-size: 11px;
+  min-height: 15px;
 }
 
 #footer #shortcuts h3 {
@@ -464,16 +533,19 @@ p.flash.error:before {
   text-shadow: -1px -1px 0px black;
   padding: 1px 0 0;
   font-size: 12px;
+  display: none;
 }
 
 #footer #shortcuts h3:after {
   content: " →";
+  display: none;
 }
 
 #footer #shortcuts ul {
   list-style: none;
   overflow: auto;
   margin: 0 0 0 165px;
+  display: none;
 }
 
 #footer #shortcuts ul li {
@@ -516,8 +588,8 @@ p.flash.error:before {
 }
 
 #footer #map #slogan {
-  margin: 25px 10px 0 13px;
-  width: 147px;
+  margin: 25px 15px 0 13px;
+  width: 142px;
   float: left;
 }
 
@@ -541,21 +613,11 @@ p.flash.error:before {
   color: silver;
 }
 
-#footer #map #slogan p.terms a {
-  font-size: 11px;
-  color: gray;
-}
-
-#footer #map #middleware, #footer #map #applications {
-  margin: 25px 30px 0 0;
+#footer #map #applications {
   float: left;
   width: 225px;
 }
 
-#footer #map #middleware {
-  font-size: 11px;
-}
-
 #footer #map h3 {
   color: silver;
   text-transform: uppercase;
@@ -563,55 +625,6 @@ p.flash.error:before {
   font-size: 11px;
 }
 
-#footer #map #middleware p {
-  color: gray;
-}
-
-#footer #map #middleware p a {
-  color: #999;
-}
-
-#footer #map #middleware ul.links {
-  list-style: none;
-  border-top: 1px solid #222;
-  padding: 10px 0 0;
-}
-
-#footer #map #middleware ul.links li {
-  margin: 0 0 7px;
-  color: #444;
-}
-
-#footer #map #middleware ul.links li:before {
-  content: "▶";
-  display: block;
-  float: left;
-  width: 1em;
-  background: #555;
-  color: #222;
-  padding: 0 0 1px 2px;
-  line-height: 14px;
-  margin: 0 5px 0 0;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
-  text-shadow: none;
-  font-size: 13px;
-  -moz-box-shadow: black 1px 1px 0;
-}
-
-#footer #map #middleware ul.links li a {
-  color: gray;
-  display: block;
-}
-
-#footer #map #middleware .main {
-  padding: 0 0 10px 80px;
-  background: url(images/gears.png) no-repeat;
-  min-height: 47px;
-  border-bottom: 1px solid black;
-}
-
 #footer #map #applications {
   margin: 25px 20px 0 0;
 }
@@ -652,19 +665,13 @@ p.flash.error:before {
   background: url(images/cards.png) no-repeat 50% 4px;
 }
 
-#footer #map #applications ul li.profiler {
-  font-size: 11px;
-  padding-left: 50px;
-  background: url(images/meter.png) no-repeat 10px 60%;
-}
-
 #footer #map #applications ul li a {
   color: silver;
 }
 
 #footer #map #elsewhere {
   float: left;
-  width: 300px;
+  width: 545px;
   margin: 25px 0 0;
   color: silver;
 }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: brighter_planet_layout
 version: !ruby/object:Gem::Version 
-  hash: 119
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 48
-  version: 0.2.48
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-10 00:00:00 -06:00
+date: 2011-01-04 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,6 +120,7 @@ files:
 - public/stylesheets/images/cards.png
 - public/stylesheets/images/derek.jpg
 - public/stylesheets/images/gears.png
+- public/stylesheets/images/glow.png
 - public/stylesheets/images/ian.jpg
 - public/stylesheets/images/logo.png
 - public/stylesheets/images/matt.jpg