nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cache login form & footer

Browse source
This commit is contained in:
danielvincent 2011-01-22 13:30:31 -08:00
parent 45444316cb
commit 338e17ff87
2 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
app/views/devise/sessions/new.haml
View file

@ -20,37 +20,35 @@
});
});
.container{:style => 'text-align:center;'}
#login
= image_tag('logo_caps.png', :id => 'logo');
%br
%br
= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
%p
= f.label :username , t('username')
= f.text_field :username
%span.pod_location
="@#{AppConfig[:pod_uri].host}"
- cache(:login_form) do
.container{:style => 'text-align:center;'}
#login
= image_tag('logo_caps.png', :id => 'logo', :width => 143, :height => 21)
%br
%br
= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
%p
= f.label :username , t('username')
= f.text_field :username
%span.pod_location
="@#{AppConfig[:pod_uri].host}"
%p
= f.label :password , t('password')
= f.password_field :password
%span
- if devise_mapping.recoverable? && controller_name != 'passwords'
= link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name)
- else
\.
/%p.checkbox_select
/- if devise_mapping.rememberable?
/= f.check_box :remember_me
/= f.label :remember_me , t('.remember_me')
%p.submit
= f.submit t('.sign_in')
%span
- if !AppConfig[:registrations_closed] && devise_mapping.registerable? && controller_name != 'registrations'
= link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name)
- else
\.
%p
= f.label :password , t('password')
= f.password_field :password
%span
- if devise_mapping.recoverable? && controller_name != 'passwords'
= link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name)
- else
\.
= image_tag 'ajax-loader.gif', :id => "spinner", :class => "hidden"
%p.submit
= f.submit t('.sign_in')
%span
- if !AppConfig[:registrations_closed] && devise_mapping.registerable? && controller_name != 'registrations'
= link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name)
- else
\.
= image_tag 'ajax-loader.gif', :id => "spinner", :class => "hidden"

24
app/views/layouts/application.html.haml
View file

@ -88,17 +88,19 @@
.clearfix
/=render :partial => 'layouts/debug.haml'
%footer
.container
%ul#footer_nav
%li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
%li= link_to 'github', "https://github.com/diaspora/diaspora"
%li= link_to t('layouts.header.blog'), "http://blog.joindiaspora.com"
%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'
= image_tag 'powered_by_diaspora.png', :height => "11px", :width => "145px"
%br
= link_to t('.have_a_problem'), 'http://diaspora.shapado.com/'
- cache(:footer) do
%footer
.container
%ul#footer_nav
%li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
%li= link_to 'github', "https://github.com/diaspora/diaspora"
%li= link_to t('layouts.header.blog'), "http://blog.joindiaspora.com"
%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'
= image_tag 'powered_by_diaspora.png', :height => "11px", :width => "145px"
%br
= link_to t('.have_a_problem'), 'http://diaspora.shapado.com/'
-if !@landing_page && request.url.match(/joindiaspora.com/)
:javascript