s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dialog styles, first round of improvements to facets, data table, menus

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/trunk@1552 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
James Home 2010-10-15 02:23:22 +00:00
parent 9e35ea3775
commit fdc6fee052
17 changed files with 343 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/webapp/modules/core/MOD-INF/controller.js
View File

@ -151,10 +151,10 @@ function init() {
module, module,
[ [
"externals/jquery-ui/css/ui-lightness/jquery-ui-1.8.custom.css", "externals/jquery-ui/css/ui-lightness/jquery-ui-1.8.custom.css",
"styles/jquery-ui-overrides.less",
"styles/common.less", "styles/common.less",
"styles/pure.css", "styles/pure.css",
"styles/index.less", "styles/index.less"
"styles/jquery-ui-overrides.less"
] ]
); );
@ -225,10 +225,10 @@ function init() {
"externals/suggest/css/suggest-1.2.min.css", "externals/suggest/css/suggest-1.2.min.css",
"externals/jquery-ui/css/ui-lightness/jquery-ui-1.8.custom.css", "externals/jquery-ui/css/ui-lightness/jquery-ui-1.8.custom.css",
"externals/imgareaselect/css/imgareaselect-default.css", "externals/imgareaselect/css/imgareaselect-default.css",
"styles/jquery-ui-overrides.less",
"styles/common.less", "styles/common.less",
"styles/pure.css", "styles/pure.css",
"styles/jquery-ui-overrides.less",
"styles/util/menu.less", "styles/util/menu.less",
"styles/util/dialog.less", "styles/util/dialog.less",
@ -273,9 +273,9 @@ function init() {
[ [
"externals/suggest/css/suggest-1.2.min.css", "externals/suggest/css/suggest-1.2.min.css",
"externals/jquery-ui/css/ui-lightness/jquery-ui-1.8.custom.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/jquery-ui-overrides.less",
"styles/common.less",
"styles/pure.css"
] ]
); );
} }

BIN
main/webapp/modules/core/images/right-arrow.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 974 B

28
main/webapp/modules/core/scripts/project/browsing-engine.js
View File

@ -65,25 +65,19 @@ BrowsingEngine.prototype._initializeUI = function() {
'<div class="browsing-panel-help" bind="help">' + '<div class="browsing-panel-help" bind="help">' +
'<h1>Using facets and filters</h1>' + '<h1>Using facets and filters</h1>' +
'<p>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.</p>' + '<p>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.</p>' +
'<p>Not sure how to get started?<br /><a href="http://vimeo.com/groups/gridworks/videos" target="_blank"><b>Watch these screencasts!</b></a>.</p>' + '<p>Not sure how to get started?<br /><a href="http://vimeo.com/groups/gridworks/videos" target="_blank"><b>Watch these screencasts!</b></a></p>' +
'</div>' + '</div>' +
'<div class="browsing-panel-header" bind="header">' + '<div class="browsing-panel-header" bind="header">' +
'<div class="browsing-panel-indicator" bind="indicator">' + '<div class="browsing-panel-indicator" bind="indicator">' +
'<img src="images/small-spinner.gif" /> refreshing facets ...' + '<img src="images/small-spinner.gif" /> Refreshing facets...' +
'</div>' + '</div>' +
'<div class="browsing-panel-controls" bind="controls"><div class="grid-layout layout-tightest layout-full"><table>' + '<div class="browsing-panel-controls" bind="controls">' +
'<tr>' + '<div class="browsing-panel-controls-refresh">' +
'<td>' + '<a href="javascript:{}" bind="refreshLink" class="button" title="Update all facets">Refresh</a>' +
'<a href="javascript:{}" bind="refreshLink" class="action" title="Make sure all facets are up-to-date">Refresh</a>' + '</div>' +
'</td>' + '<a href="javascript:{}" bind="resetLink" class="button button-pill-left" title="Clear selection in all facets">Reset All</a>' +
'<td width="1%">' + '<a href="javascript:{}" bind="removeLink" class="button button-pill-right" title="Remove all facets">Remove All</a>' +
'<a href="javascript:{}" bind="resetLink" class="action" title="Clear selection in all facets">Reset&nbsp;All</a>' + '</div>' +
'</td>' +
'<td width="1%">' +
'<a href="javascript:{}" bind="removeLink" class="action" title="Remove all facets">Remove&nbsp;All</a>' +
'</td>' +
'</tr>' +
'</table></div></div>' +
'</div>' + '</div>' +
'<ul bind="facets" class="facets-container"></ul>' '<ul bind="facets" class="facets-container"></ul>'
); );

