cedar 0.0.1.pre → 0.0.2.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37a9874d9ec3974d629266793d477fe5d9829703
-  data.tar.gz: 45048b87938643c88e6ddb15c3f5f9e6ef746bef
+  metadata.gz: 4a0c5adf5e2f07dee717a83cc3d4276628878d38
+  data.tar.gz: 2bb4a59d7c2f52846d3aa915608551cc66f73b61
 SHA512:
-  metadata.gz: e08c905f813b6d74df6e8f8aea8dd5be3e733df0e8606fc4b5835d6bb990e1995f6ca01f248d92cd7e167a09d533e1f46e9c6c4c2a179e1cd0d6c73433a76ccf
-  data.tar.gz: 12f2a566de94014a87e59f70bb500b0abfb8a5055ae008c09832f20eb5ef459cf76a0fcfb5b2c508cfff7af8b1701c3bb2c85c3e599e8bfc479961af7f4a4a6b
+  metadata.gz: 87a412b3141bc1d09d2208a14e95d2c888de89b00df8c4557a32556448b4626faa5a798a39344f13ef744d51e649783a6b5975d459a05f5312511c798f759698
+  data.tar.gz: e2aff822c1c56cf62bd11fe509890344d032d6fad2a214aa527e2902e01e383e2365c6b00ca6d0cccc44ba951d48b65d7ba9e002dea6bb03f221d4219262d1d3

data/{vendor → lib}/assets/javascripts/cedar.js

@@ -174,12 +174,6 @@ Cedar.ContentEntry.prototype.setContent = function(json) {
 
 // takes into account edit mode styling
 Cedar.ContentEntry.prototype.getContent = function(options){
-
-  var payload = null;
-  if (options && options.length && options['json']){
-    return { content: 'jsonified' + this.content };
-  }
-
   if (Cedar.auth.isEditMode()) {
     return this.getEditOpen(this.cedarId) + this.content + this.getEditClose();
   }
@@ -213,26 +207,13 @@ Cedar.ContentEntry.prototype.render = function() {
   }.bind(this));
 }
 
-Cedar.ContentEntry.prototype.renderJSON = function() {
-  //this.retrieve();
-
-  return this.retrieve().done( function() {
-    return (this.getContent({'json':true}));
-  }.bind(this));
-
-
-  // return this.retrieve().done(function() {
-  //   return $.Deferred().resolve(this.getContent({'json':true}));
-  // }.bind(this));
-}
-
 // styling for edit box
 Cedar.ContentEntry.prototype.getEditOpen = function(id) {
   var block;
-  block = '<span class="cms-editable clearfix">';
-  block += '<span class="cms-edit-tools">';
-  block += '<a target="cedarEdit" href="' + Cedar.config.server + 'cmsadmin/EditData?cdr=1&t=ContentEntry&o=' + encodeURIComponent(id) + '" class="cms-edit-icon" >';
-  block += '<b class="cms-edit-label">content block</b><i class="cms-icon cms-icon-right cms-icon-edit"></i></a>';
+  block = '<span class="cedar-cms-editable clearfix">';
+  block += '<span class="cedar-cms-edit-tools">';
+  block += '<a target="cedarEdit" href="' + Cedar.config.server + 'cmsadmin/EditData?cdr=1&t=ContentEntry&o=' + encodeURIComponent(id) + '" class="cedar-cms-edit-icon" >';
+  block += '<b class="cedar-cms-edit-label">content block</b><i class="cedar-cms-icon cedar-cms-icon-right cedar-cms-icon-edit"></i></a>';
   block += '</span>';
   return block;
 }

data/{vendor → lib}/assets/stylesheets/cedar.scss

