[Libreoffice-commits] online.git: 2 commits - loleaflet/admin loleaflet/src
Tamás Zolnai (via logerrit)
logerrit at kemper.freedesktop.org
Sun Nov 24 13:31:32 UTC 2019
loleaflet/admin/admin.html | 1
loleaflet/src/control/Control.ContextMenu.js | 11 ++++++
loleaflet/src/unocommands.js | 43 +++++++++++++++++++++++++++
3 files changed, 53 insertions(+), 2 deletions(-)
New commits:
commit d00d996607a7bc7f2a733c9934cc6c6a08c39a4a
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Nov 22 16:17:20 2019 +0100
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Sun Nov 24 14:31:22 2019 +0100
Fix admin console.
PID became visible after this commit:
87b95bb546a9f3739cd688b5c068b00095f7737b
Change-Id: I55da1cbafaf4422576214d1b8ee1710605765e31
Reviewed-on: https://gerrit.libreoffice.org/83609
Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>
diff --git a/loleaflet/admin/admin.html b/loleaflet/admin/admin.html
index c310321a7..acd114098 100644
--- a/loleaflet/admin/admin.html
+++ b/loleaflet/admin/admin.html
@@ -90,7 +90,6 @@
<h4><script>document.write(l10nstrings.strServerUptime)</script></h4>
</div>
</div>
- </div>
<div class="container-fluid">
<ul class="nav nav-tabs">
<li class="active">
commit 02eb585f83eba007b849adb88433d688392104cc
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu Nov 21 15:53:05 2019 +0100
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Sun Nov 24 14:31:13 2019 +0100
Allow items for chart context menu
Change-Id: I5843aa884f6f0e2ad3f1e9817ebe24767c5777ff
Reviewed-on: https://gerrit.libreoffice.org/83608
Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>
diff --git a/loleaflet/src/control/Control.ContextMenu.js b/loleaflet/src/control/Control.ContextMenu.js
index 6a28637bc..caad6dcc4 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -28,7 +28,16 @@ L.Control.ContextMenu = L.Control.extend({
'WrapMenu', 'WrapOff', 'WrapOn', 'WrapIdeal', 'WrapLeft', 'WrapRight', 'WrapThrough',
'WrapThroughTransparent', 'WrapContour', 'WrapAnchorOnly',
'ArrangeFrameMenu', 'ArrangeMenu', 'BringToFront', 'ObjectForwardOne', 'ObjectBackOne', 'SendToBack',
- 'RotateMenu', 'RotateLeft', 'RotateRight', 'TransformDialog', 'FormatLine', 'FormatArea'],
+ 'RotateMenu', 'RotateLeft', 'RotateRight', 'TransformDialog', 'FormatLine', 'FormatArea',
+ 'FormatChartArea', 'InsertTitles', 'InsertRemoveAxes',
+ 'DeleteLegend', 'DiagramType', 'DataRanges', 'DiagramData', 'View3D',
+ 'FormatWall', 'FormatFloor', 'FormatLegend', 'FormatTitle', 'FormatDataSeries',
+ 'FormatAxis', 'FormatMajorGrid', 'FormatMinorGrid', 'FormatDataLabels',
+ 'FormatDataLabel', 'FormatDataPoint', 'FormatMeanValue', 'FormatXErrorBars', 'FormatYErrorBars',
+ 'FormatTrendline', 'FormatTrendlineEquation', 'FormatSelection', 'FormatStockLoss',
+ 'FormatStockGain', 'InsertDataLabel' , 'DeleteDataLabel', 'ResetDataPoint',
+ 'InsertTrendline', 'InsertMeanValue', 'InsertXErrorBars' , 'InsertYErrorBars', 'ResetAllDataPoints' , 'DeleteAxis',
+ 'InsertAxisTitle', 'InsertMinorGrid', 'InsertMajorGrid' , 'InsertAxis', 'DeleteMajorGrid' , 'DeleteMinorGrid'],
text: ['TableInsertMenu',
'InsertRowsBefore', 'InsertRowsAfter', 'InsertColumnsBefore', 'InsertColumnsAfter',
diff --git a/loleaflet/src/unocommands.js b/loleaflet/src/unocommands.js
index deb7e70b0..a4dccef43 100644
--- a/loleaflet/src/unocommands.js
+++ b/loleaflet/src/unocommands.js
@@ -50,6 +50,7 @@ var unoCommandsArray = {
DataFilterSpecialFilter:{spreadsheet:{menu:_('~Advanced Filter...'),},},
DataFilterStandardFilter:{spreadsheet:{menu:_('~Standard Filter...'),},},
DataMenu:{global:{menu:_('~Data'),},},
+ DataRanges:{global:{menu:_('~Data Ranges...'),},},
DataSort:{spreadsheet:{menu:_('~Sort...'),},},
DecrementIndent:{global:{context:_('Decrease Indent'),menu:_('Decrease Indent'),},},
DecrementLevel:{text:{menu:_('Demote One Level'),},},
@@ -59,14 +60,21 @@ var unoCommandsArray = {
DelBreakMenu:{spreadsheet:{menu:_('Delete Page ~Break'),},},
DeleteAllNotes:{global:{menu:_('Delete All Comments'),},spreadsheet:{menu:_('Delete All Comments'),},},
DeleteAuthor:{global:{menu:_('Delete All Comments by This Author'),},},
+ DeleteAxis:{global:{menu:_('Delete Axis'),},},
DeleteColumnbreak:{spreadsheet:{menu:_('Remove ~Column Break'),},},
DeleteColumns:{presentation:{menu:_('Delete Column'),},spreadsheet:{menu:_('Delete Columns'),},text:{menu:_('~Columns'),},},
DeleteComment:{global:{menu:_('Delete Comment'),},},
+ DeleteDataLabel:{global:{menu:_('Delete Single Data Label'),},},
+ DeleteLegend:{global:{menu:_('Delete Legend'),},},
+ DeleteMajorGrid:{global:{menu:_('Delete Major Grid'),},},
+ DeleteMinorGrid:{global:{menu:_('Delete Minor Grid'),},},
DeleteNote:{spreadsheet:{menu:_('Delete Comment'),},},
DeleteRowbreak:{spreadsheet:{menu:_('Remove ~Row Break'),},},
DeleteRows:{presentation:{menu:_('Delete Row'),},spreadsheet:{menu:_('Delete Rows'),},text:{menu:_('~Rows'),},},
DeleteSlide:{presentation:{menu:_('~Delete Slide'),},},
DeleteTable:{text:{menu:_('~Table'),},},
+ DiagramData:{global:{menu:_('~Data Table...'),},},
+ DiagramType:{global:{menu:_('Chart T~ype...'),},},
DownSearch:{global:{menu:_('Find Next'),},},
DuplicateSlide:{presentation:{menu:_('Duplicate ~Slide'),},},
EditHeaderAndFooter:{spreadsheet:{menu:_('~Headers and Footers...'),},},
@@ -80,14 +88,34 @@ var unoCommandsArray = {
FontColor:{global:{menu:_('Font Color'),},text:{menu:_('Font Color'),},},
FontDialog:{global:{menu:_('C~haracter...'),},},
FormatArea:{global:{menu:_('A~rea...'),},},
+ FormatAxis:{global:{menu:_('Format Axis...'),},},
FormatBulletsMenu:{global:{menu:_('Lis~ts'),},},
FormatCellDialog:{spreadsheet:{context:_('~Format Cells...'),menu:_('Ce~lls...'),},},
+ FormatChartArea:{global:{menu:_('Format Chart Area...'),},},
FormatColumns:{text:{menu:_('Co~lumns...'),},},
+ FormatDataLabel:{global:{menu:_('Format Single Data Label...'),},},
+ FormatDataLabels:{global:{menu:_('Format Data Labels...'),},},
+ FormatDataPoint:{global:{menu:_('Format Data Point...'),},},
+ FormatDataSeries:{global:{menu:_('Format Data Series...'),},},
+ FormatFloor:{global:{menu:_('Format Floor...'),},},
+ FormatLegend:{global:{menu:_('Format Legend...'),},},
FormatLine:{global:{menu:_('L~ine...'),},},
+ FormatMajorGrid:{global:{menu:_('Format Major Grid...'),},},
+ FormatMeanValue:{global:{menu:_('Format Mean Value Line...'),},},
FormatMenu:{global:{menu:_('F~ormat'),},},
+ FormatMinorGrid:{global:{menu:_('Format Minor Grid...'),},},
FormatPaintbrush:{global:{context:_('Clone Formatting (double click for multi-selection)'),menu:_('Clone'),},text:{context:_('Clone Formatting (double click and Ctrl or Cmd to alter behavior)'),menu:_('Clone'),},},
+ FormatSelection:{global:{menu:_('Format Selection...'),},},
FormatSpacingMenu:{global:{menu:_('~Spacing'),},},
+ FormatStockGain:{global:{menu:_('Format Stock Gain...'),},},
+ FormatStockLoss:{global:{menu:_('Format Stock Loss...'),},},
FormatTextMenu:{global:{menu:_('Te~xt'),},},
+ FormatTitle:{global:{menu:_('Format Title...'),},},
+ FormatTrendline:{global:{menu:_('Format Trend Line...'),},},
+ FormatTrendlineEquation:{global:{menu:_('Format Trend Line Equation...'),},},
+ FormatWall:{global:{menu:_('Format Wall...'),},},
+ FormatXErrorBars:{global:{menu:_('Format X Error Bars...'),},},
+ FormatYErrorBars:{global:{menu:_('Format Y Error Bars...'),},},
FormattingMarkMenu:{global:{menu:_('Formatting Mark'),},},
FullScreen:{global:{menu:_('F~ull Screen'),},},
FunctionDialog:{spreadsheet:{menu:_('~Function...'),},},
@@ -111,11 +139,14 @@ var unoCommandsArray = {
InsertAnnotation:{global:{context:_('Insert Comment'),menu:_('Comme~nt'),},presentation:{menu:_('Comme~nt'),},spreadsheet:{context:_('Insert Co~mment'),menu:_('Comm~ent'),},},
InsertAuthorField:{presentation:{menu:_('~Author'),},text:{menu:_('First ~Author'),},},
InsertAuthoritiesEntry:{text:{menu:_('~Bibliography Entry...'),},},
+ InsertAxis:{global:{menu:_('Insert Axis'),},},
+ InsertAxisTitle:{global:{menu:_('Insert Axis Title'),},},
InsertBreakMenu:{spreadsheet:{menu:_('Insert Page ~Break'),},},
InsertColumnBreak:{spreadsheet:{menu:_('~Column Break'),},text:{menu:_('Insert Column Break'),},},
InsertColumnsAfter:{presentation:{menu:_('Insert Column After'),},spreadsheet:{context:_('Insert Columns ~After'),menu:_('Columns ~After'),},text:{menu:_('Columns ~After'),},},
InsertColumnsBefore:{presentation:{menu:_('Insert Column Before'),},spreadsheet:{context:_('Insert Columns ~Before'),menu:_('Columns ~Before'),},text:{menu:_('Columns ~Before'),},},
InsertColumnsMenu:{spreadsheet:{menu:_('Insert Co~lumns'),},},
+ InsertDataLabel:{global:{menu:_('Insert Single Data Label'),},},
InsertDateField:{text:{menu:_('~Date'),},},
InsertEndnote:{text:{menu:_('~Endnote'),},},
InsertField:{text:{menu:_('~More Fields...'),},},
@@ -125,7 +156,10 @@ var unoCommandsArray = {
InsertHeaderFooterMenu:{text:{menu:_('He~ader and Footer'),},},
InsertIndexesEntry:{text:{menu:_('~Index Entry...'),},},
InsertLRM:{global:{menu:_('~Left-to-right mark'),},},
+ InsertMajorGrid:{global:{menu:_('Insert Major Grid'),},},
+ InsertMeanValue:{global:{menu:_('Insert Mean ~Value Line'),},},
InsertMenu:{global:{menu:_('~Insert'),},},
+ InsertMinorGrid:{global:{menu:_('Insert Minor Grid'),},},
InsertMultiIndex:{text:{menu:_('Table of Contents, ~Index or Bibliography...'),},},
InsertNeutralParagraph:{text:{menu:_('Insert Unnumbered Entry'),},},
InsertNonBreakingSpace:{global:{menu:_('~Non-breaking space'),},},
@@ -136,6 +170,7 @@ var unoCommandsArray = {
InsertPageNumberField:{global:{menu:_('~Page Numbers...'),},text:{menu:_('~Page Number'),},},
InsertPagebreak:{text:{menu:_('~Page Break'),},},
InsertRLM:{global:{menu:_('~Right-to-left mark'),},},
+ InsertRemoveAxes:{global:{menu:_('Insert/Delete Axes...'),},},
InsertRowBreak:{spreadsheet:{menu:_('~Row Break'),},},
InsertRowsAfter:{presentation:{menu:_('Insert Row Below'),},spreadsheet:{context:_('Insert Rows ~Below'),menu:_('Rows ~Below'),},text:{menu:_('Rows ~Below'),},},
InsertRowsBefore:{presentation:{menu:_('Insert Row Above'),},spreadsheet:{context:_('Insert Rows ~Above'),menu:_('Rows ~Above'),},text:{menu:_('Rows ~Above'),},},
@@ -146,9 +181,13 @@ var unoCommandsArray = {
InsertSymbol:{global:{context:_('Insert Special Character'),menu:_('S~pecial Character...'),},},
InsertTimeField:{global:{menu:_('Time Field'),},text:{menu:_('~Time'),},},
InsertTitleField:{text:{menu:_('T~itle'),},},
+ InsertTitles:{global:{menu:_('Insert Titles...'),},},
InsertTopicField:{text:{menu:_('~Subject'),},},
InsertZWNBSP:{global:{menu:_('No-width no ~break'),},},
InsertZWSP:{global:{menu:_('No-~width optional break'),},},
+ InsertTrendline:{global:{menu:_('Insert Tre~nd Line...'),},},
+ InsertXErrorBars:{global:{menu:_('Insert X Error ~Bars...'),},},
+ InsertYErrorBars:{global:{menu:_('Insert Y Error ~Bars...'),},},
Italic:{global:{menu:_('Italic'),},},
JumpDownThisLevel:{text:{menu:_('To Next Paragraph in Level'),},},
JumpUpThisLevel:{text:{menu:_('To Previous Paragraph in Level'),},},
@@ -157,6 +196,7 @@ var unoCommandsArray = {
LanguageStatus:{global:{menu:_('Language Status'),},},
LayoutStatus:{presentation:{menu:_('Layout'),},},
LeftPara:{global:{context:_('Align Left'),menu:_('Left'),},},
+ MasterSlidesPanel:{presentation:{menu:_('Master Slides'),},},
MergeCells:{presentation:{menu:_('Merge Cells'),},spreadsheet:{menu:_('Merge Cells'),},text:{menu:_('Merge Cells'),},},
ModifyPage:{presentation:{menu:_('Slide ~Layout'),},},
MoveDown:{text:{menu:_('Move Down'),},},
@@ -198,7 +238,9 @@ var unoCommandsArray = {
RemoveTableOf:{text:{menu:_('Delete index'),},},
RenameTable:{spreadsheet:{menu:_('~Rename Sheet...'),},},
ReplyComment:{global:{menu:_('Reply Comment'),},},
+ ResetAllDataPoints:{global:{menu:_('Reset all Data Points'),},},
ResetAttributes:{global:{menu:_('~Clear Direct Formatting'),},spreadsheet:{context:_('Clear Direct Formatting'),menu:_('Clear ~Direct Formatting'),},text:{context:_('Clear Direct Formatting'),menu:_('Clear ~Direct Formatting'),},},
+ ResetDataPoint:{global:{menu:_('Reset Data Point'),},},
RightPara:{global:{context:_('Align Right'),menu:_('Right'),},},
RotateLeft:{text:{menu:_('Rotate 90° ~Left'),},},
RotateMenu:{global:{menu:_('Rot~ate'),},},
@@ -272,6 +314,7 @@ var unoCommandsArray = {
UpSearch:{global:{menu:_('Find Previous'),},},
UpdateCurIndex:{text:{context:_('Update index'),menu:_('Current ~Index'),},},
Validation:{spreadsheet:{menu:_('~Validity...'),},},
+ View3D:{global:{menu:_('~3D View...'),},},
ViewMenu:{global:{menu:_('~View'),},},
Watermark:{text:{menu:_('Watermark...'),},},
WordCountDialog:{text:{menu:_('~Word Count...'),},},
More information about the Libreoffice-commits
mailing list