46
main/webapp/modules/core/scripts/views/data-table/add-column-by-fetching-urls-dialog.html
View File

@ -1,25 +1,27 @@
<div class="dialog-frame" style="width: 700px;"> <div class="dialog-frame" style="width: 700px;">
<div class="dialog-header" bind="dialogHeader"></div> <div class="dialog-border">
<div class="dialog-body" bind="dialogBody"> <div class="dialog-header" bind="dialogHeader"></div>
<div class="grid-layout layout-normal layout-full"><table cols="2"> <div class="dialog-body" bind="dialogBody">
<tr> <div class="grid-layout layout-normal layout-full"><table cols="2">
<td width="1%" style="white-space: pre;">New column name</td> <tr>
<td><input bind="columnNameInput" size="40" /></td> <td width="1%" style="white-space: pre;">New column name</td>
<td><input bind="columnNameInput" size="40" /></td>
<td width="1%" style="white-space: pre;">Throttle delay</td>
<td><input bind="throttleDelayInput" size="10" value="5000" /> milliseconds</td> <td width="1%" style="white-space: pre;">Throttle delay</td>
</tr> <td><input bind="throttleDelayInput" size="10" value="5000" /> milliseconds</td>
<tr> </tr>
<td width="1%" style="white-space: pre;">On error</td> <tr>
<td colspan="3"><input type="radio" name="dialog-onerror-choice" value="set-to-blank" checked /> set to blank <td width="1%" style="white-space: pre;">On error</td>
<input type="radio" name="dialog-onerror-choice" value="store-error" /> store error</td> <td colspan="3"><input type="radio" name="dialog-onerror-choice" value="set-to-blank" checked /> set to blank
</tr> <input type="radio" name="dialog-onerror-choice" value="store-error" /> store error</td>
<tr><td colspan="4"><h3>Formulate the URLs to fetch:</h3></td></tr> </tr>
<tr><td colspan="4">$EXPRESSION_PREVIEW_WIDGET$</td></tr> <tr><td colspan="4"><h3>Formulate the URLs to fetch:</h3></td></tr>
</table></div> <tr><td colspan="4">$EXPRESSION_PREVIEW_WIDGET$</td></tr>
</div> </table></div>
<div class="dialog-footer" bind="dialogFooter"> </div>
<button bind="okButton">&nbsp;&nbsp;OK&nbsp;&nbsp;</button> <div class="dialog-footer" bind="dialogFooter">
<button bind="cancelButton">Cancel</button> <button bind="okButton">&nbsp;&nbsp;OK&nbsp;&nbsp;</button>
<button bind="cancelButton">Cancel</button>
</div>
</div> </div>
</div> </div>

36
main/webapp/modules/core/scripts/views/data-table/add-column-dialog.html
View File

