Move out yield from container, more flexible

This commit is contained in:
Rei
2014-03-18 15:25:10 +08:00
parent 9fbd40c8c4
commit f54922c075
31 changed files with 826 additions and 798 deletions

View File

@@ -1,23 +1,24 @@
- @page_title = t '.user_s_comments', name: @user.name
.row
.col-md-9
= render 'users/profile', user: @user
#comments.panel
.panel-heading
h3.panel-title
= t '.comments'
.panel-body
.list-group.list-group-campo
- if @comments.any?
= render @comments
- else
.list-group-item.text-center.text-muted.empty-message
= t '.no_comment_yet'
- if @comments.total_pages > 1
.panel-footer.clearfix
.pull-right
= paginate @comments, theme: 'campo', params: { anchor: 'comments' }
.container
.row
.col-md-9
= render 'users/profile', user: @user
#comments.panel
.panel-heading
h3.panel-title
= t '.comments'
.panel-body
.list-group.list-group-campo
- if @comments.any?
= render @comments
- else
.list-group-item.text-center.text-muted.empty-message
= t '.no_comment_yet'
- if @comments.total_pages > 1
.panel-footer.clearfix
.pull-right
= paginate @comments, theme: 'campo', params: { anchor: 'comments' }
.col-md-3
= render 'users/sidebar', user: @user
.col-md-3
= render 'users/sidebar', user: @user

View File

@@ -1,24 +1,25 @@
- @page_title = t '.user_s_likes', name: @user.name
.row
.col-md-9
= render 'users/profile', user: @user
#likes.panel
.panel-heading
h3.panel-title
= t '.likes'
.panel-body
ul.list-group.list-group-campo data-creator-id=@user.id
- if @likes.any?
- @likes.each do |like|
= render "users/likes/like/#{like.likeable_type.downcase}", like: like
- else
li.list-group-item.text-center.text-muted.empty-message
= t '.no_like_yet'
- if @likes.total_pages > 1
.panel-footer.clearfix
.pull-right
= paginate @likes, theme: 'campo', params: { anchor: 'likes' }
.container
.row
.col-md-9
= render 'users/profile', user: @user
#likes.panel
.panel-heading
h3.panel-title
= t '.likes'
.panel-body
ul.list-group.list-group-campo data-creator-id=@user.id
- if @likes.any?
- @likes.each do |like|
= render "users/likes/like/#{like.likeable_type.downcase}", like: like
- else
li.list-group-item.text-center.text-muted.empty-message
= t '.no_like_yet'
- if @likes.total_pages > 1
.panel-footer.clearfix
.pull-right
= paginate @likes, theme: 'campo', params: { anchor: 'likes' }
.col-md-3
= render 'users/sidebar', user: @user
.col-md-3
= render 'users/sidebar', user: @user

View File

