marley-jamaica 0.0.2 → 0.0.3

data/lib/marley/client/jamaica.css

@@ -1,4 +1,36 @@
 body {background: #C9DE96; color: #000; font:13px/1.231 sans-serif; *font-size:small;height: 100%; min-height: 100%;}
+#main_menu__section {
+	background: #fff;
+	border: 1px solid #398235;
+	border-radius: 1em;
+	box-shadow: 0 0 10px rgba(51,51,51,0.5);
+	margin: 2em auto;
+	width: 90%;
+  height:90%;
+  position:relative;
+}
+#main_menu__section > .navigation {
+  display:block;
+  float:left;
+  width:20%;
+  height:85%;
+  overflow:auto;
+  text-align:center;
+}
+.navigation{
+  display:inline-block;
+  padding:.3em;
+  margin:0;
+}
+
+.content{
+  float:left;
+  width:75%;
+  height:85%;
+  overflow:auto;
+  margin:0 1em;
+}
+
 input, textarea {
 	border: 1px solid #398235;
 	line-height: 1.5em;
@@ -69,14 +101,6 @@ input[type=button]:hover,
 	cursor: pointer;
 }
 
-#main_menu__section {
-	background: #fff;
-	border: 1px solid #398235;
-	border-radius: 1em;
-	box-shadow: 0 0 10px rgba(51,51,51,0.5);
-	margin: 2em auto;
-	width: 90%;
-}
 h1{
   background: #398235;
   border-bottom: 1px solid #398235;
@@ -90,6 +114,7 @@ h1{
   border-bottom-left-radius: 0;
   border-bottom-right-radius: 0;
 }
+.navigation .navigation {padding:0;font-size:90%;}
 .navigation h1 {
   width:100%;
   padding:0;
@@ -107,17 +132,13 @@ h1{
 	content: "\25BE";
 }
 .navigation li { list-style:none; margin: 1em 0; }
-
-.navigation {min-width:20em;width:20%;padding:.3em;margin:0;display:inline-block;text-align:center;}
-.navigation .navigation {padding:0;font-size:90%;}
-.content{display:inline-block;width:60%;vertical-align:top;margin:0 1em;border:solid 1px;height:100%;border-radius:.5em;}
 li.collapsed ul{display:none;}
 
 .instanceContainer {
   position:relative;
   border: 1px solid #398235;
-  border-radius: 8px;
-  margin: 0 0 2em;
+  border-radius: .5em;
+  margin: .5em 0;
 }
 .instanceContainer .instanceContainer{margin:0 0 2em 2em;}
 .colContainer div {

data/lib/marley/client/jamaica.js

@@ -8,7 +8,13 @@ VALUE_INDEX=3;
 String.prototype.humanize=function(){return pl.map(this.replace(/^_/,'').split('_'),function(w){return w[0].toUpperCase()+w.slice(1)}).join(' ');}
 pl(function(){
   r.call(_jamaica_json,'body');
-  pl('#main_menu__section').append('<div id="current_content" class="content active"></div>');
+  pl('.content:empty').remove();
+  var contents=pl('.content');
+  if (contents.get().length===0){
+    pl('#main_menu__section').append('<div id="current_content" class="content active"></div>');
+  }else{
+    contents.appendTo('#main_menu__section');
+  }
   pl.win_bind('form','submit',j.formSubmit);
   pl.win_bind('.navigation li a','click',j.menuClick);
   pl.win_bind('.navigation li h1','click',j.toggleNav);
@@ -22,7 +28,7 @@ j={
   ajax_defaults:{
     load:function(){pl('body').css('cursor','wait')},
     always:function(){pl('body').css('cursor','default');},
-    success:function(json){r.call(json,'#'+this.id); },
+    success:function(json){pl(this).parent(2).replaceWith(r.call(json).toDom()); },
     error:function(stat,json){
       var err=JSON.parse(json);
       var attrs=err[1];
@@ -45,9 +51,7 @@ j={
   },
   menuClick:function(e){
     e.preventDefault();
-    //var target='#'+pl(this).parents('.navigation').attr('id').replace(/__navigation$/,'__content');
-    var target='#current_content';
-    pl.ajax(j.make_ajax_params.call(this,{success:function(json){r.call(json,target)}}));
+    pl.ajax(j.make_ajax_params.call(this,{success:function(json){r.call(json,'#current_content')}}));
   },
   formSubmit:function(e){
     e.preventDefault();

data/lib/marley/client/reggae.js

@@ -72,17 +72,12 @@ r.nodeTypes={
   "section":function(m){
     if (r.sectionTypes[m.attrs.name]){ return r.sectionTypes[m.attrs.name]};
     var attrs=m.attrs;
-    //need to fix and use below
-    function get_nav(n){
-     return ["ul",{"class":"navigation"},
-      pl.map(attrs.navigation,function(i){return ["li",{},[i]]})];
-    }
     var nav=pl.map(attrs.navigation,function(i){return ["li",{},[i]]});
     return ["div",{"class":"section","id":attrs.name+"__section"},
       [ ["h1",{},attrs.title],
       ["div",{"class":"menuDescription"},attrs.description],
       ["ul",{"class":"navigation"},nav],
-      m.content[0] ? m.content : " " ]
+      ["div",{"class":attrs.name+"__content content"},m.content]]
     ];
   },
   "instance":function(i) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: marley-jamaica
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Herb Daily
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-27 00:00:00 -03:00
+date: 2012-03-20 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: 0.7.0
     version: 
 description: A simple client for the Reggae data interchange format
 email: herb.daily@safe-mail.net