@ -1,20 +1,22 @@
<div class="dialog-frame" style="width: 700px;"> <div class="dialog-frame" style="width: 700px;">
<div class="dialog-header" bind="dialogHeader"></div> <div class="dialog-border">
<div class="dialog-body" bind="dialogBody"> <div class="dialog-header" bind="dialogHeader"></div>
<div class="grid-layout layout-normal layout-full"><table cols="2"> <div class="dialog-body" bind="dialogBody">
<tr> <div class="grid-layout layout-normal layout-full"><table cols="2">
<td width="1%" style="white-space: pre;">New column name</td> <tr>
<td><input bind="columnNameInput" size="40" /></td> <td width="1%" style="white-space: pre;">New column name</td>
</tr> <td><input bind="columnNameInput" size="40" /></td>
<tr> </tr>
<td width="1%" style="white-space: pre;">On error</td> <tr>
<td><input type="radio" name="create-column-dialog-onerror-choice" value="set-to-blank" checked /> set to blank <input type="radio" name="create-column-dialog-onerror-choice" value="store-error" /> store error <input type="radio" name="create-column-dialog-onerror-choice" value="keep-original" /> keep original</td> <td width="1%" style="white-space: pre;">On error</td>
</tr> <td><input type="radio" name="create-column-dialog-onerror-choice" value="set-to-blank" checked /> set to blank <input type="radio" name="create-column-dialog-onerror-choice" value="store-error" /> store error <input type="radio" name="create-column-dialog-onerror-choice" value="keep-original" /> keep original</td>
<tr><td colspan="2">$EXPRESSION_PREVIEW_WIDGET$</td></tr> </tr>
</table></div> <tr><td colspan="2">$EXPRESSION_PREVIEW_WIDGET$</td></tr>
</div> </table></div>
<div class="dialog-footer" bind="dialogFooter"> </div>
<button bind="okButton">&nbsp;&nbsp;OK&nbsp;&nbsp;</button> <div class="dialog-footer" bind="dialogFooter">
<button bind="cancelButton">Cancel</button> <button bind="okButton">&nbsp;&nbsp;OK&nbsp;&nbsp;</button>
<button bind="cancelButton">Cancel</button>
</div>
</div> </div>
</div> </div>

28
main/webapp/modules/core/scripts/views/data-table/cell-recon-search-for-match.html
View File

@ -1,16 +1,18 @@
<div class="dialog-frame" style="width: 400px;"> <div class="dialog-frame" style="width: 400px;">
<div class="dialog-header" bind="dialogHeader">Search for Match</div> <div class="dialog-border">
<div class="dialog-body" bind="dialogBody"> <div class="dialog-header" bind="dialogHeader">Search for Match</div>
<div class="grid-layout layout-normal layout-full"><table> <div class="dialog-body" bind="dialogBody">
<tr><td colspan="2">Search Freebase for topic to match <span bind="cellTextSpan"></span></td></tr> <div class="grid-layout layout-normal layout-full"><table>
<tr> <tr><td colspan="2">Search Freebase for topic to match <span bind="cellTextSpan"></span></td></tr>
<td><input bind="input" /></td> <tr>
<td><input type="checkbox" checked="true" bind="checkSimilar" /> Match other cells with same content</td> <td><input bind="input" /></td>
</tr> <td><input type="checkbox" checked="true" bind="checkSimilar" /> Match other cells with same content</td>
</table></div> </tr>
</div> </table></div>
<div class="dialog-footer" bind="dialogFooter"> </div>
<button bind="okButton">Match</button> <div class="dialog-footer" bind="dialogFooter">
<button bind="cancelButton">Cancel</button> <button bind="okButton">Match</button>
<button bind="cancelButton">Cancel</button>
</div>
</div> </div>
</div> </div>

90
main/webapp/modules/core/scripts/views/data-table/sorting-criterion-dialog.html
View File

