dorsale 3.2.0 → 3.3.0

data/app/views/dorsale/customer_vault/people/edit.html.slim

@@ -3,7 +3,7 @@
     = render "dorsale/customer_vault/people/context", person: @person
     = render "dorsale/customer_vault/people/data_context", person: @person
 
-  - content_for :main
+  - content_for :page_body
     .panel.panel-default: .panel-heading: .panel-title
       = t("actions.update")
       = " : "
@@ -11,4 +11,4 @@
 
     = render "dorsale/customer_vault/people/form"
 
-  = render_contextual
+  = render_dorsale_page

data/app/views/dorsale/customer_vault/people/index.html.slim

@@ -11,7 +11,7 @@
     = render "dorsale/customer_vault/people/index_tabs"
 
   - content_for :actions
-    = render "dorsale/customer_vault/people/actions"
+    = render "dorsale/customer_vault/people/index_actions"
 
   - content_for :page_body
     = render "dorsale/customer_vault/people/list"
@@ -23,4 +23,4 @@
     .text-center
       = info model, :count, @people_without_pagination.count
 
-  = render_dorsale_index
+  = render_dorsale_page

data/app/views/dorsale/customer_vault/people/invoices.html.slim

@@ -1,5 +1,4 @@
-- content_for :person_page
-  .panel.panel-default
-    = render "dorsale/billing_machine/invoices/list", invoices: @person.invoices
+- content_for :table
+  = render "dorsale/billing_machine/invoices/list", invoices: @person.invoices
 
 = render "dorsale/customer_vault/people/show_layout"

data/app/views/dorsale/customer_vault/people/new.html.slim

@@ -1,8 +1,8 @@
 .customer_vault
-  - content_for :main
+  - content_for :page_body
     .panel.panel-default: .panel-heading: .panel-title
       = t("actions.new_#{@person.person_type}")
 
     = render "dorsale/customer_vault/people/form"
 
-  = render_contextual
+  = render_dorsale_page

data/app/views/dorsale/customer_vault/people/show.html.slim

@@ -1,4 +1,4 @@
-- content_for :person_page
+- content_for :page_body
   = comments_for(@person)
 
   - if @person.try(:context).present?

data/app/views/dorsale/customer_vault/people/tasks.html.slim

@@ -1,4 +1,5 @@
-- content_for :person_page
-  = tasks_for(@person)
+.flyboy
+  - content_for :page_body
+    = tasks_for(@person)
 
-= render "dorsale/customer_vault/people/show_layout"
+  = render "dorsale/customer_vault/people/show_layout"

data/app/views/dorsale/expense_gun/categories/_index_actions.html.slim

@@ -0,0 +1,2 @@
+- if policy(::Dorsale::ExpenseGun::Category).create?
+  = create_button new_expense_gun_category_path, action: :create

data/app/views/dorsale/expense_gun/categories/index.html.slim

@@ -3,10 +3,9 @@
     = ::Dorsale::ExpenseGun::Category.ts
 
   - content_for :actions
-    - if policy(::Dorsale::ExpenseGun::Category).create?
-      = create_button new_expense_gun_category_path, action: :create
+    = render "dorsale/expense_gun/categories/index_actions"
 
   - content_for :table
     = render "dorsale/expense_gun/categories/list", categories: @categories
 
-  = render_dorsale_index
+  = render_dorsale_page

data/app/views/dorsale/expense_gun/expenses/_index_actions.html.slim

@@ -0,0 +1,2 @@
+- if policy(::Dorsale::ExpenseGun::Expense).create?
+  = create_button dorsale.new_expense_gun_expense_path, text: t("expense_gun.expense.actions.create")

data/app/views/dorsale/expense_gun/expenses/_show_actions.html.slim

