Fix sessions layout meta tags. Refs #2162

This commit is contained in:
Pavel Chipiga 2011-11-10 01:50:42 +02:00
parent 85025bcdca
commit c5fdfcd39d
9 changed files with 11 additions and 7 deletions

View File

@ -18,6 +18,7 @@ gem "yui-compressor", "0.9.5" # Higher versions depends on Platform gem which co
gem 'ancestry', '~> 1.2.4' gem 'ancestry', '~> 1.2.4'
gem 'paperclip', "~> 2.3" gem 'paperclip', "~> 2.3"
gem "will_paginate", "~> 3.0.2" gem "will_paginate", "~> 3.0.2"
gem 'meta-tags', '~> 1.2.4', :require => 'meta_tags'
gem "russian" gem "russian"
gem "grit" gem "grit"

View File

@ -122,6 +122,8 @@ GEM
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
meta-tags (1.2.4)
actionpack
mime-types (1.17.2) mime-types (1.17.2)
multi_json (1.0.3) multi_json (1.0.3)
multi_xml (0.4.1) multi_xml (0.4.1)
@ -284,6 +286,7 @@ DEPENDENCIES
hirb hirb
hpricot hpricot
jammit jammit
meta-tags (~> 1.2.4)
mysql2 (<= 0.2.9) mysql2 (<= 0.2.9)
oa-openid (~> 0.3.2) oa-openid (~> 0.3.2)
omniauth (~> 0.3.2) omniauth (~> 0.3.2)

View File

@ -1,5 +1,5 @@
.block .block
%h2= t("devise.confirmations.resend_header") %h2= title t("devise.confirmations.resend_header")
.content .content
- if resource.errors.present? - if resource.errors.present?
.flash .flash

View File

@ -1,5 +1,5 @@
.block .block
%h2= t('devise.passwords.edit') %h2= title t('devise.passwords.edit')
.content .content
- if resource.errors.present? - if resource.errors.present?
.flash .flash

View File

@ -1,5 +1,5 @@
.block .block
%h2= t('devise.passwords.link') %h2= title t('devise.passwords.link')
.content .content
- if resource.errors.present? - if resource.errors.present?
.flash .flash

View File

@ -1,5 +1,5 @@
#block-signup.block #block-signup.block
%h2 #{t("devise.registrations.edit")} #{resource_name.to_s.humanize} %h2= title (t("devise.registrations.edit") + ' ' + resource_name.to_s.humanize)
.content .content
= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put, :class => "form" }) do |f| = form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put, :class => "form" }) do |f|
- if resource.errors.present? - if resource.errors.present?

View File

@ -1,5 +1,5 @@
#block-signup.block #block-signup.block
%h2= t("devise.registrations.sign_up_header") %h2= title t("devise.registrations.sign_up_header")
.content .content
= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :class => "form" }) do |f| = form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :class => "form" }) do |f|
- if resource.errors.present? - if resource.errors.present?

View File

@ -1,5 +1,5 @@
#block-login.block #block-login.block
%h2= t("layout.sessions.sign_in_header") %h2= title t("layout.sessions.sign_in_header")
.content.login .content.login
- if flash.present? - if flash.present?
.flash .flash

View File

@ -1,7 +1,7 @@
!!! !!!
%html %html
%head %head
%title= t("layout.global_header") = display_meta_tags :site => APP_CONFIG['project_name']
= render :partial => "layouts/javascripts" = render :partial => "layouts/javascripts"
-#= include_stylesheets :sessions -#= include_stylesheets :sessions
= stylesheet_link_tag "web-app-theme/base.css", "web-app-theme/themes/default/style.css", "web-app-theme/override.css" = stylesheet_link_tag "web-app-theme/base.css", "web-app-theme/themes/default/style.css", "web-app-theme/override.css"