rails_admin_live_edit 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b6b4a676bed556b540062787187771802df7a4b
-  data.tar.gz: bb497e09e631aa8abb6c37d7bad2c5844eb5d4b8
+  metadata.gz: 0edb6a9d579a56400807ee4943cff28c60ce28af
+  data.tar.gz: 16c77573069b89fac7d59465d12353392b3aaa26
 SHA512:
-  metadata.gz: 590d64361e39287ca1a16421e2291e64ed4209b1538c987198474557f67b1279ea54d808c7888acb2f5d1f552e3df2b6a380d355667a198035ebdbd0c7457525
-  data.tar.gz: 29ab465455b1bf0401cca0ba6724ffd6b302cedd722888155508f757157cdb8c2f4cdadaedf8b431fc52d8fd1876f0a07e684a4379d2f26001c5c755af8db3e3
+  metadata.gz: 584f45b1e7877700cc06895109c5756e9859f86da37dde64fd59db07eb5e48b552c8a6fa0136255569bafe24347a74fecb8541b6a1c793a525400ac9e733e5df
+  data.tar.gz: 78fd9689464faa8de90d54e29914404cad0a1a2601d5475bde907ffed63804bd0b83e478cf09050a7bba0bdf606180299643c68e6ac02b9ec01c00b914e46cc6

data/README.md

@@ -2,7 +2,9 @@
 
 A [rails_admin](https://github.com/sferik/rails_admin) plugin to edit site contents from the frontend.
 
-If the user is logged in in rails_admin and is viewing an editable page an edit button is shown on the top right which allow to open a modal window to edit the page content.
+If the user is logged in rails_admin a fixed bar on bottom is shown. It allows to edit the current record (if in a *show* page) or to create a new one (if in an *index* page).
+
+Demo: [heroku app](http://rails-admin-material.herokuapp.com/posts/)
 
 ## Installation
 
@@ -10,14 +12,16 @@ If the user is logged in in rails_admin and is viewing an editable page an edit
 
 - Add to application layout (in body) (erb example): `<%= render 'live_edit/ra_live_editor' %>`
 
-- Add to *app/assets/javascripts/application.js*: `//= require rmodal.js/dist/rmodal`
-
 - Edit or create *app/assets/javascripts/rails_admin/custom/ui.js* and add: `//= require rails_admin/plugins/live_edit/ui.js`
 
+## Notes
+
+- This plugin use `current_user` method to check if the user is logged in; to bypass this check it is possible to define a `current_user` helper method.
+
 ## Preview
 
 ![preview](preview.jpg)
 
 ## Contributors
 
-- [Mattia Roccoberton](http://blocknot.es) - creator, maintainer
+- [Mattia Roccoberton](http://blocknot.es) - creator, maintainer

data/app/views/live_edit/_ra_live_editor.html.haml

@@ -1,11 +1,28 @@
 :ruby
+  ra_logged = false
   ra_le_model = false
-  if defined?( current_user ) && current_user && action_name == 'show' && params[:id]
-    ra_le_model = controller_name.singularize
-    ra_le_id = params[:id]
+  p '1'
+  p current_user
+  if defined?( current_user ) && current_user
+    p '2'
+    ra_logged = true
+    model = controller_name.singularize
+    if RailsAdmin.config && RailsAdmin.config.models.map{ |mod| mod.abstract_model.model_name.underscore }.include?( model )
+      p '3'
+      ra_le_model = model
+      ra_le_id = params[:id]
+    end
+    if RailsAdmin.config.main_app_name
+      if RailsAdmin.config.main_app_name.is_a? Proc
+        name = RailsAdmin.config.main_app_name.call
+      else
+        name = RailsAdmin.config.main_app_name
+      end
+      admin_title = name[1] ? name[1] : '' if name.is_a? Array
+    end
   end
 
-- if ra_le_model && ra_le_id
+- if ra_logged
   :css
     .ra-le-button {
       background: #ddd;
@@ -22,11 +39,15 @@
     .ra-le-button.btn2 {
       border-top: 1px solid #aaa;
       border-left: 1px solid #aaa;
+    }
+    .ra-le-button.btn3 {
+      border-top: 1px solid #aaa;
+      border-left: 1px solid #aaa;
       border-right: 1px solid #aaa;
       border-radius: 0 5px 0 0;
     }
     .ra-le-controls {
-      background: rgba(0, 0, 0, .2);
+      background: rgba(0, 0, 0, .3);
       bottom: 0;
       left: 0;
       padding-top: 5px;
@@ -34,6 +55,15 @@
       text-align: right;
       width: 100%;
     }
+    .ra-le-controls > .admin-title {
+      color: #fff;
+      float: left;
+      padding: 4px 0 0 8px;
+    }
+    .ra-le-controls > .close {
+      border-left: 1px solid #aaa;
+      padding: 5px 0;
+    }
     .ra-le-controls > a:last-child {
       margin-right: 5px;
     }
@@ -51,8 +81,13 @@
       left: 0;
       right: 0;
       bottom: 0;
+      opacity: 0;
       overflow-x: hidden;
       overflow-y: auto;
+      transition: opacity 0.3s;
+    }
+    #ra-le-modal.opened {
+      opacity: 1;
     }
     #ra-le-modal > .modal-dialog {
       position: relative;
@@ -60,8 +95,12 @@
       width: 940px;
       -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
       box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
-      background: #fff;
       margin: 0 auto;
+      opacity: 1;
+      transition: opacity 0.3s;
+    }
+    #ra-le-modal > .modal-dialog.closed {
+      opacity: 0;
     }
     #ra-le-modal .dlg-buttons {
       background: #ccc;
@@ -101,8 +140,15 @@
           %a.btn-close.ra-le-button{ href: '#', onclick: 'event.preventDefault();modal.close();' }= t 'live_edit.button.close'
 
   .ra-le-controls
-    %a.btn1.ra-le-button#ra-le-open-modal{ href: '#' }>= t 'live_edit.button.edit_page'
-    = link_to t('live_edit.button.admin'), rails_admin_path, class: 'btn2 ra-le-button'
+    .admin-title= admin_title
+    = link_to rails_admin_path, class: 'btn1 ra-le-button' do
+      = t('live_edit.button.admin')
+    - if ra_le_model
+      - if ra_le_id
+        %a.btn2.ra-le-button#ra-le-open-modal1{ href: '#', 'data-op': 'edit' }>= t 'live_edit.button.edit_page'
+      %a.btn3.ra-le-button#ra-le-open-modal2{ href: '#', 'data-op': 'new' }>= t 'live_edit.button.new_page'
+    - else
+      %span.close==  
 
   :javascript
     // >>> rmodal.js >>>
@@ -265,13 +311,15 @@
     })));
     // <<< rmodal.js <<<
 
