Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0834518A8F for ; Mon, 25 Jan 2016 17:13:57 +0000 (UTC) Received: (qmail 8597 invoked by uid 500); 25 Jan 2016 17:13:56 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 8509 invoked by uid 500); 25 Jan 2016 17:13:56 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 8141 invoked by uid 99); 25 Jan 2016 17:13:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Jan 2016 17:13:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 48EFFE0AC9; Mon, 25 Jan 2016 17:13:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Date: Mon, 25 Jan 2016 17:14:05 -0000 Message-Id: In-Reply-To: <399db72d63bc4aa0a4e20b98b6f39ed4@git.apache.org> References: <399db72d63bc4aa0a4e20b98b6f39ed4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/11] ignite git commit: IGNITE-843 Added information block for igfs. IGNITE-843 Added information block for igfs. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ac8625b4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ac8625b4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ac8625b4 Branch: refs/heads/ignite-843-rc3 Commit: ac8625b480d317d58f8b46bb792b78598c0af154 Parents: 40e44de Author: Andrey Authored: Mon Jan 25 18:01:32 2016 +0700 Committer: Andrey Committed: Mon Jan 25 18:01:32 2016 +0700 ---------------------------------------------------------------------- .../information/information.directive.js | 30 +++++++++++++ .../app/directives/information/information.jade | 20 +++++++++ .../app/directives/information/information.scss | 46 ++++++++++++++++++++ .../control-center-web/src/main/js/app/index.js | 2 + .../src/main/js/public/stylesheets/style.scss | 1 + .../src/main/js/views/configuration/igfs.jade | 11 +++-- 6 files changed, 106 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ac8625b4/modules/control-center-web/src/main/js/app/directives/information/information.directive.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/directives/information/information.directive.js b/modules/control-center-web/src/main/js/app/directives/information/information.directive.js new file mode 100644 index 0000000..9250639 --- /dev/null +++ b/modules/control-center-web/src/main/js/app/directives/information/information.directive.js @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import template from './information.jade!'; + +export default ['igniteInformation', [() => { + return { + scope: { + title: '@' + }, + restrict: 'E', + template, + replace: true, + transclude: true + }; +}]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/ac8625b4/modules/control-center-web/src/main/js/app/directives/information/information.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/directives/information/information.jade b/modules/control-center-web/src/main/js/app/directives/information/information.jade new file mode 100644 index 0000000..3153a22 --- /dev/null +++ b/modules/control-center-web/src/main/js/app/directives/information/information.jade @@ -0,0 +1,20 @@ +//- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +.block-information + span.icon.fa.fa-info-circle + h3(style='font-weight: bold') {{::title}} + div(ng-transclude='') http://git-wip-us.apache.org/repos/asf/ignite/blob/ac8625b4/modules/control-center-web/src/main/js/app/directives/information/information.scss ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/directives/information/information.scss b/modules/control-center-web/src/main/js/app/directives/information/information.scss new file mode 100644 index 0000000..1e53a1a --- /dev/null +++ b/modules/control-center-web/src/main/js/app/directives/information/information.scss @@ -0,0 +1,46 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +$ignite-block-information: #fcfcfc; +$ignite-block-information-border: #aab8c6; +$ignite-block-information-icon: #4a6785; + +.block-information { + position: relative; + + background: $ignite-block-information; + + border-radius: 5px; + border: 1px solid $ignite-block-information-border; + + margin: 20px 0; + padding: 10px 10px 0 30px; + + + > .icon { + color: $ignite-block-information-icon; + + position: absolute; + top: 12px; + left: 10px; + + font-size: 16px; + + vertical-align: text-bottom + } +} + http://git-wip-us.apache.org/repos/asf/ignite/blob/ac8625b4/modules/control-center-web/src/main/js/app/index.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/index.js b/modules/control-center-web/src/main/js/app/index.js index 7c56081..c9611b7 100644 --- a/modules/control-center-web/src/main/js/app/index.js +++ b/modules/control-center-web/src/main/js/app/index.js @@ -82,6 +82,7 @@ import './modules/terms/main'; import igniteLoading from './directives/loading/loading.directive'; import igniteCallout from './directives/callout/callout.directive'; import igniteCalloutCel from './directives/callout/callout-cel.directive'; +import igniteInformation from './directives/information/information.directive'; import igniteUiAceXml from './directives/ui-ace-xml/ui-ace-xml.directive'; import igniteUiAceJava from './directives/ui-ace-java/ui-ace-java.directive'; import igniteUiAcePom from './directives/ui-ace-pom/ui-ace-pom.directive'; @@ -124,6 +125,7 @@ angular .directive(...igniteLoading) .directive(...igniteCallout) .directive(...igniteCalloutCel) +.directive(...igniteInformation) .directive(...igniteUiAceXml) .directive(...igniteUiAceJava) .directive(...igniteUiAcePom) http://git-wip-us.apache.org/repos/asf/ignite/blob/ac8625b4/modules/control-center-web/src/main/js/public/stylesheets/style.scss ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss index 404971a..18dc326 100644 --- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss +++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss @@ -19,6 +19,7 @@ @import "bootstrap-custom"; @import "./../../app/directives/callout/callout.scss"; +@import "./../../app/directives/information/information.scss"; $logo-path: "/images/logo.png"; $input-height: 28px; http://git-wip-us.apache.org/repos/asf/ignite/blob/ac8625b4/modules/control-center-web/src/main/js/views/configuration/igfs.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/igfs.jade b/modules/control-center-web/src/main/js/views/configuration/igfs.jade index a30af50..13c14dc 100644 --- a/modules/control-center-web/src/main/js/views/configuration/igfs.jade +++ b/modules/control-center-web/src/main/js/views/configuration/igfs.jade @@ -19,24 +19,27 @@ include ../includes/controls .docs-header h1 Create and Configure IGFS .docs-body(ng-controller='igfsController') - ignite-callout + ignite-information(data-title='Configure IGFS only if you going to use In-memory File System') + p Ignite File System (IGFS) is an in-memory file system allowing work with files and directories over existing cache infrastructure. + p IGFS can either work as purely in-memory file system, or delegate to another file system (e.g. various Hadoop file system implementations) acting as a caching layer (see #[a(href='https://apacheignite.readme.io/docs/secondary-file-system' target='_blank') secondary file system] for more detail). + p In addition IGFS provides API to execute map-reduce tasks over file system data. + //-- ignite-callout ignite-callout-cel(data-title='On This Screen') li Configure IGFS file systems li ignite-dialog More info ignite-dialog-title IGFS screen - ignite-dialog-content + ignite-dialog-content | Manage your IGFS file systems on current screen.#[br] | IGFS can be assigned to specified #[a(ui-sref='base.configuration.clusters') clusters].#[br] | Generated cluster with IGFS available on #[a(ui-sref='base.configuration.summary') summary] screen. - + ignite-callout-cel(data-title='Next Steps') li Continue to #[a(ui-sref='base.configuration.summary') Summary] li Back to #[a(ui-sref='base.configuration.clusters') Clusters] div(dw-loading='loadingIgfsScreen' dw-loading-options='{text: "Loading IGFS screen...", className: "page-loading-overlay"}') div(ng-show='ui.ready') - hr +main-table('IGFS', 'igfss', 'igfsName', 'selectItem(row)', '{{$index + 1}}) {{row.name}}', 'name') .padding-top-dflt(bs-affix) .panel-tip-container(data-placement='bottom' bs-tooltip='' data-title='Create new IGFS')