Skip to content

Commit

Permalink
Merge pull request #2844 from ONLYOFFICE/feature/fix-bugs-develop
Browse files Browse the repository at this point in the history
Feature/fix bugs develop
  • Loading branch information
maxkadushkin authored Feb 15, 2024
2 parents 04e9be1 + b0e8d69 commit bd04815
Show file tree
Hide file tree
Showing 60 changed files with 517 additions and 275 deletions.
19 changes: 10 additions & 9 deletions apps/common/mobile/resources/less/common-ios.less
Original file line number Diff line number Diff line change
Expand Up @@ -70,20 +70,20 @@
}

.navbar, .navbar-bg, .subnavbar {
background-color: var(--f7-navbar-bg-color);

a.btn-doc-back {
width: 22px;
}
background-color: var(--f7-navbar-bg-color);

.title {
font-weight: 600;
color: @text-normal;
//line-height: 17px;
//max-height: 34px;
//overflow: hidden;
}

.navbar-inner, .subnavbar-inner {
z-index: auto;
}

.sheet-close {
width: 44px;
height: 44px;
Expand All @@ -96,6 +96,11 @@
.icon-back {
color: @brandColor;
}

.title {
font-size: 15px;
font-weight: normal;
}
}

.popover__titled {
Expand Down Expand Up @@ -183,10 +188,6 @@
}
}

.popover-arrow:after {
background: rgba(0, 0, 0, 0.9);
}

