diff --git a/main/webapp/modules/core/MOD-INF/controller.js b/main/webapp/modules/core/MOD-INF/controller.js index 8afe0e164..a887cfc26 100644 --- a/main/webapp/modules/core/MOD-INF/controller.js +++ b/main/webapp/modules/core/MOD-INF/controller.js @@ -151,10 +151,10 @@ function init() { module, [ "externals/jquery-ui/css/ui-lightness/jquery-ui-1.8.custom.css", + "styles/jquery-ui-overrides.less", "styles/common.less", "styles/pure.css", - "styles/index.less", - "styles/jquery-ui-overrides.less" + "styles/index.less" ] ); @@ -225,10 +225,10 @@ function init() { "externals/suggest/css/suggest-1.2.min.css", "externals/jquery-ui/css/ui-lightness/jquery-ui-1.8.custom.css", "externals/imgareaselect/css/imgareaselect-default.css", - + + "styles/jquery-ui-overrides.less", "styles/common.less", "styles/pure.css", - "styles/jquery-ui-overrides.less", "styles/util/menu.less", "styles/util/dialog.less", @@ -273,9 +273,9 @@ function init() { [ "externals/suggest/css/suggest-1.2.min.css", "externals/jquery-ui/css/ui-lightness/jquery-ui-1.8.custom.css", - "styles/common.less", - "styles/pure.css", "styles/jquery-ui-overrides.less", + "styles/common.less", + "styles/pure.css" ] ); } diff --git a/main/webapp/modules/core/images/right-arrow.png b/main/webapp/modules/core/images/right-arrow.png index ae869631a..a3de8f5f2 100644 Binary files a/main/webapp/modules/core/images/right-arrow.png and b/main/webapp/modules/core/images/right-arrow.png differ diff --git a/main/webapp/modules/core/scripts/project/browsing-engine.js b/main/webapp/modules/core/scripts/project/browsing-engine.js index 5745b0a49..0c7b7f629 100644 --- a/main/webapp/modules/core/scripts/project/browsing-engine.js +++ b/main/webapp/modules/core/scripts/project/browsing-engine.js @@ -65,25 +65,19 @@ BrowsingEngine.prototype._initializeUI = function() { '
' + '

Using facets and filters

' + '

Use facets and filters to select subsets of your data to act on. Choose facet and filter methods from the menus at the top of each data column.

' + - '

Not sure how to get started?
Watch these screencasts!.

' + + '

Not sure how to get started?
Watch these screencasts!

' + '
' + '
' + - '
' + - ' refreshing facets ...' + - '
' + - '
' + - '' + - '' + - '' + - '' + - '' + - '
' + - 'Refresh' + - '' + - 'Reset All' + - '' + - 'Remove All' + - '
' + + '
' + + ' Refreshing facets...' + + '
' + + '
' + + '
' + + 'Refresh' + + '
' + + 'Reset All' + + 'Remove All' + + '
' + '
' + '' ); diff --git a/main/webapp/modules/core/scripts/views/data-table/add-column-by-fetching-urls-dialog.html b/main/webapp/modules/core/scripts/views/data-table/add-column-by-fetching-urls-dialog.html index db1587ad2..0c635b97b 100644 --- a/main/webapp/modules/core/scripts/views/data-table/add-column-by-fetching-urls-dialog.html +++ b/main/webapp/modules/core/scripts/views/data-table/add-column-by-fetching-urls-dialog.html @@ -1,25 +1,27 @@
-
-
-
- - - - - - - - - - - - - -
New column nameThrottle delay milliseconds
On error set to blank - store error

Formulate the URLs to fetch:

$EXPRESSION_PREVIEW_WIDGET$
-
- \ No newline at end of file diff --git a/main/webapp/modules/core/scripts/views/data-table/add-column-dialog.html b/main/webapp/modules/core/scripts/views/data-table/add-column-dialog.html index 10582d206..20bf8a489 100644 --- a/main/webapp/modules/core/scripts/views/data-table/add-column-dialog.html +++ b/main/webapp/modules/core/scripts/views/data-table/add-column-dialog.html @@ -1,20 +1,22 @@
-
-
-
- - - - - - - - - -
New column name
On error set to blank store error keep original
$EXPRESSION_PREVIEW_WIDGET$
-
- \ No newline at end of file diff --git a/main/webapp/modules/core/scripts/views/data-table/cell-recon-search-for-match.html b/main/webapp/modules/core/scripts/views/data-table/cell-recon-search-for-match.html index dd5060150..5dcce5ee1 100644 --- a/main/webapp/modules/core/scripts/views/data-table/cell-recon-search-for-match.html +++ b/main/webapp/modules/core/scripts/views/data-table/cell-recon-search-for-match.html @@ -1,16 +1,18 @@
-
Search for Match
-
-
- - - - - -
Search Freebase for topic to match
Match other cells with same content
-
- \ No newline at end of file diff --git a/main/webapp/modules/core/scripts/views/data-table/sorting-criterion-dialog.html b/main/webapp/modules/core/scripts/views/data-table/sorting-criterion-dialog.html index 8c3d4936d..78a1013ab 100644 --- a/main/webapp/modules/core/scripts/views/data-table/sorting-criterion-dialog.html +++ b/main/webapp/modules/core/scripts/views/data-table/sorting-criterion-dialog.html @@ -1,46 +1,48 @@
-
-
-
- - - - - - - - - -
Sort cell values asPosition blanks and errors
-
- - - - - - - - - - - - - - - - -
text case-sensitive
numbers
dates
booleans
-
-
    -

    Drag and drop to re-order

    -
    - - - -
    +
    +
    +
    +
    + + + + + + + + + +
    Sort cell values asPosition blanks and errors
    +
    + + + + + + + + + + + + + + + + +
    text case-sensitive
    numbers
    dates
    booleans
    +
    +
      +

      Drag and drop to re-order

      +
      + + + +
      +
      +
      - -
      \ No newline at end of file +
      \ No newline at end of file diff --git a/main/webapp/modules/core/scripts/views/data-table/split-column-dialog.html b/main/webapp/modules/core/scripts/views/data-table/split-column-dialog.html index 6591849f3..b10d82f73 100644 --- a/main/webapp/modules/core/scripts/views/data-table/split-column-dialog.html +++ b/main/webapp/modules/core/scripts/views/data-table/split-column-dialog.html @@ -1,55 +1,57 @@
      -
      -
      -
      - - -
      -
      - - - - - - - - - - - - - - - - - - - - - - - - - -

      How to Split Column

      by separator
      Separator regular expression
      Split into columns at most (leave blank for no limit)
      by field lengths
      List of integers separated by commas, e.g., 5, 7, 15
      -
      -
      - - - - - - - - - - - -

      After Splitting

      Guess cell type
      Remove this column
      -
      -
      - \ No newline at end of file diff --git a/main/webapp/modules/core/scripts/views/data-table/text-transform-dialog.html b/main/webapp/modules/core/scripts/views/data-table/text-transform-dialog.html index 313299d40..32b150090 100644 --- a/main/webapp/modules/core/scripts/views/data-table/text-transform-dialog.html +++ b/main/webapp/modules/core/scripts/views/data-table/text-transform-dialog.html @@ -1,15 +1,17 @@
      -
      -
      -
      - - - - - - - -
      $EXPRESSION_PREVIEW_WIDGET$
      On error set to blank
      store error
      keep original
      Re-transform until no change
      up to times
      +
      +
      +
      +
      + + + + + + + +
      $EXPRESSION_PREVIEW_WIDGET$
      On error set to blank
      store error
      keep original
      Re-transform until no change
      up to times
      +