rademade_admin 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 506cc86834c33f984bbdf61e71dec4fa7a50e1e2
-  data.tar.gz: ea1cc018f8994d3757f7647ee0897c75aec5cb5f
+  metadata.gz: cbf2b035073b7ecd22583c679174032a17198b6f
+  data.tar.gz: 680b96e301ee4c35cb8b056c9a2dad63525267b1
 SHA512:
-  metadata.gz: c0802b51d1350071bebd1c4ae8cde902a18627f13a14aef041575e32ed52c3be0a2d903a5f6c729d46512cf2357337b3d866a41105ce1aa6c2ab40cef5166080
-  data.tar.gz: 23254105027ffe82e06ecd9b0a61d61c1f0c96b520d43acb951fe62df286a38af1a8232989131bf1738c108e6e5aa1f4bfa14bda80d2971ad738537f5a72e784
+  metadata.gz: 4eeb141cfbcbda28277a22f2381190fc23b6567486b5492abff1888bda148b47876a56beb2edaaaa87121b216b8008d757497a5183a8c042e5a9c342939ca00a
+  data.tar.gz: 9cdac46cb24a8f0bca639994b135ec5380d8db904e8881bc1a046d55205fa32eb5c2abbe19a4867a28d902bc8e3d921bb73be989b70a22942f03076daf08d2f1

data/app/assets/javascripts/rademade_admin.coffee

@@ -21,6 +21,7 @@
 #= require jquery-validation/src/core
 #= require jquery-validation/src/ajax
 #= require jquery-validation/src/delegate
+#= require TableDnD/js/jquery.tablednd
 #= require leaflet/dist/leaflet-src
 #= require moment/moment
 #= require turbolinks

data/app/assets/javascripts/rademade_admin/app/common/cropper.coffee

@@ -6,7 +6,6 @@ class @Cropper extends Backbone.View
   className : 'add_new_popup'
 
   events :
-    'click' : 'check'
     'click [data-crop]' : 'crop'
     'click [data-close]' : 'close'
 
@@ -31,9 +30,6 @@ class @Cropper extends Backbone.View
       $image.Jcrop
         onSelect : @_updateCropAttributes
 
-  check : (e) ->
-    @closePopup() if $(e.target).closest('.crop').length is 0
-
   crop : (e) ->
     e.preventDefault()
     @closePopup()

data/app/assets/javascripts/rademade_admin/app/common/image-preview.coffee

@@ -0,0 +1,33 @@
+class @ImagePreview extends Backbone.View
+
+  className : 'add_new_popup hide'
+
+  events :
+    'click' : 'close'
+
+  show : (imagePath) ->
+    @render(imagePath)
+    @$el.removeClass 'hide'
+
+  close : (e) ->
+    e.preventDefault()
+    @closePopup()
+
+  closePopup : () ->
+    @$el.addClass 'hide'
+
+  render : (imagePath) ->
+    @$el.html @_getHTML(imagePath : imagePath)
+
+  _getHTML : (data) ->
+    JST['rademade_admin/app/templates/image-preview-popup'](data)
+
+  @init : () ->
+    imagePreview = new ImagePreview
+    $('#pad-wrapper').append imagePreview.$el
+    $('tr .image-preview').click (e) ->
+      fullUrl = $(e.currentTarget).attr('full-url')
+      imagePreview.show(fullUrl) if fullUrl
+
+$ ->
+  $(document).on 'page:load ready init-plugins', ImagePreview.init

data/app/assets/javascripts/rademade_admin/app/templates/image-preview-popup.jst.ejs

@@ -0,0 +1,3 @@
+<div class="image-preview-popup">
+    <img src="<%= imagePath %>">
+</div>

data/app/assets/javascripts/rademade_admin/app/templates/related-item.jst.ejs

@@ -1,5 +1,5 @@
 <span><%= text %></span><%
 if (editurl) {
-    %><button data-edit="<%= editurl %>"><%= I18n.t('rademade_admin.edit_related_item') %></button><%
+    %><button class="select2-item-edit" data-edit="<%= editurl %>"><%= I18n.t('rademade_admin.edit_related_item') %></button><%
 }
-%><button data-remove><%= I18n.t('rademade_admin.destroy') %></button>
+%><button class="select2-item-remove" data-remove><%= I18n.t('rademade_admin.destroy') %></button>

data/app/assets/javascripts/rademade_admin/library/ckeditor/config.js

