Skip to content
Extraits de code Groupes Projets
Valider 24fdf8fb rédigé par Pablo Cuadrado's avatar Pablo Cuadrado Validation de Steffen van Bergerem
Parcourir les fichiers

rightbar invitations ported to bootstrap

parent b2e38662
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -5,11 +5,19 @@ ...@@ -5,11 +5,19 @@
} }
#invitationsModal { #invitationsModal {
#paste_link_wrapper {
font-size: 12px;
padding: 10px;
}
#paste_link { font-weight: 700; } #paste_link { font-weight: 700; }
#invite_code { margin-top: 10px; } #invite_code {
padding: 5px;
display: block;
height: auto;
}
#codes_left { color: $text-grey; } #codes_left { color: $text-grey; }
.control-label { width: 120px; } .control-label { width: 200px; }
.controls { margin-left: 140px; } .controls { margin-left: 220px; }
#email_invitation { #email_invitation {
padding-top: 10px; padding-top: 10px;
margin-top: 20px; margin-top: 20px;
......
...@@ -14,7 +14,7 @@ class InvitationsController < ApplicationController ...@@ -14,7 +14,7 @@ class InvitationsController < ApplicationController
respond_to do |format| respond_to do |format|
format.html do format.html do
render params[:blueprint] ? 'invitations/new_blueprint' : 'invitations/new', layout: false render 'invitations/new', layout: false
end end
end end
end end
......
#paste_link #paste_link_wrapper
= t('.paste_link') #paste_link
%span#codes_left = t('.paste_link')
= '(' + t('.codes_left', :count => @invite_code.count) + ')' %span#codes_left
.form-horizontal = '(' + t('.codes_left', :count => @invite_code.count) + ')'
.control-group = invite_link(@invite_code)
.controls
= invite_link(@invite_code)
#email_invitation #email_invitation
= form_tag new_user_invitation_path, :class => 'form-horizontal' do = form_tag new_user_invitation_path, :class => 'form-horizontal' do
......
= t('.share_this') = t('.share_this')
= invite_link(current_user.invitation_code) = 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') = t('.by_email')
= render 'shared/modal', = render 'shared/modal',
......
= 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'
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
%h5.title-header %h5.title-header
= t('shared.invitations.invite_your_friends') = t('shared.invitations.invite_your_friends')
.content .content
= render "shared/invitations_blueprint" = render "shared/invitations"
.section .section
.title .title
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter