cedar 0.1.0.pre → 0.1.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03697cb90c8de98f666639f866148165b07230f2
-  data.tar.gz: 151b967aaf5b0f878dccaf8a5399033f3b81dd43
+  metadata.gz: a3e41500eb184aac2c9bc274cc802fffa66aee72
+  data.tar.gz: e58e773a697d69fe5601792b818fc84cad7ef7f6
 SHA512:
-  metadata.gz: af9724aa878757929535be4e3a8d005345260c269b21fb6048dd12df9baebffd3c719d4edc10545c177c55e897e2a20afc1b573299c4f7416235548bc9e4aab4
-  data.tar.gz: c15b1a9939ffafa79f7b9877b51bca4ec9a1e4e25cc9b35eddb393e3320ee2609a093983de22c642c0c92e9049d495c8272c45f2dc76f42b11a632ce82ccc95b
+  metadata.gz: 2c81982f965d4ffce99a1c2f4d6ba85724688ef98c703c96a017fe4375e99c286d6efe2ce09c7c428f716d4f7cca5e6d6fa0dd29762ed4763e900507b68b8a44
+  data.tar.gz: 811ade0d0b27c6f2f7afb06aa7dd4584a92a9117c8b912fde7d8bdda66e5d925fa845df33375ba2beee03b7d9d6c1ae036e75c9743c12883f69a3c54e5c82ec0

data/README.md

@@ -18,40 +18,52 @@ Or install it yourself as:
 
     $ gem install cedar
 
-## Usage
 
 
-## Contributing
+## Ply Dev Notes
 
-1. Fork it ( https://github.com/[my-github-username]/cedar/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
 
+add yourself as a user at:
 
-## 
+https://rubygems.org/gems/cedar
 
-dev notes:
-increment version.rb and Gemspec in target
-rake build
-gem push pkg/cedar-x.x.x.gem
+then do the following to save your stuff:
 
+```
+curl -u your_rubygems_username https://rubygems.org/api/v1/api_key.yaml >
+~/.gem/credentials; chmod 0600 ~/.gem/credentials
+```
 
-misc:
+someone who already is a project owner then will add you:
 
-https://rubygems.org/gems/cedar
+```
+gem owner cedar -a foo@example.com
+```
 
-curl -u your_rubygems_username https://rubygems.org/api/v1/api_key.yaml >
-~/.gem/credentials; chmod 0600 ~/.gem/credentials
+once you've updated the code, do the following 3 steps to publish:
 
-gem build cedar.gemspec
 
-gem push cedar-0.0.x.pre.gem
+1) increment `version.rb` and `Gemspec` in target
 
-gem list -r --pre cedar
+2) `rake build`
 
-gem install --pre cedar
+3) `gem push pkg/cedar-x.x.x.gem`
 
-add owner:
-gem owner cedar -a foo@example.com
+
+
+misc:
+
+
+to create a new gem:
+```
+gem build cedar.gemspec
+```
+
+to see what's been published:
+```
+gem list -r --pre cedar
+```
+to install outside of a project:
+```
+gem install --pre cedar
+```

data/lib/assets/javascripts/cedar.js

@@ -31,10 +31,16 @@ Cedar.Init = function() {
   }
 
   if (Cedar.auth.isEditMode()) {
-    jQuery( document ).ready(function( $ ) {
-      var logOff = '<a href="" onclick="location.reload(true)" style="position: absolute; bottom: 20px; right: 120px; ">[refresh]</a>';
-      logOff += '<a href="' + Cedar.auth.getLogOffURL() + '" style="position: absolute; bottom: 20px; right: 60px; ">[logout]</a>';
-      $(document.body).append(logOff);
+    $(document).ready(function() {
+      var $body = $('body');
+      var globalActions = '<div class="cedar-cms-global-actions">' +
+        // '<a href="#" onclick="window.location.reload(true);return false;">[refresh]</a>' +
+        '<a class="cedar-cms-global-action" href="' + Cedar.auth.getLogOffURL() + '">' +
+        '<span class="cedar-cms-icon cedar-cms-icon-edit"></span> ' +
+        '<span class="cedar-cms-global-action-label">Log Off Cedar</span>' +
+        '</a>' +
+        '</div>';
+      $body.append(globalActions);
     });
   }
 
@@ -68,12 +74,15 @@ Cedar.Auth.prototype.getLogOffURL = function() {
 
 // adapted from stackoverflow: http://stackoverflow.com/questions/1634748/how-can-i-delete-a-query-string-parameter-in-javascript
 Cedar.Auth.prototype.removeURLParameter = function(url, parameter) {
+  var splitUrl = url.split('#');
+  var serverUrl = splitUrl[0];
+  var clientUrl = splitUrl[1];
   //prefer to use l.search if you have a location/link object
-  var urlparts= url.split('?');
-  if (urlparts.length>=2) {
+  var splitServerUrl= serverUrl.split('?');
+  if (splitServerUrl.length>=2) {
 
-    var prefix= encodeURIComponent(parameter); //+'=';
-    var pars= urlparts[1].split(/[&;]/g);
+    var prefix = encodeURIComponent(parameter); //+'=';
+    var pars = splitServerUrl[1].split(/[&;]/g);
 
     //reverse iteration as may be destructive
     for (var i= pars.length; i-- > 0;) {
@@ -83,11 +92,11 @@ Cedar.Auth.prototype.removeURLParameter = function(url, parameter) {
       }
     }
 
-    url= urlparts[0];
+    var updatedServerUrl= splitServerUrl[0];
     if (pars.length > 0) {
-      url += '?'+pars.join('&');
+      updatedServerUrl += '?'+pars.join('&');
     }
-    return url;
+    return updatedServerUrl + "#" + clientUrl;
   } else {
     return url;
   }
@@ -215,11 +224,17 @@ Cedar.ContentEntry.prototype.render = function() {
 
 // styling for edit box
 Cedar.ContentEntry.prototype.getEditOpen = function(id) {
-  var block;
-  block = '<span class="cedar-cms-editable clearfix">';
+  var jsString = "if(event.stopPropagation){event.stopPropagation();}" +
+  "event.cancelBubble=true;" +
+  "window.location.href=this.attributes.href.value + \'&referer=' + encodeURIComponent(window.location.href) + '\';" +
+  "return false;";
+
+  var 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 += '<a onclick="' + jsString + '" href="' + Cedar.config.server +
+           '/cmsadmin/EditData?cdr=1&t=ContentEntry&o=' + encodeURIComponent(id) +
+           '" class="cedar-cms-edit-icon cedar-js-edit" >';
+  block += '<i class="cedar-cms-icon cedar-cms-icon-right cedar-cms-icon-edit"></i></a>';
   block += '</span>';
   return block;
 }

data/lib/assets/stylesheets/cedar.scss

@@ -3,17 +3,20 @@
 * @browsers	ALL
 **/
 
-
-
-
 .cedar-cms-editable {
+  position: relative;
   display: inline-block !important;
-  border: 1px dotted #F65126 !important
+  border: 1px dotted #F65126 !important;
+  padding-right: 20px;
+  min-height: 22px;
+  vertical-align: middle;
 }
 
 .cedar-cms-edit-tools {
   font-family: Arial, sans-serif;
-  position: relative;
+  position: absolute;
+  top: 0;
+  right: 0;
   display: block !important;
   font-size: 10px !important;
   line-height: 1.2 !important;
@@ -44,9 +47,9 @@
   top: 0;
   right: 0;
   height: 18px;
-  border: 1px solid #fff;
-  background-color: #ffddd0 !important;
+  background-color: transparent !important;
   padding: 0;
+  margin: 1px;
 }
 
 /* 4 classes to display icons */
@@ -62,24 +65,36 @@
 
 /* Standalone icons */
 .cedar-cms-icon {
-  min-height: 18px;
   width: 18px;
   height: 18px;
-  display: -moz-inline-stack;
+  line-height: 18px;
   display: inline-block;
   vertical-align: middle;
-  zoom: 1;
-  *display: inline;
-  _height: 18px;
   background: transparent url(cedar-display-tools-sprite.png) scroll no-repeat 0 0;
 }
 
 .cedar-cms-icon-right {
-  border-right: 0;
-  border-left: 1px solid #fff;
+  margin-left: 2px;
 }
 
 
 .cedar-cms-icon-edit {
   background-position: -89px -20px;
 }
+
+/* Action Links */
+.cedar-cms-global-actions {
+  position: absolute;
+  top: 0;
+  right: 0;
+}
+.cedar-cms-global-action {
+  display: inline-block;
+  color: #F65126 !important;
+  background: #FFF;
+  line-height: 18px;
+  padding: 3px 4px 3px 3px;
+}
+.cedar-cms-global-action * {
+  vertical-align: top;
+}

data/lib/cedar/version.rb

@@ -1,3 +1,3 @@
 module Cedar
-  VERSION = "0.1.0.pre"
+  VERSION = "0.1.1.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cedar
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre
+  version: 0.1.1.pre
 platform: ruby
 authors:
 - Jed Murdock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,6 +64,7 @@ files:
 - pkg/cedar-0.0.7.pre.gem
 - pkg/cedar-0.0.8.pre.gem
 - pkg/cedar-0.0.9.pre.gem
+- pkg/cedar-0.1.0.pre.gem
 homepage: http://plyinteractive.com
 licenses:
 - MIT