@@ -1,6 +1,3 @@
-// Place all the styles related to the welcome controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
 /**
 * Styles particular to the CMS when in "edit-mode" while viewing a front-end page.
 * @browsers	ALL
@@ -8,21 +5,14 @@
 
 
 
-#cmsToolbarPlaceholder {
-  height: 46px !important;
-}
-
-.cms-edit-control,
-.cms-edit-tools {
-  font-family: Arial, sans-serif;
-}
 
-.cms-editable {
+.cedar-cms-editable {
   display: block !important;
   border: 1px dotted #F65126 !important
 }
 
-.cms-edit-tools {
+.cedar-cms-edit-tools {
+  font-family: Arial, sans-serif;
   position: relative;
   display: block !important;
   font-size: 10px !important;
@@ -30,27 +20,25 @@
   text-align: left !important;
 }
 
-.cms-edit-tools a {
+.cedar-cms-edit-tools a {
   color: #F26521 !important;
   text-decoration: none !important;
 }
 
-.cms-edit-tools a:hover {
+.cedar-cms-edit-tools a:hover {
   color: #FA8A2D !important;
   text-decoration: none !important;
 }
 
-.cms-edit-label {
+.cedar-cms-edit-label {
   color: #F26521 !important;
   text-transform: uppercase;
   font-size: 10px;
   padding: 0 6px;
 }
 
-.cms-edit-tools .cms-edit-icon,
-.cms-edit-tools .cms-edit-icon:hover,
-#industryNavMain #inner .cms-edit-tools .cms-edit-icon,
-#industryNavMain #inner .cms-edit-tools .cms-edit-icon:hover {
+.cedar-cms-edit-tools .cedar-cms-edit-icon,
+.cedar-cms-edit-tools .cedar-cms-edit-icon:hover {
   display: block;
   position: absolute;
   top: 0;
@@ -64,25 +52,17 @@
 
 /* 4 classes to display icons */
 
-.cms-edit-tools.spacer {
+.cedar-cms-edit-tools.spacer {
   height: 20px;
 }
 
-.cms-edit-tools.left-align .cms-edit-icon {
+.cedar-cms-edit-tools.left-align .cedar-cms-edit-icon {
   right: auto;
   left: 0;
 }
 
-.cms-error-log {
-  background-color: white;
-  border: 1px solid black;
-  margin-bottom: 5px;
-  padding: 5px;
-  color: black;
-}
-
 /* Standalone icons */
-.cms-icon {
+.cedar-cms-icon {
   min-height: 18px;
   width: 18px;
   height: 18px;
@@ -92,31 +72,15 @@
   zoom: 1;
   *display: inline;
   _height: 18px;
-  background: transparent url(/resources/cms/media/image/display-tools-sprite.png) scroll no-repeat 0 0;
+  background: transparent url(cedar-display-tools-sprite.png) scroll no-repeat 0 0;
 }
 
-.cms-icon-left {
-  border-left: 0;
-  border-right: 1px solid #fff;
-}
-
-.cms-icon-right {
+.cedar-cms-icon-right {
   border-right: 0;
   border-left: 1px solid #fff;
 }
 
-.cms-icon-nav {
-  background-position: -67px -1px;
-}
 
-.cms-icon-edit {
+.cedar-cms-icon-edit {
   background-position: -89px -20px;
 }
-
-.cms-icon-list {
-  background-position: -34px -39px;
-}
-
-.cms-icon-widget {
-  background-position: -71px -58px;
-}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cedar
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre
+  version: 0.0.2.pre
 platform: ruby
 authors:
 - Jed Murdock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies: []
 description: Pre-Release Cedar/Ply CaaS Asset Gem
 email: jedmurdock@gmail.com
@@ -16,11 +16,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- vendor/assets/images/display-tools-sprite.png
-- vendor/assets/javascripts/cedar.js
-- vendor/assets/javascripts/cedar.marionette.js
-- vendor/assets/javascripts/cedarInit.js.erb
-- vendor/assets/stylesheets/cedar.scss
+- lib/assets/images/cedar-display-tools-sprite.png
+- lib/assets/javascripts/cedar.js
+- lib/assets/javascripts/cedar.marionette.js
+- lib/assets/javascripts/cedarInit.js.erb
+- lib/assets/stylesheets/cedar.scss
 homepage: http://plyinteractive.com
 licenses:
 - MIT