engine2 1.0.4 → 1.0.9

data/app/app.css

@@ -61,6 +61,11 @@ tr.tr_hover {
   font-weight:normal;
 }
 
+textarea {
+  /*white-space: nowrap;*/
+  white-space: pre-wrap;
+}
+
 /*.modal-backdrop{
   position:fixed;
   top:0;
@@ -201,3 +206,15 @@ button {
 }*/
 
 a[ng-click] {cursor:pointer;}
+
+.dndDragging {
+}
+
+.dndDraggingSource {
+}
+
+.dndPlaceholder{
+}
+
+.dndDragover {
+}

data/app/engine2.coffee

@@ -1,34 +1,71 @@
 'use strict'
-require 'angular-route'
 require 'angular-sanitize'
 require 'angular-animate'
 require 'angular-cookies'
 require 'angular-local-storage'
 require 'angular-ui-tree'
+require '@uirouter/core'
+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', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStrap', 'ngFileUpload', 'ui.tree', 'LocalStorageModule']) # 'draggabilly'
-.config ($httpProvider, $routeProvider, $compileProvider, localStorageServiceProvider, $logProvider) ->
-    loaderOn = -> angular.element(document.querySelectorAll('.loader')).eq(-1).css("visibility", 'visible')
+angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStrap', 'ngFileUpload', 'ui.tree', 'LocalStorageModule', 'angularLoad', 'ngWebSocket', 'ui.router', 'dndLists', 'toastr']) # 'ui.select'
+.config ($httpProvider, $compileProvider, localStorageServiceProvider, $logProvider, $qProvider, $locationProvider, $provide) ->
     $httpProvider.interceptors.push 'e2HttpInterceptor'
-    $httpProvider.defaults.transformRequest.push (data, headersGetter) ->
-        loaderOn()
-        data
+    $provide.decorator '$httpBackend', ($delegate) ->
+        (method, url, post, callback, headers, timeout, withCredentials, responseType) ->
+            url = url.replace(/;/g, '%3B') unless method == 'POST'
+            $delegate(method, url, post, callback, headers, timeout, withCredentials, responseType)
     # $httpProvider.defaults.headers.common['Cache-Control'] = 'no-cache'
     # $httpProvider.defaults.cache = false;
-    $httpProvider.defaults.headers.get ||= {} # if !$httpProvider.defaults.headers.get
+    $httpProvider.defaults.headers.get ?= {} # if !$httpProvider.defaults.headers.get
     $httpProvider.defaults.headers.get['If-Modified-Since'] = '0'
     # localStorageServiceProvider.setStorageType('sessionStorage')
     localStorageServiceProvider.setPrefix('E2')
     $compileProvider.debugInfoEnabled(false)
     $logProvider.debugEnabled(true)
     $httpProvider.useApplyAsync(true)
-    # $locationProvider.html5Mode(true);
-
+    # $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 'PrettyYAML', -> require 'json-to-pretty-yaml'
+.filter 'yaml', (PrettyYAML) -> (input) -> PrettyYAML.stringify(input, 4)
+
+.factory 'MetaCache', ($cacheFactory) -> $cacheFactory('MetaCache')
 .factory 'e2HttpInterceptor', ($q, $injector, E2Snippets) ->
-    loaderOff = -> angular.element(document.querySelectorAll('.loader')).eq(-1).css("visibility", 'hidden')
+    loaderToggle = (toggle) -> angular.element(document.querySelectorAll('.loader')).eq(-1).css("visibility", toggle)
+    loaderOn = -> loaderToggle('visible')
+    timeout = null
+    loaderOff = ->
+        if timeout
+            clearTimeout timeout
+            timeout = null
+            loaderToggle('hidden')
+
+    request: (request) ->
+        if timeout
+            clearTimeout timeout
+            timeout = null
+        else
+            timeout = setTimeout(loaderOn, 200)
+        request
+
     response: (response) ->
         loaderOff()
         response
@@ -47,21 +84,38 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
         $q.reject(response)
 
 .factory 'E2Snippets', ->
-    icon = (name) -> "<span class='glyphicon glyphicon-#{name}'></span>"
-    aicon = (name) -> "<i class='fa fa-#{name}'></i>"
+    icon = (name) ->
+        if name.slice(0, 3) == 'fa_'
+            "<i class='fa fa-#{name.slice(3)}'></i>"
+        else
+            "<span class='glyphicon glyphicon-#{name}'></span>"
+
     ng_class_names = ['active', 'enabled', 'disabled']
     icon: icon
