engine2 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 61ac9190b96b7053391913f8121f1df0bc1967c0
-  data.tar.gz: b532a2ca2828607b2068450761cc55a77d43f597
+SHA256:
+  metadata.gz: 58f23892775f4ae41feaedf7b372844c6524e8088262d51dd7b91e23ccd136c0
+  data.tar.gz: 3a9350c94bee76c210976c9f06edde30bfb3fec3c0ac56941f40889a193d3f7f
 SHA512:
-  metadata.gz: 3afb80475e3f7cad3bed23163f0b03f1d54d9268a46749c5e7d9dbc5aa77cbb0859b83592094e50b8178492ff3656a98eb31123be8f56a99962bac033dc20d1a
-  data.tar.gz: a7d20b040fd8a85373a9328508710064fa403103b2c661d2d2d71eaec148910397e2d2ddcffb0aea6712eab3bb3bf49943f496e87bd413997d6e25e1d2586bed
+  metadata.gz: 73eb8d90f5701a83888592a80d33874db321756f2b003c3a0359ed2a456d317d38e4c11c307760ed98a708725135b6f03b92d06e2fc2bc2759351ecd8705a939
+  data.tar.gz: a8000d44c3092297f5a50c29ed4e4007e7f1190aefa34cc528b0e7c5375c3d1a0b7bf17321227a159c3585aee49eaf5d13120de7c884fad66e217f255a87d4ae

data/app/actions.coffee

@@ -134,7 +134,7 @@ angular.module('Engine2')
                     E2.merge(prnt, response.data)
 
                 @post_invoke(params)
-                @scope().$eval(@meta.execute) if @meta.execute
+                @execute_commands() if @meta.execute
                 if @meta.repeat
                     @scope().$on "$destroy", => @destroyed = true
                     $timeout (=> @invoke(params)), @meta.repeat unless @destroyed
@@ -203,24 +203,27 @@ angular.module('Engine2')
             ws = $websocket "ws#{l.protocol().slice(4, 5)}://#{l.host()}:#{l.port()}/#{@action_info().action_resource}", undefined, ws_meta.options
             _.each @globals().ws_methods, (method) =>
                 ws_method_impl = @["ws_#{method}"]
-                ws_method_exec = ws_meta.execute?[method]
-                if ws_method_impl || ws_method_exec
-                    ws_method = (evt) =>
-                        is_message = method == 'message'
-                        if is_message
-                            msg = JSON.parse(evt.data)
-                            if msg.error then @globals().modal().error("WebSocket [#{evt.origin}] - #{msg.error.method}", msg.error.exception) else
-                                E2.merge(@, msg)
-                                @process_meta()
-                        else msg = evt
-                        ws_method_impl.bind(@)(msg, ws, evt) if ws_method_impl
-                        @scope().$eval(ws_method_exec) if ws_method_exec
-
-                    ws["on#{_.capitalize(method)}"](ws_method)
+                ws["on#{_.capitalize(method)}"] (evt) =>
+                    if method == 'message'
+                        msg = JSON.parse(evt.data)
+                        if msg.error then @globals().modal().error("WebSocket [#{evt.origin}] - #{msg.error.method}", msg.error.exception) else
+                            E2.merge(@, msg)
+                            @process_meta()
+                    else msg = evt
+                    ws_method_impl.bind(@)(msg, ws, evt) if ws_method_impl
+                    @execute_commands() if @meta.execute
+                    delete @meta.execute
 
             @web_socket = -> ws
             @scope().$on "$destroy", -> ws.close()
 
+        execute_commands: ->
+            scope = @scope()
+            _.reduce(@meta.execute, ((pr, cmd) -> pr.then -> scope.$eval(cmd)), $q.when())
+
+        console_log: (o) ->
+            console.log o
+
     root: class RootAction extends Action
         initialize: ->
             super()
@@ -268,7 +271,10 @@ angular.module('Engine2')
                     _.each response.data.actions, (act, nm) -> act.name = nm
                     tree.actions ?= _.toArray(response.data.actions)
                     @meta_json = response.data.meta
-                    @action_state = if @meta_json.state then _.zipObject(@meta_json.state.map (k) -> [k, localStorageService.get("#{path}/#{k}")]) else {}
+                    if @meta_json.state
+                        @action_state = {}
+                        _.each @meta_json.state, (s) => @action_state[s] = localStorageService.get("#{@globals().application}/#{path.join('/')}/#{s}")
+                        @action_state
             ,
             (err) =>
                 delete @meta_json
