Removed unneccessary whitespace, a little refactoring, and added lang…

…="en" to html tags.

views/_head.haml

@@ -12,21 +12,20 @@
     %script{:src => "/js/lib/dev/coffee-script.js"}
     %script{:type => "text/coffeescript", :src => "/js/main.coffee"}
     %link{:href => "/dev/screen.css", :media => "screen", :rel => "stylesheet"}
-  
-  - else  
+
+  - else
     %script{:src => "/assets/app.js"}
     <!--[if (!IE)|(gte IE 8)]><!-->
     %link{:href => "/assets/screen-datauri.css", :media => "screen", :rel => "stylesheet"}
     <!--<![endif]-->
-    <!--[if lte IE 7]>
-    <link href="assets/screen.css" media="screen" rel="stylesheet" type="text/css" />
-    <![endif]-->
+    /[if lte IE 7]
+      %link{:href => "assets/screen.css", :media => "screen", :rel => "stylesheet", :type => "text/css"}
     %link{:rel => "apple-touch-icon-precomposed", :sizes => "114x114", :href => "images/mobile_icons/apple-touch-icon_114.png"}
     %link{:rel => "apple-touch-icon-precomposed", :sizes => "72x72", :href => "images/mobile_icons/apple-touch-icon_72.png"}
     %link{:rel => "apple-touch-icon-precomposed", :href => "images/mobile_icons/apple-touch-icon.png"}
-  
+
   != yield_content :css
-  
+
   - if production?
     :javascript
       var _gaq = _gaq || [];

views/_navigation.haml

@@ -1,6 +1,6 @@
 - if current_user.nil?
   - nav = [{:url => "/updates", :name => "World"}]
-- else 
+- else
   - nav = [{:url => "/", :name => "Timeline"}, {:url => "/replies", :name => "Replies"}, {:url => "/updates", :name => "World"}]
 - unless @hashtag.nil?
   - nav << {:url => "/hashtags/#{@hashtag}", :name => "##{@hashtag}"}

views/_update_form.haml

@@ -19,4 +19,3 @@
             %label{:for => "facebook"} Facebook
 
     #update-count{:title => 'Characters remaining'}
-

views/_updates.haml

@@ -21,7 +21,7 @@
         .in-reply
           %a{:href => "/updates/#{update.referral.id}"}
             in reply to
-            %span.name= update.referral.author.username 
+            %span.name= update.referral.author.username
 
     .end-links
       -# when @timeline is true, this is a list on the user's page
@@ -34,7 +34,7 @@
         %form{:method => "post", :action => "/updates/#{update.id}"}
           %input{:type => "hidden", :name => "_method", :value => "delete"}
           %input.remove-update{:type => "submit", :value => "I Regret This"}
-    
+
 - if updates.empty?
   .empty
     There are no updates here yet

views/_username_error.haml

@@ -1,5 +1,5 @@
 #error
   %p Warning: your username is currently empty or invalid.
-  %p 
-    Please 
+  %p
+    Please
     %a{:href=>"/reset-username", :id=>"reset_username"}click here to reset your username.

views/contact.haml

@@ -1,14 +1,14 @@
 %h1 Contact Us
 
 %p
-  Please don't hesitate to send us a message with what you think!  
-  %br/ 
+  Please don't hesitate to send us a message with what you think!
+  %br/
   All feedback, suggestions, and bug reports are welcome.
 
 %p
   Just send an email: <a href="mailto:[email protected]">[email protected]</a>.
 
 %p
-  mailinglist: <a href="mailto:[email protected]">[email protected]</a>  
-  %br/ 
+  mailinglist: <a href="mailto:[email protected]">[email protected]</a>
+  %br/
   irc: irc.freenode.net #rstatus

views/error.haml

@@ -5,7 +5,7 @@
     %title rstat.us - #{code}
     %link{:href => "/assets/screen.css", :media => "screen", :rel => "stylesheet"}
     %style