-    aicon: aicon
     boolean_true_value:     icon('check')
     boolean_false_value:    icon('unchecked')
     make_ng_class: (o) ->
         out = []
         _.each ng_class_names, (e) -> out.push(if e == 'enabled' then "'disabled': !(#{o[e]})" else "'#{e}': #{o[e]}") if o[e]?
-        _.each(o.class, (v, k) -> out.push "#{k}: #{v}") if o.class?
+        _.each(o.class, (v, k) -> out.push "'#{k}': #{v}") if o.class?
         if out.length > 0 then "ng-class=\"{#{out.join(',')}}\"" else ""
 
-.factory 'E2', ($templateCache, $http, E2Snippets, $e2Modal, $q, $injector, e2HttpInterceptor, $route, $dateFormatter, $parse) ->
-    globals: {}
+.factory 'E2', ($templateCache, $http, E2Snippets, $q, $dateFormatter, $parse, PushJS, $state, $e2Modal, toastr) ->
+    globals:
+        element: (id) ->
+            element = document.querySelector(id)
+            console.warn "Element #{id} not found" unless element
+            element
+
+        notification: (name, body, icon, timeoutx, on_close) ->
+            PushJS.create name, body: body, icon: icon, timeout: timeoutx, onClick: on_close
+
+        toastr: -> toastr
+        state: -> $state
+        modal: -> $e2Modal
+
+    uuid: (length) ->
+        Math.random().toString(10).substr(2, 8)
 
     compact: (o) ->
         _.each o, (v, k) =>
@@ -75,18 +129,19 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
             else if _.isObject(v) && !_.isDate(v)
                 @clean(v)
             else
-                # delete o[k]
-                o[k] = null
+                o[k] = null # delete o[k]
 
-    merge: (dst, src) ->
+    merge_meta: (dst, src) ->
         for k, v of src
-            if _.isObject(v) && !_.isArray(v)
-                if k.slice(-1) == '!'
-                    dst[k.slice(0, -1)] = v
-                else
-                    dst[k] = @merge(dst[k] ? {}, v)
+            throw "Attempted to override function '#{k}'" if _.isFunction(dst[k])
+            if (k == 'execute' || k == 'pre_execute') && dst[k] && src[k]
+                dst[k] = dst[k].concat(src[k])
             else
-                dst[k] = v
+                insn = k.slice(-1)
+                if _.isObject(v) && !_.isArray(v)
+                    if insn == '!' then dst[k.slice(0, -1)] = v else dst[k] = @merge_meta(dst[k] ? {}, v)
+                else
+                    if insn == '?' then dst[k.slice(0, -1)] ?= v else dst[k] = v
         dst
 
     transpose: (a) ->
@@ -98,7 +153,6 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
     from_id: (id, meta) -> _.zipObject(meta.primary_fields, id) # _.zip(meta.primary_fields, id).reduce(((rec, [k, v]) -> rec[k] = v; rec), {})
 
     icon: E2Snippets.icon
-    aicon: E2Snippets.aicon
 
     fetch_template: (template) ->
         $q.when($templateCache.get(template) || $http.get(template)).then (res) ->
@@ -137,11 +191,21 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
                     processor.arg_fun(action, arg)
                     action.scope().$eval(click)
             else
-                action[fun_name] ?= (arg) ->
-                    processor.arg_fun(action, arg)
-                    args = processor.arg_ret(action)
-                    _.merge(args, $parse(m.arguments)(action.scope())) if m.arguments?
-                    action.invoke_action(m.name, args)
+                if ofun = action[fun_name]
+                    action["#{fun_name}_super"] = (args) ->
+                        _.merge(args, $parse(m.arguments)(action.scope())) if m.arguments?
+                        action.invoke_action(m.name, args)
+
+                    action[fun_name] = (args) ->
+                        processor.arg_fun(action, args)
+                        args = processor.arg_ret(action)
+                        ofun.bind(action)(args)
+                else
+                    action[fun_name] = (arg) ->
+                        processor.arg_fun(action, arg)
+                        args = processor.arg_ret(action)
+                        _.merge(args, $parse(m.arguments)(action.scope())) if m.arguments?
+                        action.invoke_action(m.name, args)
 
             if action.find_action_info(m.name, false)?
                 show = if m.show then " && " + m.show else ""
@@ -167,11 +231,14 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
                 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()
@@ -186,12 +253,12 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
             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;")
@@ -206,138 +273,6 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
         parser = @parsers[info.type]
         if parser then parser(value, info) else value
 