@@ -318,7 +324,7 @@ angular.module('Engine2')
 
         traverse: (routes) ->
             menu_tmpl = _.template("<li {{show}} {{hide}} ui-sref-active='active'><a {{href}}>{{icon}} {{loc}}</a></li>")
-            menu_sub_tmpl = _.template("<li {{show}} {{hide}} e2-dropdown='{{dropdown}}' href-attr='ui-sref' data-animation='{{animation}}'><a href='javascript://'>{{icon}} {{loc}}<span class='caret'></span></a></li>")
+            menu_sub_tmpl = _.template("<li {{show}} {{hide}} e2-dropdown='{{dropdown}}' nav='true' data-animation='{{animation}}'><a href='javascript://'>{{icon}} {{loc}}<span class='caret'></span></a></li>")
             animation = @meta.menus.menu.properties.animation
             out = routes.map (route, i) ->
                 if route.menu
@@ -345,8 +351,8 @@ angular.module('Engine2')
             @ui_state = {}
             @load_state()
 
-            delete @query.order unless @meta.info[@query.order]?.sort # _.includes(@meta.fields, @query.order)
-            _.each @query.search, ((sv, sn) => delete @query.search[sn] unless _.includes(@meta.search_fields, sn))
+            delete @query.order unless @meta.fields[@query.order]?.sort # _.includes(@meta.field_list, @query.order)
+            _.each @query.search, ((sv, sn) => delete @query.search[sn] unless _.includes(@meta.search_field_list, sn))
 
         destroy: ->
             @save_state()
@@ -355,10 +361,13 @@ angular.module('Engine2')
         process_meta: ->
             super()
             meta = @meta
-            meta.fields = meta.fields.filter((f) => !meta.info[f].hidden) if meta.fields
+            meta.field_list = meta.field_list.filter((f) => !meta.fields[f].hidden) if meta.field_list
 
         # confirm_create, view, confirm_modify, confirm_delete, assocs - implicit
 
+        render_table: ->
+            @scope().$broadcast 'render_table'
+
         menu_search_toggle: ->
             @ui_state.search_active = !@ui_state.search_active
             @save_state() unless @ui_state.search_active
@@ -372,7 +381,8 @@ angular.module('Engine2')
 
         menu_select_toggle: ->
             if @selection then delete @selection else @selection = {}
-            @scope().$broadcast 'render_table'
+            @render_table()
+
 
         menu_show_meta: ->
             @globals().modal().show
@@ -394,7 +404,7 @@ angular.module('Engine2')
             E2.id_for(@current_entry(), @meta)
 
         list_cell: (e, f) ->
-            E2.render_field(e, f, @meta)
+            E2.render_field(e, f, @meta, "<br>")
 
         invoke: (args = {}) ->
             @save_state()
@@ -404,7 +414,7 @@ angular.module('Engine2')
             super(query).then =>
                 @ui = _.pick @query, ['order', 'asc', 'page']
                 @ui.pagination_active = @ui.page != 0 || @entries.length >= @meta.config.per_page
-                @scope().$broadcast 'render_table'
+                @render_table()
 
         load_new: ->
             @query.page = 0
@@ -437,7 +447,7 @@ angular.module('Engine2')
             @load_new()
 
         search_field_change: (f) ->
-            info = @meta.info[f]
+            info = @meta.fields[f]
 
             @scope().$eval(info.onchange) if info.onchange
 
@@ -465,6 +475,17 @@ angular.module('Engine2')
         selected_info: ->
             @meta.loc.selected + ": " + @selected_size()
 
+        entry_dropped: (moved_to, render = true) ->
+            from = @entries[@moved_from]
+            @entries.splice(@moved_from, 1)
+            @entries.splice((if moved_to > @moved_from then moved_to - 1 else moved_to), 0, from)
+            delete @moved_from
+            @render_table() if render
+            true
+
+        entry_moved: (index) ->
+            @moved_from = index
+
     bulk_delete: class BulkDeleteAction extends Action
         invoke: ->
             super(ids: [_.keys(@parent().parent().selection)]).then =>
