Site
/
clarion
11
0
Fork 0
Code Issues 4 Pull Requests 1 Packages Projects Releases Wiki Activity

Add titles for all the pages

This commit is contained in:
Petko Bordjukov 2014-09-01 12:57:27 +03:00
parent 817acc98de
commit 73fda59891
18 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/lectures_controller.rb
View File

@ -37,7 +37,7 @@ class LecturesController < ApplicationController
private private
def assign_lecture def assign_lecture
@lecture = Lecture.find params[:id] @lecture = current_user.lectures.find params[:id]
end end
def lecture_params def lecture_params

2
app/controllers/workshops_controller.rb
View File

@ -37,7 +37,7 @@ class WorkshopsController < ApplicationController
private private
def assign_workshop def assign_workshop
@workshop = Workshop.find params[:id] @workshop = current_user.workshops.find params[:id]
end end
def workshop_params def workshop_params

2
app/views/devise/confirmations/new.html.slim
View File

@ -1,3 +1,5 @@
- content_for(:title) { ":: #{t :resend_instructions_header}" }
h2.entry-title = t :resend_instructions_header h2.entry-title = t :resend_instructions_header
= simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| = simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|

2
app/views/devise/passwords/edit.html.slim
View File

@ -1,3 +1,5 @@
- content_for(:title) { ":: #{t :change_pass}" }
h2.entry-title = t :change_pass h2.entry-title = t :change_pass
= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|

2
app/views/devise/passwords/new.html.slim
View File

@ -1,3 +1,5 @@
- content_for(:title) { ":: #{t :lostpass}" }
h2.entry-title = t :lostpass h2.entry-title = t :lostpass
= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|

2
app/views/devise/registrations/edit.html.slim
View File

@ -1,3 +1,5 @@
- content_for(:title) { ":: #{t :edit_speaker_profile}" }
= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put, multipart: true }) do |f| = simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put, multipart: true }) do |f|
.form_inputs .form_inputs
h2.entry-title = t :speaker_profile h2.entry-title = t :speaker_profile

2
app/views/devise/registrations/new.html.slim
View File

@ -1,3 +1,5 @@
- content_for(:title) { ":: #{t :registration}" }
h2.entry-title = t :registration h2.entry-title = t :registration
= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| = simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|

2
app/views/devise/sessions/new.html.slim
View File

@ -1,3 +1,5 @@
- content_for(:title) { ":: #{t :login}" }
h2.entry-title = t :login h2.entry-title = t :login
= simple_form_for(resource, as: resource_name, url: session_path(resource_name), ) do |f| = simple_form_for(resource, as: resource_name, url: session_path(resource_name), ) do |f|

2
app/views/devise/unlocks/new.html.slim
View File

@ -1,3 +1,5 @@
- content_for(:title) { ":: #{t :resend_unlock_instructions_title}" }
h2 =t :resend_unlock_instructions_title h2 =t :resend_unlock_instructions_title
= simple_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| = simple_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f|

5
app/views/layouts/application.html.erb
View File

@ -1,7 +1,10 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>Clarion</title> <title>
<%= Conference.current.title %>
<%= yield :title if content_for? :title %>
</title>
<%= stylesheet_link_tag 'application' %> <%= stylesheet_link_tag 'application' %>
<%= stylesheet_link_tag 'http://openfest.org/wp-content/themes/thematic-openfest/style.css' %> <%= stylesheet_link_tag 'http://openfest.org/wp-content/themes/thematic-openfest/style.css' %>
<%= csrf_meta_tags %> <%= csrf_meta_tags %>

1
app/views/lectures/edit.html.slim
View File

@ -1,2 +1,3 @@
- content_for(:title) { ":: #{t :edit_talk} #{@lecture.title}" }
h1.entry-title = t :edit_talk h1.entry-title = t :edit_talk
= render 'form' = render 'form'

1
app/views/lectures/index.html.slim
View File

@ -1,3 +1,4 @@
- content_for(:title) { ":: #{t :my_talks}" }
h1.entry-title = t :my_talks h1.entry-title = t :my_talks
- unless @lectures.empty? - unless @lectures.empty?

1
app/views/lectures/new.html.slim
View File

@ -1,2 +1,3 @@
- content_for(:title) { ":: #{t :submit_talk_header}" }
h1.entry-title = t :submit_talk_header h1.entry-title = t :submit_talk_header
= render 'form' = render 'form'

5
app/views/lectures/show.html.slim
View File

@ -1,9 +1,10 @@
- content_for(:title) { ":: #{@lecture.title}" }
h2.lecture-title h2.lecture-title
=> @lecture.title => @lecture.title
span.subtitle = @lecture.subtitle span.subtitle = @lecture.subtitle
.entry-meta .entry-meta
| = t :edit_title, track: @lecture.track.name, len: @lecture.length
=t :edit_title, track: @lecture.track.name, len: @lecture.length
section.abstract section.abstract
h3 = t :abstract h3 = t :abstract

2
app/views/workshops/edit.html.slim
View File

@ -1,2 +1,4 @@
- content_for(:title) { ":: #{t :edit_workshop} #{@workshop.title}" }
h1.entry-title = t :edit_workshop h1.entry-title = t :edit_workshop
= render 'form' = render 'form'

2
app/views/workshops/index.html.slim
View File

@ -1,3 +1,5 @@
- content_for(:title) { ":: #{t :my_workshops}" }
h1.entry-title = t :my_workshops h1.entry-title = t :my_workshops
- unless @workshops.empty? - unless @workshops.empty?

2
app/views/workshops/new.html.slim
View File

@ -1,2 +1,4 @@
- content_for(:title) { ":: #{t :new_workshop_title}" }
h1.entry-title = t :new_workshop_title h1.entry-title = t :new_workshop_title
= render 'form' = render 'form'

4
app/views/workshops/show.html.slim
View File

@ -1,8 +1,10 @@
- content_for(:title) { ":: #{@workshop.title}" }
h2.workshop-title h2.workshop-title
= @workshop.title = @workshop.title
span.subtitle = @workshop.subtitle span.subtitle = @workshop.subtitle
.entry-meta .entry-meta
|
= t :edit_title, track: @workshop.track.name, len: @workshop.length = t :edit_title, track: @workshop.track.name, len: @workshop.length
section.abstract section.abstract