verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

Merge branches 'master' and 'master' of ssh://git.verdnatura.es:/var/lib/git/salix

This commit is contained in:
Javi Gallego 2016-11-24 11:55:56 +01:00
parent fa36194a3e 574e2ce12f
commit dee8724005
7 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

8
@salix/core/src/leftmenu/leftmenu.js
View File

@ -6,12 +6,8 @@ const _NAME = 'leftmenu';
export const NAME = util.getName(_NAME); export const NAME = util.getName(_NAME);
export const COMPONENT = { export const COMPONENT = {
template: template, template: template,
controller: function(){ bindings: {
this.items = [ items: '<'
{text: "Datos fiscales", image: "person"},
{text: "Acceso web", image: "language"},
{text: "Consignatarios", image: "local_shipping"}
]
} }
}; };
module.component(NAME, COMPONENT); module.component(NAME, COMPONENT);

2
@salix/core/src/mainmenu/mainmenu.html
View File

@ -1,5 +1,5 @@
<div style="position: fixed; top: 0; right: 0; padding: 1.5em; color: white;"> <div style="position: fixed; top: 0; right: 0; padding: 1.5em; color: white;">
<i class="material-icons">apps</i> <i class="material-icons">apps</i>
<i class="material-icons">notifications</i> <i class="material-icons">notifications</i>
<i class="material-icons md-18">account_circle</i> <i class="material-icons">account_circle</i>
</div> </div>

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

@ -1,6 +1,6 @@
<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;">Client</h3>
<vn-searchbar></vn-searchbar> <vn-searchbar ></vn-searchbar>
</vn-one> </vn-one>
</vn-horizontal> </vn-horizontal>

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

@ -1,7 +1,7 @@
<vn-vertical full-height pad-medium> <vn-vertical full-height pad-medium>
<vn-horizontal> <vn-horizontal>
<vn-one> <vn-one>
<h3>CLIENTE _ Datos básicos</h3> <h3>Datos básicos</h3>
</vn-one> </vn-one>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>

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

@ -2,7 +2,7 @@
<vn-topbar></vn-topbar> <vn-topbar></vn-topbar>
<vn-horizontal class="full-height"> <vn-horizontal class="full-height">
<vn-empty class="bg-content" style="width: 18em"> <vn-empty class="bg-content" style="width: 18em">
<vn-leftmenu></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-customer-data-basic></vn-customer-data-basic>

11
@salix/crud/src/client/index/index.js
View File

@ -5,6 +5,15 @@ const _NAME = 'clientIndex';
//export const NAME = module.getName(_NAME); //export const NAME = module.getName(_NAME);
export const NAME = "vnClientIndex"; export const NAME = "vnClientIndex";
export const COMPONENT = { export const COMPONENT = {
template: template template: template,
controller: function(){
this.items = [
{text: "Datos básicos", image: "person"},
{text: "Datos facturación", image: "assignment"},
{text: "Acceso web", image: "language"},
{text: "Consignatarios", image: "local_shipping"},
{text: "Notas", image: "insert_drive_file"}
]
}
}; };
module.component(NAME, COMPONENT); module.component(NAME, COMPONENT);