@@ -0,0 +1,19 @@
+- if policy(@expense).update?
+  = update_button dorsale.edit_expense_gun_expense_path(@expense)
+
+- if policy(@expense).copy?
+  = copy_button dorsale.copy_expense_gun_expense_path(@expense)
+
+- if policy(@expense).submit?
+  = dorsale_button dorsale.submit_expense_gun_expense_path(@expense), action: :submit, method: "patch", confirm: true, icon: :check, class: "btn btn-xs btn-primary"
+
+- if policy(@expense).accept?
+  = dorsale_button dorsale.accept_expense_gun_expense_path(@expense), action: :accept, method: "patch", confirm: true, icon: :check, class: "btn btn-xs btn-success"
+
+- if policy(@expense).refuse?
+  = dorsale_button dorsale.refuse_expense_gun_expense_path(@expense), action: :refuse, method: "patch", confirm: true, icon: :ban, class: "btn btn-xs btn-danger"
+
+- if policy(@expense).cancel?
+  = dorsale_button dorsale.cancel_expense_gun_expense_path(@expense), action: :cancel, method: "patch", confirm: true, icon: :times, class: "btn btn-xs btn-warning"
+
+= print_button

data/app/views/dorsale/expense_gun/expenses/index.html.slim

@@ -8,8 +8,7 @@
     = paginate @expenses
 
   - content_for :actions
-    - if policy(::Dorsale::ExpenseGun::Expense).create?
-      = create_button dorsale.new_expense_gun_expense_path, text: t("expense_gun.expense.actions.create")
+    = render "dorsale/expense_gun/expenses/index_actions"
 
   - content_for :filters
     = render "dorsale/expense_gun/expenses/filters"
@@ -17,4 +16,4 @@
   - content_for :page_body
     = render "dorsale/expense_gun/expenses/list", expenses: @expenses
 
-  = render_dorsale_index
+  = render_dorsale_page

data/app/views/dorsale/expense_gun/expenses/show.html.slim

@@ -1,65 +1,52 @@
 .expense_gun
-  .actions.top
-    - if policy(@expense).update?
-      = update_button dorsale.edit_expense_gun_expense_path(@expense)
+  - content_for :actions
+    = render "dorsale/expense_gun/expenses/show_actions"
 
-    - if policy(@expense).copy?
-      = copy_button dorsale.copy_expense_gun_expense_path(@expense)
+  - content_for :title
+    = @expense.t
+    = " : "
+    = @expense
 
-    - if policy(@expense).submit?
-      = link_to t("expense_gun.expense.actions.submit"), dorsale.submit_expense_gun_expense_path(@expense), data: {method: "patch", confirm: t("actions.confirm")}, class: "btn btn-primary"
-
-    - if policy(@expense).accept?
-      = link_to t("expense_gun.expense.actions.accept"), dorsale.accept_expense_gun_expense_path(@expense), data: {method: "patch", confirm: t("actions.confirm")}, class: "btn btn-success"
-
-    - if policy(@expense).refuse?
-      = link_to t("expense_gun.expense.actions.refuse"), dorsale.refuse_expense_gun_expense_path(@expense), data: {method: "patch", confirm: t("actions.confirm")}, class: "btn btn-danger"
-
-    - if policy(@expense).cancel?
-      = link_to t("expense_gun.expense.actions.cancel"), dorsale.cancel_expense_gun_expense_path(@expense), data: {method: "patch", confirm: t("actions.confirm")}, class: "btn btn-warning"
-
-    = print_button
-
-  .panel.panel-default
-    .panel-heading: .panel-title
-        = @expense.t
-        = " : "
-        = @expense
 
+  - content_for :table
     .panel-body
       = info @expense, :date
       = info @expense, :user
       = info @expense, :state
 
-  hr
+  - content_for :page_body
 
-  - @expense.expense_lines.each do |expense_line|
-    .panel.panel-default.expense-line
-      .panel-body
-        .row
-          .col-md-4
-            = info expense_line, :name
-            = info expense_line, :category
-            = info expense_line, :date
+    hr
 
-          .col-md-4
-            = info expense_line, :total_all_taxes,  helper: :euros
-            = info expense_line, :company_part,     helper: :percentage
-            = info expense_line, :employee_payback, helper: :euros
+    - @expense.expense_lines.each do |expense_line|
+      .panel.panel-default.expense-line
+        .panel-body
+          .row
+            .col-md-4
+              = info expense_line, :name
+              = info expense_line, :category
+              = info expense_line, :date
 
-          .col-md-4
-            = info expense_line, :vat,                  helper: :euros
-            = info expense_line, :total_vat_deductible, helper: :euros
+            .col-md-4
+              = info expense_line, :total_all_taxes,  helper: :euros
+              = info expense_line, :company_part,     helper: :percentage
+              = info expense_line, :employee_payback, helper: :euros
 
