Merge

@salix/app/src/configroutes.js

@@ -24,9 +24,11 @@ function config($stateProvider, $urlRouterProvider) {
         $stateProvider.state(route.state, {
             url: route.url,
             template: route.template,
+            views: route.views,
             resolve: {
                 loader: loader(route)
             }
+            
         })
     });
 }

@salix/core/src/left-menu/descriptor.html

@@ -1,5 +1,4 @@
-<vn-horizontal>
+<div class="pad-medium">
-    <vn-one style="padding: 0 1em;">
+    <i class="material-icons" style="font-size:60px; margin-right: 10px; float: left;">person</i>
-        <h3>Descriptor</h3>
+    <p class="margin-none" ng-repeat="descriptor1 in $ctrl.descriptor">{{descriptor1.text}} </p>
-    </vn-one>
+</div>
-</vn-horizontal>

@salix/core/src/left-menu/descriptor.js

@@ -5,6 +5,9 @@ import * as util from '../util';
 const _NAME = 'descriptor';
 export const NAME = util.getName(_NAME);
 export const COMPONENT = {
-    template: template
+    template: template,
+    bindings: {
+        descriptor: '<'
+    }
 };
 module.component(NAME, COMPONENT);

@salix/core/src/left-menu/left-menu.html

@@ -1,4 +1,4 @@
 <vn-vertical>
-    <vn-descriptor></vn-descriptor>
+    <vn-descriptor descriptor = "$ctrl.descriptor" ></vn-descriptor>
     <vn-actions items = "$ctrl.items"></vn-actions>
 </vn-vertical>

@salix/core/src/left-menu/left-menu.js

@@ -8,7 +8,8 @@ export const NAME = util.getName(_NAME);
 export const COMPONENT = {
     template: template,
     bindings: {
-        items: '<'
+        items: '<',
+        descriptor: '<'
     }
 };
 module.component(NAME, COMPONENT);

@salix/core/src/left-menu/menu-item.html

@@ -1,4 +1,3 @@
-
 <li>
 <a href="{{$ctrl.item.href}}" style="display: block; text-decoration: none; color: inherit; padding: .5em 1em;">
     <i class="material-icons" style="float: right; margin-left: .4em;">keyboard_arrow_right</i>

@salix/core/src/topbar/topbar.html

@@ -1,6 +1,8 @@
 <vn-horizontal style="color: white; height: 100%;" class="bg-dark-bar">
     <vn-one>
-        <h3 style="float: left;">Client</h3>
+        <h3 style="float: left;" class="pad-large-left">Client</h3>
-        <vn-searchbar ></vn-searchbar>
     </vn-one>
+    <vn-two>
+           <vn-searchbar ></vn-searchbar>
+    </vn-two>
 </vn-horizontal>

@salix/crud/src/client/databasic/databasic.html

@@ -0,0 +1,36 @@
+<vn-vertical full-height pad-medium>
+    <vn-horizontal>
+        <vn-one>
+            <h3>Datos básicos</h3>
+        </vn-one>
+    </vn-horizontal>
+    <vn-horizontal>
+        <vn-one>
+            <vn-textfield label="Alias" name"alias" model="customer.alias"></vn-textfield>
+            <vn-textfield label="NIF/CIF" name="fi" model="customer.fi"></vn-textfield>
+        </vn-one>
+     </vn-horizontal>
+     <vn-horizontal>
+        <vn-one>
+          <vn-textfield label="Razón social" name"socialName" model="customer.socialName"></vn-textfield>
+          <vn-date-picker label="Fecha alta" name"dischargeDate" model="customer.dischargeDate"></vn-date-picker>
+        </vn-one> 
+    </vn-horizontal>
+    <vn-horizontal>
+        <vn-one>
+          <vn-textfield label="Contacto" name="contact" model="customer.contact"></vn-textfield>
+          <vn-textfield label="Teléfono" name="telefono" model="customer.phone"></vn-textfield>
+        </vn-one>
+    </vn-horizontal>
+    <vn-horizontal>
+        <vn-one>
+            <vn-textfield label="Calidad" name="quality" model="customer.quality"></vn-textfield>
+            <vn-combo label="Comercial" name="salesPerson" model="customer.salesPerson"></vn-combo>
+        </vn-one>
+    </vn-horizontal>
+    <vn-horizontal>
+        <vn-one>
+            <vn-button class="colored" text="Guardar"></vn-button>
+        </vn-one>
+    </vn-horizontal>
+</vn-vertical>

@salix/crud/src/client/databasic/databasic.js

@@ -0,0 +1,11 @@
+import template from './databasic.html';
+import {module} from '../../module';
+
+export const _NAME = 'clientDataBasic';
+//export const NAME = module.getName(_NAME);
+export const NAME = "vnClientDataBasic";
+
+export const COMPONENT = {
+    template: template
+};
+module.component(NAME, COMPONENT);

@salix/crud/src/client/index/index.html

@@ -2,7 +2,7 @@
     <vn-topbar></vn-topbar>
     <vn-horizontal class="full-height">
         <vn-empty class="bg-content" style="width: 18em">
-            <vn-left-menu items="$ctrl.items"></vn-left-menu>
+            <vn-left-menu items="$ctrl.items" descriptor="$ctrl.descriptor"></vn-left-menu>
         </vn-empty>
         <vn-auto>
             <vn-customer-basic-data></vn-customer-basic-data>

@salix/crud/src/client/index/index.js

@@ -2,18 +2,23 @@ import template from './index.html';
 import {module} from '../../module';
 
 const _NAME = 'clientIndex';
-//export const NAME = module.getName(_NAME);
+// export const NAME = module.getName(_NAME);
 export const NAME = "vnClientIndex";
 export const COMPONENT = {
     template: template,
-    controller: function(){
+    controller: function() {
         this.items = [
             {text: "Datos básicos", image: "person", href: "#/client/basic-data"},
             {text: "Datos facturación", image: "assignment", href: "#/client/invoicing-data"}, 
             {text: "Acceso web", image: "language", href: "#/client/web-access"},
             {text: "Consignatarios", image: "local_shipping", href: "#/client/addresses"},
             {text: "Notas", image: "insert_drive_file", href: "#/client/notes"}
-        ]
+        ];
+        this.descriptor = [
+            {text: "Cliente 1231"},
+            {text: "Floristeria Lola"},
+            {text: "987 654 321"}
+        ];
     }
 };
 module.component(NAME, COMPONENT);