@@ -472,12 +493,12 @@ angular.module('Engine2')
 
     view: class ViewAction extends Action
         view_cell: (e, f) ->
-            E2.render_field(e, f, @meta)
+            E2.render_field(e, f, @meta, "<br>")
 
     form_base_action: class FormBaseAction extends Action
         initialize: ->
             super()
-            _.each @meta.info, (info, name) =>
+            _.each @meta.fields, (info, name) =>
                 if info.remote_onchange
                     @scope().$watch (=> @record?[name]), (n) => if n? #if typeof(n) != "undefined"
                         params = value: @record[name]
@@ -488,7 +509,7 @@ angular.module('Engine2')
                     @scope().$watch (=> @record?[name]), (n) => if n?
                         @scope().$eval(info.onchange)
 
-            if @meta.tabs
+            if @meta.tab_list
                 @scope().$watch "action.activeTab", (tab) => if tab? # && tab >= 0
                     @panel_shown()
 
@@ -496,36 +517,37 @@ angular.module('Engine2')
 
         post_invoke: (args) ->
             super()
-            _.each @meta.info, (info, name) =>
+            _.each @meta.fields, (info, name) =>
                 if _.isString(@record[name]) && !info.dont_strip
                     @record[name] = @record[name].trim()
 
         panel_menu_default_action: ->
-            _.each @meta.info, (v, n) =>
+            _.each @meta.fields, (v, n) =>
                 @record[n] = null if @record[n] is undefined
             params = record: @record
             params.parent_id ?= @parent().query?.parent_id # and StarToManyList ?
             @invoke_action(@default_action_name, params).then =>
                 dfd = $q.defer()
                 if @errors
-                    if @meta.tabs
+                    if @meta.tab_list
                         [i, first, curr] = [0, null, false]
-                        for tab in @meta.tabs
-                            if _(tab.fields).find((f) => @errors[f])
+                        for tab_name in @meta.tab_list
+                            tab = @meta.tabs[tab_name]
+                            if _(tab.field_list).find((f) => @errors[f])
                                 first = i if not first?
                                 act = true if @activeTab == i
                             i++
                         @activeTab = first unless act
 
                         if @activeTab?
-                            field = _(@meta.tabs[@activeTab].fields).find((f) => @errors[f])
+                            field = _(@meta.tabs[@meta.tab_list[@activeTab]].field_list).find((f) => @errors[f])
                             # console.log field undefined ?
                         else
                             @activeTab = 0
                             @alert = @errors
                     else
-                        field = _(@meta.fields).find((f) => @errors[f])
-                        @alert = @errors if (!field || !@meta.info[field] || @meta.info[field].hidden) # ?
+                        field = _(@meta.field_list).find((f) => @errors[f])
+                        @alert = @errors if (!field || !@meta.fields[field] || @meta.fields[field].hidden) # ?
                     $timeout => @scope().$broadcast("focus_field", field)
                     #e.scope.$eval(meta.execute) if meta.execute # ?
                     dfd.resolve()
@@ -534,15 +556,15 @@ angular.module('Engine2')
                 dfd.promise
 
         panel_shown: ->
-            field = if @meta.tabs
-                tab = @meta.tabs[@activeTab]
+            field = if @meta.tab_list
+                tab = @meta.tabs[@meta.tab_list[@activeTab]]
                 if @errors
-                    _(tab.fields).find((f) => @errors[f]) || _(tab.fields).find((f) => !@meta.info[f].hidden)
+                    _(tab.field_list).find((f) => @errors[f]) || _(tab.field_list).find((f) => !@meta.fields[f].hidden)
                 else
-                    tab ?= @meta.tabs[0]
-                    _(tab.fields).find((f) => !@meta.info[f].hidden && !@meta.info[f].disabled)
+                    tab ?= @meta.tabs[@meta.tab_list[0]]
+                    _(tab.field_list).find((f) => !@meta.fields[f].hidden && !@meta.fields[f].disabled)
             else
-                _(@meta.fields).find((f) => !@meta.info[f].hidden && !@meta.info[f].disabled)
+                _(@meta.field_list).find((f) => !@meta.fields[f].hidden && !@meta.fields[f].disabled)
             $timeout (=> @scope().$broadcast("focus_field", field)), 300 # hack, on shown ?
 
     infra: class InfraAction extends Action