@ -1,46 +1,48 @@
<div class="dialog-frame" style="width: 400px;"> <div class="dialog-frame" style="width: 400px;">
<div class="dialog-header" bind="dialogHeader"></div> <div class="dialog-border">
<div class="dialog-body" bind="dialogBody"> <div class="dialog-header" bind="dialogHeader"></div>
<div class="grid-layout layout-normal layout-full "><table> <div class="dialog-body" bind="dialogBody">
<tr> <div class="grid-layout layout-normal layout-full "><table>
<td>Sort cell values as</td> <tr>
<td>Position blanks and errors</td> <td>Sort cell values as</td>
</tr> <td>Position blanks and errors</td>
<tr> </tr>
<td> <tr>
<div class="grid-layout layout-tightest grid-layout-for-text" bind="valueTypeOptions"><table> <td>
<tr> <div class="grid-layout layout-tightest grid-layout-for-text" bind="valueTypeOptions"><table>
<td width="1"><input type="radio" name="sorting-dialog-value-type" value="string" /></td> <tr>
<td>text <input type="checkbox" class="inline" bind="caseSensitiveCheckbox" /> case-sensitive</td> <td width="1"><input type="radio" name="sorting-dialog-value-type" value="string" /></td>
</tr> <td>text <input type="checkbox" class="inline" bind="caseSensitiveCheckbox" /> case-sensitive</td>
<tr> </tr>
<td width="1"><input type="radio" name="sorting-dialog-value-type" value="number" /></td> <tr>
<td>numbers</td> <td width="1"><input type="radio" name="sorting-dialog-value-type" value="number" /></td>
</tr> <td>numbers</td>
<tr> </tr>
<td width="1"><input type="radio" name="sorting-dialog-value-type" value="date" /></td> <tr>
<td>dates</td> <td width="1"><input type="radio" name="sorting-dialog-value-type" value="date" /></td>
</tr> <td>dates</td>
<tr> </tr>
<td width="1"><input type="radio" name="sorting-dialog-value-type" value="boolean" /></td> <tr>
<td>booleans</td> <td width="1"><input type="radio" name="sorting-dialog-value-type" value="boolean" /></td>
</tr> <td>booleans</td>
</table></div> </tr>
</td> </table></div>
<td> </td>
<ul class="sorting-dialog-blank-error-positions" bind="blankErrorPositions"></ul> <td>
<p>Drag and drop to re-order</p> <ul class="sorting-dialog-blank-error-positions" bind="blankErrorPositions"></ul>
</td> <p>Drag and drop to re-order</p>
</tr> </td>
<tr><td colspan="2" bind="directionOptions"> </tr>
<input type="radio" class="inline" name="sorting-dialog-direction" value="forward" /><label bind="directionForwardLabel">forward</label> <tr><td colspan="2" bind="directionOptions">
<input type="radio" class="inline" name="sorting-dialog-direction" value="reverse" /><label bind="directionReverseLabel">reverse</label> <input type="radio" class="inline" name="sorting-dialog-direction" value="forward" /><label bind="directionForwardLabel">forward</label>
<span bind="sortAloneContainer" style="display:none;"><input type="checkbox" class="inline" /><label>sort by this column alone</label></span> <input type="radio" class="inline" name="sorting-dialog-direction" value="reverse" /><label bind="directionReverseLabel">reverse</label>
</td></tr> <span bind="sortAloneContainer" style="display:none;"><input type="checkbox" class="inline" /><label>sort by this column alone</label></span>
</table></div> </td></tr>
</table></div>
</div>
<div class="dialog-footer" bind="dialogFooter">
<button bind="okButton">&nbsp;&nbsp;OK&nbsp;&nbsp;</button>
<button bind="cancelButton">Cancel</button>
</div>
</div> </div>
<div class="dialog-footer" bind="dialogFooter"> </div>
<button bind="okButton">&nbsp;&nbsp;OK&nbsp;&nbsp;</button>
<button bind="cancelButton">Cancel</button>
</div>
</div>

106
main/webapp/modules/core/scripts/views/data-table/split-column-dialog.html
View File