@@ -1,62 +1,63 @@
.row
.col-md-6.col-md-offset-3
.panel
.panel-heading
h3.panel-title
= t '.sign_up'
.panel-body
= form_for @user, html: { id: 'new-user-form' } do |f|
= render 'share/form_error_messages', form: f
.form-group
= f.label :name, class: 'control-label'
= f.text_field :name, placeholder: t('.your_full_name'), tabindex: 1, class: 'form-control'
.form-group
= f.label :email, class: 'control-label'
= f.text_field :email, placeholder: t('.your_email'), tabindex: 2, class: 'form-control'
.form-group
= f.label :username, class: 'control-label'
= f.text_field :username, placeholder: t('.pick_a_username'), tabindex: 3, class: 'form-control'
.form-group
= f.label :password, class: 'control-label'
= f.password_field :password, placeholder: t('.choose_a_password'), tabindex: 4, class: 'form-control'
= f.submit t('.create_account'), class: 'btn btn-success', tabindex: 5
.container
.row
.col-md-6.col-md-offset-3
.panel
.panel-heading
h3.panel-title
= t '.sign_up'
.panel-body
= form_for @user, html: { id: 'new-user-form' } do |f|
= render 'share/form_error_messages', form: f
.form-group
= f.label :name, class: 'control-label'
= f.text_field :name, placeholder: t('.your_full_name'), tabindex: 1, class: 'form-control'
.form-group
= f.label :email, class: 'control-label'
= f.text_field :email, placeholder: t('.your_email'), tabindex: 2, class: 'form-control'
.form-group
= f.label :username, class: 'control-label'
= f.text_field :username, placeholder: t('.pick_a_username'), tabindex: 3, class: 'form-control'
.form-group
= f.label :password, class: 'control-label'
= f.password_field :password, placeholder: t('.choose_a_password'), tabindex: 4, class: 'form-control'
= f.submit t('.create_account'), class: 'btn btn-success', tabindex: 5
javascript:
$('#new-user-form').validate({
rules: {
'user[name]': {
required: true,
},
'user[email]': {
required: true,
format: /^([^@\s]+)@((?:[a-z0-9-]+\.)+[a-z]{2,})$/i,
remote: '/users/check_email'
},
'user[username]': {
required: true,
remote: '/users/check_username',
format: /^[a-z0-9-]+$/i
},
'user[password]': {
required: true
}
},
messages: {
'user[name]': {
required: '#{@user.errors.generate_message :name, :blank}'
},
'user[email]': {
required: '#{@user.errors.generate_message :email, :blank}',
remote: '#{@user.errors.generate_message :email, :taken}',
format: '#{@user.errors.generate_message :email, :format}'
},
'user[username]': {
required: '#{@user.errors.generate_message :username, :blank}',
remote: '#{@user.errors.generate_message :username, :taken}',
format: '#{@user.errors.generate_message :username, :format}'
},
'user[password]': {
required: '#{@user.errors.generate_message :password, :blank}'
}
}
});
javascript:
$('#new-user-form').validate({
rules: {
'user[name]': {
required: true,
},
'user[email]': {
required: true,
format: /^([^@\s]+)@((?:[a-z0-9-]+\.)+[a-z]{2,})$/i,
remote: '/users/check_email'
},
'user[username]': {
required: true,
remote: '/users/check_username',
format: /^[a-z0-9-]+$/i
},
'user[password]': {
required: true
}
},
messages: {
'user[name]': {
required: '#{@user.errors.generate_message :name, :blank}'
},
'user[email]': {
required: '#{@user.errors.generate_message :email, :blank}',
remote: '#{@user.errors.generate_message :email, :taken}',
format: '#{@user.errors.generate_message :email, :format}'
},
'user[username]': {
required: '#{@user.errors.generate_message :username, :blank}',
remote: '#{@user.errors.generate_message :username, :taken}',
format: '#{@user.errors.generate_message :username, :format}'
},
'user[password]': {
required: '#{@user.errors.generate_message :password, :blank}'
}
}
});

View File

@@ -1,22 +1,24 @@
- @page_title = t '.user_s_topics', name: @user.name
.row
.col-md-9
= render 'users/profile', user: @user
#topics.panel
.panel-heading
h3.panel-title
= t '.topics'
.panel-body
.list-group.list-group-campo
- if @topics.any?
= render partial: 'topics/topic', collection: @topics
- else
.list-group-item.text-center.text-muted.empty-message
= t '.no_topic_yet'
- if @topics.total_pages > 1
.panel-footer.clearfix
.pull-right
= paginate @topics, theme: 'campo', params: { anchor: 'topics' }
.col-md-3
= render 'users/sidebar', user: @user
.container
.row
.col-md-9
= render 'users/profile', user: @user
#topics.panel
.panel-heading
h3.panel-title
= t '.topics'
.panel-body
.list-group.list-group-campo
- if @topics.any?
= render partial: 'topics/topic', collection: @topics
- else
.list-group-item.text-center.text-muted.empty-message
= t '.no_topic_yet'
- if @topics.total_pages > 1
.panel-footer.clearfix
.pull-right
= paginate @topics, theme: 'campo', params: { anchor: 'topics' }
.col-md-3
= render 'users/sidebar', user: @user