diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/aspects/_aspect_dropdown.html.haml | 48 | ||||
| -rw-r--r-- | app/views/publisher/_aspect_dropdown.html.haml | 38 | ||||
| -rw-r--r-- | app/views/publisher/_publisher.html.haml | 6 | ||||
| -rw-r--r-- | app/views/users/_edit.haml | 1 | ||||
| -rw-r--r-- | app/views/users/_post_default.html.haml | 12 | ||||
| -rw-r--r-- | app/views/users/_post_default.mobile.haml | 1 |
6 files changed, 65 insertions, 41 deletions
diff --git a/app/views/aspects/_aspect_dropdown.html.haml b/app/views/aspects/_aspect_dropdown.html.haml new file mode 100644 index 000000000..6199d4b1e --- /dev/null +++ b/app/views/aspects/_aspect_dropdown.html.haml @@ -0,0 +1,48 @@ +-# locals: selected_aspects. Note: all_aspects is a global in the ApplicationController +:ruby + dropdown_css = {"data-toggle" => "dropdown"} + if current_user.getting_started? + dropdown_css[:title] = popover_with_close_html("2. #{t('shared.public_explain.control_your_audience')}") + dropdown_css["data-content"] = t("shared.public_explain.visibility_dropdown") + end + +.btn-group.aspect_dropdown + %button.btn.btn-default.dropdown-toggle{dropdown_css} + - if public_selected?(selected_aspects) + %i.entypo-globe.small#visibility-icon + %span.text + = t("public") + - else + %i.entypo-lock.small#visibility-icon + %span.text + - if all_aspects_selected?(all_aspects, selected_aspects) + = t("all_aspects") + - elsif selected_aspects.size == 1 + = selected_aspects.first.name + - else + = t("shared.aspect_dropdown.toggle", count: selected_aspects.size) + %span.caret + %ul.dropdown-menu.pull-right{unSelectable: "on"} + + %li.public.radio{"data-aspect_id" => "public", :class => ("selected" if public_selected?(selected_aspects))} + %a + %span.status_indicator + %i.glyphicon.glyphicon-ok + %span.text + = t("public") + %li.all_aspects.radio{"data-aspect_id" => "all_aspects", + :class => ("selected" if all_aspects_selected?(all_aspects, selected_aspects))} + %a + %span.status_indicator + %i.glyphicon.glyphicon-ok + %span.text + = t("all_aspects") + %li.divider + - all_aspects.each do |aspect| + %li.aspect_selector{"data-aspect_id" => aspect.id, + :class => ("selected" if aspect_selected?(aspect, all_aspects, selected_aspects))} + %a + %span.status_indicator + %i.glyphicon.glyphicon-ok + %span.text + = aspect.name diff --git a/app/views/publisher/_aspect_dropdown.html.haml b/app/views/publisher/_aspect_dropdown.html.haml deleted file mode 100644 index e97e50426..000000000 --- a/app/views/publisher/_aspect_dropdown.html.haml +++ /dev/null @@ -1,38 +0,0 @@ -.btn-group.aspect_dropdown - %button.btn.btn-default.dropdown-toggle{ ! current_user.getting_started? ? {'data-toggle' => 'dropdown'} : {'data-toggle' => 'dropdown', title: popover_with_close_html("2. #{t('shared.public_explain.control_your_audience')}"), 'data-content'=> t('shared.public_explain.visibility_dropdown')} } - - if publisher_public - %i#visibility-icon.entypo-globe.small - %span.text - = t('public') - - else - %i#visibility-icon.entypo-lock.small - %span.text - - if all_aspects_selected?(selected_aspects) - = t('all_aspects') - - elsif selected_aspects.size == 1 - = selected_aspects.first.name - - else - = t('shared.aspect_dropdown.toggle', count: selected_aspects.size) - %span.caret - %ul.dropdown-menu.pull-right{ unSelectable: 'on' } - - %li.public.radio{"data-aspect_id" => "public", class: ("selected" if publisher_public)} - %a - %span.status_indicator - %i.glyphicon.glyphicon-ok - %span.text - = t('public') - %li.all_aspects.radio{"data-aspect_id" => "all_aspects", class: ("selected" if (!publisher_public && all_aspects_selected?(selected_aspects)))} - %a - %span.status_indicator - %i.glyphicon.glyphicon-ok - %span.text - = t('all_aspects') - %li.divider - - for aspect in all_aspects - %li.aspect_selector{ 'data-aspect_id' => aspect.id, class: !all_aspects_selected?(selected_aspects) && selected_aspects.include?(aspect) ? "selected" : "" } - %a - %span.status_indicator - %i.glyphicon.glyphicon-ok - %span.text - = aspect.name diff --git a/app/views/publisher/_publisher.html.haml b/app/views/publisher/_publisher.html.haml index 5e1ca38f1..d71b1e27f 100644 --- a/app/views/publisher/_publisher.html.haml +++ b/app/views/publisher/_publisher.html.haml @@ -40,9 +40,9 @@ != t("shared.publisher.formatWithMarkdown", markdown_link: link_to(t("help.markdown"), "https://diasporafoundation.org/formatting", target: :blank)) - - if publisher_public + - if public_selected?(selected_aspects) = hidden_field_tag "aspect_ids[]", "public" - - elsif all_aspects_selected?(selected_aspects) + - elsif all_aspects_selected?(all_aspects, selected_aspects) = hidden_field_tag "aspect_ids[]", "all_aspects" - else - for aspect_id in aspect_ids @@ -54,7 +54,7 @@ .options_and_submit.col-sm-12 .public_toggle.clearfix .btn-toolbar.pull-right - = render partial: "publisher/aspect_dropdown", locals: {selected_aspects: selected_aspects} + = render partial: "aspects/aspect_dropdown", locals: {selected_aspects: selected_aspects} %button.btn.btn-group.btn-primary#submit= t("shared.publisher.share") .btn-toolbar.pull-right#publisher-service-icons diff --git a/app/views/users/_edit.haml b/app/views/users/_edit.haml index aec5eccc7..af9aea49b 100644 --- a/app/views/users/_edit.haml +++ b/app/views/users/_edit.haml @@ -115,6 +115,7 @@ .clearfix= f.submit t(".change"), class: "btn btn-primary pull-right" %hr + = render partial: "post_default" .row .col-md-12 diff --git a/app/views/users/_post_default.html.haml b/app/views/users/_post_default.html.haml new file mode 100644 index 000000000..8f5fd8eb3 --- /dev/null +++ b/app/views/users/_post_default.html.haml @@ -0,0 +1,12 @@ +.row + .col-md-12 + %h3 + = t("users.edit.default_post_visibility") + = form_for current_user, url: edit_user_path, + html: {method: :put, id: "post-default-aspects", class: "form-horizontal"} do |f| + = f.hidden_field :post_default_public, value: false + - selected_aspects = current_user.post_default_aspects + = render partial: "aspects/aspect_dropdown", locals: {selected_aspects: selected_aspects} + .small-horizontal-spacer + .clearfix= f.submit t("users.edit.change"), class: "btn btn-primary pull-right" +%hr diff --git a/app/views/users/_post_default.mobile.haml b/app/views/users/_post_default.mobile.haml new file mode 100644 index 000000000..736458a9a --- /dev/null +++ b/app/views/users/_post_default.mobile.haml @@ -0,0 +1 @@ +-# This feature is not supported in mobile format. |