engine2 1.0.4 → 1.0.9

data/views/fields/scaffold.slim

@@ -1,2 +1,2 @@
-.col-lg-10.col-md-10.col-sm-10
-  e2-action action="info.assoc"
+.col-lg-12.col-md-12.col-sm-10
+  e2-action action="field.assoc"

data/views/fields/scaffold_picker.slim

@@ -1,16 +1,16 @@
-e2-action action="[info.assoc, 'decode']"
+e2-action action="[field.assoc, 'decode']"
   .col-lg-6.col-md-6.col-sm-8
     .input-group.input-group-sm
       a.btn.btn-default [
-        ng-disabled="info.disabled"
+        ng-disabled="field.disabled"
         class="form-control"
-        ng-click="!info.disabled && action.open()"
+        ng-click="!field.disabled && action.open()"
       ]
         span ng-bind-html="action.decode"
 
       .input-group-btn
-        a.btn.btn-default ng-disabled="info.disabled" ng-click="!info.disabled && action.open()": span.glyphicon.glyphicon-list
-        a.btn.btn-default ng-disabled="info.disabled || action.decode == null" ng-click="!info.disabled && action.reset()": span.glyphicon.glyphicon-remove
+        a.btn.btn-default ng-disabled="field.disabled" ng-click="!field.disabled && action.open()": span.glyphicon.glyphicon-list
+        a.btn.btn-default ng-disabled="field.disabled || action.decode == null" ng-click="!field.disabled && action.reset()": span.glyphicon.glyphicon-remove
 
     input [
       type="hidden"

data/views/fields/select_picker.slim

@@ -1,11 +1,11 @@
-e2-action action="[info.assoc, 'list']"
+e2-action action="[field.assoc, 'list']"
   .col-lg-7.col-md-8.col-sm-12
     select.btn.btn-default.btn-sm [
       ng-model="action.selected"
       ng-options="v.id as v.value for v in action.values"
       ng-change="action.change()"
-      ng-disabled="info.disabled"
-      ng-class="info.render.class"
+      ng-disabled="field.disabled"
+      ng-class="field.render.class"
       class="form-control input-sm"
       e2-field=""
     ]

data/views/fields/select_picker_opt.slim

@@ -1,15 +1,15 @@
-e2-action action="[info.assoc, 'list']"
+e2-action action="[field.assoc, 'list']"
   .col-lg-7.col-md-12.col-sm-12
     .input-group.input-group-sm
       select.btn.btn-default.btn-sm [
         ng-model="action.selected"
         ng-options="v.id as v.value for v in action.values"
         ng-change="action.change()"
-        ng-disabled="info.disabled"
-        ng-class="info.render.class"
+        ng-disabled="field.disabled"
+        ng-class="field.render.class"
         class="form-control"
         e2-field=""
       ]
       .input-group-btn
-        a.btn.btn-default ng-disabled="info.disabled || !action.selected" ng-click="action.reset()"
+        a.btn.btn-default ng-disabled="field.disabled || !action.selected" ng-click="action.reset()"
           span.glyphicon.glyphicon-remove

data/views/fields/text_area.slim

@@ -1,9 +1,10 @@
 .col-lg-11
   textarea [
+    spellcheck="false"
     ng-model="action.record[f]"
-    cols="{{info.render.cols}}"
-    rows="{{info.render.rows}}"
-    ng-disabled="info.disabled"
+    cols="{{field.render.cols}}"
+    rows="{{field.render.rows}}"
+    ng-disabled="field.disabled"
     class="form-control"
     e2-field=""
   ]

data/views/fields/time.slim

@@ -4,15 +4,16 @@
       type="text"
       class="form-control"
       ng-model="value"
-      ng-disabled="info.disabled"
+      ng-disabled="field.disabled"
 
-      data-time-format="{{::info.render.format}}"
-      data-animation="{{::info.render.animation}}"
+      data-time-format="{{::field.render.format}}"
+      data-animation="{{::field.render.animation}}"
       bs-timepicker=""
       e2-datepicker=""
-      e2-model-format="{{::info.render.model_format}}"
+      e2-model-format="{{::field.render.model_format}}"
       data-autoclose="1"
       data-arrow-behavior="picker"
+      data-time-type="{{::field.render.type}}"
 
       e2-force-view-value=""
       e2-field=""

data/views/fields/typeahead_picker.slim

@@ -1,24 +1,27 @@
-e2-action action="[info.assoc, 'typeahead']"
-  .col-lg-7.col-md-8.col-sm-12
+e2-action action="[field.assoc, 'typeahead']"
+  /.col-lg-7.col-md-8.col-sm-12
+  div e2-input-cols="{{::field.render.length}}"
     .input-group.input-group-sm
       input.btn.btn-default [
+        style="text-align:left"
         type="text"
         ng-model="action.decode"
-        bs-options="v.value for v in action.load($viewValue)"
-        ng-keypress="action.key_pressed = true"
+        bs-options="v.value for v in action.load(action.decode)"
 
-        ng-disabled="info.disabled"
-        ng-class="info.render.class"
+        ng-disabled="field.disabled"
+        ng-class="field.render.class"
         class="form-control"
 
-        data-animation="{{::info.render.animation}}"
+        data-animation="{{::field.render.animation}}"
         placeholder="..."
         data-html="true"
-        data-limit="10"
+        data-limit="{{::field.render.limit}}"
+        data-min-length="{{::field.render.min_length}}"
+        data-trigger="focus"
         bs-typeahead=""
         e2-field=""
       ]
       span.input-group-addon: span.glyphicon.glyphicon-font
       .input-group-btn
-        a.btn.btn-default ng-disabled="info.disabled || action.decode == null" ng-click="!info.disabled && action.reset()"
+        a.btn.btn-default ng-disabled="field.disabled || !action.decode" ng-click="!field.disabled && action.reset()"
           span.glyphicon.glyphicon-off

data/views/index.slim

@@ -5,11 +5,11 @@ html
     meta http-equiv="x-ua-compatible" content="IE=edge"
 
     link rel="stylesheet" href="engine2vendor.css"
-    link rel="stylesheet" href="engine2app.css"
+    link rel="stylesheet" href="engine2.css"
     script type="text/javascript" src="engine2vendor.js"
     script type="text/javascript" src="engine2.js"
 
-  body ng-app="app"
+  body ng-app="app" ng-strict-di=""
     e2-action ng-controller="AppController"
       .nav.navbar.navbar-default
         .container
@@ -36,5 +36,5 @@ html
                 .navbar-text
 
       .container
-        ng-view
+        ui-view
 

data/views/infra/inspect.slim

@@ -1,4 +1,4 @@
-e2-action action="'inspect'"
+e2-action action="'inspect_' + action.globals().application"
   div bs-tabs=""
     br
     div title="API" bs-pane=""
@@ -8,7 +8,7 @@ e2-action action="'inspect'"
             .panel-body
               script type="text/ng-template" id="nodes_renderer.html"
                 div data-nodrag="" ng-init="stack = stack.concat([$index])"
-                  span.glyphicon.glyphicon-cog ng-if="node.terminal"
+                  span.glyphicon ng-class="{'glyphicon-cog': node.access, 'glyphicon-exclamation-sign': !node.access}" ng-if="node.terminal"
                   a ng-click="action.open(stack, node, collapsed, true); toggle(this)" ng-if="!node.terminal"
                     span.glyphicon ng-class="{'glyphicon-play-circle': collapsed && node.access, 'glyphicon-download': !collapsed, 'glyphicon-exclamation-sign': collapsed && !node.access}"
                   span< ng-bind="node.name + ' ' + node.number" ng-click="action.open(stack, node, collapsed, false)" style="cursor: pointer; {{action.number == node.number && 'font-weight: bold;'}}"
@@ -24,13 +24,13 @@ e2-action action="'inspect'"
               div bs-tabs="" bs-active-pane="actionTab" ng-init="actionTab = 0"
                 div title="Action" bs-pane=""
                   br
-                  pre ng-bind="action.action_json | json"
+                  pre ng-bind="action.action_json | yaml"
                 div title="Meta" bs-pane=""
                   br
-                  pre ng-bind="action.meta_json | json"
+                  pre ng-bind="action.meta_json | yaml"
                 div title="State" bs-pane=""
                   br
-                  pre ng-bind="action.action_state | json"
+                  pre ng-bind="action.action_state | yaml"
 
     div title="Model" bs-pane=""
       .row
@@ -58,13 +58,13 @@ e2-action action="'inspect'"
               div bs-tabs="" bs-active-pane="modelTab" ng-init="modelTab = 0"
                 div title="Model" bs-pane=""
                   br
-                  pre ng-bind="action.model.info | json"
+                  pre ng-bind="action.model.info | yaml"
                 div title="Schema" bs-pane=""
                   br
-                  pre ng-bind="action.model.schema | json"
+                  pre ng-bind="action.model.schema | yaml"
                 div title="Type info" bs-pane=""
                   br
-                  pre ng-bind="action.model.type_info | json"
+                  pre ng-bind="action.model.type_info | yaml"
                 div title="Associations" bs-pane="" ng-if="action.model && action.has_assoc(action.model)"
                   br
                   .row
@@ -78,8 +78,39 @@ e2-action action="'inspect'"
                   br
                   .row
                     .col-lg-12
-                      pre ng-bind="action.activeAssoc | json"
+                      pre ng-bind="action.activeAssoc | yaml"
     div title="Globals" bs-pane=""
       .panel.panel-default
         .panel-body
-          pre ng-bind="action.globals() | json"
+          pre ng-bind="action.globals() | yaml"
+
+    div title="Environment" bs-pane=""
+      .panel.panel-default
+        .panel-body
+          pre ng-bind="action.environment | yaml"
+
+    div title="Local storage" bs-pane=""
+      .panel.panel-default
+        .panel-body
+          pre ng-bind="action.local_storage | yaml"
+          pre ng-bind="action.local_storage.keys() | yaml"
+          a.btn.btn-default ng-click="action.local_storage.clearAll()"
+            | Clear
+
+    div title="Diagnostics" bs-pane=""
+      .panel.panel-default
+        .panel-body
+          .btn-group
+            a.btn.btn-default ng-click="action.globals().notification('Name', 'Body', undefined, 2000)"
+              | Push
+            a.btn.btn-default ng-click="action.globals().toastr().success('Name', 'Body')"
+              | Toastr
+          hr
+          a.btn.btn-default> ng-click="action.web_socket().send({number: action.number})"
+            | Websocket
+          | {{action.number}}
+          br
+          | Event
+          pre ng-bind="action.event | yaml"
+          | Socket
+          pre ng-bind="action.web_socket() | json"

data/views/modals/menu_m.slim

@@ -1,7 +1,7 @@
 .modal ng-class="action.meta.panel.class"
   .modal-dialog
     .modal-content
-      .modal-header
+      .modal-header ng-if="::action.meta.panel.header"
         button.close type="button" ng-click="$hide()" ×
         h4.modal-title ng-bind-html="action.meta.panel.title"
 

data/views/panels/menu_m.slim

@@ -1,5 +1,5 @@
 .panel.panel-default
-  .panel-heading
+  .panel-heading ng-if="::action.meta.panel.header"
     h4.modal-title ng-bind-html="action.meta.panel.title"
   .panel-body
     | modal-content-to-replace

data/views/scaffold/fields.slim

@@ -1,10 +1,12 @@
 div
-  .form-group ng-class="action.errors[f] && 'has-error'" ng-repeat="f in form_field_list track by $index" ng-if="!action.meta.info[f].hidden" ng-init="info = action.meta.info[f]"
-    label.control-label ng-class="info.render.label_width || 'col-sm-3 col-md-3 col-lg-3'" for="{{f}}" ng-bind="::info.loc"
+  .form-group ng-class="action.errors[f] && 'has-error'" ng-repeat="f in form_field_list track by $index" ng-if="!action.meta.fields[f].hidden" ng-init="field = action.meta.fields[f]"
+    label.control-label ng-class="field.render.label_width || 'col-sm-3 col-md-3 col-lg-3'" for="{{f}}" ng-bind="::field.loc"
     .col-sm-9.col-md-9.col-lg-9
       .row
-        e2-include template="info.render.template"
+        e2-include template="field.render.template"
       .row
+        .col-sm-12 ng-if="::field.description"
+          small.text-muted ng-bind="::field.description"
         .col-sm-12
           small.text-danger ng-repeat="e in action.errors[f] track by $index" ng-bind="e"
-      div ng-if="info.hr": hr
+      div ng-if="::field.hr": hr

data/views/scaffold/form.slim

@@ -1,5 +1,5 @@
 form.form-horizontal role="form"
-  span ng-init="form_field_list = action.meta.fields" ng-if="true"
+  span ng-init="form_field_list = action.meta.field_list" ng-if="true"
     e2-include template="action.meta.panel.field_template"
 
   span ng-if="action.alert": .alert.alert-danger[] {{action.alert}}

data/views/scaffold/form_collapse.slim

@@ -8,11 +8,12 @@ form.form-horizontal role="form"
           ng-init="action.activeTab = [0]"
           ng-model="action.activeTab"
         ]
