cleaned up meta and link tags in layout, added retina iOS icon, fixed error caused in stream_element when socketing
This commit is contained in:
danielvincent
parent
ea25b28c5c
commit
9041a81fea
5 changed files with 65 additions and 46 deletions
31
app/views/layouts/_header.html.haml
Normal file
31
app/views/layouts/_header.html.haml
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
-# Copyright (c) 2010, Diaspora Inc. This file is
|
||||
-# licensed under the Affero General Public License version 3 or later. See
|
||||
-# the COPYRIGHT file.
|
||||
|
||||
.container{:style => "position:relative;"}
|
||||
#diaspora_text
|
||||
= link_to "DIASPORA*", (current_user ? root_path : new_user_session_path)
|
||||
%span.sub_text
|
||||
ALPHA
|
||||
|
||||
- unless current_user
|
||||
.right
|
||||
%ul#landing_nav
|
||||
%li= link_to "blog", "http://blog.joindiaspora.com"
|
||||
%li= link_to "developers", "https://github.com/diaspora/diaspora"
|
||||
%li= link_to "login", new_user_session_path
|
||||
- else
|
||||
#global_search
|
||||
= form_tag(people_path, :method => 'get') do
|
||||
= text_field_tag 'q', nil, :placeholder => t('search'), :type => 'search', :results => 5
|
||||
|
||||
%ul#user_menu
|
||||
.avatar
|
||||
= owner_image_tag
|
||||
= link_to current_user.real_name, '#'
|
||||
%li= link_to t('.view_profile'), current_user.person
|
||||
%li= link_to t('.edit_profile'), edit_person_path(current_user.person)
|
||||
%li= link_to t('.account_settings'), edit_user_path(current_user)
|
||||
%li= link_to t('.logout'), destroy_user_session_path
|
||||
|
||||
= render "shared/aspect_nav"
|
||||
|
|
@ -5,37 +5,41 @@
|
|||
!!!
|
||||
%html{:lang => I18n.locale.to_s}
|
||||
%head
|
||||
%title
|
||||
= "#{current_user.real_name} | diaspora" if current_user
|
||||
%meta{:charset => 'utf-8'}
|
||||
|
||||
%meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
|
||||
%title
|
||||
- if current_user
|
||||
= "#{current_user.real_name} | DIASPORA"
|
||||
- else
|
||||
DIASPORA
|
||||
|
||||
%meta{'http-equiv' => 'X-UA-Compatible', :content => 'IE=edge,chrome=1'}
|
||||
|
||||
%link{:rel => 'shortcut icon', :href => '/favicon.ico'}
|
||||
%link{:rel => 'apple-touch-icon', :href => '/apple-touch-icon.png'}
|
||||
|
||||
= stylesheet_link_tag "blueprint/screen", :media => 'screen'
|
||||
= stylesheet_link_tag "blueprint/print", :media => 'print'
|
||||
|
||||
= stylesheet_link_tag "application", "ui"
|
||||
= stylesheet_link_tag "vendor/jquery.fancybox-1.3.1"
|
||||
= stylesheet_link_tag "vendor/fileuploader"
|
||||
= stylesheet_link_tag "vendor/tipsy"
|
||||
|
||||
- if current_user
|
||||
%link{:rel => "alternate", :href => "#{current_user.public_url}", :type => "application/atom+xml", :title => "Public Diaspora Feed for #{current_user.real_name}"}
|
||||
|
||||
/= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
|
||||
= javascript_include_tag 'vendor/jquery144.min', 'rails'
|
||||
= javascript_include_tag '//ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js'
|
||||
:javascript
|
||||
!window.jQuery && document.write(unescape('%3Cscript src="js/libs/jquery-1.4.4.js"%3E%3C/script%3E'))
|
||||
|
||||
= javascript_include_tag 'rails'
|
||||
= javascript_include_tag 'vendor/jquery.infieldlabel'
|
||||
= javascript_include_tag 'vendor/jquery.tipsy'
|
||||
|
||||
= javascript_include_tag 'vendor/fancybox/jquery.fancybox-1.3.1.pack'
|
||||
= javascript_include_tag 'vendor/fileuploader'
|
||||
|
||||
= javascript_include_tag 'view', 'image-picker', 'stream'
|
||||
= render 'js/websocket_js' if current_user
|
||||
|
||||
- if current_user
|
||||
= render 'js/websocket_js'
|
||||
|
||||
= csrf_meta_tag
|
||||
= yield(:head)
|
||||
= csrf_meta_tag
|
||||
|
||||
-if APP_CONFIG[:google_a_site]
|
||||
:javascript
|
||||
|
|
@ -49,41 +53,17 @@
|
|||
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
|
||||
- if current_user
|
||||
%link{:rel => "alternate", :href => "#{current_user.public_url}", :type => "application/atom+xml", :title => "Public Diaspora Feed for #{current_user.real_name}"}
|
||||
|
||||
%body
|
||||
#notification
|
||||
|
||||
- flash.each do |name, msg|
|
||||
= content_tag :div, msg, :id => "flash_#{name}"
|
||||
|
||||
%header
|
||||
.container{:style => "position:relative;"}
|
||||
|
||||
#notification
|
||||
|
||||
#diaspora_text
|
||||
= link_to "DIASPORA*", (current_user ? root_path : new_user_session_path)
|
||||
%span.sub_text
|
||||
ALPHA
|
||||
|
||||
- unless current_user
|
||||
.right
|
||||
%ul#landing_nav
|
||||
%li= link_to "blog", "http://blog.joindiaspora.com"
|
||||
%li= link_to "developers", "https://github.com/diaspora/diaspora"
|
||||
%li= link_to "login", new_user_session_path
|
||||
- else
|
||||
#global_search
|
||||
= form_tag(people_path, :method => 'get') do
|
||||
= text_field_tag 'q', nil, :placeholder => t('search'), :type => 'search', :results => 5
|
||||
|
||||
%ul#user_menu
|
||||
.avatar
|
||||
= owner_image_tag
|
||||
= link_to current_user.real_name, '#'
|
||||
%li= link_to t('.view_profile'), current_user.person
|
||||
%li= link_to t('.edit_profile'), edit_person_path(current_user.person)
|
||||
%li= link_to t('.account_settings'), edit_user_path(current_user)
|
||||
%li= link_to t('.logout'), destroy_user_session_path
|
||||
|
||||
= render "shared/aspect_nav"
|
||||
= render 'layouts/header'
|
||||
|
||||
.container
|
||||
.span-24.last
|
||||
|
|
@ -104,12 +84,13 @@
|
|||
var is_ssl = ("https:" == document.location.protocol);
|
||||
var asset_host = is_ssl ? "https://s3.amazonaws.com/getsatisfaction.com/" : "http://s3.amazonaws.com/getsatisfaction.com/";
|
||||
document.write(unescape("%3Cscript src='" + asset_host + "javascripts/feedback-v2.js' type='text/javascript'%3E%3C/script%3E"));
|
||||
|
||||
:javascript
|
||||
var feedback_widget_options = {};
|
||||
|
||||
feedback_widget_options.display = "overlay";
|
||||
feedback_widget_options.company = "diaspora";
|
||||
feedback_widget_options.placement = "left";
|
||||
feedback_widget_options.placement = "right";
|
||||
feedback_widget_options.color = "#222";
|
||||
feedback_widget_options.style = "idea";
|
||||
var feedback_widget = new GSFN.feedback_widget(feedback_widget_options);
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
- if current_user.owns?(post)
|
||||
.right
|
||||
= render 'shared/reshare', :post => post if post.is_a? StatusMessage
|
||||
= render 'shared/reshare', :current_user => current_user, :post => post if post.is_a? StatusMessage
|
||||
= link_to t('delete'), object_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete"
|
||||
|
||||
= render type_partial(post), :post => post
|
||||
|
|
|
|||
BIN
public/apple-touch-icon.png
Normal file
BIN
public/apple-touch-icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
|
|
@ -220,6 +220,11 @@ header
|
|||
:-moz-border-radius 5px
|
||||
:border-radius 5px
|
||||
|
||||
.stream_photo
|
||||
img
|
||||
:height 200px
|
||||
:width 200px
|
||||
|
||||
|
||||
.from
|
||||
:font
|
||||
|
|
@ -885,6 +890,8 @@ h1.big_text
|
|||
|
||||
img
|
||||
:display none
|
||||
:height 100px
|
||||
:width 100px
|
||||
|
||||
|
||||
.image_cycle
|
||||
|
|
|
|||
Loading…
Reference in a new issue