haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Show pdf settings dailog on mobile view. 

Merge downloadas-pdf and exportpdf actions to have same functionality
on desktop and mobile view. Now we can see setup dialog on mobile view.

On mobide view Download as -> PDF should show PDF download
settings dialog before downloading the document same like
desktop view.

Signed-off-by: Gülşah Köse <gulsah.kose@collabora.com>
Change-Id: Ib0dd3877973dae025e7a6d4f15f2fa26351ea369
pull/5731/head
Gülşah Köse 2023-01-13 17:18:34 +03:00 committed by Szymon Kłos
parent ce5d6360e0
commit fb6c4c96c0
14 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/css/mobilewizard.css
View File

@ -40,7 +40,7 @@ span#main-menu-btn-icon {
width: 100%;
}
.ui-header.level-1.mobile-wizard.ui-widget img[src='images/lc_downloadas-pdf.svg']{
.ui-header.level-1.mobile-wizard.ui-widget img[src='images/lc_exportpdf.svg']{
visibility: visible;
}

2
browser/css/notebookbar.css
View File

@ -586,7 +586,7 @@
}
[class*='pdf-submenu-icon'] {
background: url('images/lc_downloadas-pdf.svg') center;
background: url('images/lc_exportpdf.svg') center;
}
[class*='epub-submenu-icon'] {

1
browser/images/lc_downloadas-epub.svg
View File

@ -1 +0,0 @@
<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m5 3v18h14v-3.345703l-2.886719 2.886719c-.603969.603969-1.622593.603969-2.226562 0l-4.4277346-4.427735c-.6039696-.603968-.6039696-1.622595 0-2.226562l4.4277346-4.4277346c.301984-.3019846.708071-.4511719 1.113281-.4511719s.811297.1491873 1.113281.4511719l2.736328 2.7363276a1.0015148 1.0015148 0 0 1 .150391.191407v-5.6582034l-4-3.7285156z" fill="#fafafa"/><path d="m5 2c-.554 0-1 .446-1 1v18c0 .554.446 1 1 1h14c.554 0 1-.446 1-1v-4.345703l-1 1v3.345703h-14v-18h9v4c0 .554.446 1 1 1h4v4.386719a1.0015148 1.0015148 0 0 1 .142578.566406 1.0015148 1.0015148 0 0 1 .75586.291016l.101562.101562v-2.455078-3.640625-.2089844c0-.4506799.098038-.4254121-.605469-1.0664062l-3.30664-3.2382813c-.709525-.7368575-.710169-.7363281-1.09375-.7363281h-.332032-.662109z" fill="#3a3a38"/><path d="m15 7h4l-4-4z" fill="#fafafa" fill-rule="evenodd"/><path d="m15 18.141999-3.142-3.141999 3.142-3.142 1.047 1.046999-2.095 2.095001 1.048 1.046999 3.142-3.142-2.737-2.736999c-.224-.2240005-.586-.2240005-.81 0l-4.427 4.426999c-.224.224-.224.586 0 .81l4.427 4.427001c.224.224.586.224.81 0l4.427-4.427001c.224-.224.224-.585999 0-.809999l-.642-.642-4.19 4.19z" fill="#1e8bcd"/></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

0
browser/images/lc_downloadas-pdf.svg → browser/images/lc_exportpdf.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

1
browser/src/control/Control.JSDialogBuilder.js
View File

@ -2481,7 +2481,6 @@ L.Control.JSDialogBuilder = L.Control.extend({
'zoterounlink': 'unlinkcitation',
'zoteroaddeditbibliography': 'addeditbibliography',
'zoterosetdocprefs': 'formproperties',
'exportpdf': 'downloadas-pdf',
};
if (iconURLAliases[cleanName]) {
cleanName = iconURLAliases[cleanName];

10
browser/src/control/Control.Menubar.js
View File

@ -864,7 +864,7 @@ L.Control.Menubar = L.Control.extend({
]},
{name: !window.ThisIsAMobileApp ? _('Download as') : _('Export as'), id: 'downloadas', type: 'menu', menu: [
{name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
{name: _('PDF Document (.pdf)'), id: 'exportpdf', type: 'action'},
{name: _('ODF text document (.odt)'), id: 'downloadas-odt', type: 'action'},
{name: _('Word 2003 Document (.doc)'), id: 'downloadas-doc', type: 'action'},
{name: _('Word Document (.docx)'), id: 'downloadas-docx', type: 'action'},
@ -918,7 +918,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:SetDocumentProperties', 'presentation'), uno: '.uno:SetDocumentProperties', id: 'properties'}
]},
{name: !window.ThisIsAMobileApp ? _('Download as') : _('Export as'), id:'downloadas', type: 'menu', menu: [
{name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
{name: _('PDF Document (.pdf)'), id: 'exportpdf', type: 'action'},
{name: _('ODF presentation (.odp)'), id: 'downloadas-odp', type: 'action'},
{name: _('PowerPoint 2003 Presentation (.ppt)'), id: 'downloadas-ppt', type: 'action'},
{name: _('PowerPoint Presentation (.pptx)'), id: 'downloadas-pptx', type: 'action'},
@ -974,7 +974,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:SetDocumentProperties', 'presentation'), uno: '.uno:SetDocumentProperties', id: 'properties'}
]},
{name: !window.ThisIsAMobileApp ? _('Download as') : _('Export as'), id:'downloadas', type: 'menu', menu: [
{name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
{name: _('PDF Document (.pdf)'), id: 'exportpdf', type: 'action'},
{name: _('ODF Drawing (.odg)'), id: 'downloadas-odg', type: 'action'}
]},
{name: _UNO('.uno:EditMenu', 'presentation'), id: 'editmenu', type: 'menu', menu: [
@ -1022,7 +1022,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:SetDocumentProperties', 'spreadsheet'), uno: '.uno:SetDocumentProperties', id: 'properties'}
]},
{name: !window.ThisIsAMobileApp ? _('Download as') : _('Export as'), id:'downloadas', type: 'menu', menu: [
{name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
{name: _('PDF Document (.pdf)'), id: 'exportpdf', type: 'action'},
{name: _('ODF spreadsheet (.ods)'), id: 'downloadas-ods', type: 'action'},
{name: _('Excel 2003 Spreadsheet (.xls)'), id: 'downloadas-xls', type: 'action'},
{name: _('Excel Spreadsheet (.xlsx)'), id: 'downloadas-xlsx', type: 'action'}
@ -1195,7 +1195,7 @@ L.Control.Menubar = L.Control.extend({
allowedViewModeActions: [
'savecomments', 'shareas', 'print', // file menu
'downloadas-pdf', 'downloadas-odt', 'downloadas-doc', 'downloadas-docx', 'downloadas-rtf', // file menu
'downloadas-odt', 'downloadas-doc', 'downloadas-docx', 'downloadas-rtf', // file menu
'downloadas-odp', 'downloadas-ppt', 'downloadas-pptx', 'downloadas-odg', 'exportpdf', 'exportepub', // file menu
'downloadas-ods', 'downloadas-xls', 'downloadas-xlsx', 'downloadas-csv', 'closedocument', // file menu
'fullscreen', 'zoomin', 'zoomout', 'zoomreset', 'showstatusbar', 'showresolved', // view menu

4
browser/src/control/Control.NotebookbarCalc.js
View File

@ -227,11 +227,11 @@ L.Control.NotebookbarCalc = L.Control.NotebookbarWriter.extend({
'vertical': 'true'
},
{
'id': 'file-downloadas-pdf',
'id': 'file-exportpdf',
'type': 'container',
'children': [
{
'id': 'downloadas-pdf',
'id': 'exportpdf',
'type': 'customtoolitem',
'text': _('PDF Document (.pdf)'),
'command': 'exportpdf',

4
browser/src/control/Control.NotebookbarDraw.js
View File

@ -188,11 +188,11 @@ L.Control.NotebookbarDraw = L.Control.NotebookbarImpress.extend({
'vertical': 'true'
},
{
'id': 'file-downloadas-pdf',
'id': 'file-exportpdf',
'type': 'container',
'children': [
{
'id': 'downloadas-pdf',
'id': 'exportpdf',
'type': 'customtoolitem',
'text': _('PDF Document (.pdf)'),
'command': 'exportpdf',

4
browser/src/control/Control.NotebookbarImpress.js
View File

@ -279,11 +279,11 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({
'vertical': 'true'
},
{
'id': 'file-downloadas-pdf',
'id': 'file-exportpdf',
'type': 'container',
'children': [
{
'id': 'downloadas-pdf',
'id': 'exportpdf',
'type': 'customtoolitem',
'text': _('PDF Document (.pdf)'),
'command': 'exportpdf',

2
browser/src/control/Control.NotebookbarWriter.js
View File

@ -226,7 +226,7 @@ L.Control.NotebookbarWriter = L.Control.Notebookbar.extend({
'type': 'container',
'children': [
{
'id': 'downloadas-pdf',
'id': 'exportpdf',
'type': 'customtoolitem',
'text': _('PDF Document (.pdf)'),
'command': 'exportpdf',

2
browser/src/control/Toolbar.js
View File

@ -361,7 +361,7 @@ L.Map.include({
if (this.isPermissionEditForComments()) {
allowedCommands.push('.uno:InsertAnnotation','.uno:DeleteCommentThread', '.uno:DeleteAnnotation', '.uno:DeleteNote',
'.uno:DeleteComment', '.uno:ReplyComment', '.uno:ReplyToAnnotation', '.uno:ResolveComment',
'.uno:ResolveCommentThread', '.uno:ResolveComment', '.uno:EditAnnotation', '.uno:ExportToEPUB');
'.uno:ResolveCommentThread', '.uno:ResolveComment', '.uno:EditAnnotation', '.uno:ExportToEPUB', '.uno:ExportToPDF');
}
for (var i in allowedCommands) {

1
cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js
View File

@ -76,6 +76,7 @@ describe('Trigger hamburger menu options.', function() {
before('hamburger_menu.ods');
mobileHelper.selectHamburgerMenuItem(['Download as', 'PDF Document (.pdf)']);
mobileHelper.pressPushButtonOfDialog('Export');
cy.get('iframe')
.should('have.attr', 'data-src')

1
cypress_test/integration_tests/mobile/impress/hamburger_menu_spec.js
View File

@ -77,6 +77,7 @@ describe('Trigger hamburger menu options.', function() {
before('hamburger_menu.odp');
mobileHelper.selectHamburgerMenuItem(['Download as', 'PDF Document (.pdf)']);
mobileHelper.pressPushButtonOfDialog('Export');
cy.get('iframe')
.should('have.attr', 'data-src')

1
cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
View File

@ -102,6 +102,7 @@ describe('Trigger hamburger menu options.', function() {
it('Download as PDF', function() {
mobileHelper.selectHamburgerMenuItem(['Download as', 'PDF Document (.pdf)']);
mobileHelper.pressPushButtonOfDialog('Export');
cy.get('iframe')
.should('have.attr', 'data-src')