ditty 0.8.0 → 0.10.2

data/views/partials/actions.haml

@@ -1,14 +1,15 @@
-- if actions.count > 1
-  - link, text = actions.shift
-  .btn-group.text-right
-    %a.btn.btn-primary{ href: link }= text
-    %button.btn.btn-primary.dropdown-toggle{ type: 'button', id: 'actions-toggle', data: { toggle: 'dropdown' } }
-      %span.caret
-      %span.sr-only Toggle Dropdown
-    %ul.dropdown-menu{ 'aria-labelledby': 'actions-toggle' }
-      -actions.each do |k, v|
-        %li
-          %a{ href: k }= v
-- elsif actions.count > 0
-  -actions.each do |k, v|
-    %a.btn.btn-primary{ href: k }= v
+- if defined?(actions)
+  - if actions.count > 1
+    - link, text = actions.shift
+    .btn-group.text-right
+      %a.btn.btn-primary{ href: link }= text
+      %button.btn.btn-primary.dropdown-toggle{ type: 'button', id: 'actions-toggle', data: { toggle: 'dropdown' } }
+        %span.caret
+        %span.sr-only Toggle Dropdown
+      %ul.dropdown-menu{ 'aria-labelledby': 'actions-toggle' }
+        -actions.each do |k, v|
+          %li
+            %a{ href: k }= v
+  - elsif actions.count > 0
+    -actions.each do |k, v|
+      %a.btn.btn-primary{ href: k }= v

data/views/partials/delete_form.haml

@@ -1,2 +1,2 @@
-= delete_form_tag "#{base_path}/#{entity.id}" do
+= delete_form_tag "#{base_path}/#{entity.display_id}" do
   %button.btn.btn-danger{ type: 'submit' }= delete_label

data/views/partials/filter_control.haml

@@ -1,6 +1,6 @@
-.form-group
+.form-group{ class: total_filters.to_i > 4 ? 'col-3' : 'col-md'}
   %label{ for: "filter_#{name}" }= label
-  %select.form-control{ name: name, id: "filter_#{name}" }
+  %select.form-control.select2{ style: 'width: 100%', name: name, id: "filter_#{name}" }
     %option{ value: '' } -- Select One --
     - options.each do |k,v| k ||= v;  v ||= k;
       %option{ value: k, selected: (params[name].eql? k)}= v

data/views/partials/footer.haml

@@ -1,5 +1,6 @@
-%footer.footer.text-muted.text-center
-  %hr
-  .copyright
-    :plain
-      &copy; <script>document.write(new Date().getFullYear())</script>, Ditty
+/ Footer
+%footer.sticky-footer.bg-light
+  .container.my-auto
+    -if ENV['SKIP_BRANDING'].blank?
+      .copyright.text-center.my-auto.text-dark
+        %span Copyright &copy; Ditty.io 2019

data/views/partials/form_control.haml

@@ -1,24 +1,31 @@
 - type = attributes.delete(:type)
+- attributes[:value] ||= model.send(field) || default
+- if help_text
+  - attributes[:'aria-describedby'] = "#{attributes[:id]}_helptext"
 - if type == 'hidden'
-  %input{attributes, type: type, value: model[field] || default}
+  %input{attributes, type: type, value: model.send(field) || default}
 - else
-  %div{ class: "form-group#{model.errors[field] ? ' has-error' : ''}" }
+  .form-group
     - if type != 'file'
-      %label.col-sm-3.control-label{ for: attributes[:id] }= label
-    .col-sm-9
+      %label{ for: attributes[:id] }= label
       - if type == 'select'
         - options = attributes.delete(:options)
+        - value = attributes.delete(:value)
+        - if attributes[:multiple]
+          - attributes[:name] = "#{attributes[:name]}[]" unless attributes[:name][-2..-1] == '[]'
         %select{attributes}
           - if attributes[:multiple]
-            - options.each do |k,v| k ||= v;  v ||= k;
-              %option{ value: k, selected: (model.send(field).map(&:id).include? k)}= v
+            - options.each do |k, v| k = v if k.nil?; v = k if v.nil?;
+              %option{ value: k.to_s, selected: value&.include?(k) }= v
           - else
-            %option{ value: ""} -- Select One --
-            - options.each do |k,v| k ||= v;  v ||= k;
-              %option{ value: k, selected: [model[field].to_s, default].include?(k.to_s)}= v
+            %option{ value: "" } -- Select One --
+            - options.each do |k, v| k = v if k.nil?; v = k if v.nil?;
+              %option{ value: k.to_s, selected: value == k }= v
       - elsif type == 'textarea'
