Merge remote-tracking branch 'refs/remotes/origin/master' into directive

# Conflicts:
#	README.md

Author: ThomasPe

README.md

@@ -7,11 +7,47 @@ Quickly generate your your schema form using this GUI builder.
 # Roadmap
 
 - Complete support of all elements based on schema-form
+- Support for editing existing Schemas & Forms
 - Provide source definition for different platforms
 - 100% test coverage
 
+<<<<<<< HEAD
 # Demo
 There is a live demo at http://ralphowino.github.io/schema-form-builder
+=======
+
+
+#Basic Usage
+
+**This is what using the Schema Form Builder should look like:**
+First, expose your (exinsting) schema and form to the $scope.
+
+```javascript
+angular.module('myModule', ['schemaFormBuilder'])
+       .controller('FormBuilderController', function($scope) {
+  // JSON Schema
+  // add an existing schema to edit it
+  // or leave blank to create a new form
+  $scope.schema = {};
+
+  // Schema Form Defintion
+  // add an existing form definition for editing
+  // or leave blank to create a new form
+  $scope.form = [];
+
+
+});
+```
+
+Then load them into the Schema Form Builder using the `sfbSchema` and `sfbForm` directives.
+
+```html
+<div ng-controller="FormBuilderController">
+    <div sfb-schema="schema" sfb-form="form"></form>
+</div>
+```
+
+>>>>>>> refs/remotes/origin/master
 
 # Simply need a html form?
 To generate vanilla/bootstrap/material forms check out ralphowino.github.com/form-builder

app/app-controller.es6

@@ -0,0 +1,82 @@
+angular.module('schemaFormBuilderApp').controller('FormBuilderController',function ($scope) {
+  // JSON Schema
+  // add an existing schema to edit it
+  // or leave blank to create a new form
+  $scope.schema = {};
+
+  // Schema Form Defintion
+  // add an existing form definition for editing
+  // or leave blank to create a new form
+  $scope.form = [];
+
+
+  $scope.$watch(function () {
+    return $scope.schema;
+  }, function (update) {
+    window.console.log("schema udpated");
+    //window.console.log("Schema Update: " + JSON.stringify(update));
+    //window.console.log("Form Update: " + JSON.stringify($scope.form));
+  }, true);
+  
+  $scope.newForm = function () {
+    $scope.model = {
+        fields: []
+      };
+  }
+
+  $scope.model = {
+            type: 'schema-form',
+            fields: [
+              {
+                type: 'text',
+                key: 'first_name',
+                title: 'First name',
+                open: false
+              },
+              {
+                type: 'text',
+                key: 'last_name',
+                title: 'Last name',
+                open: false
+              },
+              {
+                type: 'email',
+                key: 'email',
+                title: 'Email',
+                open: false,
+                showAdvance: true,
+                fieldAddonRight:'<i class="glyphicon glyphicon-envelope"></i>'
+              },
+              {
+                type: 'date',
+                key: 'dob',
+                title: 'Date of Birth',
+                open: false
+              },
+              {
+                type: 'dropdown',
+                key: 'marital-status',
+                title: 'Marital Status',
+                open: false
+              },
+              {
+                type: 'date-time',
+                key: 'check-in',
+                title: 'Check In',
+                open: false
+              },
+              {
+                type: 'date-time',
+                key: 'check-out',
+                title: 'Check Out',
+                open: false
+              },
+              {
+                type: 'textarea',
+                key: 'bio',
+                title: 'Biography',
+                open: false
+              }
+            ]
+          };
+});

app/app-module.es6

@@ -2,13 +2,13 @@
   'use strict';
 
   /* @ngdoc object
-   * @name schemaFormBuilder
+   * @name schemaFormBuilderApp
    * @description
    *
    */
   angular
-    .module('schemaFormBuilder', [
-      'builder',
+    .module('schemaFormBuilderApp', [
+      'schemaFormBuilder',
       'ui.bootstrap'
     ]);
 }());