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-6104 Web Console: moved "Download Web Agent" link to footer.
Date Thu, 17 Aug 2017 16:57:34 GMT
Repository: ignite
Updated Branches:
  refs/heads/master 5f19c1bf9 -> fb890a227


IGNITE-6104 Web Console: moved "Download Web Agent" link to footer.


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

Branch: refs/heads/master
Commit: fb890a227254a547491ef711e755282706f047b5
Parents: 5f19c1b
Author: Dmitriy Shabalin <dmitriyff@gmail.com>
Authored: Thu Aug 17 23:57:07 2017 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Thu Aug 17 23:57:07 2017 +0700

----------------------------------------------------------------------
 .../web-console-footer-links/component.js       | 23 +++++++++++++++
 .../web-console-footer-links/style.scss         | 31 ++++++++++++++++++++
 .../web-console-footer-links/template.pug       | 17 +++++++++++
 .../app/components/web-console-footer/index.js  |  4 ++-
 .../components/web-console-footer/style.scss    |  8 ++++-
 .../components/web-console-footer/template.pug  |  1 +
 .../components/web-console-header/style.scss    | 17 -----------
 .../components/web-console-header/template.pug  |  9 ------
 8 files changed, 82 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/fb890a22/modules/web-console/frontend/app/components/web-console-footer/components/web-console-footer-links/component.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-footer/components/web-console-footer-links/component.js
b/modules/web-console/frontend/app/components/web-console-footer/components/web-console-footer-links/component.js
new file mode 100644
index 0000000..40a1051
--- /dev/null
+++ b/modules/web-console/frontend/app/components/web-console-footer/components/web-console-footer-links/component.js
@@ -0,0 +1,23 @@
+/*
+ * 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 './template.pug';
+import './style.scss';
+
+export default {
+    template
+};

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb890a22/modules/web-console/frontend/app/components/web-console-footer/components/web-console-footer-links/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-footer/components/web-console-footer-links/style.scss
b/modules/web-console/frontend/app/components/web-console-footer/components/web-console-footer-links/style.scss
new file mode 100644
index 0000000..47b88af
--- /dev/null
+++ b/modules/web-console/frontend/app/components/web-console-footer/components/web-console-footer-links/style.scss
@@ -0,0 +1,31 @@
+/*!
+ * 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.
+ */
+
+web-console-footer-links {
+    margin-left: auto;
+
+    a + a {
+        margin-left: 5px;
+
+        &:before {
+            content: '|';
+            display: inline-block;
+            margin-right: 5px;
+            color: #fafafa;
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb890a22/modules/web-console/frontend/app/components/web-console-footer/components/web-console-footer-links/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-footer/components/web-console-footer-links/template.pug
b/modules/web-console/frontend/app/components/web-console-footer/components/web-console-footer-links/template.pug
new file mode 100644
index 0000000..105aa513
--- /dev/null
+++ b/modules/web-console/frontend/app/components/web-console-footer/components/web-console-footer-links/template.pug
@@ -0,0 +1,17 @@
+//-
+    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.
+
+a(href="/downloads/agent" target="_blank") Download Agent

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb890a22/modules/web-console/frontend/app/components/web-console-footer/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-footer/index.js b/modules/web-console/frontend/app/components/web-console-footer/index.js
index 8796bb7..e26b602 100644
--- a/modules/web-console/frontend/app/components/web-console-footer/index.js
+++ b/modules/web-console/frontend/app/components/web-console-footer/index.js
@@ -17,7 +17,9 @@
 
 import angular from 'angular';
 import component from './component';
+import componentLinks from './components/web-console-footer-links/component';
 
 export default angular
     .module('ignite-console.web-console-footer', [])
-    .component('webConsoleFooter', component);
+    .component('webConsoleFooter', component)
+    .component('webConsoleFooterLinks', componentLinks);

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb890a22/modules/web-console/frontend/app/components/web-console-footer/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-footer/style.scss b/modules/web-console/frontend/app/components/web-console-footer/style.scss
index 4865ff2..f3de59f 100644
--- a/modules/web-console/frontend/app/components/web-console-footer/style.scss
+++ b/modules/web-console/frontend/app/components/web-console-footer/style.scss
@@ -37,10 +37,16 @@ web-console-footer {
         display: flex;
         flex-direction: row;
         align-items: center;
+
+        & > :nth-child(2) {
+            margin-left: auto;
+        }
     }
 
     ignite-powered-by-apache {
-        margin-left: auto;
+        & > a {
+            margin-left: 40px;
+        }
     }
 
     a {

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb890a22/modules/web-console/frontend/app/components/web-console-footer/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-footer/template.pug b/modules/web-console/frontend/app/components/web-console-footer/template.pug
index be9cc6a..e7eecf5 100644
--- a/modules/web-console/frontend/app/components/web-console-footer/template.pug
+++ b/modules/web-console/frontend/app/components/web-console-footer/template.pug
@@ -16,4 +16,5 @@
 
 .container.wcf-content
     ignite-footer
+    web-console-footer-links(ng-if='$parent.user')
     ignite-powered-by-apache
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb890a22/modules/web-console/frontend/app/components/web-console-header/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-header/style.scss b/modules/web-console/frontend/app/components/web-console-header/style.scss
index 5cc2355..aef4424 100644
--- a/modules/web-console/frontend/app/components/web-console-header/style.scss
+++ b/modules/web-console/frontend/app/components/web-console-header/style.scss
@@ -145,21 +145,4 @@ web-console-header {
             border-top: 1px solid darken($brand-warning, 15%);
         }
     }
-
-    .wch-web-agent-download {
-        border-bottom-right-radius: $ignite-button-border-radius;
-        border-bottom-left-radius: $ignite-button-border-radius;
-        position: absolute;
-        top: 100%;
-        right: 0;
-        margin-top: $bottom-border-width;
-        // If defined on button, shadow would conflict with already present
-        // shadows of .btn-ignite, so we shadow wrapper instead.
-        box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.3);
-
-        .btn-ignite--primary {
-            border-top-right-radius: 0;
-            border-top-left-radius: 0;
-        }
-    }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb890a22/modules/web-console/frontend/app/components/web-console-header/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-header/template.pug b/modules/web-console/frontend/app/components/web-console-header/template.pug
index 3971cec..6930d07 100644
--- a/modules/web-console/frontend/app/components/web-console-header/template.pug
+++ b/modules/web-console/frontend/app/components/web-console-header/template.pug
@@ -25,12 +25,3 @@
         
     .wch-slot.wch-slot-left(ng-transclude='slotLeft')
     .wch-slot.wch-slot-right(ng-transclude='slotRight')
-
-    .wch-web-agent-download
-        a.btn-ignite.btn-ignite--primary(
-            ng-if='$ctrl.isWebAgentDownloadVisible'
-            href='/api/v1/downloads/agent'
-            target='_self'
-        )
-            svg.icon-left(ignite-icon='download')
-            | Download Web Agent
\ No newline at end of file


Mime
View raw message