+    var iframe = '';
     window.onload = function() {
       var modal = new RModal(document.getElementById('ra-le-modal'), {
         beforeOpen: function(next) {
-          document.getElementById('ra-le-content').innerHTML = '<iframe src="#{rails_admin.edit_path( ra_le_model, ra_le_id )}" width="930px" height="470px"></iframe>';
+          document.getElementById('ra-le-content').innerHTML = iframe;
           next();
         },
         afterOpen: function() {
+          document.getElementById('ra-le-modal').className = 'opened';
         },
         beforeClose: function(next) {
           next();
@@ -281,8 +329,10 @@
         }
         // , bodyClass: 'modal-open'
         // , dialogClass: 'modal-dialog modal-dialog-lg'
+        // , dialogOpenClass: 'opened'
         // , dialogOpenClass: 'animated fadeIn'
         // , dialogCloseClass: 'animated fadeOut'
+        , dialogCloseClass: 'closed'
 
         // , focus: true
         // , focusElements: ['input.form-control', 'textarea', 'button.btn-primary']
@@ -292,9 +342,22 @@
       document.addEventListener('keydown', function(ev) {
         modal.keydown(ev);
       }, false);
-      document.getElementById('ra-le-open-modal').addEventListener("click", function(ev) {
-        ev.preventDefault();
-        modal.open();
-      }, false);
       window.modal = modal;
     }
+
+  - if ra_le_model
+    :javascript
+      if( document.getElementById('ra-le-open-modal1') ) {
+        document.getElementById('ra-le-open-modal1').addEventListener("click", function(ev) {
+          ev.preventDefault();
+          iframe = '<iframe src="#{rails_admin.edit_path( ra_le_model, ra_le_id ? ra_le_id : 0 )}" width="930px" height="470px"></iframe>';
+          modal.open();
+        }, false);
+      }
+      if( document.getElementById('ra-le-open-modal2') ) {
+        document.getElementById('ra-le-open-modal2').addEventListener("click", function(ev) {
+          ev.preventDefault();
+          iframe = '<iframe src="#{rails_admin.new_path( ra_le_model )}" width="930px" height="470px"></iframe>';
+          modal.open();
+        }, false);
+      }

data/lib/rails_admin_live_edit/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminLiveEdit
-  VERSION = '0.1.4'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_live_edit
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies: []
 description: A rails_admin plugin to edit site contents from the frontend
 email: