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

Refactor partials + pronto

Browse source
This commit is contained in:
flaburgan 2017-05-10 13:18:49 +02:00 committed by Benjamin Neff
parent a7d97b7fd3
commit 2782edc780
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
20 changed files with 187 additions and 206 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/mobile/mobile_drawer.js
View file

@ -5,7 +5,7 @@
evt.preventDefault(); evt.preventDefault();
$("#app").toggleClass("draw"); $("#app").toggleClass("draw");
}); });
$("#all_aspects, #followed_tags, #admin").bind("tap click", function(evt) { $("#all_aspects, #followed_tags, #admin").bind("tap click", function(evt) {
evt.preventDefault(); evt.preventDefault();
$(this).find("+ li").toggleClass("hide"); $(this).find("+ li").toggleClass("hide");
}); });

9
app/assets/stylesheets/admin.scss
View file

@ -31,6 +31,11 @@
} }
} }
// Weekly stats
.week-selector {
margin-top: 18px;
}
// Pod stats // Pod stats
.segment-selection { .segment-selection {
select, select,
@ -49,6 +54,10 @@
.content { .content {
padding-bottom: 20px; padding-bottom: 20px;
} }
.panel-body .btn-info {
margin-right: 5px;
}
} }
/** pod list **/ /** pod list **/

2
app/assets/stylesheets/mobile/mobile.scss
View file

