Repository: ignite Updated Branches: refs/heads/ignite-843 89df91993 -> cd0caa96a
IGNITE-843 WIP on preview. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cd0caa96 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cd0caa96 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cd0caa96 Branch: refs/heads/ignite-843 Commit: cd0caa96aeaf0b2b1ca0f0d360bff5c19c07ff87 Parents: 89df919 Author: Alexey Kuznetsov <[email protected]> Authored: Wed Aug 26 18:32:46 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Aug 26 18:32:46 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/public/stylesheets/style.scss | 10 ++++++++++ .../src/main/js/views/includes/controls.jade | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cd0caa96/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 9f644a4..04cb9e8 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 @@ -1459,6 +1459,16 @@ a { .ace_cursor { opacity:1 } } +.preview-panel { + margin-top: 10px; + margin-left: 20px; + + border-radius: 5px; + border: thin dotted lightgrey; + + padding: 0 3px; +} + .preview-legend { top: 0; right: 0; http://git-wip-us.apache.org/repos/asf/ignite/blob/cd0caa96/modules/control-center-web/src/main/js/views/includes/controls.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade index 1cf8819..1181e5d 100644 --- a/modules/control-center-web/src/main/js/views/includes/controls.jade +++ b/modules/control-center-web/src/main/js/views/includes/controls.jade @@ -466,10 +466,10 @@ mixin preview(previewModel, id) -var previewModelJava = previewModel + 'Java' -var previewModelState = previewModel + 'State' - .panel-details(style='margin-left: 20px; padding: 0 3px') + .preview-panel .preview-legend i.group-legend-btn(ng-click='#{previewModelState} = !#{previewModelState}') img(ng-if='#{previewModelState}' src='/images/xml.png' title='Show XML') img(ng-if='!#{previewModelState}' src='/images/java.png' title='Show Java code') - .ace-preview(ng-if='!#{previewModelState}' id='#{id}' ui-ace='{onLoad: previewInit, mode: "xml"}' ng-model='preview[#{previewModel} + "Xml"]') - .ace-preview(ng-if='#{previewModelState}' id='#{id}' ui-ace='{onLoad: previewInit, mode: "java"}' ng-model='preview[#{previewModel} + "Java"]') + div(ng-if='!#{previewModelState}' id='#{id}' ui-ace='{onLoad: previewInit, mode: "xml"}' ng-model='preview[#{previewModel} + "Xml"]') + div(ng-if='#{previewModelState}' id='#{id}' ui-ace='{onLoad: previewInit, mode: "java"}' ng-model='preview[#{previewModel} + "Java"]')