-  hr
+            .col-md-4
+              = info expense_line, :vat,                  helper: :euros
+              = info expense_line, :total_vat_deductible, helper: :euros
 
-  .panel.panel-default
-    .panel-body
-      = info @expense, :total_all_taxes,        helper: :euros
-      = info @expense, :total_employee_payback, helper: :euros
-      = info @expense, :total_vat_deductible,   helper: :euros
+    hr
+
+    .panel.panel-default
+      .panel-body
+        = info @expense, :total_all_taxes,        helper: :euros
+        = info @expense, :total_employee_payback, helper: :euros
+        = info @expense, :total_vat_deductible,   helper: :euros
+
+    hr
 
-  hr
+    .attachments-panel
+      = attachments_for(@expense)
 
-  .attachments-panel
-    = attachments_for(@expense)
+  = render_dorsale_page

data/app/views/dorsale/flyboy/folders/_context.html.slim

@@ -15,4 +15,4 @@
       = info folder, :description, helper: :text2html
 
   .context-footer
-    = render "dorsale/flyboy/folders/actions", folder: folder
+    = render "dorsale/flyboy/folders/context_actions", folder: folder

data/app/views/dorsale/flyboy/folders/_index_actions.html.slim

@@ -0,0 +1,2 @@
+- if policy(::Dorsale::Flyboy::Folder).create?
+  = create_button dorsale.new_flyboy_folder_path

data/app/views/dorsale/flyboy/folders/edit.html.slim

@@ -1,8 +1,8 @@
 .flyboy
-  - content_for :context do
+  - content_for :context
     = render "dorsale/flyboy/folders/context", folder: @folder
 
-  - content_for :main do
+  - content_for :page_body
     = render "dorsale/flyboy/folders/form"
 
-  = render_contextual
+  = render_dorsale_page

data/app/views/dorsale/flyboy/folders/index.html.slim

@@ -11,8 +11,7 @@
     = search_form
 
   - content_for :actions
-    - if policy(::Dorsale::Flyboy::Folder).create?
-      = create_button dorsale.new_flyboy_folder_path
+    = render "dorsale/flyboy/folders/index_actions"
 
   - content_for :table
     = render "dorsale/flyboy/folders/list", folders: @folders
@@ -20,4 +19,4 @@
   - content_for :pagination
     = paginate @folders
 
-  = render_dorsale_index
+  = render_dorsale_page

data/app/views/dorsale/flyboy/folders/show.html.slim

@@ -1,9 +1,14 @@
 .flyboy
-  - content_for :context do
+  - content_for :title
+    = icon :check_square_o
+    = " "
+    = ::Dorsale::Flyboy::Task.ts
+
+  - content_for :context
     = render "dorsale/flyboy/folders/context", folder: @folder
 
-  - content_for :main do
+  - content_for :page_body
     .tasks
       = tasks_for @folder
 
-  = render_contextual
+  = render_dorsale_page

data/app/views/dorsale/flyboy/tasks/_index_actions.html.slim

@@ -0,0 +1,2 @@
+- if policy(model).export?
+  = export_button url_for(format: :xlsx), download: "#{model.ts}.xlsx"

data/app/views/dorsale/flyboy/tasks/_tasks_for_taskable.html.slim

@@ -1,9 +1,10 @@
 .flyboy
-  = render "dorsale/flyboy/filters"
+  - content_for :filters
+    = render "dorsale/flyboy/filters"
 
-  .panel.panel-default
+  - content_for :table
     = render "dorsale/flyboy/tasks/list", tasks: tasks, nested: true
 
-  p.text-center
+  - content_for :actions
     - if policy(::Dorsale::Flyboy::Task).create?
       = create_button dorsale.new_flyboy_task_path(taskable_guid: taskable.guid), action: :new_task

data/app/views/dorsale/flyboy/tasks/edit.html.slim

@@ -1,8 +1,8 @@
 .flyboy
-  - content_for :context do
+  - content_for :context
     = render "dorsale/flyboy/tasks/context", task: @task
 
-  - content_for :main do
+  - content_for :page_body
     = render "dorsale/flyboy/tasks/form"
 
-  = render_contextual
+  = render_dorsale_page

data/app/views/dorsale/flyboy/tasks/index.html.slim

@@ -11,8 +11,7 @@
     = search_form
 
   - content_for :actions