@@ -1,5 +1,6 @@
 if (CKEDITOR && CKEDITOR.config) {
     CKEDITOR.config.language = 'en';
+    CKEDITOR.config.forcePasteAsPlainText = true;
     CKEDITOR.config.toolbar = [
         { name: 'document', groups: [ 'mode' ], items: [ 'Source' ] },
         { name: 'editing', groups: [ 'find' ], items: [ 'Find', 'Replace' ] },

data/app/assets/stylesheets/edit.css

@@ -0,0 +1,15 @@
+.image-preview-popup {
+    padding: 50px 0;
+    width: 75%;
+    height: 100%;
+    margin: auto;
+    text-align: center;
+}
+
+.image-preview-popup img {
+    width: 100%;
+}
+
+tr .image-preview {
+    cursor: pointer;
+}

data/app/assets/stylesheets/rademade_admin/base/main.sass

@@ -1,71 +1,77 @@
 html,
 body
-    height: 100%
-    min-height: 100%
+  height: 100%
+  min-height: 100%
+
 body
-    font-size: 12px
-    color: #2c4042
-    background: #34495e
-    +arial
+  font-size: 12px
+  color: #2c4042
+  background: #34495e
+  +arial
 
 a
-    text-decoration: none
-    outline: none
+  text-decoration: none
+  outline: none
 
 b,
 strong
-    font-weight: 700
+  font-weight: 700
 
 .clear
-    clear: both
-    float: none !important
+  clear: both
+  float: none !important
 
 .wrapper
-    min-width: 900px
-    height: 100%
-    overflow-x: hidden
-    background: #34495e
+  min-width: 900px
+  height: 100%
+  overflow-x: hidden
+  background: #34495e
 
 .fix
-    min-width: 900px
-    padding: 0 0 0 15px
-    margin: 0 auto
+  min-width: 900px
+  padding: 0 0 0 15px
+  margin: 0 auto
 
 .fl-l
-    float: left
+  float: left
 
 .fl-r
-    float: right
+  float: right
 
 .hide
-    display: none !important
+  display: none !important
 
 .ico
-    display: inline-block
-    position: absolute
+  display: inline-block
+  position: absolute
 
 #overlay
-    display: none
-    position: fixed
-    top: 0
-    left: 0
-    width: 100%
-    height: 100%
-    background-color: rgba(0, 0, 0, 0.7)
-    z-index: 998
+  display: none
+  position: fixed
+  top: 0
+  left: 0
+  width: 100%
+  height: 100%
+  background-color: rgba(0, 0, 0, 0.7)
+  z-index: 998
 
 input[type="text"],
 input[type="password"],
 input[type="email"]
-    margin: 0
-    outline: 0
+  margin: 0
+  outline: 0
 
 input[type="checkbox"]
-    margin: 0
-    padding: 0
+  margin: 0
+  padding: 0
 
 textarea
-    margin: 0
-    padding: 0
-    outline: 0
-    resize: none
+  margin: 0
+  padding: 0
+  outline: 0
+  resize: none
+
+textarea,
+input
+  &:disabled
+    +opacity(0.3)

data/app/assets/stylesheets/rademade_admin/blocks/buttons/main.sass

@@ -57,7 +57,10 @@ button
     border-color: #ac2925
 
 .r-margin
-  margin-right: 20px
+  margin-right: 10px
+
+.l-margin
+  margin-left: 10px
 
 .btn-sep
   margin: 0 10px
@@ -83,6 +86,8 @@ button
 .login-btn
   padding: 9px 12px
   width: 100%
+  height: auto
+  line-height: initial
   font-size: 18px
 
 .select-btn

data/app/assets/stylesheets/rademade_admin/blocks/form/select2.sass

@@ -1,67 +1,92 @@
 .form-box
-    .input-holder
-        .select2-container
-            width: 100%
-            height: 34px
-            margin-bottom: 10px
-            .select2-choices
-                padding: 0
-                display: block
-                width: 100%
-                font-size: 14px
-                color: #555
-                background-color: #fff
-                background-image: none
-                border: 1px solid #ccc
-                +box-sizing(border-box)
-                +border-radius(4px)
-                +box-shadow(inset 0 1px 1px rgba(0,0,0,.075))
-                +transition(border-color ease-in-out .15s,box-shadow ease-in-out .15s)
-                &:focus
-                    border-color: #66afe9
-                    +box-shadow(inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6))
-
-                .select2-search-choice
-                    display: none
+  .input-holder
+    .select2-container
+      width: 100%
+      height: 34px
+      margin-bottom: 10px
+      .select2-choices
+        padding: 0
+        display: block
+        width: 100%
+        font-size: 14px
+        color: #555
+        background-color: #fff
+        background-image: none
+        border: 1px solid #ccc
+        +box-sizing(border-box)
+        +border-radius(4px)
+        +box-shadow(inset 0 1px 1px rgba(0, 0, 0, .075))
+        +transition(border-color ease-in-out .15s, box-shadow ease-in-out .15s)
+        &:focus
+          border-color: #66afe9
+          +box-shadow(inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6))
 
-                .select2-search-field
-                    height: 34px
+        .select2-search-choice
+          display: none
 
-                input[type="text"]
-                    border: 0
-                    padding: 4px 12px
-                    &:focus
-                        outline: 0
-                        +box-shadow(none)
+        .select2-search-field
+          height: 34px
 
