From 7a0961e527dc3105de3155bd0b5e9654bdcf5777 Mon Sep 17 00:00:00 2001
From: saurabhbhatia <saurabh.a.bhatia@gmail.com>
Date: Tue, 26 Nov 2013 09:58:40 +0800
Subject: [PATCH] Updated Preference and Default Image

---
 app/assets/images/default-img.png         | Bin 0 -> 778 bytes
 app/views/admin/sites/preference.html.erb |  13 ++++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 app/assets/images/default-img.png

diff --git a/app/assets/images/default-img.png b/app/assets/images/default-img.png
new file mode 100644
index 0000000000000000000000000000000000000000..01487586423a970772b98b7d5775d11d0bbb6ddc
GIT binary patch
literal 778
zcmV+l1NHogP)<h;3K|Lk000e1NJLTq002Ay002A)0ssI2wVqBT0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!tVu*cRCwC#*?()=Kp4PrHHT|7+S#rv
zD@din)_?X6d||%N!6++&AUJGY-84>()$Q9JNYTyY9)INAa){iIocZMOlDpG%y<Sfp
zTFRsjFeT^&ZGbM9E2Yw@Jw7myLeRcHu*a>%ke2GzQn}arrsKWH$185NnyU=8dbADh
zHR3;`V|T9?{}mmhJ5;<59g91PI0U_CcSLbGdT;LN;z;N{xQ)b7(K~gUiVe^^atp*}
z=&ieDVq^3c-D0r>y|7+fl>7bfv)N4W36A5?T_zTywOcGE(edWyleoKl6Cgh2=G~L+
zR)YTT(bekvLydGco8?*Sc?IV=ky$j6cir5}A_pvLDAITFA-Z)>&*@U>jpup3@1LK)
z3xa^>SF!lI(`i>KRVvX?({8u;T1KN0$IzwG_(CfO)B5o6G^d=Loa$C)8S3{jrtk0X
zP?7=1%XMAyoPIbQu<3W7QVtVM&1QopiUgI5q4MnPtq$;L^pjR2u{_eG`FyrIO<Z19
z`~4q5Fwt|hZqn}*!Es6CnN8tNr$IhnAkv-AS8C#UdStV&aKO?-oOl<D#|#_2x}pd%
zlW~rYTq=37X5!%C&^H~{POVlm#f`_KbUH;ibqFcy`oW+-pa06`Ji<m$xd56dK6CSW
zxl$+`KR!;o-Mh(T%y-3QkTG30rFZwEIyc<a)dxU~Ztgsz0kEqv9hwOC?d@mozh19v
zdaK2T*0<p5&xgr0o}ev73)T$V>MlexFI-=L6rY%mbQk~MkdcX*<XBW}vazMR_<s^5
z6N`8MTlxJ&#UkF&t>O}I;#M(=#cma^Smsu-iv@0FgV@xqED;;Il|AC<Ze^7?qFdP}
zj^b7pibLJYXm<ZLh+n!Pg`g2zwcdxj8o^|{m7xDM^lt$M00Sgc1OfDkZvX%Q07*qo
IM6N<$f~e$z*Z=?k

literal 0
HcmV?d00001

diff --git a/app/views/admin/sites/preference.html.erb b/app/views/admin/sites/preference.html.erb
index ff4f802e..8a7e2e69 100644
--- a/app/views/admin/sites/preference.html.erb
+++ b/app/views/admin/sites/preference.html.erb
@@ -162,10 +162,9 @@
                   <div class="control-group">
                     <label class="control-label muted">Default Language</label>
                     <div class="controls">
-                    <% @site_in_use_locales.each do |locale| %>
+                     <% @site_in_use_locales.each do |locale| %>
                       <%= radio_button_tag "site[default_locale]", locale, @locale == locale ,:class=>"toggle-check in_use_locales", :data => { :title => "#{I18nVariable.from_locale(locale)}" } %>
                      <% end %>
-                   
                     </div>
                   </div>
 
@@ -179,10 +178,10 @@
                       <!-- 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.default_image %>
+                        <% if @site.default_image.file.present? %>
                    		   <%= image_tag( @site.default_image, :size=>"120x120") rescue ''%>
                 	      <% else %>
-                         <%= image_tag "default-img.png", :class => "pull-left upload-picture"%>
+                         <%= image_tag "http://www.placehold.it/50x50/EFEFEF/AAAAAA",:size=>"120x120",:class => "pull-left upload-picture"%>
                  	      <% end %>
                         </div>
                         <div class="fileupload-preview fileupload-exists thumbnail pull-left"></div>
@@ -208,10 +207,10 @@
                       <!-- 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 ''%>
+                        <% if @site.favicon.file.present? %>
+                          <%= image_tag( @site.favicon, :size=>"120x120") rescue ''%>
                         <% else %>
-                        <%= image_tag "default-img.png", :class => "pull-left upload-picture"%>
+                          <%= image_tag "http://www.placehold.it/50x50/EFEFEF/AAAAAA",:size=>"120x120", :class => "pull-left upload-picture"%>
                         <% end %>
                         </div>
                         <div class="fileupload-preview fileupload-exists thumbnail pull-left"></div>