caboose-cms 0.2.6 → 0.2.7

data/app/assets/javascripts/caboose/admin.js

@@ -14,6 +14,7 @@
 //= require jquery_ujs
 //= require colorbox-rails
 //= require caboose/modal_integration
-//= require jquery.ui.all
-//= require tinymce-jquery
-//= require modeljs.all
+/* require jquery.ui.all  */
+/* require tinymce-jquery */
+/* require modeljs.all    */
+

data/app/assets/javascripts/caboose/modal_integration.js

@@ -23,13 +23,3 @@ function fix_colorbox() {
   //h = $('#cboxLoadedContent').height();
   //$('#cboxLoadedContent').css('height', ''+(h+28)+'px'); 
 }
-
-//lastkeys = "";
-//$(document).keyup(function(e) {
-//  if (e.keyCode == 13 && (lastkeys == "caboose" || lastkeys == "CABOOSE")) 
-//    $.colorbox({ href: '/station', iframe: true, initialWidth: 200, initialHeight: 50,  innerWidth: 200, innerHeight:  50, scrolling: false, transition: 'fade', closeButton: false, onComplete: fix_colorbox, opacity: 0.50 });
-//
-//  lastkeys += String.fromCharCode(e.keyCode);  
-//  if (lastkeys.length > 7)
-//    lastkeys = lastkeys.substr(1);  
-//});

data/app/assets/javascripts/caboose/model/all.js

@@ -4,6 +4,7 @@
 //= require caboose/model/model_binder
 //= require caboose/model/bound_control
 //= require caboose/model/bound_checkbox
+//= require caboose/model/bound_image
 //= require caboose/model/bound_select
 //= require caboose/model/bound_text
 //= require caboose/model/bound_textarea

data/app/assets/javascripts/caboose/model/bound_checkbox.js