-        %textarea{attributes}= preserve(model[field] || default)
+        %textarea{attributes}= preserve(model.send(field) || default)
       - else
-        %input{attributes, type: type, value: model[field] || default}
+        %input{ attributes, type: type }
       - if model.errors[field]
-        %p.help-block.text-danger= model.errors[field].join(', ')
+        .invalid-feedback= model.errors[field].join(', ')
+      - if help_text
+        %small.form-text.text-muted{ id: "#{attributes[:id]}_helptext" }= help_text

data/views/partials/form_tag.haml

@@ -1,5 +1,5 @@
 %form{ { method: %i[get post].include?(form_verb.to_sym) ? form_verb : :post, action: url }.merge(attributes) }
-  = Rack::Csrf.csrf_tag(env) unless ENV['APP_ENV'] == 'test'
+  = Rack::Csrf.csrf_tag(env) unless form_verb.to_sym == :get || ENV['APP_ENV'] == 'test'
   - if form_verb.to_sym == :get && layout
     %input{ name: 'layout', value: layout, type: 'hidden' }
   - if %i[get post].include?(form_verb.to_sym) == false

data/views/partials/navitems.haml

@@ -0,0 +1,42 @@
+- if authenticated?
+  - Ditty::Components.navigation(request).each do |item|
+    - if item[:type] == 'divider'
+      %hr.sidebar-divider.my-0
+    - elsif item[:target].nil? || policy(item[:target]).list?
+      - if item[:group]
+        %li.nav-item
+          %a.nav-link.collapsed{ href: '#', 'data-toggle': 'collapse', 'data-target': "##{item[:group].parameterize}", 'aria-expanded': 'true', 'aria-controls': item[:group].parameterize }
+            - if item[:icon]
+              %i.fas.fa-fw{ class: "fa-#{item[:icon]}" }
+            %span= item[:group]
+          .collapse{ id: item[:group].parameterize, 'data-parent': '#accordionSidebar' }
+            .bg-white.py-2.collapse-inner.rounded
+              - item[:items].each do |sub_item|
+                - next unless sub_item[:target] && policy(sub_item[:target]).list?
+                %a.collapse-item{ href: "#{settings.map_path}#{sub_item[:link]}" }
+                  - if sub_item[:icon]
+                    %i.fa.fa-fw{ class: "fa-#{sub_item[:icon]}" }
+                  = sub_item[:text]
+      - else
+        %li.nav-item
+          %a.nav-link{ href: "#{settings.map_path}#{item[:link]}" }
+            - if item[:icon]
+              %i.fas.fa-fw{ class: "fa-#{item[:icon]}" }
+            %span= item[:text]
+  %hr.sidebar-divider.my-0
+  %li.nav-item
+    = delete_form_tag("#{settings.map_path}/auth", attributes: { id: 'logout-form' }) do
+      %a.nav-link{ type: 'submit', onClick: 'document.getElementById("logout-form").submit()' }
+        %i.fas.fa-fw.fa-sign-out-alt
+        %span Logout
+- else
+  %li.nav-item
+    %a.nav-link{ href: "#{settings.map_path}/auth/login" }
+      %i.fas.fa-fw.fa-user
+      %span Log In
+  - if policy(::Ditty::User).register?
+    %li.nav-item
+      %a.nav-link{ href: "#{settings.map_path}/auth/register" }
+        %i.fas.fa-fw.fa-pen-square
+        %span Register
+

data/views/partials/notifications.haml

@@ -1,28 +1,32 @@
 - if flash[:danger]
   .alert.alert-danger.alert-dismissible{ role: "alert" }
-    %button.close{ 'type' => 'button', 'aria-hidden' => 'true', 'area-label' => 'true', 'data-dismiss' => 'alert' } ×
-    %ul
+    %button.close{ type: 'button', 'aria-label': 'Close', 'data-dismiss': 'alert' }
+      %span{ 'aria-hidden': 'true' } ×
+    %ul.mb-0
       - [*flash[:danger]].each do |msg|
         %li= msg
 
 - if flash[:warning]
   .alert.alert-warning.alert-dismissible{ role: "alert" }
-    %button.close{ 'type' => 'button', 'aria-hidden' => 'true', 'area-label' => 'true', 'data-dismiss' => 'alert' } ×
-    %ul
+    %button.close{ type: 'button', 'aria-label': 'Close', 'data-dismiss': 'alert' }
+      %span{ 'aria-hidden': 'true' } ×
+    %ul.mb-0
       - [*flash[:warning]].each do |msg|
         %li= msg
 
 - if flash[:success]
   .alert.alert-success.alert-dismissible{ role: "alert" }
