From d2459f42c02386587616fd1fcf0b093e3b9f9afa Mon Sep 17 00:00:00 2001
From: saurabhbhatia <saurabh.a.bhatia@gmail.com>
Date: Wed, 16 Oct 2013 18:48:21 +0800
Subject: [PATCH] Added Favicon and default image for orbitbar

---
 app/views/admin/sites/preference.html.erb | 26 +++++++++++++++++++++++
 app/views/layouts/_left_menu.html.erb     |  3 +--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/sites/preference.html.erb b/app/views/admin/sites/preference.html.erb
index 6a8e879e..cad47e6c 100644
--- a/app/views/admin/sites/preference.html.erb
+++ b/app/views/admin/sites/preference.html.erb
@@ -192,6 +192,32 @@
                       
                       </div>
                     </div>
+
+                    <div class="control-group">
+                    <label class="control-label muted">Orbit Favicon</label>
+                    <div class="controls">
+                      <!-- if this page editing please add class "fileupload-edit" -->
+                      <div class="fileupload fileupload-new clearfix" data-provides="fileupload">
+                        <div class="fileupload-new thumbnail pull-left">
+                        <% if @site.favicon %>
+                         <%= image_tag( @site.favicon, :size=>"120x120") rescue ''%>
+                        <% else %>
+                       <img class="pull-left upload-picture" src="/assets/default-img.png" />
+                        <% end %>
+                        </div>
+                        <div class="fileupload-preview fileupload-exists thumbnail pull-left"></div>
+                        <span class="btn btn-file">
+                        <% if @site.favicon.file.present?%>
+                         <%= f.file_field :favicon, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>Change
+                         <%else%>
+                         <%= f.file_field :favicon, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>Select Image
+                         <%end%>
+                        </span>
+                        <a href="#" class="btn fileupload-exists" data-dismiss="fileupload">Cancel</a>
+                      
+                      </div>
+                    </div>
+
                   </div>
 
                 </div>
diff --git a/app/views/layouts/_left_menu.html.erb b/app/views/layouts/_left_menu.html.erb
index 0b3aa139..772f3389 100644
--- a/app/views/layouts/_left_menu.html.erb
+++ b/app/views/layouts/_left_menu.html.erb
@@ -28,8 +28,7 @@
   </li>
   
 </ul>
-<% @url_path = "#{request.fullpath}".scan(/admin/)%>
-<% if (@site.default_image.present? && (!@url_path.include? "admin"))%>
+<% if @site.default_image.present?%>
 <style>
   #orbit-bar .orbitlogo {
   width: 20px;