Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Commit

Permalink
Changes to leave & add participant dialogs
Browse files Browse the repository at this point in the history
  • Loading branch information
@justinsoltesz
justinsoltesz committed Aug 3, 2015
1 parent c0e3216 commit a8e7a0f
Show file tree
Hide file tree
Showing 13 changed files with 72 additions and 26 deletions.
11 changes: 9 additions & 2 deletions public/assets/css/admin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3002,11 +3002,19 @@ section.form {
display: inline-block; }
section.form p.form__checkbox:last-child {
margin-bottom: 0; }
section.form p.form__description {
section.form p.form__description, section.form .form__radio p.form__radio__description {
font-size: 0.8em;
line-height: 1.4;
color: #666;
margin: -4px 0 4px 0; }
section.form .form__radio {
padding: 0 0 0 30px;
margin-bottom: 20px; }
section.form .form__radio input[type="radio"] {
float: left;
margin: 6px 0 0 -26px; }
section.form .form__radio:last-child {
margin-bottom: 0; }
section.form p.form__data {
margin: 0;
font-size: 0.9em; }
Expand Down Expand Up @@ -3140,7 +3148,6 @@ section.form {
margin: 0; }
.modal section.form {
border: none;
padding-bottom: 15px;
margin: 0;
overflow: auto; }
.modal section.form h2 {
Expand Down
2 changes: 1 addition & 1 deletion public/assets/css/admin.min.css
View file

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions public/assets/css/admin.rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2505,11 +2505,19 @@ section.form {
display: inline-block; }
section.form p.form__checkbox:last-child {
margin-bottom: 0; }
section.form p.form__description {
section.form p.form__description, section.form .form__radio p.form__radio__description {
font-size: 0.8em;
line-height: 1.4;
color: #666;
margin: -4px 0 4px 0; }
section.form .form__radio {
padding: 0 30px 0 0;
margin-bottom: 20px; }
section.form .form__radio input[type="radio"] {
float: right;
margin: 6px -26px 0 0; }
section.form .form__radio:last-child {
margin-bottom: 0; }
section.form p.form__data {
margin: 0;
font-size: 0.9em; }
Expand Down Expand Up @@ -2643,7 +2651,6 @@ section.form {
margin: 0; }
.modal section.form {
border: none;
padding-bottom: 15px;
margin: 0;
overflow: auto; }
.modal section.form h2 {
Expand Down
2 changes: 1 addition & 1 deletion public/assets/css/admin.rtl.min.css
View file

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions public/assets/css/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3417,11 +3417,19 @@ section.form {
display: inline-block; }
section.form p.form__checkbox:last-child {
margin-bottom: 0; }
section.form p.form__description {
section.form p.form__description, section.form .form__radio p.form__radio__description {
font-size: 0.8em;
line-height: 1.4;
color: #666;
margin: -4px 0 4px 0; }
section.form .form__radio {
padding: 0 0 0 30px;
margin-bottom: 20px; }
section.form .form__radio input[type="radio"] {
float: left;
margin: 6px 0 0 -26px; }
section.form .form__radio:last-child {
margin-bottom: 0; }
section.form p.form__data {
margin: 0;
font-size: 0.9em; }
Expand Down Expand Up @@ -4457,7 +4465,6 @@ html.js .inline-moderation.floating i {
margin: 0; }
.modal section.form {
border: none;
padding-bottom: 15px;
margin: 0;
overflow: auto; }
.modal section.form h2 {
Expand Down
2 changes: 1 addition & 1 deletion public/assets/css/main.min.css
View file

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions public/assets/css/rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2920,11 +2920,19 @@ section.form {
display: inline-block; }
section.form p.form__checkbox:last-child {
margin-bottom: 0; }
section.form p.form__description {
section.form p.form__description, section.form .form__radio p.form__radio__description {
font-size: 0.8em;
line-height: 1.4;
color: #666;
margin: -4px 0 4px 0; }
section.form .form__radio {
padding: 0 30px 0 0;
margin-bottom: 20px; }
section.form .form__radio input[type="radio"] {
float: right;
margin: 6px -26px 0 0; }
section.form .form__radio:last-child {
margin-bottom: 0; }
section.form p.form__data {
margin: 0;
font-size: 0.9em; }
Expand Down Expand Up @@ -3960,7 +3968,6 @@ html.js .inline-moderation.floating i {
margin: 0; }
.modal section.form {
border: none;
padding-bottom: 15px;
margin: 0;
overflow: auto; }
.modal section.form h2 {
Expand Down
2 changes: 1 addition & 1 deletion public/assets/css/rtl.min.css
View file

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions public/css/_forms.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,24 @@ section.form {
margin: side-values(-4px 0 4px 0);
}

.form__radio {
padding: side-values(0 0 0 30px);
margin-bottom: 20px;

input[type="radio"] {
float: $left;
margin: side-values(6px 0 0 -26px);
}

p.form__radio__description {
@extend .form__description;
}

&:last-child {
margin-bottom: 0;
}
}

p.form__data {
margin: 0;
font-size: 0.9em;
Expand Down
1 change: 0 additions & 1 deletion public/css/_modals.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@

section.form {
border: none;
padding-bottom: 15px;
margin: 0;
overflow: auto;

Expand Down
5 changes: 3 additions & 2 deletions resources/lang/en/conversations.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
'view_all' => 'View All Conversations',
'participants' => 'Participants',
'participants_list' => 'Enter list of usernames seprated by commas...',
'participants_desc' => 'Enter usernames seprated by commas',
'title' => 'Title',
'message' => 'Message',
'create' => 'Start Conversation',
Expand All @@ -23,9 +24,9 @@
'no_messages' => 'You don\'t have any active conversations',
'leave' => 'Leave',
'leave_conversation' => 'Leave Conversation',
'leave_conversation_desc' => 'This will hide the conversation but you will still get notifications if new messages are sent to this conversation',
'leave_conversation_desc' => 'The conversation will be hidden but you will continue to receive notifications if new messages are sent to this conversation',
'ignore_conversation' => 'Ignore Conversation',
'ignore_conversation_desc' => 'This will ignore the conversation and you won\'t get notifications if new messages are sent to this conversation',
'ignore_conversation_desc' => 'The conversation will be ignored and you will no longer receive notifications if new messages are sent to this conversation',
'add_participants' => 'Add Participants',
'last_read' => 'Last read:',
'reply' => 'Post Reply',
Expand Down
20 changes: 10 additions & 10 deletions resources/views/conversation/leave.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
<section class="form">
<div class="form__section">
<div class="form__row">
<h3>{{ trans('conversations.leave_conversation') }}</h3>

{{ form_radio('leave', 'leave', true, {'id': 'leave'}) }}
{{ form_label('leave', trans('conversations.leave_conversation_desc')) }}
</div>
<div class="form__row">
<h3>{{ trans('conversations.ignore_conversation') }}</h3>

{{ form_radio('leave', 'ignore', false, {'id': 'ignore'}) }}
{{ form_label('ignore', trans('conversations.ignore_conversation_desc')) }}
<div class="form__radio">
{{ form_radio('leave', 'leave', true, {'id': 'leave'}) }}
<h3 class="form__radio__title">{{ form_label('leave', trans('conversations.leave_conversation')) }}</h3>
<p class="form__radio__description">{{ form_label('leave', trans('conversations.leave_conversation_desc')) }}</p>
</div>
<div class="form__radio">
{{ form_radio('leave', 'ignore', false, {'id': 'ignore'}) }}
<h3 class="form__radio__title">{{ form_label('ignore', trans('conversations.ignore_conversation')) }}</h3>
<p class="form__radio__description">{{ form_label('ignore', trans('conversations.ignore_conversation_desc')) }}</p>
</div>
</div>
</div>
</section>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/conversation/new_participant.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div class="form__section">
<div class="form__row">
<h3>{{ form_label('participants', trans('conversations.participants')) }}</h3>
{{ trans('conversations.participants_list') }}
<p class="form__description">{{ trans('conversations.participants_desc') }}</p>
{# TODO: some sort of autocomplete #}
{{ form_text('participants') }}
</div>
Expand Down

0 comments on commit a8e7a0f

Please sign in to comment.