-    %button.close{ 'type' => 'button', 'aria-hidden' => 'true', 'area-label' => 'true', 'data-dismiss' => 'alert' } ×
-    %ul
+    %button.close{ type: 'button', 'aria-label': 'Close', 'data-dismiss': 'alert' }
+      %span{ 'aria-hidden': 'true' } ×
+    %ul.mb-0
       - [*flash[:success]].each do |msg|
         %li= msg
 
 
 - if flash[:info]
   .alert.alert-info.alert-dismissible{ role: "alert" }
-    %button.close{ 'type' => 'button', 'aria-hidden' => 'true', 'area-label' => 'true', 'data-dismiss' => 'alert' } ×
-    %ul
+    %button.close{ type: 'button', 'aria-label': 'Close', 'data-dismiss': 'alert' }
+      %span{ 'aria-hidden': 'true' } ×
+    %ul.mb-0
       - [*flash[:info]].each do |msg|
         %li= msg

data/views/partials/pager.haml

@@ -1,26 +1,45 @@
 %nav{"aria-label" => "Page navigation"}
-  - if list.pagination_record_count > 0
-    %p.text-center Showing #{list.current_page_record_range} of #{list.pagination_record_count} records
-    %ul.pager
-      - if list.first_page?
-        %li.disabled
-          %span First
-        %li.disabled
-          %span Previous
-      - else
-        %li
-          %a{href: first_link} First
-        %li
-          %a{href: prev_link} Previous
-      - if list.last_page?
-        %li.disabled
-          %span Next
-        %li.disabled
-          %span Last
-      - else
-        %li
-          %a{href: next_link} Next
-        %li
-          %a{href: last_link} Last
-  - else
-    %p.text-center No records to show
+  .row
+    .col-sm-12.col-md-6
+      %p.my-2
+        - if list.pagination_record_count > 0
+          Showing #{list.current_page_record_range} of #{list.pagination_record_count} records
+        - else
+          %p.text-center No records to show
+    .col-sm-12.col-md-6
+      - if list.pagination_record_count > 0
+        %ul.pagination.justify-content-end
+          - if list.first_page?
+            %li.page-item.disabled
+              %span.page-link First
+            %li.page-item.disabled
+              %span.page-link Previous
+          - else
+            %li.page-item
+              %a.page-link{ href: first_link } First
+            %li.page-item
+              %a.page-link{ href: prev_link } Previous
+          %li.page-item
+            .dropdown
+              %button.page-link.dropdown-toggle{ type: 'button', id: 'dropdownMenuButton', 'data-toggle':  'dropdown', 'aria-haspopup': 'true', 'aria-expanded': 'false' }
+                = params[:count] || 10
+              .dropdown-menu
+                %a.dropdown-item{ href: "#{base_path}?#{query_string(count: 10)}" } 10
+                %a.dropdown-item{ href: "#{base_path}?#{query_string(count: 25)}" } 25
+                %a.dropdown-item{ href: "#{base_path}?#{query_string(count: 50)}" } 50
+                %a.dropdown-item{ href: "#{base_path}?#{query_string(count: 100)}" } 100
+          - if list.last_page?
+            %li.page-item.disabled
+              %span.page-link Next
+            %li.page-item.disabled
+              %span.page-link Last
+          - else
+            %li.page-item
+              %a.page-link{ href: next_link } Next
+            %li.page-item
+              %a.page-link{ href: last_link } Last
+          %li
+             
+          %li
+            %a.page-link{ href: "#{base_path}/.csv?#{URI.encode_www_form(params.merge(count: 'all'))}" }
+              Export

data/views/partials/search.haml

@@ -1,21 +1,25 @@
-- if self.class.const_defined?(:SEARCHABLE) || self.class.const_defined?(:FILTERS)
+- if self.class.const_defined?(:SEARCHABLE) && SEARCHABLE.count.positive? || self.class.const_defined?(:FILTERS) && FILTERS.count.positive?
   = form_tag(base_path, form_verb: :get, attributes: { class: '' }) do
-    - if self.class.const_defined?(:SEARCHABLE)
+    - if self.class.const_defined?(:SEARCHABLE) && SEARCHABLE.count.positive?
       .form-group
         .input-group
           %input.form-control{ name: 'q', type: 'text', placeholder: 'Search...', value: params[:q] }
           .input-group-btn
             %button.btn.btn-primary{ type: 'submit' }
               %span.fa.fa-search