@@ -34,9 +34,7 @@ BoundCheckbox = BoundControl.extend({
       .attr('type', 'checkbox')
       .css('left', $('#'+this.placeholder).outerWidth() + 10)
       .attr('checked', this.attribute.value)
-      .on('change', function() {
-        this2.binder.cancel_active();
-        this2.binder.active_control = this;
+      .on('change', function() {        
         this2.save(); 
       })
     );
@@ -67,7 +65,6 @@ BoundCheckbox = BoundControl.extend({
       if (resp.error) this2.error(resp.error);
       else
       {
-        this2.binder.active_control = this2;
         if (this2.binder.success)
           this2.binder.success(this2);
         this2.view();

data/app/assets/javascripts/caboose/model/bound_image.js

@@ -0,0 +1,93 @@
+
+BoundImage = BoundControl.extend({
+
+  //el: false,
+  //model: false,
+  //attribute: false,
+  //binder: false,
+  
+  width: 100,
+  style: 'medium',
+  authenticity_token: false,
+ 
+  init: function(params) {
+    for (var thing in params)
+      this[thing] = params[thing];
+    
+    this.el = this.el ? this.el : this.model.name.toLowerCase() + '_' + this.model.id + '_' + this.attribute.name;
+         
+    var this2 = this;
+    $('#'+this.el).wrap($('<div/>').attr('id', this.el + '_container').css('position', 'relative'));
+    $('#'+this.el+'_container').empty();
+    
+    $('#'+this.el+'_container').append($('<img/>')
+      .attr('src', this.attribute.value)
+      .css('width', this.width)
+      .css('float', 'left')
+      .css('margin-right', 10)
+    );    
+    $('#'+this.el+'_container').append($('<form/>')
+      .attr('action', this.attribute.update_url)
+      .attr('method', 'post')
+      .attr('enctype', 'multipart/form-data')
+      .attr('encoding', 'multipart/form-data')
+      .attr('target', this.el + '_iframe')
+      .on('submit', function() {
+         $('#'+this2.el+'_message').html("<p class='loading'>Uploading...</p>");
+         $('#'+this2.el+'_iframe').on('load', function() { this2.post_upload(); });  
+      })
+      .append($('<input/>').attr('type', 'hidden').attr('name', 'authenticity_token').val(this.binder.authenticity_token))
+      .append($('<input/>').attr('type', 'button').val('Update').click(function() { $('#'+this2.el+'_container input[type="file"]').click(); }))
+      .append($('<input/>')
+        .attr('type', 'file')
+        .attr('name', this.attribute.name)
+        .css('display', 'none')
+        .on('change', function() { $('#'+this2.el+'_container form').submit(); })
+      )
+    );
+    $('#'+this.el+'_container').append($('<div/>')
+      .attr('id', this.el + '_message')
+    );
+    $('#'+this.el+'_container').append($('<iframe/>')
+      .attr('name', this.el + '_iframe')
+      .attr('id', this.el + '_iframe')      
+      .css('width', 0)
+      .css('height', 0)
+      .css('border', 0)
+    );
+    $('#'+this.el+'_container').append($('<br/>')
+      .css('clear', 'both')
+    );
+  },
+  
+  post_upload: function() {
+    $('#'+this.el+'_message').empty();
+    
+    var str = frames[this.el+'_iframe'].document.documentElement.innerHTML;
+    str = str.replace(/<body>(.*?)<\/body>/, '$1');
+    str = str.replace(/<html>(.*?)<\/html>/, '$1');
+    str = str.replace(/<head>.*?<\/head>(.*?)/, '$1');
+    
+    var resp = $.parseJSON(str);
+    if (resp.error)
+      this.error(resp.error);
+    else if (resp.url)
+      $('#'+this.el+'_container img').attr('src', resp.url);
+  },
+    
+  error: function(str) {
+    if (!$('#'+this.el+'_message').length)
+    {
+      $('#'+this.el+'_container').append($('<div/>')
+        .attr('id', this.el + '_message')
+        .css('width', $('#'+this.el).outerWidth())
+      );
+    }
+    $('#'+this.el+'_message').hide();
+    $('#'+this.el+'_message').html("<p class='note error'>" + str + "</p>");
+    $('#'+this.el+'_message').slideDown();
+    var this2 = this;
+    setTimeout(function() { $('#'+this2.el+'_message').slideUp(function() { $(this).empty(); }); }, 3000);
+  }
+  
+});

data/app/assets/javascripts/caboose/model/bound_text.js

@@ -7,6 +7,7 @@ BoundText = BoundControl.extend({
   //binder: false,
   
   width: false,
+  save_attempts: 0,
  
   init: function(params) {
     for (var thing in params)
@@ -32,7 +33,13 @@ BoundText = BoundControl.extend({
       else
         $('#'+this2.el).removeClass('dirty');
     });                             
-    $('#'+this.el).on('blur', function() { this2.save(); });
+    $('#'+this.el).on('blur', function() {
+      if (this2.save_attempts < 1)
+      {
+        this2.save_attempts++;
+        this2.save();
+      }      
+    });
   },
   
   save: function() {
@@ -43,6 +50,7 @@ BoundText = BoundControl.extend({
     this.show_loader();        
     var this2 = this;
     this.model.save(this.attribute, function(resp) {
+      this2.save_attempts = 0;
       if (resp.error)
       {
         this2.hide_loader();

data/app/assets/javascripts/caboose/model/model_binder.js

@@ -6,6 +6,7 @@ ModelBinder.prototype = {
   controls: [],
   //active_control: false,
   success: false,
+  authenticity_token: false,
   
   init: function(params) {
     this.model = new Model({        
@@ -14,8 +15,9 @@ ModelBinder.prototype = {
       attributes: [],
       attributes_clean: []
     });
-    if (params['update_url']) this.model.update_url = params['update_url'];
-    if (params['success'])    this.success = params['success'];
+    if (params['update_url'])         this.model.update_url = params['update_url'];
+    if (params['success'])            this.success = params['success'];
+    if (params['authenticity_token']) this.authenticity_token = params['authenticity_token'];
       
     var m = this.model;
     $.each(params['attributes'], function(i, attrib) {
@@ -35,6 +37,7 @@ ModelBinder.prototype = {
       else if (attrib.type == 'select')   control = new BoundSelect(opts);
       else if (attrib.type == 'checkbox') control = new BoundCheckbox(opts);
       else if (attrib.type == 'textarea') control = new BoundTextarea(opts);
+      else if (attrib.type == 'image')    control = new BoundImage(opts);
 
       this2.controls.push();    
     });

data/app/controllers/caboose/admin_controller.rb

@@ -4,7 +4,7 @@ module Caboose
       
     # GET /admin
     def index
-      return if !user_is_allowed('admin', 'view')      
+
     end
     
     # GET /station

data/app/controllers/caboose/login_controller.rb

@@ -4,7 +4,8 @@ module Caboose
     
     # GET /login
     def index
-      @return_url = params[:return_url].nil? ? "/" : params[:return_url];
+      @return_url = params[:return_url].nil? ? "/" : params[:return_url]
+      @modal = params[:modal].nil? ? false : params[:modal]
       redirect_to @return_url if logged_in?
     end
     

data/app/views/caboose/admin/index.html.erb

@@ -1 +1,38 @@
 <h1>Admin</h1>
+
+<%= content_for :caboose_js do %>
+<script type='text/javascript'>
+
+$(document).ready(function() {
+  open_colorbox();  
+});
+
+function open_colorbox() {
+  $.colorbox({
+    href: '/login?modal=1&return_url=/station',
+    iframe: true,
+    innerWidth: 200,
+    innerHeight:  50,
+    scrolling: false,
+    transition: 'fade',
+    closeButton: false,
+    onComplete: fix_colorbox,
+    opacity: 0.50,
+    onClosed: function() { open_colorbox(); }   
+  });
+}
+
+function fix_colorbox() {
+  $("#cboxTopLeft"      ).css('background', '#111');
+  $("#cboxTopRight"     ).css('background', '#111');
+  $("#cboxBottomLeft"   ).css('background', '#111');
+  $("#cboxBottomRight"  ).css('background', '#111');
+  $("#cboxMiddleLeft"   ).css('background', '#111');
+  $("#cboxMiddleRight"  ).css('background', '#111');
+  $("#cboxTopCenter"    ).css('background', '#111');
+  $("#cboxBottomCenter" ).css('background', '#111');
+  $("#cboxClose"        ).hide(); 
+}
+
+</script>
+<% end %>

data/app/views/caboose/login/index.html.erb

@@ -28,7 +28,7 @@ function login()
 		  if (resp.error)
 		    modal.autosize("<p class='note error'>" + resp.error + "</p>");
 			else if (resp.redirect != false)
-			  parent.window.location = resp.redirect;
+			  <%= @modal ? "" : "parent." %>window.location = resp.redirect;
 			else
 			  parent.location.reload(true);
 		},

data/app/views/layouts/caboose/_admin_top_nav.html.erb

@@ -1,6 +1,7 @@
 
 <div id='top_nav'>
   <div class='caboose_logo'></div>
+  <!--
   <ul>
   <% if (@user.nil? || @user == Caboose::User.logged_out_user) %>
     <li><a href='/login?return_url=#{request.fullpath}' id='caboose_login'><span>Login</span></a></li>
@@ -9,4 +10,5 @@
     <li class='cpanel'  ><a href='/station' id='caboose_station'><span>Dashboard</span></a></li>
   <% end %>
   </ul>
+  -->
 </div>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -179,6 +179,7 @@ files:
 - app/assets/javascripts/caboose/model/bound_checkbox.js
 - app/assets/javascripts/caboose/model/bound_checkbox_multiple.js
 - app/assets/javascripts/caboose/model/bound_control.js
+- app/assets/javascripts/caboose/model/bound_image.js
 - app/assets/javascripts/caboose/model/bound_select.js
 - app/assets/javascripts/caboose/model/bound_text.js
 - app/assets/javascripts/caboose/model/bound_textarea.js