verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 63 Releases Wiki Activity

Cambiar customer por databais 

Incluido views en config-routes
Modificaciones top bar
This commit is contained in:
nelo 2016-11-24 15:10:13 +01:00
parent 574e2ce12f
commit e4cec04eb7
8 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
@salix/app/src/configroutes.js
View File

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

12
@salix/core/src/leftmenu/itemmenu.html
View File

@ -1,7 +1,5 @@
<!--<a ui-sref="{{$ctrl.item.link}}">--> <li style="margin-top: 1em;">
<li style="margin-top: 1em;"> <i class="material-icons" style="float: right; margin-left: .4em;">keyboard_arrow_right</i>
<i class="material-icons" style="float: right; margin-left: .4em;">keyboard_arrow_right</i> <i class="material-icons" style="vertical-align: middle; margin-right: .4em;">{{$ctrl.item.image}}</i>
<i class="material-icons" style="vertical-align: middle; margin-right: .4em;">{{$ctrl.item.image}}</i> <span>{{$ctrl.item.text}}</span>
<span>{{$ctrl.item.text}}</span> </li>
</li>
<!--</a>-->

6
@salix/core/src/topbar/topbar.html
View File

@ -1,6 +1,8 @@
<vn-horizontal style="color: white; height: 100%;" class="bg-dark-bar"> <vn-horizontal style="color: white; height: 100%;" class="bg-dark-bar">
<vn-one> <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-one>
<vn-two>
<vn-searchbar ></vn-searchbar>
</vn-two>
</vn-horizontal> </vn-horizontal>

2
@salix/crud/src/client/client.js
View File

@ -1,4 +1,4 @@
export {NAME as CLIENT_DATA_BASIC_INDEX, export {NAME as CLIENT_DATA_BASIC_INDEX,
COMPONENT as CLIENT_DATA_BASIC_INDEX_COMPONENT} from './databasic/index'; COMPONENT as CLIENT_DATA_BASIC_INDEX_COMPONENT} from './databasic/databasic';
export {NAME as CLIENT_INDEX, export {NAME as CLIENT_INDEX,
COMPONENT as CLIENT_INDEX_COMPONENT} from './index/index'; COMPONENT as CLIENT_INDEX_COMPONENT} from './index/index';

0
@salix/crud/src/client/databasic/index.html → @salix/crud/src/client/databasic/databasic.html
View File

6
@salix/crud/src/client/databasic/index.js → @salix/crud/src/client/databasic/databasic.js
View File

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

2
@salix/crud/src/client/index/index.html
View File

@ -5,7 +5,7 @@
<vn-leftmenu items = "$ctrl.items" ></vn-leftmenu> <vn-leftmenu items = "$ctrl.items" ></vn-leftmenu>
</vn-empty> </vn-empty>
<vn-auto> <vn-auto>
<vn-customer-data-basic></vn-customer-data-basic> <vn-client-data-basic></vn-client-data-basic>
</vn-auto> </vn-auto>
</vn-horizontal> </vn-horizontal>
</vn-vertical> </vn-vertical>

26
@salix/crud/src/client/routes.js
View File

@ -1,9 +1,19 @@
[{ [
url: '/client/client-index', {
state: 'client-index', url: '/client/client-databasic',
template: '<vn-client-index full-height></vn-client-index>', state: 'client-databasic',
module: 'crud', template: '<vn-client-data-basic full-height></vn-client-data-basic>',
description: '', module: 'crud',
image: '', description: '',
} image: '',
},
{
url: '/client/client-index',
state: 'client-index',
template: '<vn-client-index full-height></vn-client-index>',
module: 'crud',
description: '',
image: '',
}
] ]