ab_admin 0.3.6 → 0.4.0

data/app/controllers/admin/structures_controller.rb

@@ -8,8 +8,16 @@ class Admin::StructuresController < Admin::BaseController
 
   protected
 
+  def resource_action_items
+    edit_structure = AbAdmin::Config::ActionItem.new({}) { |r| link_to icon('wrench', true), edit_resource_path(r), class: 'btn btn-warning' }
+    edit_static_page = AbAdmin::Config::ActionItem.new({}) do |r|
+      link_to(icon('pencil', true), edit_structure_record_path(r), class: 'btn btn-primary') if r.structure_type.static_page?
+    end
+    [edit_static_page, edit_structure, :destroy, :show]
+  end
+
   def tree_node_renderer
-    @tree_node_renderer ||= lambda { |r| link_to r.title, edit_structure_record_path(r), class: 'tree-item_link' }
+    @tree_node_renderer ||= lambda { |r| link_to r.admin_title, edit_structure_record_path(r), class: 'tree-item_link' }
   end
 
   def settings

data/app/controllers/admin/users_controller.rb

@@ -2,8 +2,7 @@ class Admin::UsersController < Admin::BaseController
   load_and_authorize_resource
 
   def activate
-    resource.confirm! unless resource.confirmed?
-    resource.unsuspend!
+    resource.activate!
     redirect_to :back
   end
 

data/app/views/ab_admin/devise/sessions/new.html.slim

@@ -7,4 +7,4 @@
   = f.button :submit, t('admin.auth.sessions.button'), class: 'btn-primary btn-large'
   br
   br
-  = link_to t('admin.auth.passwords.new.title'), new_password_path(resource_name)
+  = link_to t('admin.auth.passwords.new.title'), new_password_path(resource_name)

data/app/views/admin/admin_comments/_comment.html.slim

@@ -1,9 +1,23 @@
-.admin_comment-item id=dom_id(comment)
-  .admin_comment-meta
-    - if comment.author_id
-      = link_to comment.author_name, admin_user_path(id: comment.author_id), target: '_blank'
-    span.muted= l(comment.created_at, format: :long)
+.row-fluid.admin_comment-item id=dom_id(comment)
+  .span5
+    strong
+      - if comment.user_id
+        =' link_to comment.user_name, admin_user_path(id: comment.user_id), target: '_blank'
+    div.muted= l(comment.created_at, format: :long)
+    div= comment.body
+
+  .span6
+    - comment.attachment_files.each do |file|
+      .admin_comment-item-attachment
+        - if file.image?
+          a.thumbnail href=file.url target='_blank'
+            img src=file.url
+        - else
+          a.admin_comment-item-attachment-file href=file.url target='_blank'
+            = icon('file')
+            = file.human_name
+
+  .span1
     - if can? :destroy, comment
       = link_to t('admin.delete'), admin_admin_comment_path(comment), remote: true, method: :delete, class: 'btn btn-mini btn-danger'
-  .admin_comment-body
-    p= comment.body
+hr

data/app/views/admin/admin_comments/_comments.html.slim

@@ -3,4 +3,4 @@
   .admin_comments.well.well-small
     label.input_set.label.label-info= t 'admin.comments.title_content', count: record_comments.length
     #admin_comments= render partial: 'admin/admin_comments/comment', collection: record_comments
-    = render 'admin/admin_comments/form'
+    = render 'admin/admin_comments/form', commentable: resource

data/app/views/admin/admin_comments/_form.html.slim

@@ -1,5 +1,10 @@
 = admin_form_for AdminComment.new, remote: true do |f|
-  = f.input_field :resource_type, as: :hidden, value: resource.class.name
-  = f.input_field :resource_id, as: :hidden, value: resource.id
-  = f.input_field :body, size: '80x4', required: true
+  = f.input_field :resource_type, as: :hidden, value: commentable.class.name
+  = f.input_field :resource_id, as: :hidden, value: commentable.id
+  .row-fluid
+    .span5
+      = f.input_field :body, size: '80x4', required: true
+    .span7
+      = f.input :attachment_files, as: :uploader, file_type: 'file', unwrapped: true
+      = f.hidden_field :fileupload_guid if f.object.new_record?
   = f.button :submit, t('admin.comments.add'), title: t('admin.comments.add'), id: 'submit_admin_comments_form', class: 'btn btn-primary'

data/app/views/admin/admin_comments/_list_block.html.slim

