Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

moove tab create

Browse source
This commit is contained in:
OVSharova 2021-07-27 13:50:13 +03:00
parent c4a1999368
commit 5aa980df91
6 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -130,7 +130,8 @@ define([
'add:slide' : this.onAddSlide.bind(this), 'add:slide' : this.onAddSlide.bind(this),
'change:slide' : this.onChangeSlide.bind(this), 'change:slide' : this.onChangeSlide.bind(this),
'change:compact' : this.onClickChangeCompact, 'change:compact' : this.onClickChangeCompact,
'add:chart' : this.onSelectChart 'add:chart' : this.onSelectChart,
'transit:settab' : this.setTrantitTab
}, },
'FileMenu': { 'FileMenu': {
'menu:hide': this.onFileMenu.bind(this, 'hide'), 'menu:hide': this.onFileMenu.bind(this, 'hide'),
@ -2385,7 +2386,14 @@ define([
this.toolbar.createDelayedElements(); this.toolbar.createDelayedElements();
this.attachUIEvents(this.toolbar); this.attachUIEvents(this.toolbar);
}, },
setTrantitTab:function (){
var tab = {action: 'transit', caption: this.toolbar.textTabTransitions};
var $panel = this.getApplication().getController('Transitions').createToolbarPanel();
if ( $panel ) {
this.toolbar.addTab(tab, $panel, 3);
this.toolbar.setVisible('transit', true);
}
},
onAppShowed: function (config) { onAppShowed: function (config) {
var me = this; var me = this;
@ -2403,15 +2411,15 @@ define([
var tab = {action: 'review', caption: me.toolbar.textTabCollaboration}; var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel(); var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel();
if ( $panel ) { if ( $panel ) {
me.toolbar.addTab(tab, $panel, 3); me.toolbar.addTab(tab, $panel, 4);
me.toolbar.setVisible('review', config.isEdit || config.canViewReview || config.canCoAuthoring && config.canComments); me.toolbar.setVisible('review', config.isEdit || config.canViewReview || config.canCoAuthoring && config.canComments);
} }
var tab = {action: 'transit', caption: me.toolbar.textTabTransitions}; /*var tab = {action: 'transit', caption: me.toolbar.textTabTransitions};
var $panel = me.getApplication().getController('Transitions').createToolbarPanel(); var $panel = me.getApplication().getController('Transitions').createToolbarPanel();
if ( $panel ) { if ( $panel ) {
me.toolbar.addTab(tab, $panel, 3); me.toolbar.addTab(tab, $panel, 3);
me.toolbar.setVisible('transit', true); me.toolbar.setVisible('transit', true);
} }*/
if ( config.isEdit ) { if ( config.isEdit ) {
me.toolbar.setMode(config); me.toolbar.setMode(config);

1
apps/presentationeditor/main/app/template/Toolbar.template
View file

@ -142,6 +142,7 @@
<span class="btn-slot text x-huge" id="slot-btn-insvideo"></span> <span class="btn-slot text x-huge" id="slot-btn-insvideo"></span>
</div> </div>
</section> </section>
<!-- <section id="transitions-panel" class="panel" data-tab="transit"> </section>-->
</section> </section>
</section> </section>
</div> </div>

2
apps/presentationeditor/main/app/template/Transitions.template
View file

@ -1,4 +1,4 @@
<section id="transitions-panel" class="panel" data-tab="transit"> <section id="transitions-panel" class="panel" data-tab="transit">
<div class="group flex small" id="transit-field-effects" style=" width: 63%; min-width: 300px; " ></div> <div class="group flex small" id="transit-field-effects" style=" width: 63%; min-width: 300px; " ></div>
<div class="group small"> <div class="group small">

2
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -987,6 +987,7 @@ define([
me.isCompactView = mode.compactview; me.isCompactView = mode.compactview;
if ( mode.isEdit ) { if ( mode.isEdit ) {
me.$el.html(me.rendererComponents(me.$layout)); me.$el.html(me.rendererComponents(me.$layout));
} else { } else {
me.$layout.find('.canedit').hide(); me.$layout.find('.canedit').hide();
me.$layout.addClass('folded'); me.$layout.addClass('folded');
@ -1005,6 +1006,7 @@ define([
if ( mode.isEdit ) { if ( mode.isEdit ) {
me.setTab('home'); me.setTab('home');
me.processPanelVisible(); me.processPanelVisible();
this.fireEvent('transit:settab',[this]);
} }
if ( me.isCompactView ) if ( me.isCompactView )

2
apps/presentationeditor/main/app/view/Transitions.js
View file

@ -261,7 +261,7 @@ define([
}); });
this.chStartOnClick = new Common.UI.CheckBox({ this.chStartOnClick = new Common.UI.CheckBox({
el: this.$el.findById('#transit-checkbox-slidenum'), el: this.$el.find('#transit-checkbox-slidenum'),
labelText: this.strStartOnClick labelText: this.strStartOnClick
}); });

4
apps/presentationeditor/main/resources/less/Transitions.less
View file

@ -2,6 +2,10 @@
input { input {
text-align: left; text-align: left;
} }
.dropdown-menu li a{
padding: 7px 20px;
}
.item { .item {
background: transparent; background: transparent;