@ -1,55 +1,57 @@
<div class="dialog-frame" style="width: 600px;"> <div class="dialog-frame" style="width: 600px;">
<div class="dialog-header" bind="dialogHeader"></div> <div class="dialog-border">
<div class="dialog-body" bind="dialogBody"> <div class="dialog-header" bind="dialogHeader"></div>
<div class="grid-layout layout-looser layout-full"><table><tr> <div class="dialog-body" bind="dialogBody">
<td> <div class="grid-layout layout-looser layout-full"><table><tr>
<div class="grid-layout layout-tighter"><table> <td>
<tr> <div class="grid-layout layout-tighter"><table>
<td colspan="3"><h3>How to Split Column</h3></td> <tr>
</tr> <td colspan="3"><h3>How to Split Column</h3></td>
<tr> </tr>
<td width="1%"><input type="radio" checked="true" name="split-by-mode" value="separator" /></td> <tr>
<td colspan="2">by separator</td> <td width="1%"><input type="radio" checked="true" name="split-by-mode" value="separator" /></td>
</tr> <td colspan="2">by separator</td>
<tr><td></td> </tr>
<td>Separator</td> <tr><td></td>
<td style="white-space: pre;"><input size="15" value="," bind="separatorInput" /> <input type="checkbox" bind="regexInput" /> regular expression</td> <td>Separator</td>
</tr> <td style="white-space: pre;"><input size="15" value="," bind="separatorInput" /> <input type="checkbox" bind="regexInput" /> regular expression</td>
<tr><td></td> </tr>
<td>Split into</td> <tr><td></td>
<td style="white-space: pre;"><input size="3" bind="maxColumnsInput" /> columns at most (leave blank for no limit)</td> <td>Split into</td>
</tr> <td style="white-space: pre;"><input size="3" bind="maxColumnsInput" /> columns at most (leave blank for no limit)</td>
<tr> </tr>
<td width="1%"><input type="radio" name="split-by-mode" value="lengths" /></td> <tr>
<td colspan="2">by field lengths</td> <td width="1%"><input type="radio" name="split-by-mode" value="lengths" /></td>
</tr> <td colspan="2">by field lengths</td>
<tr><td></td> </tr>
<td colspan="2"><textarea style="width: 100%;" bind="lengthsTextarea"></textarea></td> <tr><td></td>
</tr> <td colspan="2"><textarea style="width: 100%;" bind="lengthsTextarea"></textarea></td>
<tr><td></td> </tr>
<td colspan="2">List of integers separated by commas, e.g., 5, 7, 15</td> <tr><td></td>
</tr> <td colspan="2">List of integers separated by commas, e.g., 5, 7, 15</td>
</table></div> </tr>
</td> </table></div>
<td> </td>
<div class="grid-layout layout-tighter"><table> <td>
<tr> <div class="grid-layout layout-tighter"><table>
<td colspan="3"><h3>After Splitting</h3></td> <tr>
</tr> <td colspan="3"><h3>After Splitting</h3></td>
<tr> </tr>
<td width="1%"><input type="checkbox" checked="true" bind="guessCellTypeInput" /></td> <tr>
<td colspan="2">Guess cell type</td> <td width="1%"><input type="checkbox" checked="true" bind="guessCellTypeInput" /></td>
</tr> <td colspan="2">Guess cell type</td>
<tr> </tr>
<td width="1%"><input type="checkbox" checked="true" bind="removeColumnInput" /></td> <tr>
<td colspan="2">Remove this column</td> <td width="1%"><input type="checkbox" checked="true" bind="removeColumnInput" /></td>
</tr> <td colspan="2">Remove this column</td>
</table></div> </tr>
</td> </table></div>
</table></div> </td>
</div> </table></div>
<div class="dialog-footer" bind="dialogFooter"> </div>
<button bind="okButton">&nbsp;&nbsp;OK&nbsp;&nbsp;</button> <div class="dialog-footer" bind="dialogFooter">
<button bind="cancelButton">Cancel</button> <button bind="okButton">&nbsp;&nbsp;OK&nbsp;&nbsp;</button>
<button bind="cancelButton">Cancel</button>
</div>
</div> </div>
</div> </div>

24
main/webapp/modules/core/scripts/views/data-table/text-transform-dialog.html
View File

