0.2.1 prerelease

neokoenig · May 24, 2014 · dbad529 · dbad529
1 parent 4fab81a
commit dbad529
Show file tree

Hide file tree

Showing 12 changed files with 291 additions and 531 deletions.
diff --git a/demo/customcolumns.html b/demo/customcolumns.html
@@ -45,7 +45,7 @@
 
    $("#mycanvas").gridmanager({
       debug : 1 ,
-      buttons: [[12], [6,6], [4,4,4], [3,3,3,3], [2,1,2,1,2,1,3], [1,3,1,4,3], [2,8,2], [4,8], [8,4]]
+      controlButtons: [[12], [6,6], [4,8,4], [3,7,1,1], [2,1,2,1,2,1,3], [1,3,1,4,3], [2,8,2], [4,8], [8,4]]
     });
 
 

diff --git a/demo/fluid.html b/demo/fluid.html
@@ -0,0 +1,59 @@
+ <!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Fluid - Gridmanager Development</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">  
+
+    <!-- Bootstrap CSS -->
+    <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">   
+
+  <!-- Grid Manager CSS -->
+    <link href="../dist/css/jquery.gridmanager.css" rel="stylesheet"> 
+
+
+     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- jQuery -->
+     <script src="//code.jquery.com/jquery-2.1.1.min.js"></script>
+    <!-- jQuery UI -->
+     <script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
+    <!-- Bootstrap JS -->
+     <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+
+     <!-- Grid Manager JS -->
+     <script src="../dist/js/jquery.gridmanager.js"></script> 
+
+  </head>
+<body> 
+
+
+
+<div class="container-fluid">  
+    <div id="mycanvas">  
+
+    </div> 
+</div> 
+
+<!--================== JS ================--> 
+<script> 
+$(document).ready(function(){  
+
+   $("#mycanvas").gridmanager({ 
+        controlPrepend: "<div class='row-fluid'><div class='col-md-12'><div id='gm-addnew' class='btn-group '>", 
+        // Row Specific
+        rowSelector: "div.row-fluid",
+        rowPrepend:  "<div class='row-fluid gm-editing'>"
+    }   );
+
+
+});
+</script> 
+</body>
+</html>
+
diff --git a/demo/fluidtest.html b/demo/fluidtest.html
diff --git a/demo/index.html b/demo/index.html
@@ -19,12 +19,13 @@ <h1>Gridmanager.js v  0.2.0</h1>
   <h3>Demos:</h3>
 
   <ul>
-    <li><a href="simple.html">Simple, No RTE version</a><br /> - No rich text editor loaded</li>
-    <li><a href="tinymce.html">TinyMCE Version</a><br /> - TinyMCE loaded, default config</li>
-    <li><a href="ckeditor.html">CKEditor Version</a><br /> - CKEditor loaded, default config</li>
-    <li><a href="ckeditor-custom.html">CKEditor Custom Version</a><br /> - CKEditor loaded, custom config file</li>
-    <li><a href="customcolumns.html">Custom Columns</a><br /> - Configuration for custom column presets</li>
+    <li><a href="simple.html">Simple, No RTE version</a><br /> - No rich text editor loaded: just uses browsers native functionality</li>
+    <li><a href="tinymce.html">TinyMCE Version</a><br /> - TinyMCE loaded (N.B requires jquery adapter), default config</li>
+    <li><a href="ckeditor.html">CKEditor Version</a><br /> - CKEditor loaded  (N.B requires jquery adapter), default config</li>
+    <li><a href="ckeditor-custom.html">CKEditor Custom Version</a><br /> - CKEditor loaded  (N.B requires jquery adapter), with custom config file</li>
+    <li><a href="customcolumns.html">Custom Columns</a><br /> - Example configuration for custom column presets</li>
     <li><a href="multiple.html">Multiple instances</a><br /> - Really not recommended, just here for kicks.</li>
+    <li><a href="fluid.html">Fluid Layout</a><br /> - A couple of options needed to turn row into row-fluid</li>
   </ul>
 </div> 
 

diff --git a/dist/css/jquery.gridmanager.css b/dist/css/jquery.gridmanager.css
@@ -7,21 +7,22 @@
  */
 
 #gm-controls {margin:5px 0;}
-#gm-canvas {min-height: 100px; } 
-#gm-canvas div.row.gm-editing, #gm-canvas div.row-fluid.gm-editing {padding: 5px; -webkit-box-shadow: 0px 0px 5px 0px rgba(50, 50, 50, 0.75);
-			-moz-box-shadow:    0px 0px 5px 0px rgba(50, 50, 50, 0.75);
-			box-shadow:         0px 0px 5px 0px rgba(50, 50, 50, 0.75); min-height: 20px; margin-bottom: 10px; } 
-
-#gm-canvas div.gm-editing
-{
-padding:4px 15px;   min-height: 30px; -webkit-box-shadow: inset 0px 0px 5px 0px rgba(50, 50, 50, 0.75);
-					-moz-box-shadow:  inset  0px 0px 5px 0px rgba(50, 50, 50, 0.75);
-					box-shadow:      inset   0px 0px 5px 0px rgba(50, 50, 50, 0.75);
-}
-
+#gm-canvas {min-height: 100px;} 
+#gm-canvas .gm-editing {
+	-webkit-box-shadow: inset 0px 0px 5px 0px rgba(50, 50, 50, 0.75);
+	-moz-box-shadow:  inset  0px 0px 5px 0px rgba(50, 50, 50, 0.75);
+	box-shadow:      inset   0px 0px 5px 0px rgba(50, 50, 50, 0.75); 
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	padding:4px 15px;   
+	min-height: 30px;
+	}  
+
+#gm-canvas div.row.gm-editing, 
+#gm-canvas div.row-fluid.gm-editing {
+	padding: 5px;  
+	min-height: 20px; margin-bottom: 10px;}
 #gm-canvas div.gm-tools {padding:3px;   min-height: 30px; display:block; clear:both;}
 #gm-canvas div.gm-tools a:hover {cursor: pointer;}
-
-/* TinyMCE */
-#gm-canvas div.mce-content-body {border:1px solid red;}