-      
+
   %body#fourohfour
     .single-update
       .update-text-wrap
@@ -16,18 +16,18 @@
 
         %a{:href => "/"}
           Go back to rstat.us
-        
+
         .image404
           %img{:src => "/images/404.jpg"}
           .credits
-            Original artwork by 
+            Original artwork by
             %a{:href => "http://shelleymonahan.com"}
               Shelley Monahan
     /
-      Browsers like Google Chrome and Internet Explorer decide not to display 
+      Browsers like Google Chrome and Internet Explorer decide not to display
       error pages if the content length of the page is too short.  For Internet Explorer,
       it appears the magic number is 512 bytes.  To be safe, make sure your error
-      pages are long enough.  This little comment is here to do just that. 
+      pages are long enough.  This little comment is here to do just that.
       Maybe some day there will be a really witty 404 page here.  I'm thinking
-      something along the lines of "rrrrrrgh!  This rstatus page has been 
+      something along the lines of "rrrrrrgh!  This rstatus page has been
       commandeered by pirates."  Okay that should be enough...

views/footer.haml

@@ -7,7 +7,7 @@
       %li
         %a{:href=>"/home"}
           Home
-      - unless logged_in?   
+      - unless logged_in?
         %li
           %a{:href=>"/login"}
             Login/Signup

views/forgot_password.haml

@@ -3,7 +3,7 @@
 %p Just provide us with the email address on your account and we will send you an email with a link to reset your password.
 
 %form{:action => "/forgot_password", :method => "POST"}
-  %label{:for => "email" } Email: 
+  %label{:for => "email" } Email:
   %input{:type => "text", :name => "email", :id => "email"}
   %br/
   %input{:type => "submit", :value => "Send"}

views/help.haml

@@ -6,22 +6,22 @@
   You can use the username reset to change your username
   %a{:href => "/reset-username"} http://rstat.us/reset-username
   %br
-  Note: This is only for users that have a blank username or a Facebook url. 
+  Note: This is only for users that have a blank username or a Facebook url.
   Username resets will be added at a later date.
-  
+
 %h3 My username is blank
 
-%p 
+%p
   You can use the username reset to change your username
   %a{:href => "/reset-username"} http://rstat.us/reset-username
   %br
-  Note: This is only for users that have a blank username or a Facebook url. 
+  Note: This is only for users that have a blank username or a Facebook url.
   Username resets will be added at a later date.
-  
+
 %h3 I signed in with Twitter or Facebook, but I want use the rstat.us login
 
 %p
-  You can enable username/password logins by setting your password in the 
+  You can enable username/password logins by setting your password in the
   - if logged_in?
     %a{:href => "/users/#{current_user.username}/edit"} edit profile screen
   - else
@@ -36,11 +36,11 @@
     %a{:href => "/users/#{current_user.username}/edit"} edit profile screen
   - else
     edit profile screen.
-    
+
 %h3 Do you have an api?
 
 %p
-  We currently do not have an api, but we hope to add one soon. If you would 
+  We currently do not have an api, but we hope to add one soon. If you would
   like to help please
   %a{:href => "https://github.com/hotsh/rstat.us"} check out the repo
 
@@ -49,19 +49,19 @@
 %p
   There is but it's still hidden behind this address
   %a{:href => "/search"} http://rstat.us/search
-  
+
 %h3 What about the hash tags?
 
 %p
   They can be found under 
   %a{:href => "/hashtags/rstatus"} http://rstat.us/hashtags/some_tag
-  where 
+  where
   %i some_tag
-  can be something like 
+  can be something like
   %a{:href => "/hashtags/rstatus"} rstatus
-  or 
+  or
   %a{:href => "/hashtags/berlin"} berlin
-    
+
 %h3 I would really like the site to do <something>
 
 %p
@@ -70,6 +70,6 @@
 
 %hr
 
-%p 
+%p
   If you did not find answers to your questions log a ticket at 
   %a{:href => "http://rstatus.lighthouseapp.com/projects/73488-rstatus/overview"} Lighthouse