@@ -552,7 +574,7 @@ angular.module('Engine2')
                 if @user
                     @invoke_action('login_form').then (act) =>
                         act.record = name: @user.name
-                        act.meta.info.name.disabled = true
+                        act.meta.fields.name.disabled = true
                         act.dont_reload_routes = !reload_routes # true
                 else
                     @invoke().then => @set_access(true, true, @user)
@@ -591,12 +613,7 @@ angular.module('Engine2')
     modify: class ModifyAction extends FormAction
         # invoke: (args) ->
         #     super(args).then =>
-        #         _.each @meta.primary_fields, (f) => @meta.info[f].disabled = true
-
-    on_change: class OnChangeAction extends Action
-        post_invoke: ->
-            super()
-            @parent().scope().$eval(@meta.execute) if @meta.execute
+        #         _.each @meta.primary_fields, (f) => @meta.fields[f].disabled = true
 
     confirm: class ConfirmAction extends Action
         panel_menu_approve: ->
@@ -607,7 +624,7 @@ angular.module('Engine2')
         initialize: ->
             super()
             @decode_field = @scope().f
-            @dinfo = @parentp().meta.info[@decode_field]
+            @dinfo = @parentp().meta.fields[@decode_field]
             throw "Primary and foreign key list lengths dont match: [#{@meta.primary_fields}] and [#{@dinfo.fields}]" unless @meta.primary_fields.length == @dinfo.fields.length
             @scope().$on "search_reset", => @clean()
 
@@ -626,7 +643,7 @@ angular.module('Engine2')
             @parentp().search_field_change?(@decode_field)
 
         decode_description: (entry) ->
-            @meta.decode_fields.map((f) => E2.render_field(entry, f, @meta)).join(@meta.separator)
+            @meta.decode_fields.map((f) => E2.render_field(entry, f, @meta, ', ')).join(@meta.separator)
 
         parentp: ->
             @parent().parent()
@@ -653,11 +670,11 @@ angular.module('Engine2')
                 if @selected.length > 0
                     _.each @dinfo.fields, (fk) -> record[fk] = []
                     _.each @selected, (sel) =>
-                        _(@dinfo.fields).zip(E2.split_keys(sel)).each(([fk, k]) => record[fk].push E2.parse_entry(k, @parentp().meta.info[fk])).value
+                        _(@dinfo.fields).zip(E2.split_keys(sel)).each(([fk, k]) => record[fk].push E2.parse_entry(k, @parentp().meta.fields[fk])).value
                 else @clear_record()
             else
                 if @selected
-                    _(@dinfo.fields).zip(E2.split_keys(@selected)).each(([fk, k]) => record[fk] = E2.parse_entry(k, @parentp().meta.info[fk])).value
+                    _(@dinfo.fields).zip(E2.split_keys(@selected)).each(([fk, k]) => record[fk] = E2.parse_entry(k, @parentp().meta.fields[fk])).value
                 else @clear_record()
 
             @parentp().search_field_change?(@decode_field)
@@ -679,12 +696,12 @@ angular.module('Engine2')
                 if @multiple
                     _.each @dinfo.fields, (fk) => record[fk] = []
                     _.each sel, (rec, ids) =>
-                        _(@dinfo.fields).zip(E2.split_keys(ids)).each(([k, v]) => record[k].push E2.parse_entry(v, @parentp().meta.info[k])).value
+                        _(@dinfo.fields).zip(E2.split_keys(ids)).each(([k, v]) => record[k].push E2.parse_entry(v, @parentp().meta.fields[k])).value
                     @invoke_decode _.values(sel)
                     delete @decode if _.isEmpty(sel)
                 else
                     [ids, rec] = _(sel).toPairs().head()
-                    _(@dinfo.fields).zip(E2.split_keys(ids)).each(([k, v]) => record[k] = E2.parse_entry(v, @parentp().meta.info[k])).value
+                    _(@dinfo.fields).zip(E2.split_keys(ids)).each(([k, v]) => record[k] = E2.parse_entry(v, @parentp().meta.fields[k])).value
                     @invoke_decode [rec]
                 @parentp().search_field_change?(@decode_field)
 
@@ -694,7 +711,7 @@ angular.module('Engine2')
             else
                 decode_descriptions = (recs) => @decode = recs.map((fields) => @decode_description(fields)).join(' | ')
                 recs = recs.map (r) => if _.isArray(r) then E2.from_id(r, @meta) else r
