developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Favicon display and wording

This commit is contained in:
saurabhbhatia 2013-10-22 10:33:05 +08:00
parent 11ef2a13d6
commit 0a69bbb653
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/admin/sites/preference.html.erb
View File

@ -182,7 +182,7 @@
<% if @site.default_image %> <% if @site.default_image %>
<%= image_tag( @site.default_image, :size=>"120x120") rescue ''%> <%= image_tag( @site.default_image, :size=>"120x120") rescue ''%>
<% else %> <% else %>
<img class="pull-left upload-picture" src="/assets/default-img.png" /> <%= image_tag "default-img.png", :class => "pull-left upload-picture"%>
<% end %> <% end %>
</div> </div>
<div class="fileupload-preview fileupload-exists thumbnail pull-left"></div> <div class="fileupload-preview fileupload-exists thumbnail pull-left"></div>
@ -191,7 +191,7 @@
<%= f.file_field :default_image, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>Change <%= f.file_field :default_image, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>Change
</span> </span>
<%= f.check_box :remove_default_image %> <%= f.check_box :remove_default_image %>
Remove Favicon Remove OrbitBar Logo
<%else%> <%else%>
<span class="btn btn-file"> <span class="btn btn-file">
<%= f.file_field :default_image, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>Select Image <%= f.file_field :default_image, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>Select Image
@ -211,7 +211,7 @@
<% if @site.favicon %> <% if @site.favicon %>
<%= image_tag( @site.favicon, :size=>"120x120") rescue ''%> <%= image_tag( @site.favicon, :size=>"120x120") rescue ''%>
<% else %> <% else %>
<img class="pull-left upload-picture" src="/assets/default-img.png" /> <%= image_tag "default-img.png", :class => "pull-left upload-picture"%>
<% end %> <% end %>
</div> </div>
<div class="fileupload-preview fileupload-exists thumbnail pull-left"></div> <div class="fileupload-preview fileupload-exists thumbnail pull-left"></div>

4
app/views/layouts/_meta.html.erb
View File

@ -1,4 +1,8 @@
<% if @site.favicon%>
<link rel="shortcut icon" href="<%= @site.favicon %>">
<% else %>
<link rel="shortcut icon" href="<%= asset_path 'favicon.ico' %>"> <link rel="shortcut icon" href="<%= asset_path 'favicon.ico' %>">
<% end %>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0">
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">

1
app/views/layouts/page_layout.html.erb
View File

@ -1,6 +1,7 @@
<!DOCTYPE HTML> <!DOCTYPE HTML>
<html class="<%= I18n.locale.to_s %>"> <html class="<%= I18n.locale.to_s %>">
<head> <head>
<%= render 'layouts/meta' %>
<meta charset="utf-8"> <meta charset="utf-8">
<%= page_title(@item).html_safe %> <%= page_title(@item).html_safe %>
<link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>"> <link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>">