-        div.panel.panel-default ng-repeat="t in ::action.meta.tabs track by $index"
+        div ng-init="tabs = action.meta.tabs"
+        div.panel.panel-default ng-repeat="t in ::action.meta.tab_list track by $index" ng-if="!tabs[t].hidden"
           div.panel-heading role="tab"
             h4.panel-title
-              a bs-collapse-toggle="" ng-click="" ng-bind="::t.loc"
-          div.panel-collapse role="tabpanel" bs-collapse-target="" ng-init="form_field_list = t.fields"
+              a bs-collapse-toggle="" ng-click="" ng-bind="::tabs[t].loc"
+          div.panel-collapse role="tabpanel" bs-collapse-target="" ng-init="form_field_list = tabs[t].field_list"
             div.panel-body
               e2-include template="action.meta.panel.field_template"
 

data/views/scaffold/form_tabs.slim

@@ -1,8 +1,9 @@
 form.form-horizontal role="form"
   span ng-if="true"
     div bs-tabs="" bs-active-pane="action.activeTab" ng-init="action.activeTab = 0"
-      div ng-repeat="t in ::action.meta.tabs track by $index" title="{{::t.loc}}" bs-pane=""
-        div ng-if="!t.lazy || $index == action.activeTab" ng-init="form_field_list = t.fields"
+      div ng-init="tabs = action.meta.tabs"
+      div ng-repeat="t in ::action.meta.tab_list track by $index" title="{{::tabs[t].loc}}" bs-pane="" disabled="{{tabs[t].disabled}}" ng-if="!tabs[t].hidden"
+        div ng-if="!tabs[t].lazy || $index == action.activeTab" ng-init="form_field_list = tabs[t].field_list"
           br
           e2-include template="action.meta.panel.field_template"
 