@ -1,15 +1,17 @@
<div class="dialog-frame" style="width: 700px;"> <div class="dialog-frame" style="width: 700px;">
<div class="dialog-header" bind="dialogHeader"></div> <div class="dialog-border">
<div class="dialog-body" bind="dialogBody"> <div class="dialog-header" bind="dialogHeader"></div>
<div class="grid-layout layout-tight layout-full"><table> <div class="dialog-body" bind="dialogBody">
<tr><td colspan="4">$EXPRESSION_PREVIEW_WIDGET$</td></tr> <div class="grid-layout layout-tight layout-full"><table>
<tr style="white-space: pre;"> <tr><td colspan="4">$EXPRESSION_PREVIEW_WIDGET$</td></tr>
<td width="1%">On error</td> <tr style="white-space: pre;">
<td><input type="radio" name="text-transform-dialog-onerror-choice" value="set-to-blank" checked /> set to blank<br/><input type="radio" name="text-transform-dialog-onerror-choice" value="store-error" /> store error<br/><input type="radio" name="text-transform-dialog-onerror-choice" value="keep-original" /> keep original</td> <td width="1%">On error</td>
<td width="1%"><input type="checkbox" bind="repeatCheckbox" /></td> <td><input type="radio" name="text-transform-dialog-onerror-choice" value="set-to-blank" checked /> set to blank<br/><input type="radio" name="text-transform-dialog-onerror-choice" value="store-error" /> store error<br/><input type="radio" name="text-transform-dialog-onerror-choice" value="keep-original" /> keep original</td>
<td>Re-transform until no change<br/>up to <input bind="repeatCountInput" value="10" size="3" /> times</td> <td width="1%"><input type="checkbox" bind="repeatCheckbox" /></td>
</tr> <td>Re-transform until no change<br/>up to <input bind="repeatCountInput" value="10" size="3" /> times</td>
</table> </tr>
</table>
</div>
</div> </div>
<div class="dialog-footer" bind="dialogFooter"> <div class="dialog-footer" bind="dialogFooter">
<button bind="okButton">&nbsp;&nbsp;OK&nbsp;&nbsp;</button> <button bind="okButton">&nbsp;&nbsp;OK&nbsp;&nbsp;</button>

72
main/webapp/modules/core/scripts/views/data-table/transpose-columns-into-rows.html
View File

@ -1,38 +1,40 @@
<div class="dialog-frame" style="width: 600px;"> <div class="dialog-frame" style="width: 600px;">
<div class="dialog-header" bind="dialogHeader"></div> <div class="dialog-border">
<div class="dialog-body" bind="dialogBody"> <div class="dialog-header" bind="dialogHeader"></div>
<div class="grid-layout layout-normal layout-full grid-layout-for-ui"><table> <div class="dialog-body" bind="dialogBody">
<tr> <div class="grid-layout layout-normal layout-full grid-layout-for-ui"><table>
<td>From Column</td> <tr>
<td>To Column</td> <td>From Column</td>
<td>Formatting Options</td> <td>To Column</td>
</tr> <td>Formatting Options</td>
<tr> </tr>
<td><select bind="fromColumnSelect" size="20" style="width: 100%;"></select></td> <tr>
<td><select bind="toColumnSelect" size="20" style="width: 100%;"></select></td> <td><select bind="fromColumnSelect" size="20" style="width: 100%;"></select></td>
<td><div class="grid-layout layout-tightest"><table> <td><select bind="toColumnSelect" size="20" style="width: 100%;"></select></td>
<tr> <td><div class="grid-layout layout-tightest"><table>
<td colspan="2">Combined column name <input bind="combinedColumnNameInput" size="15" /></td> <tr>
</tr> <td colspan="2">Combined column name <input bind="combinedColumnNameInput" size="15" /></td>
<tr> </tr>
<td colspan="2"><input type="checkbox" bind="prependColumnNameCheckbox" checked /> prepend column name</td> <tr>
</tr> <td colspan="2"><input type="checkbox" bind="prependColumnNameCheckbox" checked /> prepend column name</td>
<tr> </tr>
<td>&nbsp;</td> <tr>
<td>Separate column name and cell value with <td>&nbsp;</td>
<input bind="separatorInput" size="5" value=":" /> <td>Separate column name and cell value with
</td> <input bind="separatorInput" size="5" value=":" />
</tr> </td>
<tr> </tr>
<td>&nbsp;</td> <tr>
<td><input type="checkbox" bind="ignoreBlankCellsCheckbox" checked /> ignore blank cells</td> <td>&nbsp;</td>
</tr> <td><input type="checkbox" bind="ignoreBlankCellsCheckbox" checked /> ignore blank cells</td>
</table></div></td> </tr>
</tr> </table></div></td>
</table></div> </tr>
</div> </table></div>
<div class="dialog-footer" bind="dialogFooter"> </div>
<button bind="okButton">Transpose</button> <div class="dialog-footer" bind="dialogFooter">
<button bind="cancelButton">Cancel</button> <button bind="okButton">Transpose</button>
<button bind="cancelButton">Cancel</button>
</div>
</div> </div>
</div> </div>

