File tree Expand file tree Collapse file tree 4 files changed +24
-11
lines changed Expand file tree Collapse file tree 4 files changed +24
-11
lines changed Original file line number Diff line number Diff line change @@ -69,13 +69,13 @@ module.exports = function (grunt) {
6969 ] ,
7070 dest : '<%= pkg.target %>/dependencies.js'
7171 } ,
72- js :{
72+ js : {
7373 options : {
7474 banner : '<%= banner %>' ,
7575 separator : ';\n'
7676 } ,
7777 src : [
78- 'js/dico/ config.js' ,
78+ 'js/config.js' ,
7979 'js/i18n/EN.js' ,
8080
8181 'js/dico/def.js' ,
@@ -97,7 +97,9 @@ module.exports = function (grunt) {
9797 'js/view-action/toolbar.js' ,
9898 //'js/navbar.js',
9999
100- 'js/dico/app.js'
100+ 'js/dico/app.js' ,
101+
102+ '!*-nogit' , // NOT ! here
101103 ] ,
102104 dest : '<%= pkg.target %>/evolutility.js'
103105 } ,
Original file line number Diff line number Diff line change 375375}
376376.demo-links > div {
377377 display : inline-block;
378- margin : 10px 0 20px 30 px ;
378+ margin : 10px 0 20px 16 px ;
379379}
380380.mt20 {
381381 margin-top : 20px ;
File renamed without changes.
Original file line number Diff line number Diff line change @@ -641,17 +641,28 @@ return Backbone.View.extend({
641641 vMode = isEditable ?mode :'browse' ,
642642 fts = eDef . fieldTypes ;
643643
644- h . push ( '<div style="width:' + p . width + '%" class="evol-pnl" data-pid="' + p . id + '">' ,
645- dom . panelBegin ( p , this . style , true ) ,
646- '<div class="evo-plist"><table class="table" data-mid="' + ( p . attribute || p . id ) + '"><thead><tr>' ) ;
647- _ . each ( p . elements , function ( elem ) {
648- if ( elem . type === fts . pix ) {
644+ function _th ( h , e ) {
645+ if ( e . type === fts . pix ) {
649646 h . push ( '<th class="evo-col-pix">' ) ;
650647 } else {
651648 h . push ( '<th>' ) ;
652649 }
653- h . push ( elem . label + ( ( isEditable && elem . required ) ?dom . html . required :'' ) + '</th>' ) ;
654- } ) ;
650+ h . push ( e . label + ( ( isEditable && e . required ) ?dom . html . required :'' ) + '</th>' ) ;
651+ }
652+
653+ h . push ( '<div style="width:' + p . width + '%" class="evol-pnl" data-pid="' + p . id + '">' ,
654+ dom . panelBegin ( p , this . style , true ) ,
655+ '<div class="evo-plist"><table class="table" data-mid="' + ( p . attribute || p . id ) + '"><thead><tr>' ) ;
656+
657+ if ( _ . isArray ( p . elements ) ) {
658+ _ . each ( p . elements , function ( elem ) {
659+ _th ( h , elem ) ;
660+ } ) ;
661+ } else if ( _ . isObject ( p . elements ) ) {
662+ for ( var elem in p . elements ) {
663+ _th ( h , elements [ elem ] ) ;
664+ }
665+ }
655666 if ( vMode === 'edit' ) {
656667 h . push ( '<th></th>' ) ;
657668 }
You can’t perform that action at this time.
0 commit comments