Move branding assets to /images/branding for asset pipeline, update template files to point to new branding directory

app/assets/stylesheets/application.css.sass

@@ -165,7 +165,7 @@ header
 
   :background
     :color rgb(40,35,35)
-    :image image-url('header-bg.png')
+    :image image-url('branding/header-bg.png')
 
   :z-index 1001
   :padding 6px 0
@@ -1513,7 +1513,7 @@ ul#landing_nav
 
 #diaspora_description
   :background
-    :image image-url('ball.png')
+    :image image-url('branding/ball.png')
     :repeat no-repeat
     :position top center
 

app/assets/templates/header.jst.hbs

@@ -1,7 +1,7 @@
 <div class="container" style="position:relative;">
 
   <a href="/stream">
-    <img alt="Logo_small" class="diaspora_header_logo" height="38px" width="65px" src="{{imageUrl "header-logo.png"}}" />
+    <img alt="Logo_small" class="diaspora_header_logo" height="38px" width="65px" src="{{imageUrl "branding/header-logo.png"}}" />
   </a>
 
   <span class="header-nav">

app/views/layouts/application.html.haml

@@ -70,4 +70,4 @@
           %li= link_to t('layouts.header.code'), "#{root_url.chomp('/')}/source.tar.gz" unless request.url.match(/joindiaspora.com/)
           %li= link_to t('.whats_new'), 'https://github.com/diaspora/diaspora/wiki/Changelog'
           %li= link_to(t('layouts.application.toggle'), toggle_mobile_path)  if is_mobile_device?
-        = image_tag 'powered_by_diaspora.png', :height => "11px", :width => "145px"
+        = image_tag 'branding/powered_by_diaspora.png', :height => "11px", :width => "145px"

app/views/layouts/application.mobile.haml

@@ -49,7 +49,7 @@
     .navbar.navbar-fixed-top
       .navbar-inner
         .container{:style => "position: relative;"}
-          = link_to(image_tag('header-logo2x.png', :height => 40, :width => 40, :id => 'header_title'), stream_path)
+          = link_to(image_tag('branding/header-logo2x.png', :height => 40, :width => 40, :id => 'header_title'), stream_path)
           - if user_signed_in?
             #header-nav
               .activity-nav

app/views/layouts/notifier.html.erb

@@ -28,7 +28,7 @@
   <table cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:14px;color:#333;">
     <tr>
       <td style="text-align:center;padding:30px;">
-        <img src="<%=AppConfig[:pod_url]%>images/logo_caps.png" alt="DIASPORA*" width="95px" height="14px"/>
+        <img src="<%=AppConfig[:pod_url]%>images/branding/logo_caps.png" alt="DIASPORA*" width="95px" height="14px"/>
       </td>
     </tr>
   </table>

app/views/sessions/new.haml

@@ -16,9 +16,9 @@
 .container{:style => 'text-align:center;'}
   #login
     %p
-      = image_tag('asterisk.png', :id => 'asterisk', :class => 'logo', :height => 154, :width => 154)
+      = image_tag('branding/asterisk.png', :id => 'asterisk', :class => 'logo', :height => 154, :width => 154)
     %p
-      = image_tag('logo_caps.png', :id => 'logo', :width => 98, :height => 14)
+      = image_tag('branding/logo_caps.png', :id => 'logo', :width => 98, :height => 14)
 
     - flash.each do |name, msg|
       %p{:class => "login_#{name}"}= msg