Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-843 3c2cfe555 -> 181fd9858


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/181fd985/modules/web-control-center/nodejs/views/settings/admin.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/settings/admin.jade 
b/modules/web-control-center/nodejs/views/settings/admin.jade
new file mode 100644
index 0000000..1986ca2
--- /dev/null
+++ b/modules/web-control-center/nodejs/views/settings/admin.jade
@@ -0,0 +1,52 @@
+//-
+    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.
+extends ../templates/layout
+
+append scripts
+    script(src='/admin-controller.js')
+
+block container
+    .greedy.row(ng-controller='adminController')
+        .docs-content
+            .docs-header
+                h1 List of registered users
+                hr
+            .docs-body
+                table.table.table-striped(st-table='userListDisplay' 
st-safe-src='userList')
+                    thead
+                        tr
+                            th(colspan='5')
+                                input.form-control(type='text' st-search='' 
class='' placeholder='Search ...')
+                        tr
+                            th(st-sort='username') User name
+                            th(st-sort='email') Email
+                            th(st-sort='lastLogin') Last login
+                            th(st-sort='lastLogin') Admin
+                            th(colspan='2') Actions
+                    tbody
+                        tr(ng-repeat='user in userListDisplay')
+                            td {{user.username}}
+                            td
+                                a(ng-href='mailto:{{user.email}}') 
{{user.email}}
+                            td
+                                span.small {{user.lastLogin | date:'medium'}}
+                            td
+                                input(type='checkbox' 
ng-disabled='user.adminChanging || user._id == loggedInUser._id'
+                                ng-model='user.admin' 
ng-change='toggleAdmin(user)')
+                            td(width='1%')
+                                a(ng-click='removeUser(user)' 
ng-show='user._id != loggedInUser._id' title='Remove user')
+                                    
span.glyphicon.glyphicon-remove(style='color: red')
+                            td(width='1%')
+                                
a(ng-href='admin/become?viewedUserId={{user._id}}' ng-show='user._id != 
loggedInUser._id' title='View user\'s configurations')
+                                    span.glyphicon.glyphicon-eye-open

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/181fd985/modules/web-control-center/nodejs/views/settings/profile.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/settings/profile.jade 
b/modules/web-control-center/nodejs/views/settings/profile.jade
new file mode 100644
index 0000000..14a8bb5
--- /dev/null
+++ b/modules/web-control-center/nodejs/views/settings/profile.jade
@@ -0,0 +1,58 @@
+//-
+    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.
+
+extends ../templates/layout
+
+mixin lbl(txt)
+    label.col-sm-2.required.labelFormField #{txt}
+
+append scripts
+    script(src='/profile-controller.js')
+
+block container
+    .row.greedy(ng-controller='profileController')
+        .docs-content
+            .docs-header
+                h1 User profile
+                hr
+            .docs-body
+                form.form-horizontal(name='profileForm' novalidate)
+                    .col-sm-10(style='padding: 0')
+                        .details-row
+                            +lbl('User name:')
+                            .col-sm-4
+                                input.form-control(type='text' 
ng-model='profileUser.username' placeholder='Input name' required)
+                        .details-row
+                            +lbl('Email:')
+                            .col-sm-4
+                                input.form-control(type='email' 
ng-model='profileUser.email' placeholder='y...@domain.com' required)
+                        .details-row
+                            .checkbox
+                                label
+                                    input(type="checkbox" 
ng-model='profileUser.changePassword')
+                                    | Change password
+                        div(ng-show='profileUser.changePassword')
+                            .details-row
+                                +lbl('New password:')
+                                .col-sm-4
+                                    input.form-control(type='password', 
ng-model='profileUser.newPassword' placeholder='New password' 
ng-required='profileUser.changePassword')
+                            .details-row
+                                +lbl('Confirm:')
+                                .col-sm-4
+                                    input.form-control(type='password', 
ng-model='profileUser.confirmPassword' match='profileUser.newPassword' 
placeholder='Confirm new password' ng-required='profileUser.changePassword')
+                    .col-sm-12.details-row
+                        
button#save-btn.btn.btn-primary(ng-disabled='profileForm.$invalid' 
ng-click='saveUser()') Save
+

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/181fd985/modules/web-control-center/nodejs/views/sql.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/sql.jade 
b/modules/web-control-center/nodejs/views/sql.jade
deleted file mode 100644
index 93e2893..0000000
--- a/modules/web-control-center/nodejs/views/sql.jade
+++ /dev/null
@@ -1,23 +0,0 @@
-//-
-    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.
-
-extends templates/layout
-
-block container
-    .docs-header
-        h1 SQL
-        p Connect to Zeppelin and execute SQL queries.
-        hr

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/181fd985/modules/web-control-center/nodejs/views/sql/sql.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/sql/sql.jade 
b/modules/web-control-center/nodejs/views/sql/sql.jade
index e575676..ea989e0 100644
--- a/modules/web-control-center/nodejs/views/sql/sql.jade
+++ b/modules/web-control-center/nodejs/views/sql/sql.jade
@@ -12,7 +12,7 @@
     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.