@@ -0,0 +1,7 @@
+td.close-wrap
+  .admin_comments
+    label.input_set.label.label-info
+      = t 'admin.comments.title_content', count: collection.length
+      a.pull-right.btn-close href="#" = icon('remove', true)
+    #admin_comments= render partial: 'admin/admin_comments/comment', collection: collection
+    = render 'admin/admin_comments/form'

data/app/views/admin/admin_comments/create.js.erb

@@ -1,4 +1,5 @@
 <% if resource.persisted? %>
-  $('#admin_comments').append('<%= render partial: 'comment', object: resource %>');
-  $('#new_admin_comment')[0].reset();
+  $context = $('#<%= dom_id(resource.resource, 'list_admin_comments') %>').or('body');
+  $('#admin_comments', $context).append('<%= j render('comment', comment: resource) %>');
+  $('#new_admin_comment', $context).replaceWith('<%= j render('form', commentable: resource.resource) %>');
 <% end %>

data/app/views/admin/admin_comments/destroy.js.erb

@@ -1 +1 @@
-$('#<%= dom_id(resource) %>').slideUp();
+$('#<%= dom_id(resource) %>').remove();

data/app/views/admin/admin_comments/index.js.erb

@@ -0,0 +1,14 @@
+<%
+  wrap_id = dom_id(commentable, 'list_admin_comments')
+  html = render('list_block')
+%>
+
+$base = $('#<%= dom_id(commentable, 'list') %>');
+$cont = $('#<%= wrap_id %>')
+if ($cont[0]) {
+  $cont.html("<%= j html %>");
+} else {
+  $base.after("<%= j %[<tr id="#{wrap_id}" class="list_admin_comments">#{html}</tr>].html_safe %>");
+}
+var colspan = $base.closest('table').find('tr:first > th').length;
+$('#<%= wrap_id %> td:first').attr('colspan', colspan);

data/app/views/admin/assets/batch_edit.html.slim

@@ -0,0 +1,14 @@
+= admin_form_for Asset.new, url: batch_update_admin_assets_path, remote: true, html: {class: 'fileupload-edit-form'} do |f|
+  - first_locale = Globalize.available_locales.first
+  - f.locale_tabs do |l|
+    - @assets.each do |asset|
+      .row-fluid
+        .span4
+          a.thumbnail href=asset.url target='_blank' = image_tag(asset.thumb_url)
+        .span8
+          - if first_locale == l
+            p= text_field :data, :base_filename, index: asset.id, value: asset.base_filename, placeholder: Asset.han(:data_file_name), style: 'width: 95%;'
+          - [:alt, :name].each do |attr|
+            - loc_attr = "#{attr}_#{l}"
+            p= text_field :data, loc_attr, index: asset.id, value: asset.send(loc_attr), placeholder: Asset.han(attr), style: 'width: 95%;'
+      hr

data/app/views/admin/base/_modal_form_layout.html.slim

@@ -0,0 +1,12 @@
+= admin_form_for resource do |f|
+  .modal-header
+    button.close data-dismiss='modal' type='button' ×
+    h3= [resource_class.model_name.human(count: 1), t('admin.actions.new.title')].join(' - ')
+  .modal-body
+    = render 'modal_form', f: f
+    = hidden_field_tag :modal, true
+  .modal-footer
+    button.btn data-dismiss='modal' = t('admin.form.cancel')
+    button.btn.btn-primary type='submit' name='_save' data-disable-with=t('admin.form.save')
+      = icon('ok', true)
+      = t('admin.form.save')

data/app/views/admin/base/_search_layout.html.slim

@@ -2,8 +2,9 @@
 #toggle_sidebar_on.btn.btn-large = icon('chevron-right')
 h3= t('admin.search.title')
 = search_admin_form_for @search, url: collection_path do |f|
-  - cache [I18n.locale, 'search_form_inside', resource_class.name, params[:q].hash] do
+  - cache [I18n.locale, 'search_form_inside', resource_class.name, params[:q].hash, current_user.user_role_id] do
     = render 'search_form', f: f
     br
-    = f.submit t('admin.search.submit'), class: 'btn btn-success btn-large'
-    = f.submit t('admin.search.cancel'), class: 'btn', id: 'search_cancel'
+    div
+      = f.submit t('admin.search.submit'), class: 'btn btn-success btn-large'
+      = f.submit t('admin.search.cancel'), class: 'btn', id: 'search_cancel'

data/app/views/admin/base/_table.html.slim

@@ -2,9 +2,9 @@ table.table.table-striped.index_table#list
   thead
     tr.pjax_links
       = batch_action_toggle
-      th= sort_link(@search, :id)
+      th= list_sort_link(:id)
       - resource_class.content_columns.map(&:name).without('updated_at').each do |col|
-        th= sort_link(@search, col)
+        th= list_sort_link(col)
       th=t 'admin.table.actions'
   tbody
     - collection.each do |item|

data/app/views/admin/base/create.js.erb

@@ -1,8 +1,13 @@
-<%
-  form_wrap_id = dom_id(resource_class.new, 'list_edit')
-  html = render('table', collection: [resource]).match(/<tbody>(.*)<\/tbody>/m)[1].html_safe
-%>
-$('#<%= form_wrap_id %>').remove();
-$('#list tbody').prepend('<%= j html %>');
-$('#<%= dom_id(resource, 'list') %>').addClass('success').scrollToEl();
-$(document).trigger('admin:list_init');
+<% unless params[:modal] %>
+  <%
+    form_wrap_id = dom_id(resource_class.new, 'list_edit')
+    html = render('table', collection: [resource]).match(/<tbody>(.*)<\/tbody>/m)[1].html_safe
+  %>
+  $('#<%= form_wrap_id %>').remove();
+  $('#list tbody').prepend('<%= j html %>');
+  $('#<%= dom_id(resource, 'list') %>').addClass('success').scrollToEl();
+  $(document).trigger('admin:list_init');
+<% end %>
+
+
+window.ab_admin_last_created = <%= raw resource.for_input_token.to_json %>;

data/app/views/admin/base/history.html.slim

@@ -0,0 +1,18 @@
+table.table.table-striped
+  thead
+    tr
+      th= Track.han(:user)
+      th= Track.han(:key)
+      th= Track.han(:trackable)
+      th= Track.han(:owner)
+      th= Track.han(:created_at)
+      th= Track.han(:trackable_changes)
+  tbody
+    - resource.tracks.recently.each do |track|
+      tr
+        td= auto_show_link track.user
+        td= track.action_title
+        td= auto_show_link track.trackable, title: track.trackable.try(:han), missing: track.name
+        td= auto_show_link track.owner
+        td= l(track.created_at, format: :short)
+        td= track.trackable_changed_attrs

data/app/views/admin/base/index.html.slim

@@ -1,10 +1,10 @@
 /- if settings[:index_view] == 'table'
 = form_tag url_for(action: :batch), id: 'batch_action_form', class: 'pjax-form' do
   input name='batch_action' id='batch_action' type='hidden'
-  = render 'admin/shared/batch_actions'
+  = render 'admin/shared/content_actions'
     
-#content= render settings[:index_view]
-.pagination.pull-left
+#content= render current_index_view
+.pagination-wrap.pull-left
   = will_paginate collection, renderer: BootstrapPagination::Rails
   .pagination_info= pagination_info collection
 .btn-toolbar.pull-right.pjax_links

data/app/views/admin/base/new.js.erb

@@ -1,10 +1,16 @@
-<%
-  form_wrap_id = dom_id(resource, 'list_edit')
-  html = %[<tr id="#{form_wrap_id}" class="warning list_edit"><td>#{render('form')}</td></tr>].html_safe
-%>
-$('#<%= form_wrap_id %>').remove();
-$('#list tbody').prepend('<%= j html %>');
-$('#<%= form_wrap_id %> td:first').attr('colspan', $('#list tr:first th').length);
-$('#<%= form_wrap_id %> form').trigger('admin:form_init');
+<% if params[:modal] %>
+  var $form = $('#modal_form');
+  $form.html("<%= j render 'modal_form_layout' %>");
+  $form.find('form').trigger('admin:form_init');
+<% else %>
+  <%
+    form_wrap_id = dom_id(resource, 'list_edit')
+    html = %[<tr id="#{form_wrap_id}" class="warning list_edit"><td>#{render('form')}</td></tr>].html_safe
+  %>
+  $('#<%= form_wrap_id %>').remove();
+  $('#list tbody').prepend('<%= j html %>');
+  $('#<%= form_wrap_id %> td:first').attr('colspan', $('#list tr:first th').length);
+  $('#<%= form_wrap_id %> form').trigger('admin:form_init');
+<% end %>
 
 <%= render 'admin/shared/flash', flash: flash %>

data/app/views/admin/base/show.html.slim

@@ -4,5 +4,4 @@ table.table.table-striped
       th= t 'admin.show.attr'
       th= t 'admin.show.value'
   tbody
-    = render 'show_table'
-
+    = render 'show_table'

data/app/views/admin/base/show.js.erb

@@ -0,0 +1,7 @@
+<%
+  html = render('table', collection: [resource]).match(/<tbody[^>]*>(.*)<\/tbody>/m)[1].html_safe
+%>
+$wrap = $('#list');
+$wrap.prepend('<%= j html %>');
+$('#<%= dom_id(resource, 'list') %>').scrollToEl();
+$(document).trigger('admin:list_init');

data/app/views/admin/fileupload/_asset_templates.html.slim

@@ -0,0 +1,29 @@
+script#image_template type='text/x-handlebars-template'
+  .fileupload-asset id="asset_{{id}}" data-id='{{id}}'
+    = link_to icon('remove', true), '/admin/assets/{{id}}', remote: true, method: :delete, title: t('admin.delete'), class: 'destroy_asset', \
+       data: {confirm: t('admin.delete_confirmation')}
+    .main_image title=t('admin.fileupload.main_image') = icon('home', true)
+    .crop_image title=t('admin.fileupload.crop') = icon('resize-full', true)
+    .rotate_image title=t('admin.fileupload.rotate') = icon('repeat', true)
+    a.fileupload-file.fancybox href='{{url}}' rel='fancybox'
+      img src='{{thumb_url}}' title='{{filename}}'
+
+
+script#file_template type='text/x-handlebars-template'
+  .fileupload-asset id="asset_{{id}}" data-id='{{id}}'
+    a href='{{url}}' target='_blank' {{original_name}}
+    span  ({{human_filesize}})
+    = link_to icon('remove', true), '/admin/assets/{{id}}', remote: true, method: :delete, title: t('admin.delete'), \
+      class: 'destroy_asset btn btn-danger btn-mini', data: {confirm: t('admin.delete_confirmation')}
+
+
+script#video_template type='text/x-handlebars-template'
+  .fileupload-asset id="asset_{{id}}" data-id='{{id}}'
+    = link_to icon('remove', true), '/admin/assets/{{id}}', remote: true, method: :delete, title: t('admin.delete'), \
+      class: 'destroy_asset btn btn-danger btn-mini', data: {confirm: t('admin.delete_confirmation')}
+    video controls='true'
+      source src='{{url}}'
+      | Your browser does not support mp4 videos
+      .video-filename
+        a href='{{url}}' target='_blank' {{original_name}}
+        span  ({{human_filesize}})

data/app/views/admin/fileupload/_container.html.slim

@@ -1,13 +1,14 @@
-= content_tag :div, id: element_id, class: css_class, data: container_data do
-  = error
-  .fileupload-drop-area
-    span= t('admin.fileupload.drop_here')
-  .fileupload-list.clearfix= render partial: "admin/fileupload/#{asset_template}", collection: assets
-  .file-types
-    span.fileupload-button
-      button.btn type="button" = button_title
-    .type-info
-      span.file_title== "#{file_title}. "
-      span.file_max_size== "#{t('admin.fileupload.max_size')}: <b>#{file_max_size}</b> MB"
+.fileupload id=options[:container_id] class=options[:container_class]
+  = options[:error]
+  .fileupload-list.clearfix= render partial: asset_template, collection: assets
+  .fileupload-upload
+    .fileupload-button.pull-left
+      .btn= options[:button_title] || I18n.t("admin.fileupload.button#{'s' if options[:multiple]}")
+      = file_field_tag 'data', multiple: options[:multiple]
+    .fileupload-edit-button.btn.pull-left= t('admin.actions.edit.link')
 
-= init_js(js)
+    .fileupload-info
+      .fileupload-info-extensions= options[:extensions].join(', ')
+      .fileupload-info-max_size== "#{t('admin.fileupload.max_size')}: <b>#{options[:max_size]}</b> MB"
+
+= init_js("new AdminAssets(#{js_options.to_json})")

data/app/views/admin/fileupload/_file.html.slim

@@ -1,5 +1,5 @@
-.asset id="asset_#{file.id}" data-id=file.id
+.fileupload-asset id="asset_#{file.id}" data-id=file.id
   a href=file.url target='_blank' = file.human_name
   span== " (#{file.human_filesize}) - #{l(file.created_at, format: :long)}"
   = link_to icon('remove', true), admin_asset_path(file), remote: true, method: :delete, \
-    class: 'del_asset btn btn-danger btn-mini', data: {confirm: t('admin.delete_confirmation')}
+    class: 'destroy_asset btn btn-danger btn-mini', data: {confirm: t('admin.delete_confirmation')}

data/app/views/admin/fileupload/_image.html.slim

@@ -0,0 +1,8 @@
+.fileupload-asset id="asset_#{image.id}" data-id=image.id
+  = link_to icon('remove', true), admin_asset_path(image), remote: true, method: :delete, title: t('admin.delete'), class: 'destroy_asset', \
+     data: {confirm: t('admin.delete_confirmation')}
+  .main_image title=t('admin.fileupload.main_image') = icon('home', true)
+  .crop_image title=t('admin.fileupload.crop') = icon('resize-full', true)
+  .rotate_image title=t('admin.fileupload.rotate') = icon('repeat', true)
+  a.fileupload-file.fancybox href=image.url rel='fancybox'
+    img src=image.thumb_url title=image.filename

data/app/views/admin/fileupload/_video.html.slim

@@ -1,5 +1,5 @@
-.asset id="asset_#{video.id}" data-id=video.id
-  = link_to icon('remove', true), admin_asset_path(video), remote: true, method: :delete, title: t('admin.delete'), class: 'del_asset', \
+.fileupload-asset id="asset_#{video.id}" data-id=video.id
+  = link_to icon('remove', true), admin_asset_path(video), remote: true, method: :delete, title: t('admin.delete'), class: 'destroy_asset', \
      data: {confirm: t('admin.delete_confirmation')}
   video controls='true'
     source src=video.url

data/app/views/admin/headers/_form.html.slim

@@ -1,5 +1,7 @@
 = f.simple_fields_for :header, f.object.default_header do |h|
   = h.locale_tabs do |l|
     = h.input :title, locale: l
+    = h.input :h1, locale: l
     = h.input :keywords, locale: l
     = h.input :description, locale: l, as: :text
+    = h.input :seo_block, locale: l, as: :text

data/app/views/admin/locators/edit.html.slim

@@ -35,7 +35,7 @@ table.table.table-bordered.table-striped
             div== keys.join(' > ')
             .btn.btn-mini.btn-inverse.auto_translate.pull-right google translate
           td = text_area_tag 'locale_hash' + keys.map{|k| "[#{k}]" }.join, value
-          td = text_area_tag 'fake', t(keys.join('.')), disabled: true
+          td = text_area_tag 'fake', t(keys.join('.'), locale: I18n.default_locale), disabled: true
     tbody
       tr
         td colspan=3 = submit_tag t('admin.form.save'), class: 'btn btn-primary'

data/app/views/admin/locators/show.html.slim

@@ -3,11 +3,10 @@ table.table.table-striped.table-bordered style='width: 1050px;'
     tr
       th= t('admin.locators.locale')
       th= t('admin.locators.file')
-  - locale_regexp = Regexp.new(I18n.available_locales.join('|'))
   - @files.each do |path|
     - filename = File.basename(path)
     tr class=cycle('odd', 'even')
-      td= filename[locale_regexp]
+      td= filename.to_s[/\w+/]
       td= link_to filename, edit_admin_locators_path(filename: filename)
 
 =' link_to t('admin.locators.prepare'), prepare_admin_locators_path, class: 'btn btn-warning', method: :post

data/app/views/admin/manager/_form.html.slim

@@ -8,13 +8,13 @@
           = f.locale_tabs do |l|
             - node.fields.each do |field|
               - field.options[:as] = :editor if !field.options.key?(:as) && field.name.to_s =~ /description|content|body/
-              = f.input field.name, field.options.merge(locale: l)
+              = f.render_dsl_node field, locale: l
         - else
           = input_set node.title, node.options do
             - node.fields.each do |field|
-              = f.input field.name, field.options
+              = f.render_dsl_node field
       - else
-        = f.input node.name, node.options
+        = f.render_dsl_node node
 
     - if f.object.respond_to?(:fileupload_guid) && f.object.new_record?
       = f.hidden_field :fileupload_guid
@@ -23,3 +23,17 @@
 
   - if settings[:comments]
     = admin_comments
+
+  - if settings[:history] && settings[:history][:sidebar]
+    .sidebar.abs_bar.well.well-small
+      label.do_toggle.label.label-large= t 'admin.actions.history.title'
+      table.table.table-striped
+        thead
+          tr
+            th= Track.han(:created_at)
+            th= Track.han(:user)
+        tbody
+          - resource.tracks.recently.each do |a|
+            tr
+              td= l(a.created_at, format: :short)
+              td= auto_show_link a.user