-            .select2-choice
-                height: 34px
-                background-color: #fff
-                background-image: none
-                border: 1px solid #ccc
-                .select2-chosen
-                    height: 34px
-                    line-height: 34px
-                    font-size: 14px
-                .select2-arrow
-                    b
-                        background-position: 0 4px
+        input[type="text"]
+          border: 0
+          padding: 4px 12px
+          &:focus
+            outline: 0
+            +box-shadow(none)
 
+      .select2-choice
+        height: 34px
+        background-color: #fff
+        background-image: none
+        border: 1px solid #ccc
+        .select2-chosen
+          height: 34px
+          line-height: 34px
+          font-size: 14px
+        .select2-arrow
+          b
+            background-position: 0 4px
 
-    .select2-items-list
+  .select2-items-list
+    float: left
+    margin-top: 15px
+    width: 100%
+    border-top: 1px solid #bdc3c7
+    li
+      padding: 10px 0
+      font-size: 14px
+      line-height: 24px
+      border-bottom: 1px solid #bdc3c7
+      +clear
+      span
         float: left
-        margin-top: 15px
-        width: 100%
-        border-top: 1px solid #bdc3c7
-        li
-            padding: 10px 0
-            font-size: 14px
-            line-height: 24px
-            border-bottom: 1px solid #bdc3c7
-            +clear
-            span
-                float: left
-                width: 63%
-                +to
-            button
-                float: right
+        width: 63%
+        +to
+      button
+        float: right
+
+  .select2-item-edit,
+  .select2-item-remove
+    position: relative
+    width: 25px
+    height: 25px
+    background: none
+    overflow: hidden
+    text-indent: 100%
+    cursor: pointer
+    &:before
+      position: absolute
+      top: 0
+      left: 0
+      height: 100%
+      width: 100%
+      font-size: 14px
+      color: #000
+      text-indent: 0
+      @extend .glyphicon
+
+  .select2-item-edit
+    @extend .glyphicon-edit
+
+  .select2-item-remove
+    @extend .glyphicon-trash

data/app/controllers/rademade_admin/model_controller.rb

@@ -61,6 +61,7 @@ module RademadeAdmin
       respond_to do |format|
         format.html { render_template }
         format.json { render :json => @items }
+        format.csv { send_data RademadeAdmin::CsvService.new(model_info, @items).to_csv }
       end
     end
 
@@ -80,6 +81,7 @@ module RademadeAdmin
       render_template
     end
 
+    # TODO move related to other controller or remove
     def related
       authorize! :read, model_class
       @related_model_info = RademadeAdmin::RelationService.new.related_model_info(model_info, params[:relation])
@@ -131,6 +133,7 @@ module RademadeAdmin
     end
 
     protected
+    # TODO move to search module
 
     def index_items
       conditions = Search::Conditions::List.new(params, model_info.data_items)

data/app/helpers/rademade_admin/field_helper.rb

@@ -9,21 +9,23 @@ module RademadeAdmin::FieldHelper
   # @return [String]
   #
   def display_item_value(item, data_item)
-    value = item.send(data_item.preview_accessor)
-    if data_item.has_relation?
-      # rm_todo extract method
-      if data_item.relation.has_many?
-        link_to data_item.label, admin_related_item(item, data_item.getter)
-      else
-        link_to value.to_s, admin_edit_uri(value) unless value.nil?
-      end
-    elsif data_item.has_uploader?
-      RademadeAdmin::Upload::PreviewService.new(value).uploaded_file_html
+    value = raw_item_value(item, data_item)
+    return (value ? '✔' : '×') if value.is_a?(::Boolean)
+    value
+  end
+
+  def display_related_item(data_item, value)
+    if data_item.relation.has_many?
+      link_to(data_item.label, admin_related_item(item, data_item.getter))
     else
-      value.to_s.html_safe
+      link_to(value.to_s, admin_edit_uri(value)) unless value.nil?
     end
   end
 
+  def display_upload_item(_, value)
+    RademadeAdmin::Upload::PreviewService.new(value).uploaded_file_html
+  end
+
   def pagination_option(number, name = 'paginate')
     hash_params = request.query_parameters.clone
     hash_params.delete(:page)
@@ -35,8 +37,18 @@ module RademadeAdmin::FieldHelper
   end
 
   def input_attr(attrs = {})
-    attrs.deep_merge :wrapper_html => { :class => 'form-group' },
-                :input_html => { :class => 'form-input' }
+    attrs.deep_merge(
+      wrapper_html: { class: 'form-group' },
+      input_html: { class: 'form-input' }
+    )
+  end
+
+  def raw_item_value(item, data_item)
+    return data_item.list_preview_handler.call(item) unless data_item.list_preview_handler.nil?
+    value = item.send(data_item.list_preview_accessor)
+    return display_upload_item(data_item, value) if data_item.has_uploader?
+    return display_related_item(data_item, value) if data_item.has_relation?
+    value.to_s.html_safe
   end
 
 end