-.provider '$e2Modal', ->
-    $get: ($rootScope, $modal, $timeout, $window, $injector) ->
-        class MManager
-            @Z_INDEX: 1050
-            @index: 0
-            constructor: () ->
-            backdrop_z_index: (num, index) -> angular.element(document.querySelectorAll('.modal-backdrop')).eq(num).css('z-index', index)
-            modal_num: (num) -> angular.element(document.querySelectorAll('.modal')).eq(num)
-            backdrop: (bdr) -> bdr ? 'static'
-            show_before: ->
-                @z_index = MManager.Z_INDEX + MManager.index * 2
-                @modal.css('z-index', @z_index + 1)
-            hide_before: ->
-                @z_index = MManager.Z_INDEX + ((MManager.index - 1) * 2)
-            show: ->
-            hide: -> angular.element($window.document.body).addClass('modal-open modal-with-am-fade') if MManager.index > 0
-
-        class DefaultMManager extends MManager
-            show_before: ->
-                super()
-                @backdrop.css('z-index', @z_index) # @backdrop_z_index(-MManager.index - 1, z_index)
-
-        class FirstMManager extends MManager
-            constructor: () ->
-                super()
-                @threshold = 2
-            backdrop: (bdr) -> if MManager.index > @threshold then false else super(bdr)
-            show_before: ->
-                super()
-                if MManager.index > @threshold
-                    @modal_num((MManager.index - 1) - @threshold).css('display', 'none')
-                    @backdrop_z_index(0, @z_index)
-                else
-                    @backdrop.css('z-index', @z_index) # @backdrop_z_index(-MManager.index - 1, z_index)
-
-            hide_before: ->
-                super()
-                if MManager.index > @threshold
-                    @backdrop_z_index(0, @z_index)
-                    @modal_num((MManager.index - 1) - @threshold).css('display', 'block')
-
-        class SingleBackdropMManager extends MManager
-            backdrop: (bdr) -> if MManager.index > 0 then false else super(bdr)
-            show_before: ->
-                super()
-                @backdrop_z_index(0, @z_index)
-            hide_before: ->
-                super()
-                @backdrop_z_index(0, @z_index)
-
-        is_modal: -> MManager.index > 0
-
-        show: (action) ->
-            scope = if action.scope then action.scope().$new(true) else $rootScope.$new()
-            scope.action = action
-            manager = new SingleBackdropMManager()
-
-            scope.$on 'modal.show.before', (e, m) ->
-                e.stopPropagation()
-                manager.modal = m.$element
-                manager.backdrop = m.$backdrop
-                throw "Modal has element" if action.element?()
-                action.element = -> m.$element
-                action.panel_show?()
-                manager.show_before()
-                MManager.index++
-
-            scope.$on 'modal.show', (e, m) ->
-                e.stopPropagation()
-                manager.show()
-                action.panel_shown?()
-
-            scope.$on 'modal.hide.before', (e) ->
-                e.stopPropagation()
-                MManager.index--
-                manager.hide_before()
-                action.panel_hide?()
-
-            scope.$on 'modal.hide', (e) ->
-                e.stopPropagation()
-                manager.hide()
-                action.panel_hidden?()
-                scope.$destroy()
-
-            $injector.get('E2').fetch_panel(action.meta.panel, true).then (template) ->
-                modal = $modal
-                    scope: scope
-                    show: false
-                    template: template
-                    backdrop: manager.backdrop(action.meta.panel.backdrop)
-                    animation: action.meta.panel.animation ? 'am-fade'
-
-                action.modal_hide = -> modal.$scope.$hide()
-                modal.$promise.then ->
-                    modal.show()
-                    modal
-
-        error: (title, msg, html) ->
-            body = if html then msg else "<div class='alert alert-danger'>#{msg}</div>"
-            clazz = if html then "modal-huge" else "modal-large"
-            @show meta: panel: (panel_template: "close_m", template_string: body, title: title, class: clazz, footer: true) # message: msg,
-
-        confirm: (title, msg, action) ->
-            body = "<div class='alert alert-warning'>#{msg}</div>"
-            clazz = "modal-large"
-            @show
-                confirm: action,
-                meta: panel: (panel_template: "confirm_m", template_string: body, title: title, class: clazz, footer: true) # message: msg,
-
-.directive 'e2Modal', ($e2Modal) ->
-    restrict: 'E'
-    # replace: true
-    # transclude: true
-    scope: true
-    compile: (celem, cattr) ->
-        obody = celem[0].children[0]
-        celem.empty() if obody
-        (scope, elem, attrs) ->
-            scope.$on attrs.name, (ev, args) ->
-                return if ev.defaultPrevented
-                ev.preventDefault()
-
-                panel = panel_template: attrs.panelTemplate, title: attrs.title, class: attrs.clazz, footer: true
-                if obody then panel.template_string = obody.outerHTML else panel.template = attrs.template
-                action = meta: (panel: panel), scope: -> scope
-                _.assign(action, args)
-
-                modal = $e2Modal.show(action)
-                hide_off = scope.$on "#{attrs.name}_close", ->
-                    hide_off()
-                    modal.then (m) -> m.$scope.$hide()
-
 .directive 'e2Field', ($timeout, $filter) ->
     require: 'ngModel'
     restrict: 'A'