-          - if self.class.const_defined? :FILTERS
+          - if self.class.const_defined?(:FILTERS) && FILTERS.count.positive?
             .input-group-btn
-              %button.btn.btn-default{ type: 'button', :'data-toggle' => 'collapse', :'data-target' => '#filter-form', :'aria-expanded' => 'false', :'aria-controls' => '#filter-form'}
+              %button.btn.btn-secondary{ type: 'button', :'data-toggle' => 'collapse', :'data-target' => '#filter-form', :'aria-expanded' => 'false', :'aria-controls' => '#filter-form'}
                 %span.fa.fa-arrow-down
 
-    - if self.class.const_defined?(:FILTERS)
-      #filter-form{ class: self.class.const_defined?(:SEARCHABLE) ? 'collapse' : '' }
-        .form-inline
-          - FILTERS.each do |filter|
-            = filter_control(filter)
-          - unless self.class.const_defined?(:SEARCHABLE)
-            %button.btn.btn-default{ type: 'submit'} Go
+    - if self.class.const_defined?(:FILTERS) && FILTERS.count.positive?
+      #filter-form{ class: self.class.const_defined?(:SEARCHABLE) && SEARCHABLE.count.positive? ? 'collapse' : '' }
+        .card.card-default.mb-2
+          .card-body
+            .row
+              - FILTERS.each do |filter|
+                = filter_control(filter, filters: FILTERS.count)
+              - unless self.class.const_defined?(:SEARCHABLE) && SEARCHABLE.count.positive?
+                .form-group
+                  %label
+                  %button.form-control.btn.btn-secondary{ type: 'submit'} Go

data/views/partials/sidebar.haml

@@ -1,37 +1,15 @@
-.sidebar-nav.navbar-collapse
-  %ul.nav.nav-pills.nav-stacked
-    - if authenticated?
-      %li
-        %a{ href: "#{settings.map_path}/" }
-          %i.fa.fa-home.fa-fw
-          Home
-      - Ditty::Components.navigation.each do |item|
-        - if item[:target].nil? || policy(item[:target]).list?
-          - if item[:group]
-            %li
-              %a{ href: '#' }
-                %i.fa.fa-fw{ class: "fa-#{item[:icon]}" }
-                =item[:group]
-                %span.fa.arrow
-              %ul.nav.nav-second-level
-                - item[:items].each do |sub_item|
-                  - if sub_item[:target].nil? || policy(sub_item[:target]).list?
-                    %li
-                      %a{ href: "#{settings.map_path}#{sub_item[:link]}" }
-                        %i.fa.fa-fw{ class: "fa-#{sub_item[:icon]}" }
-                        = sub_item[:text]
-          - else
-            %li
-              %a{ href: "#{settings.map_path}#{item[:link]}" }
-                %i.fa.fa-fw{ class: "fa-#{item[:icon]}" }
-                = item[:text]
-    - else
-      %li
-        %a{ href: "#{settings.map_path}/auth/login" }
-          %i.fa.fa-user.fa-fw
-          Log In
-      - if policy(::Ditty::User).register?
-        %li
-          %a{ href: "#{settings.map_path}/auth/register" }
-            %i.fa.fa-pencil-square-o.fa-fw
-            Register
+/ Sidebar
+%ul#accordionSidebar.navbar-nav.bg-gradient-primary.sidebar.sidebar-dark.accordion
+  / Sidebar - Brand
+  %a.sidebar-brand.d-flex.align-items-center.justify-content-center{ href: config('ditty.home_page', settings.map_path || '/') }
+    .sidebar-brand-icon.rotate-n-15
+      %i.fas{ class: config('ditty.brand-icon', 'fa-laugh-wink') }
+    .sidebar-brand-text.mx-3
+      = config('ditty.title', 'Ditty')
+
+  %hr.sidebar-divider.my-0
+
+  = haml :'partials/navitems'
+
+  .text-center.d-none.d-md-inline
+    %button#sidebarToggle.rounded-circle.border-0

data/views/partials/sort_ui.haml

@@ -0,0 +1,2 @@
+%a{ href: "#{base_path}?#{sort_query(field)}" }
+  %i.fa{ class: sort_icon(field) }

data/views/partials/topbar.haml