@ -886,7 +886,7 @@ select#aspect_ids_ {
.tag_following_action { margin: 5px 0 10px 0; } .tag_following_action { margin: 5px 0 10px 0; }
/* --- Admin pages --- */ // --- Admin pages ---
.pod-version { .pod-version {
// The fetching of the pod version is not done on mobile currently so we hide this alert. // The fetching of the pod version is not done on mobile currently so we hide this alert.
display: none; display: none;

1
app/controllers/admin/pods_controller.rb
View file

@ -27,7 +27,6 @@ module Admin
respond_with do |format| respond_with do |format|
format.html { redirect_to admin_pods_path } format.html { redirect_to admin_pods_path }
format.json { render json: PodPresenter.new(pod).as_json } format.json { render json: PodPresenter.new(pod).as_json }
format.mobile { redirect_to admin_pods_path }
end end
end end
end end

23
app/views/admins/_dashboard.haml
View file

@ -1,12 +1,11 @@
.col-md-9 #pod-status
#pod-status %h2
%h2 = t(".pod_status")
= t(".pod_status") .alert.alert-info.pod-version{role: "alert"}
.alert.alert-info.pod-version{role: "alert"} = t(".fetching_diaspora_version")
= t(".fetching_diaspora_version") - if unreviewed_reports_count > 0
- if unreviewed_reports_count > 0 .alert.alert-warning.reports-warning{role: "alert"}
.alert.alert-warning.reports-warning{role: "alert"} = t("report.unreviewed_reports", count: unreviewed_reports_count)
= t("report.unreviewed_reports", count: unreviewed_reports_count) - else
- else %p
%p = t("report.unreviewed_reports", count: 0)
= t("report.unreviewed_reports", count: 0)

95
app/views/admins/_stats.haml
View file

@ -1,61 +1,50 @@
- content_for :head do - content_for :head do
= stylesheet_link_tag :admin = stylesheet_link_tag :admin
.col-md-9 %h1= t(".usage_statistic")
%h1= t(".usage_statistic")
.row .row
= form_tag("/admins/stats", method: "get", class: "form-inline segment-selection") do = form_tag("/admins/stats", method: "get", class: "col-sm-12 form-inline segment-selection") do
.col-sm-2.col-sm-push-8 .col-sm-2.col-sm-push-8
%select.form-control{name: "range"} %select.form-control{name: "range"}
%option{value: "daily", selected: ("selected" if params[:range] == "daily")} - ["daily", "week", "2weeks", "month"].each do |range|
= t(".daily") %option{value: range, selected: ("selected" if params[:range] == range)}
%option{value: "week", selected: ("selected" if params[:range] == "week")} = t(".#{range}")
= t(".week") .col-sm-2.col-sm-push-8
%option{value: "2weeks", selected: ("selected" if params[:range] == "2weeks")} = submit_tag t(".go"), class: "btn btn-primary btn-block"
= t(".2weeks")
%option{value: "month", selected: ("selected" if params[:range] == "month")}
= t(".month")
.col-sm-2.col-sm-push-8
= submit_tag t(".go"), class: "btn btn-primary btn-block"
.col-sm-8.col-sm-pull-4 .col-sm-8.col-sm-pull-4
%h4
!= t("admins.stats.display_results", segment: content_tag(:strong, @segment))
.row
- %i(posts comments aspect_memberships users).each do |name|
- model = instance_variable_get("@#{name}")
- if name == :aspect_memberships
- name = t(".shares", count: model[:yesterday])
- else
- name = t(".#{name}", count: model[:yesterday])
.col-md-3
%h2{style: "font-weight:bold;"}
= name.to_s
%h4 %h4
!= t("admins.stats.display_results", segment: content_tag(:strong, @segment)) = model[:day_before]
%span.percent_change{class: (model[:change] > 0 ? "green" : "red")}
= "(#{model[:change]}%)"
.row .row
- %i(posts comments aspect_memberships users).each do |name| %p.col-md-12.alert.alert-info.text-center{role: "alert"}
- model = instance_variable_get("@#{name}") != t("admins.stats.current_segment",
- if name == :aspect_memberships post_yest: content_tag(:strong, @posts[:yesterday] / @user_count.to_f),
- name = t(".shares", count: model[:yesterday]) post_day: content_tag(:strong, @posts[:day_before] / @user_count.to_f))
- if name == :posts
- name = t(".posts", count: model[:yesterday])
- if name == :comments
- name = t(".comments", count: model[:yesterday])
- if name == :users
- name = t(".users", count: model[:yesterday])
.col-md-3 .row
%h2{style: "font-weight:bold;"} .col-md-12
= name.to_s %h3= t(".50_most")
%h4 %ul
= model[:day_before] - @popular_tags.each do |name, count|
%span.percent_change{class: (model[:change] > 0 ? "green" : "red")} %li
= "(#{model[:change]}%)" != t("admins.stats.tag_name",
name_tag: content_tag(:strong, name),
.row count_tag: content_tag(:strong, count))
.col-md-12
%p.alert.alert-info.text-center{role: "alert"}
!= t("admins.stats.current_segment",
post_yest: content_tag(:strong, @posts[:yesterday] / @user_count.to_f),
post_day: content_tag(:strong, @posts[:day_before] / @user_count.to_f))
.row
.col-md-12
%h3= t(".50_most")
%ul
- @popular_tags.each do |name, count|
%li
!= t("admins.stats.tag_name",
name_tag: content_tag(:strong, name),
count_tag: content_tag(:strong, count))

2
app/views/admins/_user_entry.haml
View file

@ -67,8 +67,6 @@
admin_close_account_path(user), admin_close_account_path(user),
method: :post, data: {confirm: t("admins.user_search.are_you_sure")}, method: :post, data: {confirm: t("admins.user_search.are_you_sure")},
class: "btn btn-danger btn-block" class: "btn btn-danger btn-block"
- unless user.closed_account?
- if user.access_locked? - if user.access_locked?
= link_to t("admins.user_search.unlock_account"), = link_to t("admins.user_search.unlock_account"),
admin_unlock_account_path(user), admin_unlock_account_path(user),

95
app/views/admins/_user_search.haml
View file

@ -1,58 +1,57 @@
- content_for :head do - content_for :head do
= stylesheet_link_tag :admin = stylesheet_link_tag :admin
.col-md-9 .row
.row .user_search.col-md-12
.user_search.col-md-12 %h3= t("admins.admin_bar.user_search")
%h3= t("admins.admin_bar.user_search") = form_for @search, url: {action: "user_search"}, html: {method: :get, class: "form-horizontal"} do |f|
= form_for @search, url: {action: "user_search"}, html: {method: :get, class: "form-horizontal"} do |f| .form-group
.form-group = f.label :username, t("username"), class: "col-sm-2 control-label"
= f.label :username, t("username"), class: "col-sm-2 control-label" .col-sm-10
.col-sm-10 = f.text_field :username, class: "form-control"
= f.text_field :username, class: "form-control"
.form-group .form-group
= f.label :email, t("email"), class: "col-sm-2 control-label" = f.label :email, t("email"), class: "col-sm-2 control-label"
.col-sm-10 .col-sm-10
= f.text_field :email, class: "form-control" = f.text_field :email, class: "form-control"
.form-group .form-group
= f.label :guid, t("admins.user_entry.guid"), class: "col-sm-2 control-label" = f.label :guid, t("admins.user_entry.guid"), class: "col-sm-2 control-label"
.col-sm-10 .col-sm-10
= f.text_field :guid, class: "form-control" = f.text_field :guid, class: "form-control"
.form-group .form-group
.col-md-offset-2.col-md-8.col-sm-12 .col-md-offset-2.col-md-8.col-sm-12
= f.label :under13 do = f.label :under13 do
= f.check_box :under13 = f.check_box :under13
= t(".under_13") = t(".under_13")
.col-md-2.col-sm-12 .col-md-2.col-sm-12
= submit_tag t("admins.stats.go"), class: "btn btn-block btn-primary" = submit_tag t("admins.stats.go"), class: "btn btn-block btn-primary"
.row .row
.col-md-12 .col-md-12
.alert.alert-info.text-center{role: "alert"} .alert.alert-info.text-center{role: "alert"}
= t(".users", count: @users.count) = t(".users", count: @users.count)
.row .row
.users.col-md-12 .users.col-md-12
%ul.media-list %ul.media-list
- @users.each do |user| - @users.each do |user|
= render partial: "user_entry", locals: {user: user} = render partial: "user_entry", locals: {user: user}
.row .row
.more_invites.col-md-12 .more_invites.col-md-12
%h3= t("shared.invitations.invites") %h3= t("shared.invitations.invites")
.clearfix#add-invites-section .clearfix#add-invites-section
!= t(".you_currently", count: current_user.invitation_code.count, != t(".you_currently", count: current_user.invitation_code.count,
link: link_to(t(".add_invites"), add_invites_path(current_user.invitation_code), link: link_to(t(".add_invites"), add_invites_path(current_user.invitation_code),
class: "btn btn-link pull-right block-admin")) class: "btn btn-link pull-right block-admin"))
= form_tag "admin_inviter", method: :get, class: "form-horizontal" do = form_tag "admin_inviter", method: :get, class: "form-horizontal" do
.form-group .form-group
%label.col-xs-12.col-md-2.control-label %label.col-xs-12.col-md-2.control-label
= t(".email_to") = t(".email_to")
.col-xs-12.col-md-8 .col-xs-12.col-md-8
= text_field_tag "identifier", nil, class: "form-control" = text_field_tag "identifier", nil, class: "form-control"
.col-xs-12.col-md-2 .col-xs-12.col-md-2
= submit_tag t(".invite"), class: "btn btn-block btn-primary" = submit_tag t(".invite"), class: "btn btn-block btn-primary"

21
app/views/admins/_weekly_user_stats.haml Normal file
View file

@ -0,0 +1,21 @@
- content_for :head do
= stylesheet_link_tag :admin
.row
.col-md-9.col-xs-12
%h2
= t(".current_server", date: Time.zone.now.to_date)
.col-md-3.col-xs-12
= form_tag("/admins/weekly_user_stats", method: "get", class: "form-inline week-selector row") do
.col-xs-9.center
= select_tag(:week,
options_for_select(@created_users_by_week.keys.reverse, @selected_week),
class: "form-control")
.col-xs-3.center
= submit_tag t("admins.stats.go"), class: "btn btn-primary"
= t(".amount_of", count: @counter)
%br
- @created_users_by_week[@selected_week].each do |m|
= link_to m, "/u/#{m}"

3
app/views/admins/dashboard.html.haml
View file

@ -2,4 +2,5 @@
.row .row
.col-md-3 .col-md-3
= render partial: "admins/admin_bar" = render partial: "admins/admin_bar"
= render partial: "admins/dashboard" .col-md-9
= render partial: "admins/dashboard"

3
app/views/admins/dashboard.mobile.haml
View file

@ -1,4 +1 @@
- content_for :head do
= stylesheet_link_tag :admin
= render partial: "admins/dashboard" = render partial: "admins/dashboard"

11
app/views/admins/pods.mobile.haml
View file

@ -1,8 +1,5 @@
.container %h2
.row = t(".pod_network")
.col-md-9
%h2
= t(".pod_network")
.alert.alert-warning .alert.alert-warning
!= t(".pod_desktop_view", desktop_link: link_to(t(".pod_desktop_link"), toggle_mobile_path)) != t(".pod_desktop_view", desktop_link: link_to(t(".pod_desktop_link"), toggle_mobile_path))

3
app/views/admins/stats.html.haml
View file

@ -2,4 +2,5 @@
.row .row
.col-md-3 .col-md-3
= render partial: "admins/admin_bar" = render partial: "admins/admin_bar"
= render partial: "admins/stats" .col-md-9
= render partial: "admins/stats"

1
app/views/admins/user_entry.mobile.haml
View file

@ -1 +0,0 @@
= render partial: "user_entry"

3
app/views/admins/user_search.html.haml
View file

@ -2,4 +2,5 @@
.row .row
.col-md-3 .col-md-3
= render partial: "admins/admin_bar" = render partial: "admins/admin_bar"
= render partial: "admins/user_search" .col-md-9
= render partial: "admins/user_search"

14
app/views/admins/weekly_user_stats.haml
View file

@ -3,16 +3,4 @@
.col-md-3 .col-md-3
= render partial: "admins/admin_bar" = render partial: "admins/admin_bar"
.col-md-9 .col-md-9
%h2 = render partial: "admins/weekly_user_stats"
= t(".current_server", date: Time.zone.now.to_date)
.pull-right
= form_tag("/admins/weekly_user_stats", method: "get", class: "form-inline") do
= select_tag(:week, options_for_select(@created_users_by_week.keys.reverse, @selected_week), class: "form-control")
= submit_tag t("admins.stats.go"), class: "btn btn-primary"
= t(".amount_of", count: @counter)
%br
- @created_users_by_week[@selected_week].each do |m|
= link_to m, "/u/#{m}"
%br

18
app/views/admins/weekly_user_stats.mobile.haml
View file

@ -1,17 +1 @@
.col-md-9 = render partial: "admins/weekly_user_stats"
%h2
= t(".current_server", date: Time.zone.now.to_date)
%div
= form_tag("/admins/weekly_user_stats", method: "get", class: "form-inline") do
= select_tag(:week,
options_for_select(@created_users_by_week.keys.reverse,
@selected_week),
class: "form-control")
= submit_tag t("admins.stats.go"), class: "btn btn-primary btn-block"
= t(".amount_of", count: @counter)
%br
- @created_users_by_week[@selected_week].each do |m|
= link_to m, "/u/#{m}"
%br

2
app/views/layouts/_drawer.mobile.haml
View file

@ -44,7 +44,7 @@
%li= link_to t("admins.admin_bar.user_search"), user_search_path %li= link_to t("admins.admin_bar.user_search"), user_search_path
%li= link_to t("admins.admin_bar.weekly_user_stats"), weekly_user_stats_path %li= link_to t("admins.admin_bar.weekly_user_stats"), weekly_user_stats_path
%li= link_to t("admins.admin_bar.pod_stats"), pod_stats_path %li= link_to t("admins.admin_bar.pod_stats"), pod_stats_path
%li{role: "presentation", class: current_page?(report_index_path)} %li
%a{href: report_index_path} %a{href: report_index_path}
- if unreviewed_reports_count > 0 - if unreviewed_reports_count > 0
.pull-right.badge .pull-right.badge

82
app/views/report/_reports.haml
View file

@ -1,46 +1,44 @@
- content_for :head do - content_for :head do
= stylesheet_link_tag :admin = stylesheet_link_tag :admin
= stylesheet_link_tag :report
.col-md-9 .reports
.reports %h1
%h1 = t("report.title")
= t("report.title") - if @reports.empty?
- if @reports.empty? %p
%p = t("report.unreviewed_reports", count: 0)
= t("report.unreviewed_reports", count: 0) - @reports.each do |report|
- @reports.each do |report| - if report.item
- if report.item .panel.panel-default
.panel.panel-default - username = report.user.username
- username = report.user.username .panel-heading
.panel-heading .reporter.pull-right
.reporter.pull-right != t("report.reported_label", person: link_to(username, user_profile_path(username)))
!= t("report.reported_label", person: link_to(username, user_profile_path(username))) .reason
.reason %span.reason-label
%span.reason-label = t("report.reason_label")
= t("report.reason_label") %span
%span = report.text
= report.text .panel-body
.panel-body .content
.content = report_content(report)
= report_content(report) .segment-selection
.segment-selection = button_to t("report.reported_user_details"),
= button_to t("report.reported_user_details"), user_search_path(admins_controller_user_search: {guid: report.reported_author.guid}),
user_search_path(admins_controller_user_search: {guid: report.reported_author.guid}), class: "btn pull-left btn-info btn-small col-md-3 col-xs-12", method: :post
class: "btn pull-left btn-info btn-small col-md-3 col-xs-12", method: :post
= button_to t("report.review_link"), report_path(report.id, type: report.item_type),
class: "btn pull-left btn-info btn-small col-md-3 col-xs-12", method: :put
= button_to t("report.delete_link"), report_path(report.id, type: report.item_type),
data: {confirm: t("report.confirm_deletion")},
class: "btn pull-right btn-danger btn-small col-md-3 col-xs-12", method: :delete
- else
.panel.panel-default
- username = report.user.username
.panel-heading
.reporter.pull-right
!= t("report.reported_label", person: link_to(username, user_profile_path(username)))
.title
= report_content(report)
.panel-body
= button_to t("report.review_link"), report_path(report.id, type: report.item_type), = button_to t("report.review_link"), report_path(report.id, type: report.item_type),
class: "btn pull-left btn-info btn-small", method: :put class: "btn pull-left btn-info btn-small col-md-3 col-xs-12", method: :put
= button_to t("report.delete_link"), report_path(report.id, type: report.item_type),
data: {confirm: t("report.confirm_deletion")},
class: "btn pull-right btn-danger btn-small col-md-3 col-xs-12", method: :delete
- else
.panel.panel-default
- username = report.user.username
.panel-heading
.reporter.pull-right
!= t("report.reported_label", person: link_to(username, user_profile_path(username)))
.title
= report_content(report)
.panel-body
= button_to t("report.review_link"), report_path(report.id, type: report.item_type),
class: "btn pull-left btn-info btn-small", method: :put

3
app/views/report/index.html.haml
View file

@ -3,4 +3,5 @@
.col-md-3 .col-md-3
- if current_user.admin? - if current_user.admin?
= render partial: "admins/admin_bar" = render partial: "admins/admin_bar"
= render partial: "report/reports" .col-md-9
= render partial: "report/reports"