From 424501ba0e8d5fc805ac1ee43eeebb97a6cd83b2 Mon Sep 17 00:00:00 2001 From: James Home Date: Sat, 23 Oct 2010 01:21:13 +0000 Subject: [PATCH] UI tweaks to menu text git-svn-id: http://google-refine.googlecode.com/svn/trunk@1624 7d457c2a-affb-35e4-300a-418c747d4874 --- .../freebase/module/scripts/extension.js | 12 +++--- .../modules/core/scripts/project/exporters.js | 12 +++--- .../views/data-table/column-header-ui.js | 18 ++++----- .../views/data-table/data-table-view.js | 28 +++++++------- .../views/data-table/menu-edit-cells.js | 38 +++++++++---------- .../views/data-table/menu-edit-column.js | 18 ++++----- 6 files changed, 63 insertions(+), 63 deletions(-) diff --git a/extensions/freebase/module/scripts/extension.js b/extensions/freebase/module/scripts/extension.js index ac78bee6e..b7336406c 100644 --- a/extensions/freebase/module/scripts/extension.js +++ b/extensions/freebase/module/scripts/extension.js @@ -87,28 +87,28 @@ ExtensionBar.addExtensionMenu({ "submenu" : [ { "id" : "freebase/schema-alignment", - label: "Edit Schema Aligment Skeleton ...", + label: "Edit schema aligment skeleton...", click: function() { FreebaseExtension.handlers.editSchemaAlignment(false); } }, { "id" : "freebase/reset-schema-alignment", - label: "Reset Schema Alignment Skeleton ...", + label: "Reset schema alignment skeleton...", click: function() { FreebaseExtension.handlers.editSchemaAlignment(true); } }, {}, { "id" : "freebase/load-info-freebase", - label: "Load into Freebase ...", + label: "Load into Freebase...", click: function() { FreebaseExtension.handlers.loadIntoFreebase(); } }, { "id" : "freebase/browse-load", - label: "Browse to Data Load ...", + label: "Browse data load details...", click: function() { FreebaseExtension.handlers.browseToDataLoad(); } }, { "id" : "freebase/import-qa-data", - label: "Import QA Data", + label: "Import QA data", click: function() { FreebaseExtension.handlers.importQAData(); } } ] @@ -144,7 +144,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) { [ "core/edit-column", "core/add-column-by-fetching-urls" ], { id: "freebase/add-columns-from-freebase", - label: "Add Columns From Freebase ...", + label: "Add columns from Freebase ...", click: doAddColumnFromFreebase } ); diff --git a/main/webapp/modules/core/scripts/project/exporters.js b/main/webapp/modules/core/scripts/project/exporters.js index aaefc83e4..3c03b11ff 100644 --- a/main/webapp/modules/core/scripts/project/exporters.js +++ b/main/webapp/modules/core/scripts/project/exporters.js @@ -41,23 +41,23 @@ ExporterManager.handlers = {}; ExporterManager.MenuItems = [ { "id" : "core/export-project", - "label": "Export Project", + "label": "Export project", "click": function() { ExporterManager.handlers.exportProject(); } }, {}, { "id" : "core/export-tsv", - "label": "Tab-Separated Value", + "label": "Tab-separated value", "click": function() { ExporterManager.handlers.exportRows("tsv", "tsv"); } }, { "id" : "core/export-csv", - "label": "Comma-Separated Value", + "label": "Comma-separated value", "click": function() { ExporterManager.handlers.exportRows("csv", "csv"); } }, { "id" : "core/export-html-table", - "label": "HTML Table", + "label": "HTML table", "click": function() { ExporterManager.handlers.exportRows("html", "html"); } }, { @@ -68,7 +68,7 @@ ExporterManager.MenuItems = [ {}, { "id" : "core/export-tripleloader", - "label": "Tripleloader", + "label": "Triple loader", "click": function() { ExporterManager.handlers.exportTripleloader("tripleloader"); } }, { @@ -101,7 +101,7 @@ ExporterManager.handlers.exportTripleloader = function(format) { if (!theProject.overlayModels.freebaseProtograph) { alert( "You haven't done any schema alignment yet,\nso there is no triple to export.\n\n" + - "Use the Schemas > Edit Schema Alignment Skeleton...\ncommand to align your data with Freebase schemas first." + "Use the Freebase > Edit Schema Alignment Skeleton...\ncommand to align your data with Freebase schemas first." ); } else { ExporterManager.handlers.exportRows(format, "txt"); diff --git a/main/webapp/modules/core/scripts/views/data-table/column-header-ui.js b/main/webapp/modules/core/scripts/views/data-table/column-header-ui.js index e5f89f618..1317e3d8b 100644 --- a/main/webapp/modules/core/scripts/views/data-table/column-header-ui.js +++ b/main/webapp/modules/core/scripts/views/data-table/column-header-ui.js @@ -108,13 +108,13 @@ DataTableColumnHeaderUI.prototype._createMenuForColumnHeader = function(elmt) { {}, { id: "core/edit-cells", - label: "Edit Cells", + label: "Edit cells", width: "170px", submenu: [] }, { id: "core/edit-column", - label: "Edit Column", + label: "Edit column", submenu: [] }, { @@ -127,7 +127,7 @@ DataTableColumnHeaderUI.prototype._createMenuForColumnHeader = function(elmt) { this._dataTableView._getSortingCriterionForColumn(this._column.name) == null ? { id: "core/sort", - "label": "Sort ...", + "label": "Sort...", "click": function() { self._showSortingCriterion(null, self._dataTableView._getSortingCriteriaCount() > 0) } @@ -144,14 +144,14 @@ DataTableColumnHeaderUI.prototype._createMenuForColumnHeader = function(elmt) { tooltip: "Collapse/expand columns to make viewing the data more convenient", submenu: [ { - label: "Collapse This Column", + label: "Collapse this column", click: function() { self._dataTableView._collapsedColumnNames[self._column.name] = true; self._dataTableView.render(); } }, { - label: "Collapse All Other Columns", + label: "Collapse all other columns", click: function() { var collapsedColumnNames = {}; for (var i = 0; i < theProject.columnModel.columns.length; i++) { @@ -164,7 +164,7 @@ DataTableColumnHeaderUI.prototype._createMenuForColumnHeader = function(elmt) { } }, { - label: "Collapse All Columns To Left", + label: "Collapse all columns to left", click: function() { for (var i = 0; i < self._columnIndex; i++) { self._dataTableView._collapsedColumnNames[theProject.columnModel.columns[i].name] = true; @@ -173,7 +173,7 @@ DataTableColumnHeaderUI.prototype._createMenuForColumnHeader = function(elmt) { } }, { - label: "Collapse All Columns To Right", + label: "Collapse all columns to right", click: function() { for (var i = self._columnIndex + 1; i < theProject.columnModel.columns.length; i++) { self._dataTableView._collapsedColumnNames[theProject.columnModel.columns[i].name] = true; @@ -208,7 +208,7 @@ DataTableColumnHeaderUI.prototype.createSortingMenu = function() { var items = [ { - "label": "Sort ...", + "label": "Sort...", "click": function() { self._showSortingCriterion(criterion, hasOtherCriteria) } @@ -224,7 +224,7 @@ DataTableColumnHeaderUI.prototype.createSortingMenu = function() { } }); items.push({ - "label": "Un-sort", + "label": "Remove sort", "click": function() { self._dataTableView._removeSortingCriterionOfColumn(criterion.column); } diff --git a/main/webapp/modules/core/scripts/views/data-table/data-table-view.js b/main/webapp/modules/core/scripts/views/data-table/data-table-view.js index 1e187f4b2..396731f2d 100644 --- a/main/webapp/modules/core/scripts/views/data-table/data-table-view.js +++ b/main/webapp/modules/core/scripts/views/data-table/data-table-view.js @@ -487,7 +487,7 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) { width: "200px", submenu: [ { - label: "Facet by Star", + label: "Facet by star", id: "core/facet-by-star", click: function() { ui.browsingEngine.addFacet( @@ -504,7 +504,7 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) { } }, { - label: "Facet by Flag", + label: "Facet by flag", id: "core/facet-by-flag", click: function() { ui.browsingEngine.addFacet( @@ -523,19 +523,19 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) { ] }, {}, - { label: "Edit Rows", + { label: "Edit rows", id: "core/edit-rows", width: "200px", submenu: [ { - label: "Star Rows", + label: "Star rows", id: "core/star-rows", click: function() { Refine.postCoreProcess("annotate-rows", { "starred" : "true" }, null, { rowMetadataChanged: true }); } }, { - label: "Unstar Rows", + label: "Unstar rows", id: "core/unstar-rows", click: function() { Refine.postCoreProcess("annotate-rows", { "starred" : "false" }, null, { rowMetadataChanged: true }); @@ -543,14 +543,14 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) { }, {}, { - label: "Flag Rows", + label: "Flag rows", id: "core/flag-rows", click: function() { Refine.postCoreProcess("annotate-rows", { "flagged" : "true" }, null, { rowMetadataChanged: true }); } }, { - label: "Unflag Rows", + label: "Unflag rows", id: "core/unflag-rows", click: function() { Refine.postCoreProcess("annotate-rows", { "flagged" : "false" }, null, { rowMetadataChanged: true }); @@ -558,7 +558,7 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) { }, {}, { - label: "Remove All Matching Rows", + label: "Remove all matching rows", id: "core/remove-rows", click: function() { Refine.postCoreProcess("remove-rows", {}, null, { rowMetadataChanged: true }); @@ -566,12 +566,12 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) { } ] }, - { label: "Edit Columns", + { label: "Edit columns", id: "core/edit-columns", width: "200px", submenu: [ { - label: "Re-order Columns ...", + label: "Reorder columns...", id: "core/reorder-columns", click: function() { new ColumnReorderingDialog(); @@ -585,7 +585,7 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) { width: "200px", submenu: [ { - label: "Collapse All Columns", + label: "Collapse all columns", id: "core/collapse-all-columns", click: function() { for (var i = 0; i < theProject.columnModel.columns.length; i++) { @@ -595,7 +595,7 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) { } }, { - label: "Expand All Columns", + label: "Expand all columns", id: "core/expand-all-columns", click: function() { self._collapsedColumnNames = []; @@ -617,14 +617,14 @@ DataTableView.prototype._createSortingMenu = function(elmt) { var self = this; var items = [ { - "label" : "Un-sort", + "label" : "Remove sort", "click" : function() { self._sorting.criteria = []; self.update(); } }, { - "label" : "Reorder Rows Permanently", + "label" : "Reorder rows permanently", "click" : function() { Refine.postCoreProcess( "reorder-rows", diff --git a/main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js b/main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js index fc5d4f5c2..ba0a00ea0 100644 --- a/main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js +++ b/main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js @@ -144,65 +144,65 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) { MenuSystem.appendTo(menu, [ "core/edit-cells" ], [ { id: "core/text-transform", - label: "Transform ...", + label: "Transform...", click: function() { doTextTransformPrompt(); } }, { id: "core/common-transforms", - label: "Common Transforms", + label: "Common transforms", submenu: [ { id: "core/trim-whitespace", - label: "Trim Leading and Trailing Whitespace", + label: "Trim leading and trailing whitespace", click: function() { doTextTransform("value.trim()", "store-blank", false, ""); } }, { id: "core/collapse-whitespace", - label: "Collapse Consecutive Whitespace", + label: "Collapse consecutive whitespace", click: function() { doTextTransform("value.replace(/\\s+/,' ')", "store-blank", false, ""); } }, {}, { id: "core/unescape-html-entities", - label: "Unescape HTML Entities", + label: "Unescape HTML entities", click: function() { doTextTransform("value.unescape('html')", "store-blank", true, 10); } }, {}, { id: "core/to-titlecase", - label: "To Titlecase", + label: "To titlecase", click: function() { doTextTransform("value.toTitlecase()", "store-blank", false, ""); } }, { id: "core/to-uppercase", - label: "To Uppercase", + label: "To uppercase", click: function() { doTextTransform("value.toUppercase()", "store-blank", false, ""); } }, { id: "core/to-lowercase", - label: "To Lowercase", + label: "To lowercase", click: function() { doTextTransform("value.toLowercase()", "store-blank", false, ""); } }, {}, { id: "core/to-number", - label: "To Number", + label: "To number", click: function() { doTextTransform("value.toNumber()", "store-blank", false, ""); } }, { id: "core/to-date", - label: "To Date", + label: "To date", click: function() { doTextTransform("value.toDate()", "store-blank", false, ""); } }, { id: "core/to-text", - label: "To Text", + label: "To text", click: function() { doTextTransform("value.toString()", "store-blank", false, ""); } }, {}, { id: "core/to-blank", - label: "Blank Out Cells", + label: "Blank out cells", click: function() { doTextTransform("null", "store-blank", false, ""); } } ] @@ -210,29 +210,29 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) { {}, { id: "core/fill-down", - label: "Fill Down", + label: "Fill down", click: doFillDown }, { id: "core/blank-down", - label: "Blank Down", + label: "Blank down", click: doBlankDown }, {}, { id: "core/split-multi-valued-cells", - label: "Split Multi-Valued Cells ...", + label: "Split multi-valued cells...", click: doSplitMultiValueCells }, { id: "core/join-multi-valued-cells", - label: "Join Multi-Valued Cells ...", + label: "Join multi-valued cells...", click: doJoinMultiValueCells }, {}, { id: "core/cluster", - label: "Cluster & Edit ...", + label: "Cluster and edit...", click: function() { new ClusteringDialog(column.name, "value"); } } ]); @@ -334,12 +334,12 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) { MenuSystem.appendTo(menu, [ "core/transpose" ], [ { id: "core/transpose-columns-into-rows", - label: "Cells Across Columns into Rows ...", + label: "Cells across columns into rows...", click: doTransposeColumnsIntoRows }, { id: "core/transpose-rows-into-columns", - label: "Cells in Rows into Columns ...", + label: "Cells in rows into columns...", click: doTransposeRowsIntoColumns } ]); diff --git a/main/webapp/modules/core/scripts/views/data-table/menu-edit-column.js b/main/webapp/modules/core/scripts/views/data-table/menu-edit-column.js index a13407cbc..eebaccd0b 100644 --- a/main/webapp/modules/core/scripts/views/data-table/menu-edit-column.js +++ b/main/webapp/modules/core/scripts/views/data-table/menu-edit-column.js @@ -238,50 +238,50 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) { MenuSystem.appendTo(menu, [ "core/edit-column" ], [ { id: "core/split-column", - label: "Split into Several Columns ...", + label: "Split into several columns...", click: doSplitColumn }, {}, { id: "core/add-column", - label: "Add Column Based on This Column ...", + label: "Add column based on this column...", click: doAddColumn }, { id: "core/add-column-by-fetching-urls", - label: "Add Column By Fetching URLs ...", + label: "Add column by fetching URLs...", click: doAddColumnByFetchingURLs }, {}, { id: "core/rename-column", - label: "Rename This Column", + label: "Rename this column", click: doRenameColumn }, { id: "core/remove-column", - label: "Remove This Column", + label: "Remove this column", click: doRemoveColumn }, {}, { id: "core/move-column-to-beginning", - label: "Move Column to Beginning", + label: "Move column to beginning", click: function() { doMoveColumnTo(0); } }, { id: "core/move-column-to-end", - label: "Move Column to End", + label: "Move column to end", click: function() { doMoveColumnTo(theProject.columnModel.columns.length - 1); } }, { id: "core/move-column-to-left", - label: "Move Column Left", + label: "Move column left", click: function() { doMoveColumnBy(-1); } }, { id: "core/move-column-to-right", - label: "Move Column Right", + label: "Move column right", click: function() { doMoveColumnBy(1); } } ]);