@@ -0,0 +1,53 @@
+%nav.navbar.navbar-expand.navbar-light.bg-white.topbar.mb-4.static-top.shadow
+  / Sidebar Toggle
+  %button#sidebarToggleTop.btn.btn-link.d-md-none.rounded-circle.mr-3
+    %i.fa.fa-bars
+
+  /  Topbar Search
+  %form.d-none.d-sm-inline-block.form-inline.mr-auto.ml-md-3.my-2.my-md-0.mw-100.navbar-search
+    .input-group
+      %input.form-control.bg-light.border-0.small{ type: 'text', placeholder: 'Search for...', 'aria-label': 'Search', 'aria-describedby': 'basic-addon2' }
+      .input-group-append
+        %button.btn.btn-primary{ type: 'button' }
+          %i.fas.fa-search.fa-sm
+
+  / Topbar Navbar
+  %ul.navbar-nav.ml-auto
+    / Nav Item - Search Dropdown (Visible Only XS)
+    %li.nav-item.dropdown.no-arrow.d-sm-none
+      %a#searchDropdown.nav-link.dropdown-toggle{ href: '#', role: 'button', 'data-toggle': 'dropdown', 'aria-haspopup': 'true', 'aria-expanded': 'false' }
+        %i.fas.fa-search.fa-fw
+      / Dropdown - Messages
+      .dropdown-menu.dropdown-menu-right.p-3.shadow.animated--grow-in{ :'aria-labelledby' => 'searchDropdown' }
+        %form.form-inline.mr-auto.w-100.navbar-search
+          .input-group
+            %input.form-control.bg-light.border-0.small{ type: 'text', placeholder: 'Search for...', :'aria-label' => 'Search', :'aria-describedby' => 'basic-addon2' }
+            .input-group-append
+              %button.btn.btn-primary{ type: 'button' }
+                %i.fas.fa-.fa-sm
+
+
+    .topbar-divider.d-none.d-sm-block
+
+    / Nav Item - User Information
+    - if authenticated?
+      %li.nav-item.dropdown.no-arrow
+        %a#userDropdown.nav-link.dropdown-toggle{ href: '#', role: 'button', 'aria-haspopup': 'true', 'area-expanded': 'false', 'data-toggle': 'dropdown' }
+          %span.mr-2.d-none.d-lg-inline.text-gray-600.small= current_user.display_name
+          %img.img-profile.rounded-circle{ src: current_user.gravatar }
+        / Dropdown - User Information
+        .dropdown-menu.dropdown-menu-right.shadow.animated--grow-in{ 'aria-labelledby': 'userDropdown' }
+          %a.dropdown-item{ href: "#{settings.map_path}/users/profile" }
+            %i.fas.fa-user.fa-sm.fa-fw.mr-2.text-gray-400
+            Profile
+          / %a.dropdown-item{ href: '#' }
+          /   %i.fas.fa-cogs.fa-sm.fa-fw.mr-2.text-gray-400
+          /   Settings
+          %a.dropdown-item{ href: "#{settings.map_path}/login-traits" }
+            %i.fas.fa-list.fa-sm.fa-fw.mr-2.text-gray-400
+            Past Logins
+          .dropdown-divider
+          %a.dropdown-item{ href: '#', data: { toggle: 'modal', target: '#logoutModal' } }
+            %i.fas.fa-sign-out-alt.fa-sm.fa-fw.mr-2.text-gray-400
+            Logout
+    - else

data/views/partials/user_associations.haml

@@ -0,0 +1,32 @@
+- group = entity.class.to_s.demodulize.underscore
+%table.table.mb-0
+  %tbody
+    - if entity.users.count.positive?
+      - entity.users.each do |user|
+        %tr
+          %td
+            - if policy(user).read?
+              %a{ href: "#{settings.map_path}/users/#{user.id}" }
+                = user.username
+            - else
+              = user.username
+          %td.text-right
+            = delete_form_tag "#{base_path}/#{entity.display_id}/users/#{user.id}" do
+              %button.btn.btn-danger.btn-sm{ type: 'submit' } ×
+    - else
+      %tr
+        %td{ colspan: 2 } No Users Associated
+    %tr
+      %td{ colspan: 2 }
+        - users = user_options.select { |k, v| entity.users.map(&:id).include?(k) == false }
+        - if users && users.count.positive?
+          = new_form_tag "#{base_path}/#{entity.display_id}/users" do
+            .input-group.tall-select2
+              %select.form-control.select2{ name: "#{group}[user_id]", id: 'user_id' }
+                %option{ value: '' } Select User
+                - users.each do |key, value|
+                  %option{ value: key }= value
+              %span.input-group-append
+                %button.btn.btn-primary{ type: 'submit' } Add User
+        - else
+          No Users available to link