views/index.haml

@@ -1,5 +1,5 @@
 !!! 5
-%html.no-js
+%html.no-js{:lang => "en"}
   != haml :_head
   %body#home
     #main
@@ -29,7 +29,7 @@
             = flash[:notice]
 
         #pitch
-          %a#col-1.col{:href=>'/login'} 
+          %a#col-1.col{:href=>'/login'}
             %h2.title
               Sign Up
             .content
@@ -56,7 +56,7 @@
 
                 There are two things that make rstat.us special: _simplicity_ and _openness_.
 
-                **Simplicity** is a core 'feature' of rstat.us. We pride ourselves on saying 'no' to lots of features. Our interface is clean, and easy to understand. We give you just enough features to be interesting, but not enough to be complicated and confusing. 
+                **Simplicity** is a core 'feature' of rstat.us. We pride ourselves on saying 'no' to lots of features. Our interface is clean, and easy to understand. We give you just enough features to be interesting, but not enough to be complicated and confusing.
 
                 If you're a software developer, you'll probably want to check out our [Open Source page](/open_source). If that's greek to you, here's the deal on **Openness**: the programming code that makes up rstat.us is available for anyone to download, free of charge. Programmers can use that code to run their own websites just like rstat.us, and you can subscribe to your friends on any site that supports the [OStatus protocol](http://ostatus.org/about), like [identi.ca](http://identi.ca/). This also means that you can own your data, we'll never stop you from having full access to everything you've put into rstat.us.
 
@@ -68,7 +68,7 @@
               .world-link
                 %a{:href => "/updates"}
                   more...
-              %h4 
+              %h4
                 %a{:href => "/login"}
                   Join the conversation
 

views/layout.haml

@@ -1,5 +1,5 @@
 !!! 5
-%html.no-js
+%html.no-js{:lang => "en"}
   != haml :_head
   %body.internal
     #main

views/login.haml

@@ -3,7 +3,7 @@
     %form{:action => "/login", :method => "POST"}
       %h3 Log In or Sign up
       %p One form, no problem: Put in a username and password, and we'll take care of the rest.
-      
+
       .form-item
         %label{:for => "username"} Username
         %input{:id => "username", :name => "username", :size => 30, :type => "text"}
@@ -12,11 +12,11 @@
         %input{:id => "password", :name => "password", :size => 30, :type => "password"}
       .form-item
         %input{:value => "Log in", :type => "submit", :class => "button"}
-      
+
       %a{:href => "/forgot_password"} Forgot Password
 
   #signup
-    %h3 Want to sign in with Twitter or Facebook? 
+    %h3 Want to sign in with Twitter or Facebook?
     %p Use the links below:
     .twitter
       %a.button{:href=>'/auth/twitter'}
@@ -27,8 +27,7 @@
       %a.button{:href=>'/auth/facebook'}
         %span.icon.facebook
         Facebook
-        
+
 - content_for :javascript do
   :javascript
     $(document).ready(function(){$("#username").focus()});
-

views/opensource.haml

@@ -48,4 +48,3 @@
 
   - [Website](http://code.google.com/p/pubsubhubbub/)
   - [Spec Document](http://pubsubhubbub.googlecode.com/svn/trunk/pubsubhubbub-core-0.3.html)
-

views/reset_password.haml

@@ -1,10 +1,10 @@
 %h2 Password Reset
 
 %form{:action => "/reset_password/#{@token}", :method => "POST"}
-  %label{:for => "password" } Password: 
+  %label{:for => "password" } Password:
   %input{:type => "password", :name => "password", :id => "password"}
   %br/
-  %label{:for => "password_confirm" } Password Confirm: 
+  %label{:for => "password_confirm" } Password Confirm:
   %input{:type => "password", :name => "password_confirm", :id => "password_confirm"}
   %br/
-  %input{:type => "submit", :value => "Reset"}
+  %input{:type => "submit", :value => "Reset"}