ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [37/45] incubator-ignite git commit: IGNITE-843 WIP on metadata.
Date Wed, 15 Jul 2015 19:17:25 GMT
IGNITE-843 WIP on metadata.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9c855069
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9c855069
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9c855069

Branch: refs/heads/ignite-1121
Commit: 9c8550692c532abf6a1876f10c5f4119d5ee98f4
Parents: fca9ac9
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Wed Jul 15 16:24:18 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Wed Jul 15 16:24:18 2015 +0700

----------------------------------------------------------------------
 .../nodejs/controllers/metadata-controller.js   |  6 ++++
 .../nodejs/controllers/models/metadata.json     |  3 +-
 .../nodejs/views/configuration/metadata.jade    | 36 ++++++++++++++------
 3 files changed, 32 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c855069/modules/web-control-center/nodejs/controllers/metadata-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/controllers/metadata-controller.js b/modules/web-control-center/nodejs/controllers/metadata-controller.js
index a826e04..194a993 100644
--- a/modules/web-control-center/nodejs/controllers/metadata-controller.js
+++ b/modules/web-control-center/nodejs/controllers/metadata-controller.js
@@ -26,6 +26,12 @@ controlCenterModule.controller('metadataController', ['$scope', '$http',
'common
             {value: {kind: 'both'}, label: 'both'}
         ];
 
+        $scope.kinds = [
+            {value: 'query', label: 'query'},
+            {value: 'store', label: 'store'},
+            {value: 'both', label: 'both'}
+        ];
+
         $scope.template = $scope.templates[0].value;
 
         $scope.metadata = [];

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c855069/modules/web-control-center/nodejs/controllers/models/metadata.json
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/controllers/models/metadata.json b/modules/web-control-center/nodejs/controllers/models/metadata.json
index a3e2cf1..ce206b4 100644
--- a/modules/web-control-center/nodejs/controllers/models/metadata.json
+++ b/modules/web-control-center/nodejs/controllers/models/metadata.json
@@ -24,8 +24,7 @@
       "label": "Metadata for",
       "type": "dropdown",
       "model": "kind",
-      "items": "templates",
-      "placeholder": "Select kind",
+      "items": "kinds",
       "tip": ["TODO."]
     },
     {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c855069/modules/web-control-center/nodejs/views/configuration/metadata.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/configuration/metadata.jade b/modules/web-control-center/nodejs/views/configuration/metadata.jade
index 8c213c6..526edb4 100644
--- a/modules/web-control-center/nodejs/views/configuration/metadata.jade
+++ b/modules/web-control-center/nodejs/views/configuration/metadata.jade
@@ -34,14 +34,28 @@ block content
                     tr(ng-repeat='row in metadata track by row._id')
                         td.col-sm-6(ng-class='{active: row._id == selectedItem._id}')
                             a(ng-click='selectItem(row)') {{$index + 1}}) {{row.name}}
-        button.btn.btn-primary(ng-click='createItem()') &nbspAdd metadata
-        label(style='margin-left: 15px; margin-right: 10px') for:
-        button.btn.btn-default(ng-model='template' data-template='/select' data-placeholder='Choose
metadata type' bs-options='item.value as item.label for item in templates' bs-select)
-        i.tiplabel.fa.fa-question-circle(bs-tooltip data-title='{{joinTip(templateTip)}}'
type='button')
-        hr
-        form.form-horizontal(name='inputForm' ng-if='backupItem' novalidate)
-            .panel-body
-                .settings-row(ng-repeat='field in general')
-                    +form-row
-            button#save-btn.btn.btn-primary(ng-disabled='inputForm.$invalid' ng-click='saveItem()')
Save
-            button.btn.btn-primary.btn-second(ng-show='backupItem._id' ng-click='removeItem()')
Remove
+        panel-group(bs-collapse data-allow-multiple="false")
+            .panel.panel-default
+                .panel-heading
+                    h3
+                        a(bs-collapse-toggle) Manual
+                .panel-collapse(role="tabpanel" bs-collapse-target)
+                    .panel-body
+                        button.btn.btn-primary(ng-click='createItem()') &nbspAdd metadata
+                        label(style='margin-left: 15px; margin-right: 10px') for:
+                        button.btn.btn-default(ng-model='template' data-template='/select'
data-placeholder='Choose metadata type' bs-options='item.value as item.label for item in templates'
bs-select)
+                        i.tiplabel.fa.fa-question-circle(bs-tooltip data-title='{{joinTip(templateTip)}}'
type='button')
+                        hr
+                        form.form-horizontal(name='inputForm' ng-if='backupItem' novalidate)
+                            .panel-body
+                                .settings-row(ng-repeat='field in general')
+                                    +form-row
+                            button#save-btn.btn.btn-primary(ng-disabled='inputForm.$invalid'
ng-click='saveItem()') Save
+                            button.btn.btn-primary.btn-second(ng-show='backupItem._id' ng-click='removeItem()')
Remove
+            .panel.panel-default
+                .panel-heading
+                    h3
+                        a(bs-collapse-toggle) Load from database
+                .panel-collapse(role="tabpanel" bs-collapse-target)
+                    .panel-body
+                        p TODO 2


Mime
View raw message