data/views/scaffold/search.slim

@@ -1,12 +1,12 @@
 .panel.panel-default
   .panel-body
     form
-      span ng-repeat="f in action.meta.search_fields track by $index" ng-if="!action.meta.info[f].hidden_search" ng-init="info = action.meta.info[f]"
-        e2-include template="info.render.template"
+      span ng-repeat="f in action.meta.search_field_list track by $index" ng-if="!action.meta.fields[f].hidden_search" ng-init="field = action.meta.fields[f]"
+        e2-include template="field.render.template"
 
       .btn-group.btn-group-sm.pull-right
-        button.btn.btn-default ng-click="action.load_new()"
+        button.btn.btn-default ng-click="action.load_new()" ng-hide="::action.meta.disable_search_button"
           span ng-bind="::action.meta.loc.search"
           span.glyphicon.glyphicon-zoom-in<
-        button.btn.btn-default ng-click="action.search_reset()"
+        button.btn.btn-default ng-click="action.search_reset()" title="Reset"
           span.glyphicon.glyphicon-asterisk

data/views/scaffold/search_collapse.slim

@@ -9,18 +9,19 @@
           ng-init="action.ui_state.search_tab = (action.ui_state.search_tab + 0) <= 0 ? [0] : action.ui_state.search_tab"
           ng-model="action.ui_state.search_tab"
         ]