-    - if policy(model).export?
-      = download_button url_for(format: :xlsx), download: "#{model.ts}.xlsx"
+    = render "dorsale/flyboy/tasks/index_actions"
 
   - content_for :table
     = render "dorsale/flyboy/tasks/list", tasks: @tasks, nested: false
@@ -20,5 +19,5 @@
   - content_for :pagination
     = paginate @tasks
 
-  = render_dorsale_index
+  = render_dorsale_page
 

data/app/views/dorsale/flyboy/tasks/new.html.slim

@@ -1,8 +1,8 @@
 .flyboy
-  - content_for :context do
+  - content_for :context
     = render "dorsale/flyboy/tasks/taskable_context", taskable: @task.taskable
 
-  - content_for :main do
+  - content_for :page_body
     = render "dorsale/flyboy/tasks/form"
 
-  = render_contextual
+  = render_dorsale_page

data/app/views/dorsale/flyboy/tasks/show.html.slim

@@ -1,9 +1,9 @@
 .flyboy
-  - content_for :context do
+  - content_for :context
     = render "dorsale/flyboy/tasks/context", task: @task
     = render "dorsale/flyboy/tasks/taskable_context", taskable: @task.taskable
 
-  - content_for :main do
+  - content_for :page_body
     .task-comments
       = render "dorsale/flyboy/task_comments/list", task: @task
 
@@ -14,4 +14,4 @@
         .panel-body
           = text2html @task.description
 
-  = render_contextual
+  = render_dorsale_page

data/app/views/dorsale/users/_index_actions.html.slim

@@ -0,0 +1,2 @@
+- if policy(User).create?
+  = create_button dorsale.new_user_path

data/app/views/dorsale/users/index.html.slim

@@ -5,10 +5,9 @@
     = User.ts
 
   - content_for :actions
-    - if policy(User).create?
-      = create_button dorsale.new_user_path
+    = render "dorsale/users/index_actions"
 
   - content_for :table
     = render "dorsale/users/list", users: @users
 
-  = render_dorsale_index
+  = render_dorsale_page

data/config/locales/common.en.yml

@@ -57,10 +57,12 @@ en:
     export     : "Export"
     export_csv : "Export CSV"
     export_xls : "Export XLS"
+    export_xlsx: "Export XLSX"
     export_pdf : "Export PDF"
     import     : "Import"
     import_csv : "Import CSV"
     import_xls : "Import XLS"
+    import_xlsx: "Import XLSX"
     import_pdf : "Import PDF"
     send       : "Send"
     comment    : "Comment"
@@ -72,6 +74,9 @@ en:
     rename     : "Rename"
     email      : "Send by email"
     print      : "Print"
+    submit     : "Submit"
+    accept     : "Accept"
+    refuse     : "Refuse"
 
   attributes: &attributes
     id                    : "Id"

data/config/locales/common.fr.yml

@@ -65,10 +65,12 @@ fr:
     export     : "Exporter"
     export_csv : "Export CSV"
     export_xls : "Export XLS"
+    export_xlsx: "Export XLSX"
     export_pdf : "Export PDF"
     import     : "Importer"
     import_csv : "Import CSV"
     import_xls : "Import XLS"
+    import_xlsx: "Import XLSX"
     import_pdf : "Import PDF"
     send       : "Envoyer"
     comment    : "Commenter"
@@ -80,6 +82,9 @@ fr:
     rename     : "Renommer"
     email      : "Envoyer par email"
     print      : "Imprimer"
+    submit     : "Soumettre"
+    accept     : "Accepter"
+    refuse     : "Refuser"
 
   attributes: &attributes
     id                    : "Id"
@@ -167,15 +172,6 @@ fr:
     email_attachment      : "Pièce jointe"
     email_body            : "Message"
 
-    # TODO : Move to bakkbone
-    administrator         : "Administrateur?"
-    billing_machine       : "Accès Facturation?"
-    time_machine          : "Accès Gestion Du Temps?"
-    expense_gun           : "Accès Note de Frais?"
-    customer_vault        : "Accès Annuaire?"
-    flyboy                : "Accès Taches?"
-    notify_invoices_late_payments: "Notifications de Retard de Paiement?"
-
   errors:
     messages:
       extension_white_list_error : "Ce type de fichier n'est pas prit en charge"