Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 cce965c2f -> d8d2737b6
# IGNITE-843 Minor fix. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/38302355 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/38302355 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/38302355 Branch: refs/heads/ignite-843 Commit: 38302355752aae214622852c5f7d2cb49c69ee35 Parents: 5c2784e Author: Andrey <anovi...@gridgain.com> Authored: Tue Aug 18 17:23:45 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Tue Aug 18 17:23:45 2015 +0700 ---------------------------------------------------------------------- .../control-center-web/src/main/js/views/includes/header.jade | 2 +- .../src/main/js/views/templates/agent-download.jade | 6 +++--- .../src/main/js/views/templates/confirm.jade | 4 ++-- .../control-center-web/src/main/js/views/templates/copy.jade | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38302355/modules/control-center-web/src/main/js/views/includes/header.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/includes/header.jade b/modules/control-center-web/src/main/js/views/includes/header.jade index aecdf16..1e200f3 100644 --- a/modules/control-center-web/src/main/js/views/includes/header.jade +++ b/modules/control-center-web/src/main/js/views/includes/header.jade @@ -30,7 +30,7 @@ header#header.header +header-item('/configuration', '/configuration/clusters', 'Configuration') //+header-item('/monitoring', '/monitoring', 'Monitoring') li(ng-controller='notebooks') - a.dropdown-toggle(ng-hide='notebooks.length == 0' data-toggle='dropdown' bs-dropdown='notebookDropdown' data-placement='bottom-right') SQL + a.dropdown-toggle(ng-hide='notebooks.length == 0' ng-class='{active: isActive("/sql")}' data-toggle='dropdown' bs-dropdown='notebookDropdown' data-placement='bottom-right') SQL span.caret a(ng-hide='notebooks.length > 0' href='/notebooks/new') SQL //+header-item('/deploy', '/deploy', 'Deploy') http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38302355/modules/control-center-web/src/main/js/views/templates/agent-download.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/templates/agent-download.jade b/modules/control-center-web/src/main/js/views/templates/agent-download.jade index 617b053..3ad4399 100644 --- a/modules/control-center-web/src/main/js/views/templates/agent-download.jade +++ b/modules/control-center-web/src/main/js/views/templates/agent-download.jade @@ -12,11 +12,11 @@ See the License for the specific language governing permissions and limitations under the License. -.modal.center(role='dialog') +.modal.center(tabindex='-1' role='dialog') .modal-dialog .modal-content #errors-container.modal-header.header - button.close(type='button' ng-click='$hide()' aria-hidden='true') × + button.close(type='button' ng-click='$hide()') h4.modal-title Connection to Control Center Agent is not established .metadata-download p Please install and run agent for use this functionality. @@ -27,4 +27,4 @@ li Specify the agent's properties, refer to the README.txt how to configure and start Control Center Agent. li Run the executable file. .modal-footer - button.btn.btn-primary(ng-click='downloadAgent()') Download zip \ No newline at end of file + button.btn.btn-primary(ng-click='downloadAgent()') Download zip http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38302355/modules/control-center-web/src/main/js/views/templates/confirm.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/templates/confirm.jade b/modules/control-center-web/src/main/js/views/templates/confirm.jade index 949318a..c98ecf4 100644 --- a/modules/control-center-web/src/main/js/views/templates/confirm.jade +++ b/modules/control-center-web/src/main/js/views/templates/confirm.jade @@ -18,10 +18,10 @@ .modal-dialog .modal-content .modal-header - button.close(type='button' ng-click='$hide()') × + button.close(type='button' ng-click='$hide()') h4.modal-title Confirmation .modal-body(ng-show='content') p(ng-bind-html='content' style='text-align: center;') .modal-footer button.btn.btn-default(type='button' ng-click='$hide()') Cancel - button.btn.btn-primary(type='button' ng-click='ok()') Confirm \ No newline at end of file + button.btn.btn-primary(type='button' ng-click='ok()') Confirm http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38302355/modules/control-center-web/src/main/js/views/templates/copy.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/templates/copy.jade b/modules/control-center-web/src/main/js/views/templates/copy.jade index 2ba9096..f8aa4d1 100644 --- a/modules/control-center-web/src/main/js/views/templates/copy.jade +++ b/modules/control-center-web/src/main/js/views/templates/copy.jade @@ -18,7 +18,7 @@ .modal-dialog .modal-content .modal-header - button.close(type='button' ng-click='$hide()') × + button.close(type='button' ng-click='$hide()') h4.modal-title Copy form.form-horizontal(name='inputForm' novalidate) .modal-body.row @@ -28,4 +28,4 @@ input.form-control(type='text' ng-model='newName' required) .modal-footer button.btn.btn-default(type='button' ng-click='$hide()') Cancel - button.btn.btn-primary(type='button' ng-disabled='inputForm.$invalid' ng-click='ok(newName)') Confirm \ No newline at end of file + button.btn.btn-primary(type='button' ng-disabled='inputForm.$invalid' ng-click='ok(newName)') Confirm
