Fix sign up locale 🌐 + some admin improvements 💅

app/admin/category.rb

@@ -2,7 +2,7 @@
   index do
     id_column
     column :name do |category|
-      "#{tag.span(nil, class: "glyphicon glyphicon-#{category.icon_name}")} #{category.name}".html_safe
+      "#{category_icon(category)} #{category.name}".html_safe
     end
     actions
   end
@@ -17,9 +17,12 @@
 
   show do |cat|
     attributes_table do
+      row :name do
+        "#{category_icon(cat)} #{cat.name}".html_safe
+      end
+      row :icon_name
       row :created_at
       row :updated_at
-      row :icon_name
       row :name_translations do
         render_translations(cat.name_translations)
       end

app/admin/dashboard.rb

@@ -32,6 +32,16 @@
           end
         end
       end
+
+      column do
+        panel "Recent Petitions" do
+          ul do
+            Petition.last(5).map do |petition|
+              li "#{petition.user} #{glyph(:arrow_right)} #{petition.organization}".html_safe
+            end
+          end
+        end
+      end
     end
   end
 end

app/admin/document.rb

@@ -20,7 +20,7 @@
         render_translations(t.title_translations)
       end
       row :content_translations do
-        render_translations(t.content_translations, "<br>")
+        render_translations(t.content_translations, "<hr>")
       end
     end
   end

app/admin/organization.rb

@@ -1,17 +1,40 @@
 ActiveAdmin.register Organization do
   index do
     id_column
-    column :name
+    column :name do |organization|
+      output = tag.p organization.name
+
+      if organization.logo.attached?
+        output << image_tag(organization.logo.variant(resize: "40^x"))
+      end
+
+      output.html_safe
+    end
     column :created_at do |organization|
       l organization.created_at.to_date, format: :long
     end
     column :city
     column :neighborhood
     column :email
     column :phone
+    column :members do |organization|
+      organization.members.count
+    end
+    column :posts do |organization|
+      organization.posts.count
+    end
     actions
   end
 
+  show do
+    div do
+      if organization.logo.attached?
+        image_tag(organization.logo.variant(resize: "100^x"))
+      end
+    end
+    default_main_content
+  end
+
   form do |f|
     f.inputs do
       f.input :name
@@ -23,6 +46,7 @@
       f.input :address
       f.input :description
       f.input :public_opening_times
+      f.input :logo, as: :file
     end
     f.actions
   end
@@ -47,5 +71,5 @@ def destroy
   filter :neighborhood
 
   permit_params :name, :email, :web, :phone, :city, :neighborhood,
-    :address, :description, :public_opening_times
+    :address, :description, :public_opening_times, :logo
 end

app/admin/petition.rb

@@ -6,7 +6,9 @@
     column :user
     column :organization
     column :created_at
-    column :status
+    column :status do |petition|
+      petition.status.upcase
+    end
   end
 
   filter :status, as: :select, collection: -> { Petition.statuses }

app/admin/user.rb

@@ -23,6 +23,9 @@
     column :organizations do |u|
       u.organizations.map(&:to_s).join(", ")
     end
+    column :posts do |u|
+      u.posts.count
+    end
     actions
   end
 
@@ -31,6 +34,7 @@
   filter :username
   filter :phone
   filter :postcode
+  filter :locale
 
   form do |f|
     f.semantic_errors *f.object.errors.keys
@@ -40,9 +44,10 @@
       f.input :phone
       f.input :postcode
       f.input :gender, as: :select, collection: User::GENDERS
+      f.input :locale, as: :select, collection: I18n.available_locales
     end
     f.inputs "Memberships" do
-      f.has_many :members do |m|
+      f.has_many :members, allow_destroy: true do |m|
         m.input :organization, collection: Organization.order(id: :asc).pluck(:name, :id)
         m.input :active
         m.input :manager
@@ -79,5 +84,5 @@
   end
 
   permit_params :username, :email, :phone, :postcode, :gender,
-    members_attributes: [:organization_id, :active, :manager]
+    members_attributes: [:id, :organization_id, :active, :manager, :_destroy]
 end

app/assets/stylesheets/application.scss

@@ -658,7 +658,7 @@ label[required]::after{
 }
 
 .organization-logo {
-  padding-top: 100px;
+  padding-top: 80px;
 
   img {
     display: block;

app/controllers/users_controller.rb

@@ -112,8 +112,8 @@ def scoped_users
   end
 
   def user_params
-    fields_to_permit = %w"gender username email date_of_birth phone
-                          alt_phone active description notifications push_notifications postcode"
+    fields_to_permit = %w"gender username email date_of_birth phone alt_phone active
+                          locale description notifications push_notifications postcode"
     fields_to_permit += %w"admin registration_number
                            registration_date" if admin?
     fields_to_permit += %w"organization_id superadmin" if superadmin?

app/models/user.rb

@@ -31,7 +31,7 @@ class User < ApplicationRecord
   has_many :device_tokens
   has_many :petitions, dependent: :delete_all
 
-  accepts_nested_attributes_for :members
+  accepts_nested_attributes_for :members, allow_destroy: true
 
   default_scope { order("users.id ASC") }
   scope :actives, -> { references(:members).where(members: { active: true }) }

app/views/users/_form.html.erb

@@ -1,5 +1,7 @@
 <%= show_error_messages!(@user) %>
 <%= simple_form_for @user do |f| %>
+  <%= f.hidden_field :locale, value: I18n.locale %>
+
   <div class="form-inputs">
     <%= f.input :username %>
 

config/initializers/active_admin.rb

@@ -11,12 +11,12 @@
   config.comments = false
   config.namespace :admin do |admin|
     admin.build_menu :utility_navigation do |menu|
-      menu.add label: "Languages" do |lang|
+      menu.add id: :languages, label: -> { "Languages (#{I18n.t("locales.#{locale}")})" } do |lang|
         I18n.available_locales.each do |locale|
           lang.add label: I18n.t("locales.#{locale}", locale: locale), url: ->{ url_for(locale: locale) }
         end
       end
-      admin.add_current_user_to_menu  menu
+      admin.add_current_user_to_menu menu
       admin.add_logout_button_to_menu menu
     end
   end