diff --git a/services/web/app/views/project/editor.jade b/services/web/app/views/project/editor.jade index bc8016dd86..86088ded50 100644 --- a/services/web/app/views/project/editor.jade +++ b/services/web/app/views/project/editor.jade @@ -38,7 +38,7 @@ block content include ./editor/left-menu - #chat-wrapper( + #chat-wrapper.full-size( layout="chat", spacing-open="12", spacing-closed="0", diff --git a/services/web/app/views/project/editor/editor.jade b/services/web/app/views/project/editor/editor.jade index 07208a6642..4e04bf6753 100644 --- a/services/web/app/views/project/editor/editor.jade +++ b/services/web/app/views/project/editor/editor.jade @@ -9,35 +9,45 @@ div.full-size( minimum-restore-size-east="300" ) .ui-layout-center - .loading-panel(ng-show="!editor.sharejs_doc || editor.opening") - span(ng-show="editor.open_doc_id") - i.fa.fa-spin.fa-refresh - |   #{translate("loading")}... - span(ng-show="!editor.open_doc_id") - i.fa.fa-arrow-left - |   #{translate("open_a_file_on_the_left")} - - #editor( - ace-editor="editor", - ng-show="!!editor.sharejs_doc && !editor.opening" - theme="settings.theme", - keybindings="settings.mode", - font-size="settings.fontSize", - auto-complete="settings.autoComplete", - spell-check="true", - spell-check-language="project.spellCheckLanguage", - highlights="onlineUserCursorHighlights[editor.open_doc_id]" - show-print-margin="false", - sharejs-doc="editor.sharejs_doc", - last-updated="editor.last_updated", - cursor-position="editor.cursorPosition", - goto-line="editor.gotoLine", - resize-on="layout:main:resize,layout:pdf:resize", - annotations="pdf.logEntryAnnotations[editor.open_doc_id]", - read-only="!permissions.write", - on-ctrl-enter="recompileViaKey" - syntax-validation="settings.syntaxValidation" + #review-panel-wrapper.full-size( + layout="review" + spacing-open="12" + spacing-closed="0" + init-closed-east="true" + open-east="ui.reviewPanelOpen" ) + .ui-layout-center + .loading-panel(ng-show="!editor.sharejs_doc || editor.opening") + span(ng-show="editor.open_doc_id") + i.fa.fa-spin.fa-refresh + |   #{translate("loading")}... + span(ng-show="!editor.open_doc_id") + i.fa.fa-arrow-left + |   #{translate("open_a_file_on_the_left")} + + #editor( + ace-editor="editor", + ng-show="!!editor.sharejs_doc && !editor.opening" + theme="settings.theme", + keybindings="settings.mode", + font-size="settings.fontSize", + auto-complete="settings.autoComplete", + spell-check="true", + spell-check-language="project.spellCheckLanguage", + highlights="onlineUserCursorHighlights[editor.open_doc_id]" + show-print-margin="false", + sharejs-doc="editor.sharejs_doc", + last-updated="editor.last_updated", + cursor-position="editor.cursorPosition", + goto-line="editor.gotoLine", + resize-on="layout:main:resize,layout:pdf:resize,layout:review:resize", + annotations="pdf.logEntryAnnotations[editor.open_doc_id]", + read-only="!permissions.write", + on-ctrl-enter="recompileViaKey" + syntax-validation="settings.syntaxValidation" + ) + .ui-layout-east + strong Hello world .ui-layout-east div(ng-if="ui.pdfLayout == 'sideBySide'") diff --git a/services/web/public/coffee/ide.coffee b/services/web/public/coffee/ide.coffee index 01f7363c80..201d324821 100644 --- a/services/web/public/coffee/ide.coffee +++ b/services/web/public/coffee/ide.coffee @@ -64,6 +64,7 @@ define [ view: "editor" chatOpen: false pdfLayout: 'sideBySide' + reviewPanelOpen: false } $scope.user = window.user $scope.settings = window.userSettings @@ -71,6 +72,9 @@ define [ $scope.chat = {} + ide.toggleReviewPanel = () -> + $scope.ui.reviewPanelOpen = !$scope.ui.reviewPanelOpen + $scope.$digest() # Only run the header AB test for newly registered users. _abTestStartDate = new Date(Date.UTC(2016, 8, 28)) diff --git a/services/web/public/stylesheets/app/editor.less b/services/web/public/stylesheets/app/editor.less index 2db26059c4..4b38201aff 100644 --- a/services/web/public/stylesheets/app/editor.less +++ b/services/web/public/stylesheets/app/editor.less @@ -11,6 +11,7 @@ @import "./editor/publish-template.less"; @import "./editor/online-users.less"; @import "./editor/hotkeys.less"; +@import "./editor/review-panel.less"; .full-size { position: absolute; @@ -34,13 +35,6 @@ } } -#chat-wrapper { - .full-size; - > .ui-layout-resizer > .ui-layout-toggler { - display: none !important; - } -} - #ide-body { .full-size; top: 40px; diff --git a/services/web/public/stylesheets/app/editor/chat.less b/services/web/public/stylesheets/app/editor/chat.less index d702a225fe..d0ad76fe9c 100644 --- a/services/web/public/stylesheets/app/editor/chat.less +++ b/services/web/public/stylesheets/app/editor/chat.less @@ -1,5 +1,11 @@ @new-message-height: 80px; +#chat-wrapper { + > .ui-layout-resizer > .ui-layout-toggler { + display: none !important; + } +} + .chat { .loading { font-family: @font-family-serif; diff --git a/services/web/public/stylesheets/app/editor/review-panel.less b/services/web/public/stylesheets/app/editor/review-panel.less new file mode 100644 index 0000000000..1d7d807028 --- /dev/null +++ b/services/web/public/stylesheets/app/editor/review-panel.less @@ -0,0 +1,5 @@ +#review-panel-wrapper { + > .ui-layout-resizer > .ui-layout-toggler { + display: none !important; + } +} \ No newline at end of file