ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-7462 Web Console: Fixed templates.
Date Fri, 02 Mar 2018 09:03:45 GMT
Repository: ignite
Updated Branches:
  refs/heads/master eaf094bdd -> a84c900fb


IGNITE-7462 Web Console: Fixed templates.


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

Branch: refs/heads/master
Commit: a84c900fb2acbc65711b1f69a9c6d87ea2c868ad
Parents: eaf094b
Author: Ilya Borisov <klaster1@gmail.com>
Authored: Fri Mar 2 16:03:37 2018 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Fri Mar 2 16:03:37 2018 +0700

----------------------------------------------------------------------
 .../modules/states/configuration/clusters/checkpoint/s3.pug  | 6 ++----
 .../states/configuration/clusters/general/discovery/s3.pug   | 8 +++-----
 2 files changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a84c900f/modules/web-console/frontend/app/modules/states/configuration/clusters/checkpoint/s3.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/checkpoint/s3.pug
b/modules/web-console/frontend/app/modules/states/configuration/clusters/checkpoint/s3.pug
index d2f8c9e..88df1a8 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/clusters/checkpoint/s3.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/checkpoint/s3.pug
@@ -55,16 +55,14 @@ include /app/helpers/jade/mixins
         'Custom AWS credentials provider implementation class', checkpointS3Custom)
 .settings-row
     +text('Bucket name suffix:', 'model.S3.bucketNameSuffix', '"checkpointS3BucketNameSuffix"',
'false', 'default-bucket', 'Bucket name suffix')
-.pcb-flex-grid-break(ng-if-start=`$ctrl.available("2.4.0")`)
-.settings-row
+.settings-row(ng-if-start=`$ctrl.available("2.4.0")`)
     +text('Bucket endpoint:', `model.S3.bucketEndpoint`, '"checkpointS3BucketEndpoint"',
false, 'Input bucket endpoint',
     'Bucket endpoint for IP finder<br/> \
     For information about possible endpoint names visit <a href="http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region">docs.aws.amazon.com</a>')
-.settings-row
+.settings-row(ng-if-end)
     +text('SSE algorithm:', `model.S3.SSEAlgorithm`, '"checkpointS3SseAlgorithm"', false,
'Input SSE algorithm',
     'Server-side encryption algorithm for Amazon S3-managed encryption keys<br/> \
     For information about possible S3-managed encryption keys visit <a href="http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html">docs.aws.amazon.com</a>')
-.pcb-flex-grid-break(ng-if-end)
 .settings-row
     +java-class('Listener:', 'model.S3.checkpointListener', '"checkpointS3Listener" + $index',
'true', 'false',
         'Checkpoint listener implementation class name', checkpointS3)

http://git-wip-us.apache.org/repos/asf/ignite/blob/a84c900f/modules/web-console/frontend/app/modules/states/configuration/clusters/general/discovery/s3.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/general/discovery/s3.pug
b/modules/web-console/frontend/app/modules/states/configuration/clusters/general/discovery/s3.pug
index 90100b9..d459191 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/clusters/general/discovery/s3.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/general/discovery/s3.pug
@@ -24,15 +24,13 @@ mixin discovery-s3(modelAt = 'backupItem')
 
     .details-row
         +text('Bucket name:', `${model}.bucketName`, `'${discoveryKind}BucketName'`, required,
'Input bucket name', 'Bucket name for IP finder')
-    .pcb-flex-grid-break(ng-if-start=`$ctrl.available("2.4.0")`)
-    .details-row
+    .details-row(ng-if-start=`$ctrl.available("2.4.0")`)
         +text('Bucket endpoint:', `${model}.bucketEndpoint`, `'${discoveryKind}BucketEndpoint'`,
false, 'Input bucket endpoint',
         'Bucket endpoint for IP finder<br/> \
         For information about possible endpoint names visit <a href="http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region">docs.aws.amazon.com</a>')
-    .details-row
+    .details-row(ng-if-end)
         +text('SSE algorithm:', `${model}.SSEAlgorithm`, `'${discoveryKind}SSEAlgorithm'`,
false, 'Input SSE algorithm',
         'Server-side encryption algorithm for Amazon S3-managed encryption keys<br/>
\
         For information about possible S3-managed encryption keys visit <a href="http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html">docs.aws.amazon.com</a>')
-    .pcb-flex-grid-break(ng-if-end)
     .details-row
-        label Note, AWS credentials will be generated as stub
\ No newline at end of file
+        label Note, AWS credentials will be generated as stub


Mime
View raw message