-        div.panel.panel-default ng-repeat="t in ::action.meta.tabs track by $index"
+        div ng-init="tabs = action.meta.tabs"
+        div.panel.panel-default ng-repeat="t in ::action.meta.tab_list track by $index"
           div.panel-heading role="tab"
             h4.panel-title
-              a bs-collapse-toggle="" ng-click="" ng-bind="::t.loc"
-          div.panel-collapse role="tabpanel" bs-collapse-target="" ng-init="form_field_list = t.fields"
+              a bs-collapse-toggle="" ng-click="" ng-bind="::tabs[t].loc"
+          div.panel-collapse role="tabpanel" bs-collapse-target="" ng-init="form_field_list = tabs[t].field_list"
             div.panel-body
-              span ng-repeat="f in t.fields track by $index" ng-if="!action.meta.info[f].hidden_search" ng-init="info = action.meta.info[f]"
-                e2-include template="info.render.template"
+              span ng-repeat="f in form_field_list track by $index" ng-if="!action.meta.fields[f].hidden_search" ng-init="field = action.meta.fields[f]"
+                e2-include template="field.render.template"
 
       .btn-group.btn-group-sm.pull-right
-        button.btn.btn-default ng-click="action.load_new()"
+        button.btn.btn-default ng-click="action.load_new()" ng-hide="::action.meta.disable_search_button"
           span ng-bind="::action.meta.loc.search"
           span.glyphicon.glyphicon-zoom-in<