-                if _(recs).every((r) => _(@meta.fields).every((f) -> r[f]?)) && !@meta.dynamic_meta then decode_descriptions(recs) else
+                if _(recs).every((r) => _(@meta.field_list).every((f) -> r[f]?)) && !@meta.dynamic_meta then decode_descriptions(recs) else
                     @invoke(ids: [recs.map((r) => @meta.primary_fields.map (k) -> r[k])]).then => decode_descriptions(@entries)
 
         open: ->
@@ -720,7 +737,7 @@ angular.module('Engine2')
 
             @scope().$on "$typeahead.select", (e, v, index) =>
                 e.stopPropagation()
-                _(@dinfo.fields).zip(E2.split_keys(@values[index].id)).each(([fk, k]) => @record()[fk] = E2.parse_entry(k, @parentp().meta.info[fk])).value
+                _(@dinfo.fields).zip(E2.split_keys(@values[index].id)).each(([fk, k]) => @record()[fk] = E2.parse_entry(k, @parentp().meta.fields[fk])).value
                 @parentp().search_field_change?(@decode_field)
 
             @scope().$watch "action.decode", (e) => if e?
@@ -795,8 +812,23 @@ angular.module('Engine2')
             @query.changes = @changes
             super()
 
-        current_entry_is: (mode) ->
-            key = E2.id_for(@current_entry(), @meta)
+        entry_dropped: (moved_to) ->
+            pos_field = @meta.draggable.position_field
+            positions = @entries.map (e) -> e[pos_field]
+            super(moved_to, false)
+            _.each positions, (p, i) =>
+                if @entries[i][pos_field] != p
+                    if entry = @current_entry_is('create', @entries[i]) ? @current_entry_is('modify', @entries[i])
+                        entry[pos_field] = p
+                    else
+                        @changes.modify.push(@entries[i])
+                    @entries[i][pos_field] = p
+
+            @render_table() # @invoke()
+            true
+
+        current_entry_is: (mode, entry = @current_entry()) ->
+            key = E2.id_for(entry, @meta)
             _.find(@changes[mode], (e) => E2.id_for(e, @meta) == key)
 
     star_to_many_field_view: class StarToManyFieldView extends ViewAction
@@ -825,6 +857,9 @@ angular.module('Engine2')
                         pparent.changes.modify.push @parent().record
                 else # CreateAction
                     _(@parent().meta.primary_fields).each (k) => @parent().record[k] = E2.uuid(5)
+                    if draggable = pparent.meta.draggable
+                        max = _.maxBy(pparent.entries, (e) -> e.position)
+                        @parent().record[draggable.position_field] = if max then max[draggable.position_field] + 1 else 1
                     pparent.changes.create.push @parent().record
 
     star_to_many_field_delete: class StarToManyFieldDelete extends Action

data/app/app.css

@@ -205,3 +205,15 @@ button {
 }*/
 
 a[ng-click] {cursor:pointer;}
+
+.dndDragging {
+}
+
+.dndDraggingSource {
+}
+
+.dndPlaceholder{
+}
+
+.dndDragover {
+}

data/app/engine2.coffee

@@ -7,10 +7,12 @@ require 'angular-ui-tree'
 require '@uirouter/angularjs'
 require 'ng-file-upload'
 require 'angular-load'
+require 'angular-drag-and-drop-lists'
+require 'ui-select'
 
 _.templateSettings.interpolate = /{{([\s\S]+?)}}/g;
 
-angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStrap', 'ngFileUpload', 'ui.tree', 'LocalStorageModule', 'angularLoad', 'ngWebSocket', 'ui.router']) # 'draggabilly'
+angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStrap', 'ngFileUpload', 'ui.tree', 'LocalStorageModule', 'angularLoad', 'ngWebSocket', 'ui.router', 'dndLists', 'ui.select'])
 .config ($httpProvider, $compileProvider, localStorageServiceProvider, $logProvider, $qProvider, $locationProvider, $provide) ->
     $httpProvider.interceptors.push 'e2HttpInterceptor'
     $provide.decorator '$httpBackend', ($delegate) ->
@@ -29,6 +31,16 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
     # $qProvider.errorOnUnhandledRejections(false)
     # $locationProvider.hashPrefix('')
     # $locationProvider.html5Mode(false)
