Updates from the past fortnight

This commit is contained in:
Godwin
2015-04-14 19:41:46 -07:00
parent 37ee6cfee7
commit 14205f4586
28 changed files with 597 additions and 154 deletions
@@ -0,0 +1,21 @@
= row do
- if current_user
= columns(medium: 12) do
%h2=_'articles.permission_denied.headings.not_a_translator','Sorry you must be a translator to view this page'
= columns(medium: 6) do
%p=_'articles.permission_denied.paragraphs.translator_request', :p
= columns(medium: 6) do
= form_tag :translator_request do
=text_area_tag :comment, nil, placeholder: true
=button_tag :translator_request
- else
= columns(medium: 12) do
%h2=_'articles.permission_denied.headings.login_required','Sorry you must be logged in to view this page'
= columns(medium: 6) do
%p=_'articles.permission_denied.paragraphs.translator_not_logged_in', :p
= columns(medium: 6) do
= form_tag :do_confirm do
.email-field
=email_field_tag :email, nil, required: true
=label_tag :email
=button_tag :login
+4 -4
View File
@@ -6,9 +6,9 @@
%h1=_'page_titles.About_BikeBike'
%article
%h2=_'page_titles.About_BikeBike', :t
%p=_'static_text.about.paragraph_1', :p
%h2=_'articles.about_bikebike.headings.About_BikeBike', :t
%p=_'articles.about_bikebike.paragraphs.paragraph_1', :p
%h2=_'page_titles.About_BikeBike_2', :t
%h2=_'articles.about_bikebike.headings.About_BikeBike_2', :t
%figure{style: "background-image: url(#{image_url('columbus_people.jpg')})"}
%p=_'static_text.about.paragraph_2', :p
%p=_'articles.about_bikebike.paragraphs.paragraph_2', :p
+2
View File
@@ -1,3 +1,5 @@
-# EmailConfirmation.create(user: User.find_by_email('goodgodwin@hotmail.com'), url: '/')
- this_is_the_front_page
- if @conference
= render 'conferences/header'
@@ -1,9 +1,15 @@
- page_title = _'error.403.page_title.Permission_Denied'
- title page_title
- banner_title page_title
- content_for :banner do
- image = image_url('403.jpg')
#header-title.short{style: capable_of(:svg) ? nil : "background-image: url(#{image})"}
- if capable_of(:svg)
= render 'application/banner_image.svg', {:image => image}
%h1=_'page_titles.Permission_Denied'
.row
%h1
=_'error.403.title','This page is inaccessible to you'
%p
=_'error.403.description', :p
%article
- if @template
=render @template
- else
%h2
=_'articles.permission_denied.headings.main','Sorry, you currently don\'t have access to this page'
%p
=_'articles.permission_denied.paragraphs.main', :p