Refactor partials + pronto

app/assets/stylesheets/admin.scss

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

app/assets/stylesheets/mobile/mobile.scss

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

app/controllers/admin/pods_controller.rb

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

app/views/admins/_dashboard.haml

@@ -1,5 +1,4 @@
-.col-md-9
-  #pod-status
+#pod-status
   %h2
     = t(".pod_status")
   .alert.alert-info.pod-version{role: "alert"}

app/views/admins/_stats.haml

@@ -1,21 +1,15 @@
 - content_for :head do
   = stylesheet_link_tag :admin
 
-.col-md-9
-  %h1= t(".usage_statistic")
+%h1= t(".usage_statistic")
 
-  .row
-    = form_tag("/admins/stats", method: "get", class: "form-inline segment-selection") do
+.row
+  = form_tag("/admins/stats", method: "get", class: "col-sm-12 form-inline segment-selection") do
     .col-sm-2.col-sm-push-8
       %select.form-control{name: "range"}
-          %option{value: "daily", selected: ("selected" if params[:range] == "daily")}
-            = t(".daily")
-          %option{value: "week", selected: ("selected" if params[:range] == "week")}
-            = t(".week")
-          %option{value: "2weeks", selected: ("selected" if params[:range] == "2weeks")}
-            = t(".2weeks")
-          %option{value: "month", selected: ("selected" if params[:range] == "month")}
-            = t(".month")
+        - ["daily", "week", "2weeks", "month"].each do |range|
+          %option{value: range, selected: ("selected" if params[:range] == range)}
+            = t(".#{range}")
     .col-sm-2.col-sm-push-8
       = submit_tag t(".go"), class: "btn btn-primary btn-block"
 
@@ -23,17 +17,13 @@
     %h4
       != t("admins.stats.display_results", segment: content_tag(:strong, @segment))
 
-  .row
+.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])
-      - 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])
+    - else
+      - name = t(".#{name}", count: model[:yesterday])
 
     .col-md-3
       %h2{style: "font-weight:bold;"}
@@ -43,14 +33,13 @@
         %span.percent_change{class: (model[:change] > 0 ? "green" : "red")}
           = "(#{model[:change]}%)"
 
-  .row
-    .col-md-12
-      %p.alert.alert-info.text-center{role: "alert"}
+.row
+  %p.col-md-12.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
+.row
   .col-md-12
     %h3= t(".50_most")
     %ul

app/views/admins/_user_entry.haml

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

app/views/admins/_user_search.haml

@@ -1,8 +1,7 @@
 - content_for :head do
   = stylesheet_link_tag :admin
 
-.col-md-9
-  .row
+.row
   .user_search.col-md-12
     %h3= t("admins.admin_bar.user_search")
     = form_for @search, url: {action: "user_search"}, html: {method: :get, class: "form-horizontal"} do |f|
@@ -29,18 +28,18 @@
         .col-md-2.col-sm-12
           = submit_tag t("admins.stats.go"), class: "btn btn-block btn-primary"
 
-  .row
+.row
   .col-md-12
     .alert.alert-info.text-center{role: "alert"}
       = t(".users", count: @users.count)
 
-  .row
+.row
   .users.col-md-12
     %ul.media-list
       - @users.each do |user|
         = render partial: "user_entry", locals: {user: user}
 
-  .row
+.row
   .more_invites.col-md-12
     %h3= t("shared.invitations.invites")
     .clearfix#add-invites-section

app/views/admins/_weekly_user_stats.haml

@@ -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}"

app/views/admins/dashboard.html.haml

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

app/views/admins/dashboard.mobile.haml

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

app/views/admins/pods.mobile.haml

@@ -1,8 +1,5 @@
-.container
-  .row
-    .col-md-9
-      %h2
+%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))

app/views/admins/stats.html.haml

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

app/views/admins/user_entry.mobile.haml

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

app/views/admins/user_search.html.haml

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

app/views/admins/weekly_user_stats.haml

@@ -3,16 +3,4 @@
     .col-md-3
       = render partial: "admins/admin_bar"
     .col-md-9
-      %h2
-        = 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
+      = render partial: "admins/weekly_user_stats"

app/views/admins/weekly_user_stats.mobile.haml

@@ -1,17 +1 @@
-.col-md-9
-  %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
+= render partial: "admins/weekly_user_stats"

app/views/layouts/_drawer.mobile.haml

@@ -44,7 +44,7 @@
             %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.pod_stats"), pod_stats_path
-            %li{role: "presentation", class: current_page?(report_index_path)}
+            %li
               %a{href: report_index_path}
                 - if unreviewed_reports_count > 0
                   .pull-right.badge

app/views/report/_reports.haml

@@ -1,9 +1,7 @@
 - content_for :head do
   = stylesheet_link_tag :admin
-  = stylesheet_link_tag :report
 
-.col-md-9
-  .reports
+.reports
   %h1
     = t("report.title")
   - if @reports.empty?

app/views/report/index.html.haml

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