+    $provide.decorator 'ngModelDirective', ($delegate) ->
+        directive = $delegate[0]
+        compile = directive.compile
+        directive.compile = (elem, attrs, trans) ->
+            comp = compile(elem, attrs, trans)
+            pre: comp.pre
+            post: (scope, element, attr, ctrls) ->
+                ctrls[0].$parsers.push (vw) -> if vw == "" then null else vw
+                comp.post(scope, element, attr, ctrls)
+        $delegate
 
 .factory 'PushJS', -> require 'push.js'
 .factory 'MetaCache', ($cacheFactory) -> $cacheFactory('MetaCache')
@@ -212,11 +224,14 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
                 when render.true_value then E2Snippets.boolean_true_value
                 when render.false_value then E2Snippets.boolean_false_value
                 else "?"
-        list_select: (value, render) ->
-            render.list_hash ||= render.list.reduce(((h, [a, b]) -> h[a] = b; h), {})
-            render.list_hash[value] ? value
+        list_select: (value, render, separator) ->
+            render.list_hash ||= render.values.reduce(((h, [a, b]) -> h[a] = b; h), {})
+            if render.multiselect && _.isArray(value)
+                value.map((v) -> render.list_hash[v] ? ":#{value}:").join(separator)
+            else
+                render.list_hash[value] ? ":#{value}:"
         datetime: (value, render) ->
-            value.split('\.')[0]
+            value.split('\.')[0].split(' ', 2).join(' ')
             # $dateFormatter.formatDate(value, "yyyy-MM-dd", $dateFormatter.getDefaultLocale())
         integer: (value, render) -> # ?
             value.toString()
@@ -231,12 +246,12 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
             value.toString()
 
 
-    render_field: (entry, name, meta) ->
+    render_field: (entry, name, meta, separator) ->
         value = entry[name]
-        if value? && info = meta.info
+        if value? && info = meta.fields
             f_info = info[name]
             if f_info? && type = f_info.type
-                @renderers[type](value, f_info.render)
+                @renderers[type](value, f_info.render, separator)
             else
                 if f_info?.escape == false then value else
                     (value + "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")
@@ -260,7 +275,7 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
 
         name = attrs.e2Field || scope.f
         meta = scope.action.meta
-        info = meta.info[name]
+        info = meta.fields[name]
         scope.$on "focus_field", (event, n, mode) ->
             if n == name
                 elem[0].focus()
@@ -293,7 +308,7 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
     link: (scope, elem, attrs, controller) ->
         name = attrs.e2Field || scope.f
         meta = scope.action.meta
-        info = meta.info[name]
+        info = meta.fields[name]
         if info.filter
             filter = $filter(info.filter)
             controller.$parsers.push (value) ->
@@ -317,7 +332,7 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
             elem.after($compile(response.data)(scope))
 
 .directive 'e2TableBody', ($parse, $compile) ->
-    table_tmpl = _.template("<thead><tr>{{thead}}</tr></thead><tbody>{{tbody}}</tbody>")
+    table_tmpl = _.template("<thead><tr>{{thead}}</tr></thead><tbody {{tbody_attrs}}>{{tbody}}</tbody>")
     scope: false
     restrict: 'A'
     link: (scope, elem, attrs) ->
@@ -325,15 +340,16 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
             # ev.stopPropagation()
             action = scope.action
             meta = action.meta
+            draggable = meta.draggable
             position = meta.menus.item_menu.properties.position ? 0
-            right_style = if position >= meta.fields.length then "style=\"text-align: right\"" else ""
+            right_style = if position >= meta.field_list.length then "style=\"text-align: right\"" else ""
 
             thead = ""
-            fields = meta.fields.slice()
+            fields = meta.field_list.slice()
             fields.splice(position, 0, null)
             _.each fields, (f) ->
                 if f
-                    info = meta.info[f]
+                    info = meta.fields[f]
                     thead += "<th>"
                     title = if info.title then "title=\"#{info.title}\"" else ""
                     if info.sort
@@ -351,25 +367,27 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
             _.each action.entries, (e, i) ->
                 tbody += if action.selection then "<tr ng-class=\"action.selected_class(#{i})\" class=\"tr_hover\" ng-click=\"action.select(#{i}, $event)\">" else
                     row_cls = e.$row_info?.class
