[mobile] Add macros settings in Application settings

This commit is contained in:
JuliaSvinareva 2020-06-02 17:43:48 +03:00
parent cf42d66e5b
commit 7292601ee3
24 changed files with 446 additions and 6 deletions

View file

@ -254,6 +254,9 @@ define([
} else if ('#margins-view' == pageId) {
me.initPageMargin();
Common.Utils.addScrollIfNeed('.page[data-page=margin-view]', '.page[data-page=margin-view] .page-content');
} else if ('#macros-settings-view' == pageId) {
me.initPageMacrosSettings();
Common.Utils.addScrollIfNeed('.page[data-page=macros-settings-view]', '.page[data-page=macros-settings-view] .page-content');
} else {
$('#settings-readermode input:checkbox').attr('checked', Common.SharedSettings.get('readerMode'));
$('#settings-search').single('click', _.bind(me.onSearch, me));
@ -273,6 +276,20 @@ define([
}
},
initPageMacrosSettings: function() {
var me = this,
$pageMacrosSettings = $('.page[data-page="macros-settings-view"] input:radio[name=macros-settings]'),
value = Common.Utils.InternalSettings.get("de-mobile-macros-mode") || 0;
$pageMacrosSettings.single('change', _.bind(me.onChangeMacrosSettings, me));
$pageMacrosSettings.val([value]);
},
onChangeMacrosSettings: function(e) {
var value = parseInt($(e.currentTarget).val());
Common.Utils.InternalSettings.set("de-mobile-macros-mode", value);
Common.localStorage.setItem("de-mobile-macros-mode", value);
},
onChangeDisplayComments: function(e) {
var displayComments = $(e.currentTarget).is(':checked');
if (!displayComments) {

View file

@ -770,6 +770,20 @@
</ul>
</div>
<div class="list-block">
<ul>
<li>
<a id="settings-macros" class="item-link item-content" data-page="#macros-settings-view">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><%= scope.textMacrosSettings %></div>
</div>
</div>
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
@ -872,4 +886,55 @@
</div>
</div>
</div>
</div>
<!-- Macros Settings view -->
<div id="macros-settings-view">
<div class="navbar">
<div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
<div class="center sliding"><%= scope.textMacrosSettings %></div>
</div>
</div>
<div class="pages">
<div class="page page-macros-settings" data-page="macros-settings-view">
<div class="page-content">
<div class="list-block">
<ul>
<li class="media-item">
<label class="label-radio item-content">
<input type="radio" name="macros-settings" value="2">
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
<div class="item-inner">
<div class="item-title"><%= scope.textDisableAll %></div>
<div class="item-subtitle"><%= scope.textDisableAllMacrosWithoutNotification %></div>
</div>
</label>
</li>
<li class="media-item">
<label class="label-radio item-content">
<input type="radio" name="macros-settings" value="0">
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
<div class="item-inner">
<div class="item-title"><%= scope.textShowNotification %></div>
<div class="item-subtitle"><%= scope.textDisableAllMacrosWithNotification %></div>
</div>
</label>
</li>
<li class="media-item">
<label class="label-radio item-content">
<input type="radio" name="macros-settings" value="1">
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
<div class="item-inner">
<div class="item-title"><%= scope.textEnableAll %></div>
<div class="item-subtitle"><%= scope.textEnableAllMacrosWithoutNotification %></div>
</div>
</label>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>

View file

@ -59,7 +59,8 @@ define([
_canHelp = true,
_canPrint = false,
_canReview = false,
_isReviewOnly = false;
_isReviewOnly = false,
_isShowMacros = true;
return {
// el: '.view-main',
@ -120,6 +121,7 @@ define([
if (mode.customization) {
_canHelp = (mode.customization.help!==false);
_isShowMacros = (mode.customization.macros!==false);
}
},
@ -149,6 +151,7 @@ define([
if (!_canPrint) $layour.find('#settings-print').hide();
if (!_canReview) $layour.find('#settings-review').hide();
if (_isReviewOnly) $layour.find('#settings-review').addClass('disabled');
if (!_isShowMacros) $layour.find('#settings-macros').hide();
return $layour.html();
}
@ -332,7 +335,14 @@ define([
textUploaded: 'Uploaded',
textLastModified: 'Last Modified',
textLastModifiedBy: 'Last Modified By',
textCreated: 'Created'
textCreated: 'Created',
textMacrosSettings: 'Macros Settings',
textDisableAll: 'Disable All',
textDisableAllMacrosWithoutNotification: 'Disable all macros without notification',
textShowNotification: 'Show Notification',
textDisableAllMacrosWithNotification: 'Disable all macros with notification',
textEnableAll: 'Enable All',
textEnableAllMacrosWithoutNotification: 'Enable all macros without notification'
}

View file

@ -570,5 +570,12 @@
"DE.Views.Settings.textVersion": "Version",
"DE.Views.Settings.textWords": "Words",
"DE.Views.Settings.unknownText": "Unknown",
"DE.Views.Settings.textMacrosSettings": "Macros Settings",
"DE.Views.Settings.textDisableAll": "Disable All",
"DE.Views.Settings.textDisableAllMacrosWithoutNotification": "Disable all macros without notification",
"DE.Views.Settings.textShowNotification": "Show Notification",
"DE.Views.Settings.textDisableAllMacrosWithNotification": "Disable all macros with notification",
"DE.Views.Settings.textEnableAll": "Enable All",
"DE.Views.Settings.textEnableAllMacrosWithoutNotification": "Enable all macros without notification",
"DE.Views.Toolbar.textBack": "Back"
}

View file

@ -7778,3 +7778,10 @@ html.pixel-ratio-3 .numbers li {
-o-animation: flickerAnimation 2s infinite ease-in-out;
animation: flickerAnimation 2s infinite ease-in-out;
}
.page-macros-settings[data-page="macros-settings-view"] .list-block li.media-item .item-title {
font-weight: normal;
}
.page-macros-settings[data-page="macros-settings-view"] .list-block li.media-item .item-subtitle {
font-size: 14px;
color: #8e8e93;
}

View file

@ -7639,3 +7639,10 @@ html.pixel-ratio-3 .numbers li {
-o-animation: flickerAnimation 2s infinite ease-in-out;
animation: flickerAnimation 2s infinite ease-in-out;
}
.page-macros-settings[data-page="macros-settings-view"] .list-block li.media-item .item-title {
font-weight: normal;
}
.page-macros-settings[data-page="macros-settings-view"] .list-block li.media-item .item-subtitle {
font-size: 14px;
color: #9e9e9e;
}

View file

@ -276,3 +276,18 @@ input, textarea {
animation: flickerAnimation 2s infinite ease-in-out;
}
}
// Macros settings
.page-macros-settings[data-page="macros-settings-view"] {
.list-block {
li.media-item {
.item-title {
font-weight: normal;
}
.item-subtitle {
font-size: 14px;
color: @gray;
}
}
}
}

View file

@ -275,3 +275,18 @@ input, textarea {
animation: flickerAnimation 2s infinite ease-in-out;
}
}
// Macros settings
.page-macros-settings[data-page="macros-settings-view"] {
.list-block {
li.media-item {
.item-title {
font-weight: normal;
}
.item-subtitle {
font-size: 14px;
color: @gray;
}
}
}
}

View file

@ -176,6 +176,7 @@ define([
Common.Utils.addScrollIfNeed('.page[data-page=settings-info-view]', '.page[data-page=settings-info-view] .page-content');
Common.Utils.addScrollIfNeed('.page[data-page=settings-about-view]', '.page[data-page=settings-about-view] .page-content');
Common.Utils.addScrollIfNeed('.page[data-page=color-schemes-view]', '.page[data-page=color-schemes-view] .page-content');
Common.Utils.addScrollIfNeed('.page[data-page=settings-macros-view]', '.page[data-page=settings-macros-view] .page-content');
me.initSettings(pageId);
},
@ -193,9 +194,25 @@ define([
me.initPageColorSchemes();
} else if ('#settings-info-view' == pageId) {
me.initPageInfo();
} else if ('#settings-macros-view' == pageId) {
me.initPageMacrosSettings();
}
},
initPageMacrosSettings: function() {
var me = this,
$pageMacrosSettings = $('.page[data-page="settings-macros-view"] input:radio[name=macros-settings]'),
value = Common.Utils.InternalSettings.get("pe-mobile-macros-mode") || 0;
$pageMacrosSettings.single('change', _.bind(me.onChangeMacrosSettings, me));
$pageMacrosSettings.val([value]);
},
onChangeMacrosSettings: function(e) {
var value = parseInt($(e.currentTarget).val());
Common.Utils.InternalSettings.set("pe-mobile-macros-mode", value);
Common.localStorage.setItem("pe-mobile-macros-mode", value);
},
initPageInfo: function() {
var document = Common.SharedSettings.get('document') || {},
info = document.info || {};

View file

@ -522,6 +522,19 @@
</div>
</ul>
</div>
<div class="list-block">
<ul>
<li>
<a id="settings-macros" class="item-link item-content" data-page="#settings-macros-view">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><%= scope.textMacrosSettings %></div>
</div>
</div>
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
@ -544,4 +557,55 @@
</div>
</div>
</div>
</div>
<!-- Macros Settings view -->
<div id="settings-macros-view">
<div class="navbar">
<div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
<div class="center sliding"><%= scope.textMacrosSettings %></div>
</div>
</div>
<div class="pages">
<div class="page page-macros-settings" data-page="settings-macros-view">
<div class="page-content">
<div class="list-block">
<ul>
<li class="media-item">
<label class="label-radio item-content">
<input type="radio" name="macros-settings" value="2">
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
<div class="item-inner">
<div class="item-title"><%= scope.textDisableAll %></div>
<div class="item-subtitle"><%= scope.textDisableAllMacrosWithoutNotification %></div>
</div>
</label>
</li>
<li class="media-item">
<label class="label-radio item-content">
<input type="radio" name="macros-settings" value="0">
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
<div class="item-inner">
<div class="item-title"><%= scope.textShowNotification %></div>
<div class="item-subtitle"><%= scope.textDisableAllMacrosWithNotification %></div>
</div>
</label>
</li>
<li class="media-item">
<label class="label-radio item-content">
<input type="radio" name="macros-settings" value="1">
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
<div class="item-inner">
<div class="item-title"><%= scope.textEnableAll %></div>
<div class="item-subtitle"><%= scope.textEnableAllMacrosWithoutNotification %></div>
</div>
</label>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>

View file

@ -55,7 +55,8 @@ define([
canDownload = false,
canAbout = true,
canHelp = true,
canPrint = false;
canPrint = false,
isShowMacros = true;
return {
// el: '.view-main',
@ -117,6 +118,7 @@ define([
if (mode.customization) {
canHelp = (mode.customization.help!==false);
isShowMacros = (mode.customization.macros!==false);
}
},
@ -140,6 +142,7 @@ define([
if (!canAbout) $layour.find('#settings-about').hide();
if (!canHelp) $layour.find('#settings-help').hide();
if (!canPrint) $layour.find('#settings-print').hide();
if (!isShowMacros) $layour.find('#settings-macros').hide();
return $layour.html();
}
@ -186,6 +189,10 @@ define([
this.showPage('#settings-history-view');
},
showMacros: function () {
this.showPage('#settings-macros-view');
},
showHelp: function () {
var url = '{{HELP_URL}}';
if (url.charAt(url.length-1) !== '/') {
@ -213,6 +220,9 @@ define([
showSetApp: function () {
this.showPage('#settings-application-view');
if (isShowMacros) {
$('#settings-macros').single('click', _.bind(this.showMacros, this));
}
},
loadDocument: function (data) {
@ -295,7 +305,14 @@ define([
textLastModified: 'Last Modified',
textLastModifiedBy: 'Last Modified By',
textUploaded: 'Uploaded',
textLocation: 'Location'
textLocation: 'Location',
textMacrosSettings: 'Macros Settings',
textDisableAll: 'Disable All',
textDisableAllMacrosWithoutNotification: 'Disable all macros without notification',
textShowNotification: 'Show Notification',
textDisableAllMacrosWithNotification: 'Disable all macros with notification',
textEnableAll: 'Enable All',
textEnableAllMacrosWithoutNotification: 'Enable all macros without notification'
}
})(), PE.Views.Settings || {}))
});

View file

@ -547,5 +547,12 @@
"PE.Views.Settings.textUploaded": "Uploaded",
"PE.Views.Settings.textVersion": "Version",
"PE.Views.Settings.unknownText": "Unknown",
"PE.Views.Settings.textMacrosSettings": "Macros Settings",
"PE.Views.Settings.textDisableAll": "Disable All",
"PE.Views.Settings.textDisableAllMacrosWithoutNotification": "Disable all macros without notification",
"PE.Views.Settings.textShowNotification": "Show Notification",
"PE.Views.Settings.textDisableAllMacrosWithNotification": "Disable all macros with notification",
"PE.Views.Settings.textEnableAll": "Enable All",
"PE.Views.Settings.textEnableAllMacrosWithoutNotification": "Enable all macros without notification",
"PE.Views.Toolbar.textBack": "Back"
}

View file

@ -7745,3 +7745,10 @@ html.pixel-ratio-3 .numbers li {
.doc-placeholder .slide-container > .line.empty {
background: transparent;
}
.page-macros-settings[data-page="settings-macros-view"] .list-block li.media-item .item-title {
font-weight: normal;
}
.page-macros-settings[data-page="settings-macros-view"] .list-block li.media-item .item-subtitle {
font-size: 14px;
color: #8e8e93;
}

View file

@ -7655,3 +7655,10 @@ html.pixel-ratio-3 .numbers li {
.doc-placeholder .slide-container > .line.empty {
background: transparent;
}
.page-macros-settings[data-page="settings-macros-view"] .list-block li.media-item .item-title {
font-weight: normal;
}
.page-macros-settings[data-page="settings-macros-view"] .list-block li.media-item .item-subtitle {
font-size: 14px;
color: #9e9e9e;
}

View file

@ -322,3 +322,18 @@ input, textarea {
}
}
}
// Macros settings
.page-macros-settings[data-page="settings-macros-view"] {
.list-block {
li.media-item {
.item-title {
font-weight: normal;
}
.item-subtitle {
font-size: 14px;
color: @gray;
}
}
}
}

View file

@ -321,3 +321,18 @@ input, textarea {
}
}
}
// Macros settings
.page-macros-settings[data-page="settings-macros-view"] {
.list-block {
li.media-item {
.item-title {
font-weight: normal;
}
.item-subtitle {
font-size: 14px;
color: @gray;
}
}
}
}

View file

@ -258,6 +258,8 @@ define([
me.initRegSettings();
} else if ('#settings-info-view' == pageId) {
me.initPageInfo();
} else if ('#settings-macros-view' == pageId) {
me.initPageMacrosSettings();
} else {
var _userCount = SSE.getController('Main').returnUserCount();
if (_userCount > 0) {
@ -266,6 +268,20 @@ define([
}
},
initPageMacrosSettings: function() {
var me = this,
$pageMacrosSettings = $('.page[data-page="settings-macros-view"] input:radio[name=macros-settings]'),
value = Common.Utils.InternalSettings.get("sse-mobile-macros-mode") || 0;
$pageMacrosSettings.single('change', _.bind(me.onChangeMacrosSettings, me));
$pageMacrosSettings.val([value]);
},
onChangeMacrosSettings: function(e) {
var value = parseInt($(e.currentTarget).val());
Common.Utils.InternalSettings.set("sse-mobile-macros-mode", value);
Common.localStorage.setItem("sse-mobile-macros-mode", value);
},
initPageInfo: function() {
var document = Common.SharedSettings.get('document') || {},
info = document.info || {};

View file

@ -579,6 +579,19 @@
</li>
</ul>
</div>
<div class="list-block">
<ul>
<li>
<a id="settings-macros" class="item-link item-content" data-page="#settings-macros-view">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><%= scope.textMacrosSettings %></div>
</div>
</div>
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
@ -844,4 +857,55 @@
</div>
</div>
</div>
</div>
<!-- Macros Settings view -->
<div id="settings-macros-view">
<div class="navbar">
<div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
<div class="center sliding"><%= scope.textMacrosSettings %></div>
</div>
</div>
<div class="pages">
<div class="page page-macros-settings" data-page="settings-macros-view">
<div class="page-content">
<div class="list-block">
<ul>
<li class="media-item">
<label class="label-radio item-content">
<input type="radio" name="macros-settings" value="2">
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
<div class="item-inner">
<div class="item-title"><%= scope.textDisableAll %></div>
<div class="item-subtitle"><%= scope.textDisableAllMacrosWithoutNotification %></div>
</div>
</label>
</li>
<li class="media-item">
<label class="label-radio item-content">
<input type="radio" name="macros-settings" value="0">
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
<div class="item-inner">
<div class="item-title"><%= scope.textShowNotification %></div>
<div class="item-subtitle"><%= scope.textDisableAllMacrosWithNotification %></div>
</div>
</label>
</li>
<li class="media-item">
<label class="label-radio item-content">
<input type="radio" name="macros-settings" value="1">
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
<div class="item-inner">
<div class="item-title"><%= scope.textEnableAll %></div>
<div class="item-subtitle"><%= scope.textEnableAllMacrosWithoutNotification %></div>
</div>
</label>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>

View file

@ -54,7 +54,8 @@ define([
canDownload = false,
canAbout = true,
canHelp = true,
canPrint = false;
canPrint = false,
isShowMacros = true;
return {
// el: '.view-main',
@ -126,6 +127,7 @@ define([
if (mode.customization) {
canHelp = (mode.customization.help!==false);
isShowMacros = (mode.customization.macros!==false);
}
},
@ -143,6 +145,7 @@ define([
if (!canAbout) $layout.find('#settings-about').hide();
if (!canHelp) $layout.find('#settings-help').hide();
if (!canPrint) $layout.find('#settings-print').hide();
if (!isShowMacros) $layour.find('#settings-macros').hide();
return $layout.html();
}
@ -173,6 +176,10 @@ define([
}
},
showMacros: function () {
this.showPage('#settings-macros-view');
},
showSetApp: function() {
this.showPage('#settings-application-view');
$('#language-formula').single('click', _.bind(this.showFormulaLanguage, this));
@ -180,6 +187,9 @@ define([
if (!isEdit) {
$('.page[data-page=settings-application-view] .page-content > :not(.display-view)').hide();
}
if (isShowMacros) {
$('#settings-macros').single('click', _.bind(this.showMacros, this));
}
},
showFormulaLanguage: function () {
@ -421,7 +431,14 @@ define([
textLastModified: 'Last Modified',
textLastModifiedBy: 'Last Modified By',
textUploaded: 'Uploaded',
textLocation: 'Location'
textLocation: 'Location',
textMacrosSettings: 'Macros Settings',
textDisableAll: 'Disable All',
textDisableAllMacrosWithoutNotification: 'Disable all macros without notification',
textShowNotification: 'Show Notification',
textDisableAllMacrosWithNotification: 'Disable all macros with notification',
textEnableAll: 'Enable All',
textEnableAllMacrosWithoutNotification: 'Enable all macros without notification'
}
})(), SSE.Views.Settings || {}))
});

View file

@ -616,5 +616,12 @@
"SSE.Views.Settings.textUploaded": "Uploaded",
"SSE.Views.Settings.textVersion": "Version",
"SSE.Views.Settings.unknownText": "Unknown",
"SSE.Views.Settings.textMacrosSettings": "Macros Settings",
"SSE.Views.Settings.textDisableAll": "Disable All",
"SSE.Views.Settings.textDisableAllMacrosWithoutNotification": "Disable all macros without notification",
"SSE.Views.Settings.textShowNotification": "Show Notification",
"SSE.Views.Settings.textDisableAllMacrosWithNotification": "Disable all macros with notification",
"SSE.Views.Settings.textEnableAll": "Enable All",
"SSE.Views.Settings.textEnableAllMacrosWithoutNotification": "Enable all macros without notification",
"SSE.Views.Toolbar.textBack": "Back"
}

View file

@ -8306,3 +8306,10 @@ html.pixel-ratio-3 .cell-styles.dataview .row li {
.picker-modal.container-view-comment .pages {
background-color: #FFFFFF;
}
.page-macros-settings[data-page="settings-macros-view"] .list-block li.media-item .item-title {
font-weight: normal;
}
.page-macros-settings[data-page="settings-macros-view"] .list-block li.media-item .item-subtitle {
font-size: 14px;
color: #8e8e93;
}

View file

@ -8249,3 +8249,10 @@ html.pixel-ratio-3 .cell-styles.dataview .row li {
.picker-modal.container-view-comment .pages {
background-color: #FFFFFF;
}
.page-macros-settings[data-page="settings-macros-view"] .list-block li.media-item .item-title {
font-weight: normal;
}
.page-macros-settings[data-page="settings-macros-view"] .list-block li.media-item .item-subtitle {
font-size: 14px;
color: #9e9e9e;
}

View file

@ -354,4 +354,19 @@ input, textarea {
.swipe-container, .toolbar, .pages {
background-color: #FFFFFF;
}
}
// Macros settings
.page-macros-settings[data-page="settings-macros-view"] {
.list-block {
li.media-item {
.item-title {
font-weight: normal;
}
.item-subtitle {
font-size: 14px;
color: @gray;
}
}
}
}

View file

@ -355,4 +355,19 @@ input, textarea {
.swipe-container, .toolbar, .pages {
background-color: #FFFFFF;
}
}
// Macros settings
.page-macros-settings[data-page="settings-macros-view"] {
.list-block {
li.media-item {
.item-title {
font-weight: normal;
}
.item-subtitle {
font-size: 14px;
color: @gray;
}
}
}
}