.list {
.item-content {
.color-preview {
Expand Down
5 changes: 5 additions & 0 deletions apps/common/mobile/resources/less/common-material.less
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,11 @@
}
}

.subnavbar .title {
font-size: 14px;
font-weight: normal;
}

.searchbar {
input {
box-sizing: border-box;
Expand Down
5 changes: 3 additions & 2 deletions apps/common/mobile/resources/less/common.less
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,14 @@
.subnavbar {
.subnavbar-inner {
padding: 0;

.title {
//white-space: nowrap;
white-space: nowrap;
overflow: hidden;
text-overflow: initial;
margin: 0;
padding: 0;
flex-shrink: initial;
text-overflow: ellipsis;
}
}
.icon-back {
Expand Down
5 changes: 5 additions & 0 deletions apps/common/mobile/resources/less/material/icons.less
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@
height: 24px;
.encoded-svg-mask('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 6H14V12.8453L18.1962 15.2679L17.1962 17L12 14V6Z"/><path d="M21.9995 12C21.9995 16.9706 17.9701 21 12.9995 21C10.5142 21 8.26423 19.9926 6.63555 18.364L5.92844 19.0711C7.73809 20.8807 10.2381 22 12.9995 22C18.5224 22 22.9995 17.5228 22.9995 12C22.9995 6.47715 18.5224 2 12.9995 2C7.47666 2 2.99951 6.47715 2.99951 12H3.99951C3.99951 7.02944 8.02895 3 12.9995 3C17.9701 3 21.9995 7.02944 21.9995 12Z"/><path d="M1.5 10.5L3.5 12.5L5.5 10.5"/></svg>', @toolbar-icons);
}
&.icon-return {
width: 24px;
height: 24px;
.encoded-svg-mask('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M11.5 7.79289L14.3536 10.6464L13.6465 11.3536L12 9.7071V16H14.5V17H11V9.70713L9.35364 11.3536L8.64648 10.6464L11.5 7.79289Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M1 4C1 3.44772 1.44775 3 2 3H9.75L11.75 5H22C22.5522 5 23 5.44772 23 6V20C23 20.5523 22.5522 21 22 21H2C1.44775 21 1 20.5523 1 20V4ZM2 20V4H9.25L11.25 6H22V20H2Z"/></svg>', @toolbar-icons);
}
}
}
}
11 changes: 9 additions & 2 deletions apps/documenteditor/mobile/locale/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,12 @@
"warnLicenseUsersExceeded": "لقد وصلت إلى الحد الأقصى من عدد المستخدمين لـ %1محررات. تواصل مع مسئولك لمعرفة المزيد",
"warnNoLicense": "لقد وصلت إلى الحد الأقصى من الاتصالات المتزامنة لـ%1محررات.هذا المستند سيكون للقراءة فقط. تواصل مع %1 فريق المبيعات لتطوير الشروط الشخصية",
"warnNoLicenseUsers": "لقد وصلت إلى الحد الأقصى من عدد المستخدمين لـ %1. تواصل مع فريق المبيعات لتطوير الشروط الشخصية",
"warnProcessRightsChange": "ليس لديك إذن تعديل هذا الملف"
"warnProcessRightsChange": "ليس لديك إذن تعديل هذا الملف",
"textConvertForm": "Download file as pdf to save the form in the format ready for filling.",
"del_textConvertFormSave": "Save file as a fillable PDF form to be able to fill it out.",
"textCancel": "Cancel",
"textSaveAsPdf": "Save as PDF",
"textDownloadPdf": "Download PDF"
},
"Settings": {
"advDRMOptions": "ملف محمي",
Expand Down Expand Up @@ -779,7 +784,9 @@
"txtScheme6": "Concourse",
"txtScheme7": "Equity",
"txtScheme8": "Flow",
"txtScheme9": "Foundry"
"txtScheme9": "Foundry",
"textRtlInterface": "RTL Interface",
"textExplanationChangeDirection": "Application will be restarted for RTL interface activation"
},
"Toolbar": {
"dlgLeaveMsgText": "لديك تغييرات غير محفوظة. اضغط على 'البقاء في هذه الصفحة' لانتظار الحفظ التلقائي. اضغط على 'غادر هذه الصفحة' للتخلي عن كل التغييرات الغير محفوظة.",
Expand Down
11 changes: 9 additions & 2 deletions apps/documenteditor/mobile/locale/az.json
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,12 @@
"titleLicenseNotActive": "License not active",
"warnDownloadAsPdf": "Your {0} will be converted to an editable format. This may take a while. The resulting document will be optimized to allow you to edit the text, so it might not look exactly like the original {0}, especially if the original file contained lots of graphics.",
"warnLicenseAnonymous": "Access denied for anonymous users.<br>This document will be opened for viewing only.",
"warnLicenseBefore": "License not active.<br>Please contact your administrator."
"warnLicenseBefore": "License not active.<br>Please contact your administrator.",
"textConvertForm": "Download file as pdf to save the form in the format ready for filling.",
"del_textConvertFormSave": "Save file as a fillable PDF form to be able to fill it out.",
"textCancel": "Cancel",
"textSaveAsPdf": "Save as PDF",
"textDownloadPdf": "Download PDF"
},
"Settings": {
"advDRMOptions": "Qorunan Fayl",
Expand Down Expand Up @@ -779,7 +784,9 @@
"textTrackedChanges": "Tracked changes",
"textTypeEditing": "Type Of Editing",
"textTypeEditingWarning": "Allow only this type of editing in the document.",
"titleDialogUnprotect": "Unprotect Document"
"titleDialogUnprotect": "Unprotect Document",
"textRtlInterface": "RTL Interface",
"textExplanationChangeDirection": "Application will be restarted for RTL interface activation"
},
"Toolbar": {
"dlgLeaveMsgText": "Saxlanmamış dəyişiklikləriniz var. Avtomatik saxlanmanı gözləmək üçün \"Bu Səhifədə Qalın\" üzərinə klikləyin. Bütün saxlanmamış dəyişiklikləri ləğv etmək üçün \"Bu səhifədən Çıxın\" hissəsinin üzərinə klikləyin.",
Expand Down
11 changes: 9 additions & 2 deletions apps/documenteditor/mobile/locale/be.json
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,12 @@
"warnLicenseLimitedNoAccess": "License expired. You have no access to document editing functionality. Please, contact your admin.",
"warnLicenseLimitedRenewed": "License needs to be renewed. You have limited access to document editing functionality.<br>Please contact your administrator to get full access",
"warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
"warnProcessRightsChange": "You don't have permission to edit this file."
"warnProcessRightsChange": "You don't have permission to edit this file.",
"textConvertForm": "Download file as pdf to save the form in the format ready for filling.",
"del_textConvertFormSave": "Save file as a fillable PDF form to be able to fill it out.",
"textCancel": "Cancel",
"textSaveAsPdf": "Save as PDF",
"textDownloadPdf": "Download PDF"
},
"Settings": {
"advDRMOptions": "Абаронены файл",
Expand Down Expand Up @@ -779,7 +784,9 @@
"textTypeEditingWarning": "Allow only this type of editing in the document.",
"txtDownloadTxt": "Download TXT",
"txtIncorrectPwd": "Password is incorrect",
"txtProtected": "Once you enter the password and open the file, the current password will be reset"
"txtProtected": "Once you enter the password and open the file, the current password will be reset",
"textRtlInterface": "RTL Interface",
"textExplanationChangeDirection": "Application will be restarted for RTL interface activation"
},
"Toolbar": {
"dlgLeaveTitleText": "Вы выходзіце з праграмы",
Expand Down
11 changes: 9 additions & 2 deletions apps/documenteditor/mobile/locale/bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,12 @@
"warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
"warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
"warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
"warnProcessRightsChange": "You don't have permission to edit this file."
"warnProcessRightsChange": "You don't have permission to edit this file.",
"textConvertForm": "Download file as pdf to save the form in the format ready for filling.",
"del_textConvertFormSave": "Save file as a fillable PDF form to be able to fill it out.",
"textCancel": "Cancel",
"textSaveAsPdf": "Save as PDF",
"textDownloadPdf": "Download PDF"
},
"Settings": {
"advDRMOptions": "Protected File",
Expand Down Expand Up @@ -779,7 +784,9 @@
"txtScheme6": "Concourse",
"txtScheme7": "Equity",
"txtScheme8": "Flow",
"txtScheme9": "Foundry"
"txtScheme9": "Foundry",
"textRtlInterface": "RTL Interface",
"textExplanationChangeDirection": "Application will be restarted for RTL interface activation"
},
"Toolbar": {
"dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",
Expand Down
11 changes: 9 additions & 2 deletions apps/documenteditor/mobile/locale/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,12 @@
"warnLicenseUsersExceeded": "Has arribat al límit d'usuari per a %1 editors. Posa't en contacte amb l'administrador per a més informació.",
"warnNoLicense": "Has arribat al límit de connexions simultànies a %1 editors. Aquest document només s'obrirà en mode lectura. Posa't en contacte amb l'equip de vendes %1 per conèixer les condicions d'actualització personal.",
"warnNoLicenseUsers": "Has arribat al límit d'usuaris per a %1 editors. Contacta amb l'equip de vendes de %1 per obtenir les condicions de millora personals dels teus serveis.",
"warnProcessRightsChange": "No tens permís per editar aquest fitxer."
"warnProcessRightsChange": "No tens permís per editar aquest fitxer.",
"textConvertForm": "Download file as pdf to save the form in the format ready for filling.",
"del_textConvertFormSave": "Save file as a fillable PDF form to be able to fill it out.",
"textCancel": "Cancel",
"textSaveAsPdf": "Save as PDF",
"textDownloadPdf": "Download PDF"
},
"Settings": {
"advDRMOptions": "El fitxer està protegit",
Expand Down Expand Up @@ -779,7 +784,9 @@
"textSameAsSystem": "Same as system",
"textSaveAsPdf": "Save as PDF",
"textSubmit": "Submit",
"textTheme": "Theme"
"textTheme": "Theme",
"textRtlInterface": "RTL Interface",
"textExplanationChangeDirection": "Application will be restarted for RTL interface activation"
},
"Toolbar": {
"dlgLeaveMsgText": "Tens canvis sense desar. Fes clic a \"Mantingueu-vos en aquesta pàgina\" per esperar al desament automàtic. Fes clic a \"Deixar aquesta pàgina\" per descartar tots els canvis no desats.",
Expand Down
11 changes: 9 additions & 2 deletions apps/documenteditor/mobile/locale/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,12 @@
"warnLicenseUsersExceeded": "Došlo dosažení limitu %1 editorů v režimu spolupráce na úpravách. Ohledně podrobností se obraťte na svého správce.",
"warnNoLicense": "Došlo k dosažení limitu souběžného připojení %1 editorů. Tento dokument bude otevřen pouze pro náhled. Pro rozšíření funkcí kontaktujte %1 obchodní oddělení.",
"warnNoLicenseUsers": "Došlo k dosažení limitu %1 editorů. Pro rozšíření funkcí kontaktujte %1 obchodní oddělení.",
"warnProcessRightsChange": "Nemáte oprávnění pro úpravu tohoto dokumentu."
"warnProcessRightsChange": "Nemáte oprávnění pro úpravu tohoto dokumentu.",
"textConvertForm": "Download file as pdf to save the form in the format ready for filling.",
"del_textConvertFormSave": "Save file as a fillable PDF form to be able to fill it out.",
"textCancel": "Cancel",
"textSaveAsPdf": "Save as PDF",
"textDownloadPdf": "Download PDF"
},
"Settings": {
"advDRMOptions": "Zabezpečený soubor",
Expand Down Expand Up @@ -779,7 +784,9 @@
"textSameAsSystem": "Same as system",
"textSaveAsPdf": "Save as PDF",
"textSubmit": "Submit",
"textTheme": "Theme"
"textTheme": "Theme",
"textRtlInterface": "RTL Interface",
"textExplanationChangeDirection": "Application will be restarted for RTL interface activation"
},
"Toolbar": {
"dlgLeaveMsgText": "V tomto dokumentu máte neuložené změny. Klikněte na 'Zůstat na této stránce'. Klikněte na 'Opustit tuto stránku' pro zahození neuložených změn.",
Expand Down
11 changes: 9 additions & 2 deletions apps/documenteditor/mobile/locale/da.json
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,12 @@
"warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
"warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
"warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
"warnProcessRightsChange": "You don't have permission to edit this file."
"warnProcessRightsChange": "You don't have permission to edit this file.",
"textConvertForm": "Download file as pdf to save the form in the format ready for filling.",
"del_textConvertFormSave": "Save file as a fillable PDF form to be able to fill it out.",
"textCancel": "Cancel",
"textSaveAsPdf": "Save as PDF",
"textDownloadPdf": "Download PDF"
},
"Settings": {
"advDRMOptions": "Protected File",
Expand Down Expand Up @@ -779,7 +784,9 @@
"txtScheme6": "Concourse",
"txtScheme7": "Equity",
"txtScheme8": "Flow",
"txtScheme9": "Foundry"
"txtScheme9": "Foundry",
"textRtlInterface": "RTL Interface",
"textExplanationChangeDirection": "Application will be restarted for RTL interface activation"
},
"Toolbar": {
"dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",
Expand Down
11 changes: 9 additions & 2 deletions apps/documenteditor/mobile/locale/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,12 @@
"warnLicenseUsersExceeded": "Sie haben das Benutzerlimit für %1-Editoren erreicht. Bitte wenden Sie sich an Ihren Administrator, um weitere Informationen zu erhalten.",
"warnNoLicense": "Sie haben die maximale Anzahl von gleichzeitigen Verbindungen in %1-Editoren erreicht. Die Bearbeitung ist jetzt in diesem Dokument nicht verfügbar. Bitte kontaktieren Sie unser Verkaufsteam, um persönliche Upgrade-Bedingungen zu erhalten.",
"warnNoLicenseUsers": "Sie haben das Benutzerlimit für %1-Editoren erreicht. Bitte kontaktieren Sie unser Verkaufsteam, um persönliche Upgrade-Bedingungen zu erhalten.",
"warnProcessRightsChange": "Sie können diese Datei nicht bearbeiten."
"warnProcessRightsChange": "Sie können diese Datei nicht bearbeiten.",
"textConvertForm": "Download file as pdf to save the form in the format ready for filling.",
"del_textConvertFormSave": "Save file as a fillable PDF form to be able to fill it out.",
"textCancel": "Cancel",
"textSaveAsPdf": "Save as PDF",
"textDownloadPdf": "Download PDF"
},
"Settings": {
"advDRMOptions": "Geschützte Datei",
Expand Down Expand Up @@ -779,7 +784,9 @@
"textExport": "Export",
"textExportAs": "Export As",
"textLight": "Light",
"textSameAsSystem": "Same as system"
"textSameAsSystem": "Same as system",
"textRtlInterface": "RTL Interface",
"textExplanationChangeDirection": "Application will be restarted for RTL interface activation"
},
"Toolbar": {
"dlgLeaveMsgText": "Sie haben nicht gespeicherte Änderungen. Klicken Sie auf \"Auf dieser Seite bleiben\" und warten Sie, bis die Datei automatisch gespeichert wird. Klicken Sie auf \"Die Seite verlassen\", um nicht gespeicherte Änderungen zu verwerfen.",
Expand Down
11 changes: 9 additions & 2 deletions apps/documenteditor/mobile/locale/el.json
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,12 @@
"warnLicenseUsersExceeded": "Έχετε φτάσει το όριο χρήστη για συντάκτες %1.<br>Επικοινωνήστε με τον διαχειριστή σας για περισσότερες πληροφορίες.",
"warnNoLicense": "Φτάσατε το όριο ταυτόχρονων συνδέσεων σε %1 συντάκτες. Το έγγραφο θα ανοίξει μόνο για ανάγνωση. Επικοινωνήστε με την ομάδα πωλήσεων %1 για τους όρους αναβάθμισης.",
"warnNoLicenseUsers": "Έχετε φτάσει το όριο χρήστη για συντάκτες %1.<br>Επικοινωνήστε με την ομάδα πωλήσεων %1 για προσωπικούς όρους αναβάθμισης.",
"warnProcessRightsChange": "Δεν έχετε δικαίωμα επεξεργασίας αυτού του αρχείου."
"warnProcessRightsChange": "Δεν έχετε δικαίωμα επεξεργασίας αυτού του αρχείου.",
"textConvertForm": "Download file as pdf to save the form in the format ready for filling.",
"del_textConvertFormSave": "Save file as a fillable PDF form to be able to fill it out.",
"textCancel": "Cancel",
"textSaveAsPdf": "Save as PDF",
"textDownloadPdf": "Download PDF"
},
"Settings": {
"advDRMOptions": "Προστατευμένο Αρχείο",
Expand Down Expand Up @@ -779,7 +784,9 @@
"txtScheme6": "Συνάθροιση",
"txtScheme7": "Μετοχή",
"txtScheme8": "Ροή",
"txtScheme9": "Χυτήριο"
"txtScheme9": "Χυτήριο",
"textRtlInterface": "RTL Interface",
"textExplanationChangeDirection": "Application will be restarted for RTL interface activation"
},
"Toolbar": {
"dlgLeaveMsgText": "Έχετε μη αποθηκευμένες αλλαγές. Πατήστε 'Παραμονή στη Σελίδα' για να περιμένετε την αυτόματη αποθήκευση. Πατήστε 'Έξοδος από τη Σελίδα' για να απορρίψετε όλες τις μη αποθηκευμένες αλλαγές.",
Expand Down
11 changes: 9 additions & 2 deletions apps/documenteditor/mobile/locale/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,12 @@
"warnLicenseUsersExceeded": "Ha alcanzado el límite de usuarios para %1 editores. Póngase en contacto con su administrador para saber más.",
"warnNoLicense": "Ha alcanzado el límite de conexiones simultáneas con %1 editores. Este documento se abrirá sólo para su visualización. Póngase en contacto con el equipo de ventas de %1 para conocer las condiciones de actualización personal.",
"warnNoLicenseUsers": "Ha alcanzado el límite de usuarios para %1 editores. Póngase en contacto con el equipo de ventas de %1 para conocer las condiciones de actualización personal.",
"warnProcessRightsChange": "No tiene permiso para editar este archivo."
"warnProcessRightsChange": "No tiene permiso para editar este archivo.",
"textConvertForm": "Download file as pdf to save the form in the format ready for filling.",
"del_textConvertFormSave": "Save file as a fillable PDF form to be able to fill it out.",
"textCancel": "Cancel",
"textSaveAsPdf": "Save as PDF",
"textDownloadPdf": "Download PDF"
},
"Settings": {
"advDRMOptions": "Archivo protegido",
Expand Down Expand Up @@ -779,7 +784,9 @@
"txtScheme6": "Concurrencia",
"txtScheme7": "Equidad ",
"txtScheme8": "Flujo",
"txtScheme9": "Fundición"
"txtScheme9": "Fundición",
"textRtlInterface": "RTL Interface",
"textExplanationChangeDirection": "Application will be restarted for RTL interface activation"
},
"Toolbar": {
"dlgLeaveMsgText": "Tiene cambios sin guardar. Haga clic en \"Permanecer en esta página\" para esperar a que se guarde automáticamente. Haga clic en \"Salir de esta página\" para descartar todos los cambios no guardados.",
Expand Down
Loading

0 comments on commit bd04815

Please sign in to comment.