Merge pull request #834 from AlchemyCMS/resource-views-enhancements

Resource views enhancements Excellent!
AlchemyCMS · Aug 1, 2015 · fa41438 · fa41438
2 parents 6bfe4ec + 67503d3
commit fa41438
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 3 deletions.
diff --git a/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee b/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee
@@ -50,6 +50,7 @@ class window.Alchemy.Dialog
     @overlay.removeClass('open') if @overlay?
     @$document.on 'webkitTransitionEnd transitionend oTransitionEnd', =>
       @$document.off 'webkitTransitionEnd transitionend oTransitionEnd'
+      Alchemy.Tinymce.removeFrom(@dialog_body)
       @dialog_container.remove()
       @overlay.remove() if @overlay?
       @$body.removeClass('prevent-scrolling')
@@ -95,6 +96,7 @@ class window.Alchemy.Dialog
   # Initializes the Dialog body
   init: ->
     Alchemy.GUI.init(@dialog_body)
+    Alchemy.Tinymce.initFor('.alchemy-dialog-body')
     $('#overlay_tabs', @dialog_body).tabs()
     @watch_remote_forms()
 

diff --git a/app/assets/javascripts/alchemy/alchemy.tinymce.js.coffee b/app/assets/javascripts/alchemy/alchemy.tinymce.js.coffee
@@ -29,6 +29,15 @@ $.extend Alchemy.Tinymce,
     for id in ids
       @initEditor(id)
 
+  # Initializes TinyMCE editors for all textareas with .tinymce class
+  #
+  initFor: (scope) ->
+    config = @defaults
+    config['selector'] = "#{scope} textarea.tinymce"
+    config['width'] = '65%'
+    tinymce.init(config)
+    return
+
   # Initializes one specific TinyMCE editor
   #
   # @param id [Number]
@@ -66,3 +75,10 @@ $.extend Alchemy.Tinymce,
       editor = tinymce.get("tinymce_#{id}")
       if editor
         editor.remove()
+
+  # Remove all tinymce instances within given $scope
+  removeFrom: ($scope) ->
+    $('textarea.tinymce', $scope).each ->
+      tinymce.get(this.id).remove()
+      return
+    return
diff --git a/app/assets/stylesheets/alchemy/form_fields.scss b/app/assets/stylesheets/alchemy/form_fields.scss
@@ -25,7 +25,7 @@ input[type="search"]::-webkit-search-results-decoration  {
 }
 
 textarea {
-  height: auto;
+  height: auto !important;
   padding: 4px 8px !important;
   line-height: 19px !important;
 }

diff --git a/app/assets/stylesheets/alchemy/forms.scss b/app/assets/stylesheets/alchemy/forms.scss
@@ -34,7 +34,8 @@ form {
     input[type="password"],
     textarea,
     .select2-container,
-    .autocomplete_tag_list {
+    .autocomplete_tag_list,
+    .mce-tinymce {
       width: $form-right-width;
       float: right;
     }

diff --git a/app/views/alchemy/admin/partials/_search_form.html.erb b/app/views/alchemy/admin/partials/_search_form.html.erb
@@ -6,11 +6,14 @@
     <%= f.search_field resource_handler.search_field_name,
       id: 'search_input_field',
       placeholder: _t(:search) %>
+    <% local_assigns.fetch(:additional_query_fields, []).each do |field| %>
+      <%= f.hidden_field field %>
+    <% end %>
     <%= link_to '', url,
         class: 'search_field_clear',
         id: 'search_field_clear',
         title: _t(:click_to_show_all),
-        style: params[:q].present? ? 'display: block' : 'display: none' %>
+        style: params.fetch(:q, {}).fetch(resource_handler.search_field_name, '').present? ? 'display: block' : 'display: none' %>
     <% local_assigns.fetch(:additional_params, []).each do |additional_param| %>
       <%= hidden_field_tag additional_param, params[additional_param] %>
     <% end %>

diff --git a/app/views/alchemy/admin/resources/_table.html.erb b/app/views/alchemy/admin/resources/_table.html.erb
@@ -6,6 +6,7 @@
       <th class="<%= attribute[:type] %> <%= attribute[:name] %>">
         <%= sort_link [:resource_url_proxy, @query],
           sortable_resource_header_column(attribute),
+          resource_handler.model.human_attribute_name(attribute[:name]),
           hide_indicator: true %>
       </th>
     <% end %>