-        button.btn.btn-default ng-click="action.search_reset()"
+        button.btn.btn-default ng-click="action.search_reset()" title="Reset"
           span.glyphicon.glyphicon-asterisk

data/views/scaffold/search_tabs.slim

@@ -2,14 +2,15 @@
   .panel-body
     form
       div bs-tabs="" ng-init="action.ui_state.search_tab = (action.ui_state.search_tab + 0) <= 0 ? 0 : action.ui_state.search_tab" bs-active-pane="action.ui_state.search_tab"
-        div ng-repeat="t in ::action.meta.tabs track by $index" title="{{::t.loc}}" bs-pane=""
+        div ng-init="tabs = action.meta.tabs"
+        div ng-repeat="t in ::action.meta.tab_list track by $index" title="{{::tabs[t].loc}}" bs-pane=""
           br
-          span ng-repeat="f in t.fields track by $index" ng-if="!action.meta.info[f].hidden_search" ng-init="info = action.meta.info[f]"
-            e2-include template="info.render.template"
+          span ng-repeat="f in tabs[t].field_list track by $index" ng-if="!action.meta.fields[f].hidden_search" ng-init="field = action.meta.fields[f]"
+            e2-include template="field.render.template"
 
       .btn-group.btn-group-sm.pull-right
-        button.btn.btn-default ng-click="action.load_new()"
+        button.btn.btn-default ng-click="action.load_new()" ng-hide="::action.meta.disable_search_button"
           span ng-bind="::action.meta.loc.search"
           span.glyphicon.glyphicon-zoom-in<
-        button.btn.btn-default ng-click="action.search_reset()"
+        button.btn.btn-default ng-click="action.search_reset()" title="Reset"
           span.glyphicon.glyphicon-asterisk

data/views/scaffold/view.slim

@@ -1,7 +1,7 @@
 div
   table.table.table-striped.table-condensed.table-hover
-    tr ng-repeat="f in action.meta.fields track by $index" ng-hide="::action.meta.info[f].hidden"
-        td ng-bind="::action.meta.info[f].loc"
+    tr ng-repeat="f in action.meta.field_list track by $index" ng-hide="::action.meta.fields[f].hidden"
+        td ng-bind="::action.meta.fields[f].loc"
         td
           div ng-bind-html="action.view_cell(action.record, f)"
 

data/views/scaffold/view_collapse.slim

@@ -7,15 +7,16 @@ div
       ng-init="action.activeTab = [0]"
       ng-model="action.activeTab"
     ]
-    div.panel.panel-default ng-repeat="t in ::action.meta.tabs track by $index"
+    div ng-init="tabs = action.meta.tabs"
+    div.panel.panel-default ng-repeat="t in ::action.meta.tab_list track by $index"
       div.panel-heading role="tab"
         h4.panel-title
-          a bs-collapse-toggle="" ng-click="" ng-bind="::t.loc"
+          a bs-collapse-toggle="" ng-click="" ng-bind="::tabs[t].loc"
       div.panel-collapse role="tabpanel" bs-collapse-target=""
         div.panel-body
           table.table.table-striped.table-condensed.table-hover
-            tr ng-repeat="f in t.fields" ng-hide="::action.meta.info[f].hidden"
-              td ng-bind="::action.meta.info[f].loc"
+            tr ng-repeat="f in tabs[t].field_list" ng-hide="::action.meta.fields[f].hidden"
+              td ng-bind="::action.meta.fields[f].loc"
               td
                 div ng-bind-html="action.view_cell(action.record, f)"
 

data/views/scaffold/view_tabs.slim

@@ -1,10 +1,11 @@
 div
   div bs-tabs="" bs-active-pane="action.activeTab" ng-init="action.activeTab = 0"
-    div ng-repeat="t in ::action.meta.tabs" title="{{::t.loc}}" bs-pane=""
+    div ng-init="tabs = action.meta.tabs"
+    div ng-repeat="t in ::action.meta.tab_list" title="{{::tabs[t].loc}}" bs-pane=""
       br
       table.table.table-striped.table-condensed.table-hover
-        tr ng-repeat="f in t.fields" ng-hide="::action.meta.info[f].hidden"
-          td ng-bind="::action.meta.info[f].loc"
+        tr ng-repeat="f in tabs[t].field_list" ng-hide="::action.meta.fields[f].hidden"
+          td ng-bind="::action.meta.fields[f].loc"
           td
             div ng-bind-html="action.view_cell(action.record, f)"