13
main/webapp/modules/core/styles/common.less
View File

@ -54,7 +54,7 @@ a.selected {
} }
a.inaction { a.inaction {
color: #ccc; color: @chrome_primary;
} }
a.selected:hover, a.inaction:hover { a.selected:hover, a.inaction:hover {
@ -77,6 +77,7 @@ a img {
border: 1px solid #bbb; border: 1px solid #bbb;
cursor: pointer; cursor: pointer;
background: #eee; background: #eee;
white-space: nowrap;
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
.rounded_corners(3px); .rounded_corners(3px);
} }
@ -94,6 +95,16 @@ a img {
padding: 1px 15px; padding: 1px 15px;
} }
.button-pill-left, a.button-pill-left {
border-right: 1px solid #bbb;
.sharp_corners_left();
}
.button-pill-right, a.button-pill-right {
border-left: 1px solid #fff;
.sharp_corners_right();
}
.button-disabled, a.button-disabled { .button-disabled, a.button-disabled {
color: #666; color: #666;
border: 1px solid #ddd; border: 1px solid #ddd;

10
main/webapp/modules/core/styles/project/facets.less
View File

@ -66,15 +66,11 @@ a.facet-title-remove:hover {
.facet-controls-sortControls a { .facet-controls-sortControls a {
margin: 0 2px; margin: 0 2px;
padding: 2px 4px 3px 4px; padding: 2px 4px 3px 4px;
font-weight: bold;
} }
.facet-controls-sortControls a.inaction { .facet-controls-sortControls a.inaction {
background: #f8f8f8; color: #000;
color: #777; font-weight: bold;
border: 1px solid #ff6a00; }
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
}
.facet-body { .facet-body {
padding: 1px; padding: 1px;

10
main/webapp/modules/core/styles/project/sidebar.less
View File

@ -26,7 +26,16 @@
} }
.browsing-panel-controls { .browsing-panel-controls {
position: relative;
padding: @padding_normal;
visibility: hidden; visibility: hidden;
text-align: right;
}
.browsing-panel-controls-refresh {
position: absolute;
top: @padding_normal;
left: @padding_normal;
} }
.browsing-panel-help, .history-panel-help { .browsing-panel-help, .history-panel-help {
@ -48,6 +57,7 @@
.browsing-panel-help p, .history-panel-help p { .browsing-panel-help p, .history-panel-help p {
padding: 7px 20px; padding: 7px 20px;
line-height: 1.3;
} }
.history-panel-body { .history-panel-body {

21
main/webapp/modules/core/styles/theme.less
View File

@ -12,6 +12,10 @@
@light_grey: #999; @light_grey: #999;
@metadata_grey: #777; @metadata_grey: #777;
@near_black: #444; @near_black: #444;
@dialog_frame: #3a5774;
@dialog_border: #c1d9ff;
@dialog_header: #e0edfe;
@dialog_footer: #eee;
@padding_tighter: 3px; @padding_tighter: 3px;
@padding_tight: 5px; @padding_tight: 5px;
@ -25,3 +29,20 @@
border-radius: @radius; border-radius: @radius;
} }
.sharp_corners_left () {
-webkit-border-top-right-radius: 0;
-webkit-border-bottom-right-radius: 0;
-moz-border-radius-topright: 0;
-moz-border-radius-bottomright: 0;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.sharp_corners_right () {
-moz-border-radius-topleft: 0;
-moz-border-radius-bottomleft: 0;
-webkit-border-top-left-radius: 0;
-webkit-border-bottom-left-radius: 0;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}

53
main/webapp/modules/core/styles/util/dialog.less
View File

@ -1,50 +1,51 @@
@import-less url("../theme.less"); @import-less url("../theme.less");
.dialog-overlay { .dialog-overlay {
position: fixed; position: fixed;
padding: 0px; top: 0;
margin: 0px; left: 0;
top: 0px; width: 100%;
left: 0px; height: 100%;
width: 100%; background: #666;
height: 100%; opacity: 0.5;
background: black; }
opacity: 0.4;
}
.dialog-container { .dialog-container {
position: fixed; position: fixed;
padding: 0px; left: 0;
margin: 0px; width: 100%;
left: 0px; text-align: center;
width: 100%; }
text-align: center;
}
.dialog-frame { .dialog-frame {
margin: 0 auto; margin: 0 auto;
text-align: left; text-align: left;
background: white; background: white;
border: 1px solid #aaa; border: 1px solid @dialog_frame;
padding: 2px; }
.dialog-border {
border: 4px solid @dialog_border;
} }
.dialog-header { .dialog-header {
background: #404859; background: @dialog_header;
padding: 5px 10px; padding: @padding_loose;
font-weight: bold; font-weight: bold;
color: white; font-size: 1.6em;
color: #000;
cursor: move; cursor: move;
} }
.dialog-body { .dialog-body {
padding: 10px; font-size: 1.3em;
padding: @padding_looser;
} }
.dialog-footer { .dialog-footer {
background: #ddd; font-size: 1.3em;
padding: 5px 10px; background: @dialog_footer;
text-align: right; padding: @padding_loose;
} }
.dialog-footer button { .dialog-footer button {

87
main/webapp/modules/core/styles/util/menu.less
View File

@ -1,63 +1,56 @@
@import-less url("../theme.less"); @import-less url("../theme.less");
.menu-overlay { .menu-overlay {
background: black; position: fixed;
opacity: 0.15; top: 0;
position: fixed; left: 0;
padding: 0px; width: 100%;
margin: 0px; height: 100%;
top: 0px; z-index: 1000;
left: 0px; }
width: 100%;
height: 100%;
z-index: 1000;
}
.menu-container { .menu-container {
position: absolute; position: absolute;
width: 250px; width: 250px;
background: white; background: white;
padding: 1px; padding: 1px;
border: 1px solid #ddd; border: 1px solid #ccc;
font-size: 12px; border-right: 1px solid #666;
} border-bottom: 1px solid #666;
font-size: 1.2em;
}
.menu-container hr { .menu-container hr {
height: 1px; margin: 2px 0;
border: none; padding: 0;
border-top: 1px solid #ccc; height: 1px;
padding: 0px; border: none;
margin: 2px 0px; border-top: 1px solid #ccc;
} }
a.menu-item { a.menu-item {
display: block; display: block;
padding: 5px 7px; padding: 5px 7px;
text-decoration: none; text-decoration: none;
color: black; color: #000;
white-space: pre; white-space: pre;
} }
a.menu-item:hover { a.menu-item:hover, a.menu-item.menu-expanded {
color: #44a; background: #dbe8f8;
background: #eee; }
}
a.menu-item.menu-expanded {
background: #ddd;
}
a.menu-item img { a.menu-item img {
border: none; border: none;
} }
table.menu-item-layout td { table.menu-item-layout td {
vertical-align: middle; vertical-align: middle;
} }
.menu-section { .menu-section {
padding: 2px 7px; padding: 2px 7px;
background: #aaa; background: #aaa;
color: white; color: white;
font-weight: bold; font-weight: bold;
} }

11
main/webapp/modules/core/styles/views/data-table-view.less
View File

@ -60,9 +60,6 @@ table.data-table > tbody > tr.contextual > td > div {
opacity: 0.3; opacity: 0.3;
} }
table.data-table > tbody > tr.record.contextual > td {
}
table.data-table td.column-header { table.data-table td.column-header {
background: #e8e8e8; background: #e8e8e8;
cursor: pointer; cursor: pointer;
@ -118,10 +115,12 @@ a.column-header-menu:hover {
background: #6d6; background: #6d6;
} }
div.data-table-cell-content { div.data-table-cell-content {
position: relative; line-height: 1.2;
} color: #222;
position: relative;
}
div.data-table-cell-content-numeric { div.data-table-cell-content-numeric {
text-align: right; text-align: right;
} }