engine2 1.0.3 → 1.0.4

data/views/fields/date_time.slim

@@ -2,7 +2,6 @@
   .col-lg-3.col-md-3.col-sm-5
     .input-group.input-group-sm
       input.btn.btn-default [
-        ng-init="info = action.meta.info[f]"
         type="text"
         class="form-control"
         ng-model="value"

data/views/fields/datetime.slim

@@ -2,7 +2,6 @@
   .col-lg-3.col-md-3.col-sm-5
     .input-group.input-group-sm
       input.btn.btn-default [
-        ng-init="info = action.meta.info[f]"
         type="text"
         class="form-control"
         ng-model="value.value"
@@ -23,7 +22,6 @@
   .col-lg-3.col-md-3.col-sm-5
     .input-group.input-group-sm
       input.btn.btn-default [
-        ng-init="info = action.meta.info[f]"
         type="text"
         class="form-control"
         ng-model="value.value"

data/views/fields/decimal.slim

@@ -1,7 +1,6 @@
 .col-lg-4.col-md-5.col-sm-5
   .input-group.input-group-sm
     input [
-      ng-init="info = action.meta.info[f]"
       type="text"
       ng-model="action.record[f]"
       ng-disabled="info.disabled"

data/views/fields/decimal_date.slim

@@ -1,7 +1,6 @@
 .col-lg-3.col-md-3.col-sm-5
   .input-group.input-group-sm
     input [
-      ng-init="info = action.meta.info[f]"
       xe2-decimal-date-picker=""
       type="text"
       class="form-control"

data/views/fields/decimal_time.slim

@@ -1,7 +1,6 @@
 .col-lg-3.col-md-3.col-sm-5
   .input-group.input-group-sm
     input [
-      ng-init="info = action.meta.info[f]"
       xe2-decimal-time-picker="" mode="record"
       type="text"
       class="form-control"

data/views/fields/email.slim

@@ -1,8 +1,7 @@
 /.col-lg-8.col-md-10.col-sm-12
-div e2-input-cols="{{action.meta.info[f].render.length}}"
+div e2-input-cols="{{::info.render.length}}"
   .input-group.input-group-sm
     input [
-      ng-init="info = action.meta.info[f]"
       type="text"
       ng-model="action.record[f]"
       maxlength="{{info.render.length}}"

data/views/fields/file_store.slim

@@ -18,7 +18,7 @@ e2-action action="[f + '_file_store!']"
 
           td ng-bind="f.uploaded"
 
-    div ng-init="info = action.meta.info[f]"
+    div
       input [
         type="hidden"
         ng-model="action.record[f]"

data/views/fields/input_text.slim

@@ -1,8 +1,7 @@
 /.col-lg-8.col-md-9.col-sm-12
-div e2-input-cols="{{::action.meta.info[f].render.length}}"
+div e2-input-cols="{{::info.render.length}}"
   .input-group.input-group-sm
     input [
-      ng-init="info = action.meta.info[f]"
       type="text"
       ng-model="action.record[f]"
       maxlength="{{::info.render.length}}"

data/views/fields/integer.slim

@@ -3,7 +3,7 @@
     input [
       type="text"
       ng-model="action.record[f]"
-      ng-disabled="action.meta.info[f].disabled"
+      ng-disabled="info.disabled"
       class="form-control"
       e2-field=""
       e2-integer=""

data/views/fields/list_bsselect.slim

@@ -1,8 +1,7 @@
 /.col-lg-7.col-md-8.col-sm-12
-div e2-input-cols="{{::action.meta.info[f].render.length}}"
+div e2-input-cols="{{::info.render.length}}"
   button.btn.btn-default.btn-sm [
     type="button"
-    ng-init="info = action.meta.info[f]"
     ng-model="action.record[f]"
     bs-options="v[0] as v[1] for v in info.render.list"
     data-html="true"

data/views/fields/list_bsselect_opt.slim

@@ -1,9 +1,8 @@
 /.col-lg-7.col-md-8.col-sm-12
-div e2-input-cols="{{::action.meta.info[f].render.length}}"
+div e2-input-cols="{{::info.render.length}}"
   .input-group.input-group-sm
     button.btn.btn-default [
       type="button"
-      ng-init="info = action.meta.info[f]"
       ng-model="action.record[f]"
       bs-options="v[0] as v[1] for v in info.render.list"
       data-html="true"
@@ -17,5 +16,5 @@ div e2-input-cols="{{::action.meta.info[f].render.length}}"
       bs-select=""
     ]
     .input-group-btn
-      a.btn.btn-default ng-disabled="action.meta.info[f].disabled || action.record[f] == null" ng-click="action.record[f] = null"
+      a.btn.btn-default ng-disabled="info.disabled || action.record[f] == null" ng-click="action.record[f] = null"
         span.glyphicon.glyphicon-remove

data/views/fields/list_buttons.slim

@@ -1,3 +1,3 @@
 .col-lg-12
-  .btn-group.btn-group-sm ng-init="info = action.meta.info[f]" ng-model="action.record[f]" e2-field=""
+  .btn-group.btn-group-sm ng-model="action.record[f]" e2-field=""
     a.btn.btn-default ng-class="action.record[f] == v[0] && 'active'" ng-click="action.record[f] = v[0]" ng-repeat="v in info.render.list" ng-bind-html="v[1]" ng-disabled="info.disabled"

data/views/fields/list_buttons_opt.slim

@@ -1,5 +1,5 @@
 .col-lg-12
-  .btn-group.btn-group-sm ng-init="info = action.meta.info[f]" ng-model="action.record[f]" e2-field=""
+  .btn-group.btn-group-sm ng-model="action.record[f]" e2-field=""
     a.btn.btn-default ng-class="action.record[f] == v[0] && 'active'" ng-click="action.record[f] = v[0]" ng-repeat="v in info.render.list" ng-bind-html="v[1]" ng-disabled="info.disabled"
     a.btn.btn-default ng-disabled="action.record[f] == null || info.disabled" ng-click="action.record[f] = null"
       span.glyphicon.glyphicon-remove

data/views/fields/list_select.slim

@@ -1,7 +1,6 @@
 /.col-lg-7.col-md-8.col-sm-12
-div e2-input-cols="{{::action.meta.info[f].render.length}}"
+div e2-input-cols="{{::info.render.length}}"
   select.btn.btn-default.btn-sm [
-    ng-init="info = action.meta.info[f]"
     ng-model="action.record[f]"
     ng-options="v[0] as v[1] for v in info.render.list"
     ng-disabled="info.disabled"

data/views/fields/list_select_opt.slim

@@ -1,8 +1,7 @@
 /.col-lg-7.col-md-8.col-sm-12
-div e2-input-cols="{{::action.meta.info[f].render.length}}"
+div e2-input-cols="{{::info.render.length}}"
   .input-group.input-group-sm
     select.btn.btn-default.btn-sm [
-      ng-init="info = action.meta.info[f]"
       ng-model="action.record[f]"
       ng-options="v[0] as v[1] for v in info.render.list"
       ng-disabled="info.disabled"
@@ -11,5 +10,5 @@ div e2-input-cols="{{::action.meta.info[f].render.length}}"
       e2-field=""
     ]
     .input-group-btn
-      a.btn.btn-default ng-disabled="action.meta.info[f].disabled || action.record[f] == null" ng-click="action.record[f] = null"
+      a.btn.btn-default ng-disabled="info.disabled || action.record[f] == null" ng-click="action.record[f] = null"
         span.glyphicon.glyphicon-remove

data/views/fields/password.slim

@@ -1,8 +1,7 @@
 /.col-lg-8.col-md-9.col-sm-12
-div e2-input-cols="{{::action.meta.info[f].render.length}}"
+div e2-input-cols="{{::info.render.length}}"
   .input-group.input-group-sm
     input [
-      ng-init="info = action.meta.info[f]"
       type="password"
       ng-model="action.record[f]"
       maxlength="{{::info.render.length}}"

data/views/fields/radio_checkbox.slim

@@ -1,6 +1,6 @@
 .col-lg-3
   .btn-group.btn-group-sm [
-  	ng-init="info = action.meta.info[f]; action.record[f] = action.record[f] || info.render.false_value"
+  	ng-init="action.record[f] = action.record[f] || info.render.false_value"
     ng-model="action.record[f]"
     bs-buttons-radio=""
     e2-field=""

data/views/fields/scaffold.slim

@@ -1,2 +1,2 @@
 .col-lg-10.col-md-10.col-sm-10
-  e2-action action="action.meta.info[f].assoc"
+  e2-action action="info.assoc"

data/views/fields/scaffold_picker.slim

@@ -1,8 +1,7 @@
-e2-action action="[action.meta.info[f].assoc, 'decode']"
+e2-action action="[info.assoc, 'decode']"
   .col-lg-6.col-md-6.col-sm-8
     .input-group.input-group-sm
       a.btn.btn-default [
-        ng-init="info = action.meta.info[f]"
         ng-disabled="info.disabled"
         class="form-control"
         ng-click="!info.disabled && action.open()"

data/views/fields/select_picker.slim

@@ -1,7 +1,6 @@
-e2-action action="[action.meta.info[f].assoc, 'list']"
+e2-action action="[info.assoc, 'list']"
   .col-lg-7.col-md-8.col-sm-12
     select.btn.btn-default.btn-sm [
-      ng-init="info = action.meta.info[f]"
       ng-model="action.selected"
       ng-options="v.id as v.value for v in action.values"
       ng-change="action.change()"

data/views/fields/select_picker_opt.slim

@@ -1,8 +1,7 @@
-e2-action action="[action.meta.info[f].assoc, 'list']"
+e2-action action="[info.assoc, 'list']"
   .col-lg-7.col-md-12.col-sm-12
     .input-group.input-group-sm
       select.btn.btn-default.btn-sm [
-        ng-init="info = action.meta.info[f]"
         ng-model="action.selected"
         ng-options="v.id as v.value for v in action.values"
         ng-change="action.change()"

data/views/fields/text_area.slim

@@ -1,6 +1,5 @@
 .col-lg-11
   textarea [
-    ng-init="info = action.meta.info[f]"
     ng-model="action.record[f]"
     cols="{{info.render.cols}}"
     rows="{{info.render.rows}}"

data/views/fields/time.slim

@@ -1,7 +1,6 @@
 .col-lg-3.col-md-3.col-sm-5
   .input-group.input-group-sm
     input.btn.btn-default [
-      ng-init="info = action.meta.info[f]"
       type="text"
       class="form-control"
       ng-model="value"

data/views/fields/typeahead_picker.slim

@@ -1,9 +1,8 @@
-e2-action action="[action.meta.info[f].assoc, 'typeahead']"
+e2-action action="[info.assoc, 'typeahead']"
   .col-lg-7.col-md-8.col-sm-12
     .input-group.input-group-sm
       input.btn.btn-default [
         type="text"
-        ng-init="info = action.meta.info[f]"
         ng-model="action.decode"
         bs-options="v.value for v in action.load($viewValue)"
         ng-keypress="action.key_pressed = true"

data/views/index.slim

@@ -3,15 +3,11 @@ html
   head
     title App
     meta http-equiv="x-ua-compatible" content="IE=edge"
-    link rel="stylesheet" href="css/bootstrap.min.css"
-    link rel="stylesheet" href="assets/styles.css"
-    link rel="stylesheet" href="css/app.css"
 
-    script type="text/javascript" src="assets/javascripts.js"
-    script type="text/javascript" src="js/engine2.js"
-    script type="text/javascript" src="js/engine2actions.js"
-    script type="text/javascript" src="js/engine2templates.js"
-    script type="text/javascript" src="js/app.js"
+    link rel="stylesheet" href="engine2vendor.css"
+    link rel="stylesheet" href="engine2app.css"
+    script type="text/javascript" src="engine2vendor.js"
+    script type="text/javascript" src="engine2.js"
 
   body ng-app="app"
     e2-action ng-controller="AppController"

data/views/scaffold/fields.slim

@@ -1,10 +1,10 @@
 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"
-    label.control-label ng-class="action.meta.info[f].render.label_width || 'col-sm-3 col-md-3 col-lg-3'" for="{{f}}" ng-bind="::action.meta.info[f].loc"
+  .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"
     .col-sm-9.col-md-9.col-lg-9
       .row
-        e2-include template="action.meta.info[f].render.template"
+        e2-include template="info.render.template"
       .row
         .col-sm-12
           small.text-danger ng-repeat="e in action.errors[f] track by $index" ng-bind="e"
-      div ng-if="action.meta.info[f].hr": hr
+      div ng-if="info.hr": hr

data/views/scaffold/form.slim

@@ -1,11 +1,5 @@
 form.form-horizontal role="form"
-  span ng-if="::!action.meta.tabs" ng-init="form_field_list = action.meta.fields"
+  span ng-init="form_field_list = action.meta.fields" ng-if="true"
     e2-include template="action.meta.panel.field_template"
-  span ng-if="::action.meta.tabs"
-    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"
-          br
-          e2-include template="action.meta.panel.field_template"
 
   span ng-if="action.alert": .alert.alert-danger[] {{action.alert}}

data/views/scaffold/form_collapse.slim

@@ -0,0 +1,19 @@
+form.form-horizontal role="form"
+  span ng-if="true"
+      div.panel-group[
+          bs-collapse=""
+          role="tablist"
+          data-allow-multiple="true"
+          aria-multiselectable="true"
+          ng-init="action.activeTab = [0]"
+          ng-model="action.activeTab"
+        ]
+        div.panel.panel-default ng-repeat="t in ::action.meta.tabs 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"
+            div.panel-body
+              e2-include template="action.meta.panel.field_template"
+
+  span ng-if="action.alert": .alert.alert-danger[] {{action.alert}}

data/views/scaffold/form_tabs.slim

@@ -0,0 +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"
+          br
+          e2-include template="action.meta.panel.field_template"
+
+  span ng-if="action.alert": .alert.alert-danger[] {{action.alert}}

data/views/scaffold/list.slim

@@ -2,18 +2,7 @@ div
   e2-include template="action.meta.panel.search_template" ng-if="action.ui_state.search_active"
   .panel.panel-default
     .panel-body
-      table.table.table-striped.table-condensed.table-hover
-        thead
-          tr
-            th
-              div e2-button-set="action.meta.menus.menu"
-            th ng-repeat="f in action.meta.fields"
-              a> ng-if="action.meta.info[f].sort" ng-click="action.order(f)": strong ng-bind="::action.meta.info[f].loc"
-              span ng-show="action.ui.order == f"
-                span.glyphicon ng-class="action.ui.asc ? 'glyphicon-chevron-up' : 'glyphicon-chevron-down'"
-              span ng-if="!action.meta.info[f].sort" ng-bind="::action.meta.info[f].loc"
-        tbody e2-table-body=""
-
+      table.table.table-striped.table-condensed.table-hover e2-table-body=""
       span ng-if="action.ui.pagination_active"
         ul.pagination.pagination-md
           li ng-class="!action.prev_active() && 'disabled'"

data/views/scaffold/search.slim

@@ -1,15 +1,8 @@
 .panel.panel-default
   .panel-body
     form
-      span ng-if="::!action.meta.tabs"
-        span ng-repeat="f in action.meta.search_fields track by $index" ng-if="!action.meta.info[f].hidden_search"
-          e2-include template="action.meta.info[f].render.template"
-      span ng-if="::action.meta.tabs"
-        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=""
-            br
-            span ng-repeat="f in t.fields track by $index" ng-if="!action.meta.info[f].hidden_search"
-              e2-include template="action.meta.info[f].render.template"
+      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"
 
       .btn-group.btn-group-sm.pull-right
         button.btn.btn-default ng-click="action.load_new()"

data/views/scaffold/search_collapse.slim

@@ -0,0 +1,26 @@
+.panel.panel-default
+  .panel-body
+    form
+      div.panel-group[
+          bs-collapse=""
+          role="tablist"
+          data-allow-multiple="true"
+          aria-multiselectable="true"
+          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.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"
+            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"
+
+      .btn-group.btn-group-sm.pull-right
+        button.btn.btn-default ng-click="action.load_new()"
+          span ng-bind="::action.meta.loc.search"
+          span.glyphicon.glyphicon-zoom-in<
+        button.btn.btn-default ng-click="action.search_reset()"
+          span.glyphicon.glyphicon-asterisk

data/views/scaffold/search_tabs.slim

@@ -0,0 +1,15 @@
+.panel.panel-default
+  .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=""
+          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"
+
+      .btn-group.btn-group-sm.pull-right
+        button.btn.btn-default ng-click="action.load_new()"
+          span ng-bind="::action.meta.loc.search"
+          span.glyphicon.glyphicon-zoom-in<
+        button.btn.btn-default ng-click="action.search_reset()"
+          span.glyphicon.glyphicon-asterisk

data/views/scaffold/view.slim

@@ -1,18 +1,8 @@
 div
-  span ng-if="::!action.meta.tabs"
-    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"
-          td
-            div ng-bind-html="action.view_cell(action.record, f)"
-  span ng-if="::action.meta.tabs"
-    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=""
-        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"
-            td
-              div ng-bind-html="action.view_cell(action.record, f)"
+  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"
+        td
+          div ng-bind-html="action.view_cell(action.record, f)"
 
   span ng-if="::action.alert": .alert.alert-danger ng-bind="action.alert"

data/views/scaffold/view_collapse.slim

@@ -0,0 +1,22 @@
+div
+  div.panel-group[
+      bs-collapse=""
+      role="tablist"
+      data-allow-multiple="true"
+      aria-multiselectable="true"
+      ng-init="action.activeTab = [0]"
+      ng-model="action.activeTab"
+    ]
+    div.panel.panel-default ng-repeat="t in ::action.meta.tabs 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=""
+        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"
+              td
+                div ng-bind-html="action.view_cell(action.record, f)"
+
+  span ng-if="action.alert": .alert.alert-danger[] {{action.alert}}