-                    if row_cls then "<tr class=\"#{row_cls}\">" else "<tr>"
+                    tr_attrs = if draggable then "dnd-draggable=\"action.entries[#{i}]\" dnd-dragstart=\"action.entry_moved(#{i})\"" else ''
+                    if row_cls then "<tr class=\"#{row_cls}\" #{tr_attrs}>" else "<tr #{tr_attrs}>"
                 _.each fields, (f) ->
                     if f
-                        tbody += if col_cls = meta.info[f].column_class then "<td class=\"#{col_cls}\">" else "<td>"
+                        tbody += if col_cls = meta.fields[f].column_class then "<td class=\"#{col_cls}\">" else "<td>"
                         tbody += action.list_cell(e, f) ? ''
                         tbody += "</td>"
                     else
                         tbody += "<td #{right_style}><div e2-button-set=\"action.meta.menus.item_menu\" index=\"#{i}\"></div></td>"
                 tbody += "</tr>"
 
+            tbody_attrs = if draggable then 'dnd-list=\"action.entries\" dnd-drop=\"action.entry_dropped(index, external, type)\"' else ''
             elem.empty()
-            elem.append($compile(table_tmpl thead: thead, tbody: tbody)(scope))
+            elem.append($compile(table_tmpl thead: thead, tbody: tbody, tbody_attrs: tbody_attrs)(scope))
 
 .directive 'e2Dropdown', ($parse, $dropdown, $timeout, E2Snippets) ->
     event_num = 0
     dropdown_sub_tmpl = _.template("<li class='dropdown-submenu' {{show}} {{hide}}><a href=''> {{icon}} {{loc}}</a>{{sub}}</li>")
-    dropdown_tmpl = _.template("<li {{clazz}} {{show}} {{hide}}> <a {{href}} {{click}}> {{icon}} {{loc}}</a></li>")
+    dropdown_tmpl = _.template("<li {{clazz}} {{show}} {{hide}} {{active}}> <a {{href}} {{click}}> {{icon}} {{loc}}</a></li>")
 
-    render = (menu, href) ->
+    render = (menu, nav) ->
         out = menu.map (m) ->
             switch
                 when m.divider
@@ -380,13 +398,14 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
                         loc: m.menu.loc
                         show: m.menu.show && "ng-show=\"#{m.menu.show}\"" || ''
                         hide: m.menu.hide && "ng-hide=\"#{m.menu.hide}\"" || ''
-                        sub: render(m.menu.entries)
+                        sub: render(m.menu.entries, nav)
                 else
                     dropdown_tmpl
                         clazz: E2Snippets.make_ng_class(m)
                         show: m.show && "ng-show=\"#{m.show}\"" || ''
                         hide: m.hide && "ng-hide=\"#{m.hide}\"" || ''
-                        href: m.href && "#{href}=\"#{m.href}\"" || ''
+                        href: m.href && "#{if nav then 'ui-sref' else 'href'}=\"#{m.href}\"" || ''
+                        active: nav && "ui-sref-active='active'" || ''
                         click: m.click && "ng-click=\"#{m.click}\"" || ''
                         icon: m.icon && E2Snippets.icon(m.icon) || ''
                         loc: m.loc
@@ -402,8 +421,7 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
             # event.preventDefault()
             # event.stopPropagation()
             menu = $parse(attrs.e2Dropdown)(scope)
-            href = attrs.hrefAttr ? 'href'
-            dropdown = $dropdown(elem, (scope: scope, template: render(menu, href), animation: attrs.animation || 'am-flip-x', prefixEvent: "#{event_num}.tooltip")) # , delay: 1
+            dropdown = $dropdown(elem, (scope: scope, template: render(menu, attrs.nav?), animation: attrs.animation || 'am-flip-x', prefixEvent: "#{event_num}.tooltip")) # , delay: 1
             dropdown.$promise.then ->
                 event_hide = scope.$on "#{event_num}.tooltip.hide", (e) ->
                     e.stopPropagation()
@@ -504,7 +522,7 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
         action = scope.action
         mode = attr.e2Datepicker
         field = scope.other_date ? scope.other_time ? scope.f
-        info = action.meta.info[field]
+        info = action.meta.fields[field]
 
         if action.query
             scope.value[mode] = parse(action.query.search[scope.f][mode], info)