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

rightbar invitations ported to bootstrap

Browse source
This commit is contained in:
Pablo Cuadrado 2014-09-24 10:14:44 -03:00 committed by Steffen van Bergerem
parent b2e3866217
commit 24fdf8fb84
6 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/assets/stylesheets/invitations.scss
View file

@ -5,11 +5,19 @@
}
#invitationsModal {
#paste_link_wrapper {
font-size: 12px;
padding: 10px;
}
#paste_link { font-weight: 700; }
#invite_code { margin-top: 10px; }
#invite_code {
padding: 5px;
display: block;
height: auto;
}
#codes_left { color: $text-grey; }
.control-label { width: 120px; }
.controls { margin-left: 140px; }
.control-label { width: 200px; }
.controls { margin-left: 220px; }
#email_invitation {
padding-top: 10px;
margin-top: 20px;

2
app/controllers/invitations_controller.rb
View file

@ -14,7 +14,7 @@ class InvitationsController < ApplicationController
respond_to do |format|
format.html do
render params[:blueprint] ? 'invitations/new_blueprint' : 'invitations/new', layout: false
render 'invitations/new', layout: false
end
end
end

14
app/views/invitations/new.html.haml
View file

@ -1,11 +1,9 @@
#paste_link
= t('.paste_link')
%span#codes_left
= '(' + t('.codes_left', :count => @invite_code.count) + ')'
.form-horizontal
.control-group
.controls
= invite_link(@invite_code)
#paste_link_wrapper
#paste_link
= t('.paste_link')
%span#codes_left
= '(' + t('.codes_left', :count => @invite_code.count) + ')'
= invite_link(@invite_code)
#email_invitation
= form_tag new_user_invitation_path, :class => 'form-horizontal' do

2
app/views/shared/_invitations.haml
View file

@ -1,6 +1,6 @@
= t('.share_this')
= invite_link(current_user.invitation_code)
.btn.btn-link{ 'data-toggle' => 'modal', 'data-target' => '#invitationsModal'}
.btn-link{ 'data-toggle' => 'modal', 'data-target' => '#invitationsModal'}
= t('.by_email')
= render 'shared/modal',

3
app/views/shared/_invitations_blueprint.haml
View file

@ -1,3 +0,0 @@
= t('shared.invitations.share_this')
= invite_link(current_user.invitation_code)
= link_to t('shared.invitations.by_email'), new_user_invitation_path(blueprint: true), :title => t('shared.invitations.invite_someone'), :rel => 'facebox'

2
app/views/shared/_right_sections.html.haml
View file

@ -10,7 +10,7 @@
%h5.title-header
= t('shared.invitations.invite_your_friends')
.content
= render "shared/invitations_blueprint"
= render "shared/invitations"
.section
.title