@@ -347,7 +282,7 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
 
         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()
@@ -360,8 +295,8 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
         if elem[0].type in ['text', 'password']
             elem.on 'keypress', (ev) ->
                 scope.$apply ->
-                    # scope.action.panel_menu_save() if ev.keyCode == 13 # && elem[0].type != 'textarea'
-                    scope.$emit "return_pressed" if ev.keyCode == 13 # && elem[0].type != 'textarea'
+                    scope.action.panel_menu_default_action?() if ev.keyCode == 13
+
                 ev.stopPropagation()
 
             if info.filter
@@ -380,7 +315,7 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
     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) ->
@@ -397,37 +332,43 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
     scope: false
     link: (scope, elem, attrs) ->
         name = $parse(attrs.template)(scope)
-        $http.get(name, cache: $templateCache).success (body) ->
+        $http.get(name, cache: $templateCache).then (response) ->
             # elem.html($compile(body)(scope))
             # elem.replaceWith($compile(body)(scope))
             elem.empty()
-            elem.after($compile(body)(scope))
+            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) ->
+        table_scope = null
         scope.$on 'render_table', (a, ev) ->
             # ev.stopPropagation()
-            action = scope.action
+            table_scope.$destroy() if table_scope
+            table_scope = scope.$new(false)
+
+            action = table_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
                         thead += "<a ng-click=\"action.order('#{f}')\" #{title}><strong>#{info.loc}</strong></a>"
-                        if action.ui.order == f
-                            cls = if action.ui.asc then "glyphicon-chevron-up" else "glyphicon-chevron-down"
-                            thead += " <span class=\"glyphicon #{cls}\"></span>"
+                        thead += if action.ui.order == f
+                            " <span class=\"fa fa-arrow-#{if action.ui.asc then "up" else "down"}\"></span>"
+                        else
+                            " <span class=\"fa fa-sort\"></span>"
                     else
                         thead += "<span #{title}>#{info.loc}</span>"
                     thead += "</th>"
@@ -438,25 +379,27 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
             _.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)(table_scope))
 
 .directive 'e2Dropdown', ($parse, $dropdown, $timeout, E2Snippets) ->
     event_num = 0
-    dropdown_sub_tmpl = _.template("<li class='dropdown-submenu'><a href=''> {{icon}}{{aicon}} {{loc}}</a>{{sub}}</li>")
-    dropdown_tmpl = _.template("<li {{clazz}} {{show}} {{hide}}> <a href='{{href}}' {{click}}> {{icon}}{{aicon}} {{loc}}</a></li>")
+    dropdown_sub_tmpl = _.template("<li class='dropdown-submenu' {{show}} {{hide}}><a href=''> {{icon}} {{loc}}</a>{{sub}}</li>")
+    dropdown_tmpl = _.template("<li {{clazz}} {{show}} {{hide}} {{active}}> <a {{href}} {{click}}> {{icon}} {{loc}}</a></li>")
 
-    render = (menu, level) ->
+    render = (menu, nav) ->
         out = menu.map (m) ->
             switch
                 when m.divider
@@ -464,18 +407,19 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
                 when m.menu
                     dropdown_sub_tmpl
                         icon: m.menu.icon && E2Snippets.icon(m.menu.icon) || ''
-                        aicon: m.menu.aicon && E2Snippets.aicon(m.menu.aicon) || ''
                         loc: m.menu.loc
-                        sub: render(m.menu.entries)
+                        show: m.menu.show && "ng-show=\"#{m.menu.show}\"" || ''
+                        hide: m.menu.hide && "ng-hide=\"#{m.menu.hide}\"" || ''
+                        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 && "#{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) || ''
-                        aicon: m.aicon && E2Snippets.aicon(m.aicon) || ''
                         loc: m.loc
         "<ul class='dropdown-menu'>#{out.join('')}</ul>"
 
