From fbbe57f87376f4ef982160b76837dfc5da7e0e7e Mon Sep 17 00:00:00 2001
From: echarp <manu@echarp.org>
Date: Sun, 27 Dec 2015 14:35:46 +0100
Subject: [PATCH] Organisations' administration is now more complete. Refs #19

---
 app/admin/kind.rb                    |  2 ++
 app/admin/orga.rb                    | 14 +++++++++++++-
 app/assets/stylesheets/list.css.sass | 20 ++------------------
 app/views/orgas/show.text.haml       |  5 +++--
 config/initializers/active_admin.rb  |  2 +-
 5 files changed, 21 insertions(+), 22 deletions(-)
 create mode 100644 app/admin/kind.rb

diff --git a/app/admin/kind.rb b/app/admin/kind.rb
new file mode 100644
index 00000000..33625d18
--- /dev/null
+++ b/app/admin/kind.rb
@@ -0,0 +1,2 @@
+ActiveAdmin.register Kind do
+end
diff --git a/app/admin/orga.rb b/app/admin/orga.rb
index 34c15de7..e6e50927 100644
--- a/app/admin/orga.rb
+++ b/app/admin/orga.rb
@@ -1,5 +1,11 @@
 ActiveAdmin.register Orga do
-  permit_params :kind_id, :name, :url, :city, :department, :region_id
+  permit_params :kind_id, :name, :description, :url, :city, :department,
+                :region_id, :active
+
+  scope :active
+  scope :moderated
+  scope :unmoderated
+  config.sort_order = 'updated_at_desc'
 
   index do
     column :kind
@@ -8,6 +14,8 @@ ActiveAdmin.register Orga do
     column :city
     column :department
     column :region
+    column :active
+    column :updated_at
     actions
   end
 
@@ -15,12 +23,14 @@ ActiveAdmin.register Orga do
     attributes_table do
       row :kind
       row :name
+      row :description, as: :pagedown_text
       row :url do
         link_to l.url, l.url
       end
       row :city
       row :department
       row :region
+      row :active
     end
     active_admin_comments
   end
@@ -29,10 +39,12 @@ ActiveAdmin.register Orga do
     f.inputs do
       f.input :kind
       f.input :name
+      f.input :description
       f.input :url
       f.input :city
       f.input :department
       f.input :region
+      f.input :active
     end
     f.actions
   end
diff --git a/app/assets/stylesheets/list.css.sass b/app/assets/stylesheets/list.css.sass
index 1e5da432..5ad741e5 100644
--- a/app/assets/stylesheets/list.css.sass
+++ b/app/assets/stylesheets/list.css.sass
@@ -1,5 +1,3 @@
-@import compass
-
 .quantity
   text-align: right
   white-space: nowrap
@@ -40,19 +38,5 @@ dl
   dt + dd + dt +dd
     border-top: 1px solid #999
 
-.view_link:link, .edit_link:link, .delete_link:link
-  font-size: 0
-  font-weight: normal
-  text-decoration: none
-  &:hover
-    +text-shadow(2px 2px 1px lightblue)
-  &:before
-    padding: 0.5em
-    font-size: 20px
-    font-family: FontAwesome
-.view_link:link:before
-  content: ''
-.edit_link:link:before
-  content: ''
-.delete_link:link:before
-  content: ''
+.edit_link:link, .delete_link:link
+  display: none
diff --git a/app/views/orgas/show.text.haml b/app/views/orgas/show.text.haml
index 0974ac9f..bcdf845e 100644
--- a/app/views/orgas/show.text.haml
+++ b/app/views/orgas/show.text.haml
@@ -6,8 +6,9 @@
 #{Orga.human_attribute_name(:feed).concat(':').ljust 12     } #{@orga.feed}
 #{Orga.human_attribute_name(:contact).concat(':').ljust 12  } #{@orga.contact}
 #{Orga.human_attribute_name(:submitter).concat(':').ljust 12} #{@orga.submitter}
-#{Orga.human_attribute_name(:active).concat(':').ljust 12   } #{t @orga.active.to_s}
-- if @orga.description
+- if @orga.active.present?
+  #{Orga.human_attribute_name(:active).concat(':').ljust 12   } #{t @orga.active.to_s}
+- unless @orga.description.blank?
   #{Orga.human_attribute_name(:description).concat(':').ljust 12}
   = wrap(strip_tags(@orga.description).gsub(/&#13;/, '')).gsub /^/, '  '
 =====================================================
diff --git a/config/initializers/active_admin.rb b/config/initializers/active_admin.rb
index 765d17f1..38e4f9ef 100644
--- a/config/initializers/active_admin.rb
+++ b/config/initializers/active_admin.rb
@@ -4,7 +4,7 @@ ActiveAdmin.setup do |config|
   # Set the title that is displayed on the main layout
   # for each of the active admin pages.
   #
-  config.site_title = 'Agenda Du Libre'
+  config.site_title = 'Agenda du Libre'
 
   # Set the link url for the title. For example, to take
   # users to your main site. Defaults to no link.