-extends ../templates/layout-fluid
+extends ../templates/layout-sidebar
 
 append scripts
     script(src='/cache-viewer-controller.js')
@@ -22,6 +22,9 @@ append css
     link(rel='stylesheet', href='/stylesheets/sql-console.css')
 
 block container
+    .docs-header
+        h1 Connect to Ignite and execute SQL queries
+        hr
     div.greedy(ng-controller='cacheViewerController')
         h4 Sql console
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/181fd985/modules/web-control-center/nodejs/views/summary.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/summary.jade 
b/modules/web-control-center/nodejs/views/summary.jade
deleted file mode 100644
index 12c98ec..0000000
--- a/modules/web-control-center/nodejs/views/summary.jade
+++ /dev/null
@@ -1,95 +0,0 @@
-//-
-    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.
-
-extends templates/layout-sidebar
-
-append scripts
-    script(src='/summary-controller.js')
-
-    
script(src='//cdnjs.cloudflare.com/ajax/libs/SyntaxHighlighter/3.0.83/scripts/shCore.min.js')
-    
script(src='//cdnjs.cloudflare.com/ajax/libs/SyntaxHighlighter/3.0.83/scripts/shBrushXml.js')
-    
script(src='//cdnjs.cloudflare.com/ajax/libs/SyntaxHighlighter/3.0.83/scripts/shBrushJava.js')
-    
script(src='//cdnjs.cloudflare.com/ajax/libs/SyntaxHighlighter/3.0.83/scripts/shBrushPlain.js')
-    script(src="//cdn.jsdelivr.net/angularjs/1.3.15/angular-animate.min.js")
-    script(src="//cdn.jsdelivr.net/angularjs/1.3.15/angular-sanitize.min.js")
-
-append css
-    link(rel='stylesheet', 
href='//cdnjs.cloudflare.com/ajax/libs/SyntaxHighlighter/3.0.83/styles/shCore.css')
-    link(rel='stylesheet', 
href='//cdnjs.cloudflare.com/ajax/libs/SyntaxHighlighter/3.0.83/styles/shThemeDefault.css')
-
-block content
-    .docs-header
-        h1 Configurations summary
-        hr
-    .docs-body(ng-controller='summaryController')
-        div(ng-show='clusters.length == 0')
-            | No cluster configured. You can 
-            a(href='clusters') configure
-            |  it.
-        div(ng-show='clusters.length > 0')
-            p Following cluster configurations were created, you can download 
them as XML, java code or as docker file.
-            .links
-                table.col-sm-12(st-table='clusters')
-                    tbody
-                        tr(ng-repeat='row in clusters track by row._id')
-                            td.col-sm-6(ng-class='{active: row._id == 
selectedItem._id}')
-                                a(ng-click='generate(row)') {{$index + 1}}) 
{{row.name}}
-            #cfgResult.configBox(ng-show='selectedItem && !generateError && 
!loading', style='margin-top: 20px')
-                ul.nav.nav-tabs
-                    li(ng-class='{active: cfgLang == "xml"}')
-                        a(href, ng-click='cfgLang = "xml"')
-                            img(src='/images/xml.png', width='16px' 
height='16px')
-                            |  XML
-                    li(ng-class='{active: cfgLang=="java"}')
-                        a(href, ng-click='cfgLang = "java"')
-                            img(src='/images/java.png', width='16px' 
height='16px')
-                            |  Java
-                    li(ng-class="{active: cfgLang=='docker'}")
-                        a(href, ng-click='cfgLang = "docker"')
-                            img(src='/images/docker.png', width='16px' 
height='16px')
-                            |  Dockerfile
-                form.settings-row(method='post' action='summary/download')
-                    input(type="hidden" name="_id" 
value="{{selectedItem._id}}")
-                    input(type="hidden" name="javaClass" value="{{javaClass}}")
-                    input(type="hidden" name="os" value="{{os}}")
-
-                    #xmlResult(ng-show="cfgLang == 'xml'")
-                        button.btn.btn-primary.pull-right(style='margin-right: 
0px;margin-top: -45px' type='submit') Download
-                        #xmlResultDiv
-                    #javaResult(ng-show="cfgLang == 'java'")
-                        .col-sm-1
-                            label Generate:
-                        .col-sm-3
-                            button.form-control(type='button' 
ng-model='javaClass' bs-select data-placeholder='{{detail.placeholder}}' 
bs-options='item.value as item.label for item in javaClassItems' 
data-sort='false')
-                        button.btn.btn-primary.pull-right(style='margin-right: 
0px;margin-top: -40px' type='submit') Download
-                        #javaResultDiv
-                    #dockerResult(ng-show="cfgLang == 'docker'")
-                        button.btn.btn-primary.pull-right(style='margin-right: 
0px;margin-top: -40px' type='submit') Download
-                        p
-                            a(style='color:#ec1c24' 
href='https://docs.docker.com/reference/builder' target="_blank") Docker
-                            |  file is a text file with instructions to 
create Docker image.<br/>
-                            | To build image you have to store following 
Docker file with your Ignite XML configuration to the same directory.<br>
-                            | Also you could use predefined&nbsp;
-                            a(style='color:#ec1c24' 
href='https://ignite.incubator.apache.org/download.html#docker' 
target="_blank") Apache Ignite docker image
-                            | . For more information about using Ignite with 
Docker please read&nbsp;
-                            a(style='color:#ec1c24' 
href='http://apacheignite.readme.io/docs/docker-deployment' target="_blank") 
documentation
-                            |.
-                        .col-sm-2
-                            label(for='os') Operation System:
-                        .col-sm-4
-                            input#os.form-control(type='text', ng-model='os' 
placeholder='debian:8' data-min-length="0" data-html="1" 
data-auto-select="true" data-animation="am-flip-x" bs-typeahead bs-options='os 
for os in oss')
-                        .settings-row#dockerResultDiv(style='margin-top: 15px')
-                div(ng-show='generateError') {{generateError}}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/181fd985/modules/web-control-center/nodejs/views/templates/layout-fluid.jade
----------------------------------------------------------------------
diff --git 
a/modules/web-control-center/nodejs/views/templates/layout-fluid.jade 
b/modules/web-control-center/nodejs/views/templates/layout-fluid.jade
deleted file mode 100644
index 66670cb..0000000
--- a/modules/web-control-center/nodejs/views/templates/layout-fluid.jade
+++ /dev/null
@@ -1,22 +0,0 @@
-//-
-    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.
-
-extends headers
-
-block main-container
-    .container-fluid.body-container
-        .main-content
-            block container

Reply via email to