@@ -489,7 +433,7 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
             # event.preventDefault()
             # event.stopPropagation()
             menu = $parse(attrs.e2Dropdown)(scope)
-            dropdown = $dropdown(elem, (scope: scope, template: render(menu, 0), 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()
@@ -505,8 +449,8 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
         elem.on "mousedown", hook
 
 .directive 'e2ButtonSet', ($parse, $compile, E2Snippets) ->
-    button_set_tmpl = _.template("<div class='btn btn-default' {{clazz}} {{click}} {{show}} {{hide}} {{title}}> {{icon}}{{aicon}} {{loc}}</div>")
-    button_set_arr_tmpl = _.template("<div class='btn btn-default' e2-dropdown='{{dropdown}}' data-animation='{{animation}}'>{{icon}}{{aicon}}<span class='caret'></span></div>")
+    button_set_tmpl = _.template("<div class='btn btn-default' {{clazz}} {{click}} {{show}} {{hide}} {{title}}> {{icon}} {{loc}}</div>")
+    button_set_arr_tmpl = _.template("<div class='btn btn-default' e2-dropdown='{{dropdown}}' data-animation='{{animation}}'>{{icon}}<span class='caret'></span></div>")
     scope: true # because $index
     link: (scope, elem, attrs) ->
         menu = $parse(attrs.e2ButtonSet)(scope)
@@ -523,7 +467,6 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
                         dropdown: "#{attrs.e2ButtonSet}.entries[#{i}].menu.entries"
                         animation: animation
                         icon: m.menu.icon && "#{E2Snippets.icon(m.menu.icon)}&nbsp;" || ''
-                        aicon: m.menu.aicon && "#{E2Snippets.aicon(m.menu.aicon)}&nbsp;" || ''
                 else if m.divider
                 else
                     out += button_set_tmpl
@@ -532,21 +475,20 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
                         show: m.show && "ng-show=\"#{m.show}\"" || ''
                         hide: m.hide && "ng-hide=\"#{m.hide}\"" || ''
                         icon: m.icon && E2Snippets.icon(m.icon) || ''
-                        aicon: m.aicon && E2Snippets.aicon(m.aicon) || ''
                         loc: !(m.button_loc == false) && m.loc || ''
-                        title: (m.button_loc == false) && "title=\"#{m.loc}\"" || ''
+                        title: if m.title then "title=\"#{m.title}\"" else ((m.button_loc == false) && "title=\"#{m.loc}\"" || '')
 
             if menu.entries.length > brk
                 out += button_set_arr_tmpl
                     dropdown: "#{attrs.e2ButtonSet}.entries.slice(#{brk})"
                     animation: animation
                     icon: ''
-                    aicon: ''
 
             out = "<div class='btn-group #{group_class}'>#{out}</div>"
             out = $compile(angular.element(out))(scope)
             if attrs.index && !scope.$index?
                 scope.$index = attrs.index | 0
+                scope.$entry = scope.action.entries[scope.$index]
             # scope.data = attrs.data
             elem.after(out) # elem.append(out) # elem.replaceWith(out)
 
@@ -584,27 +526,35 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
             when "decimal_date"
                 match = value.match(/^(\d{4}|\d{2})(\d{2})(\d{2})$/)
                 if match then match.slice(1, 4).join('-') else value
-            else value
+            else
+                match = value.match(/(.*)(?:\s[-+]\d+)$/)
+                if match then match[1] else value
 
     scope: true
     require: 'ngModel'
     link: (scope, element, attr, controller) ->
         action = scope.action
         mode = attr.e2Datepicker
+        has_mode = !_.isEmpty(mode)
         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)
-            scope.$on "search_reset", -> scope.value[mode] = null
+            f = action.query.search[scope.f]
+            if has_mode
+                scope.value[mode] = parse(f[mode], info)
+                scope.$on "search_reset", -> scope.value[mode] = null
+            else
+                scope.value.at = parse(f, info)
+                scope.$on "search_reset", -> scope.value.at = null
         else
             value = parse(action.record[field], info)
-            if mode then scope.value[mode] = value else scope.value = value
+            if has_mode then scope.value[mode] = value else scope.value = value
 
         scope.$watch attr.ngModel, (model, o) -> if model != o
             date = format(model, attr.e2ModelFormat)
             if action.query
-                action.query.search[scope.f][mode] = date
+                if has_mode then action.query.search[scope.f][mode] = date else action.query.search[scope.f] = date
                 scope.action.search_field_change(scope.f) if date?
             else
                 action.record[field] = date