Skip to content

Commit

Permalink
Merge branch 'feature-2617-demo-data-preview' into feature-2375-demo-…
Browse files Browse the repository at this point in the history 
…theme
  • Loading branch information
@aron
aron committed Jun 28, 2012
2 parents 6c81922 + 28a42f0 commit 02f0bf3
Show file tree
Hide file tree
Showing 75 changed files with 23,972 additions and 72 deletions.
3 changes: 2 additions & 1 deletion ckan/html_resources/__init__.py
View file
Expand Up @@ -135,7 +135,8 @@ def create_resource(filename, path, filepath):
fanstatic_name = '%s/%s' % (path, member)
members.append(getattr(module, fanstatic_name))
group = Group(members)
setattr(module, group_name, group)
fanstatic_name = '%s/%s' % (path, group_name)
setattr(module, fanstatic_name, group)
# finally add the library to this module
setattr(module, name, library)
# add to fanstatic
Expand Down
88 changes: 88 additions & 0 deletions ckan/public/base/datapreview/css/datapreview.css
View file
@@ -0,0 +1,88 @@
.recline-data-explorer .header .navigation,
.recline-data-explorer .header .navigation li,
.recline-data-explorer .header .pagination,
.recline-data-explorer .header .pagination form
{
display: inline;
}

.recline-data-explorer .header .navigation {
float: left;
margin-left: 0;
padding-left: 0;
}

.recline-data-explorer .header .menu-right {
float: right;
margin-left: 5px;
padding-left: 5px;
border-left: solid 2px #ddd;
}

.header .recline-results-info {
line-height: 28px;
margin-left: 20px;
display: inline;
}

.header .recline-query-editor {
float: right;
height: 30px;
}

.header .recline-query-editor .input-prepend {
margin-bottom: auto;
}

.recline-query-editor .add-on {
float: left;
}

.header .recline-query-editor .pagination input {
width: 30px;
height: 18px;
padding: 2px 4px;
margin-top: -4px;
}

.header .recline-query-editor .pagination a {
line-height: 26px;
padding: 0 6px;
}

.header .recline-query-editor form button {
vertical-align: top;
}

.recline-data-explorer .data-view-container {
display: block;
clear: both;
}

.recline-filter-editor .filter-term .input-append a {
margin-left: -5px;
}

.recline-facet-viewer .facet-summary label {
display: inline;
}

.recline-data-explorer input {
padding: 4px;
}

.recline-data-explorer .add-on {
padding: 4px 5px;}
}

/**********************************************************
* Notifications
*********************************************************/

.recline-data-explorer .notification-loader {
width: 18px;
margin-left: 5px;
background: url(../images/small-spinner.gif) no-repeat;
display: inline-block;
}

247 changes: 247 additions & 0 deletions ckan/public/base/datapreview/css/datapreview.table-view.css
View file
@@ -0,0 +1,247 @@
#dataexplorer-tableview-dialog table td {
background: #fff;
border: 1px solid #eee;
padding: 6px;
color: #555;
}

#dataexplorer-tableview-dialog table thead td {
background: #444;
color: #fff;
border-color: #444;
border-bottom: none;
}

.dataexplorer-tableview-viewer {
position: relative;
height: 100%;
overflow: hidden;
}

.dataexplorer-tableview-nav {
list-style-type: none;
margin: 0;
padding: 0;
height: 30px;
}

.dataexplorer-tableview-nav-toggle {
float: left;
}

.dataexplorer-tableview-nav li {
float: left;
}

#dataexplorer-tableview-nav-editor,
label[for=dataexplorer-tableview-nav-editor] {
float: right;
}

.dataexplorer-tableview-grid {
border-left: 1px solid #ccc;
}

.dataexplorer-tableview-graph {
z-index: 1;
background-color: #fff;
margin-right: 220px;
}

.dataexplorer-tableview-editor {
z-index: 1;
background-color: #efefef;
width: 198px;
padding: 5px 10px;
border: 1px solid #ccc;
overflow: auto;
overflow-x: hidden;
float: right;
}

.dataexplorer-tableview-editor ul {
list-style-type: none;
margin: 0;
padding: 0;
overflow: hidden;
}

.dataexplorer-tableview-editor li {
margin-bottom: 10px;
}

.dataexplorer-tableview-editor .dataexplorer-tableview-editor-group {
padding-bottom: 10px;
margin-bottom: 10px;
border-bottom: 1px solid #ddd;
}

.dataexplorer-tableview-editor label {
display: block;
font-weight: bold;
color: #555;
line-height: 1.4;
}

.dataexplorer-tableview-editor label a {
float: right;
font-size: 11px;
color: #999;
font-weight: normal;
}

.dataexplorer-tableview-editor select {
width: 100%;
}

.dataexplorer-tableview-editor button {
float: right;
}

.dataexplorer-tableview-editor-buttons {
clear: right;
overflow: hidden;
}

.dataexplorer-tableview-editor-submit {
margin-top: 10px;
padding-top: 10px;
border-top: 1px solid #ddd;
}

.dataexplorer-tableview-editor-info {
border-bottom: 1px solid #ddd;
margin-bottom: 10px;
}

.dataexplorer-tableview-editor-info h1,
.dataexplorer-tableview-editor-info p {
font-size: 12px;
margin: 0 0 10px;
color: #555;
}

.dataexplorer-tableview-editor-info h1 {
line-height: 16px;
cursor: pointer;
font-family: sans-serif;
font-size: 13px;
font-weight: bold;
margin: 0 0 4px;
}

.dataexplorer-tableview-editor-info h1 span {
position: relative;
top: 1px;
display: inline-block;
width: 12px;
height: 12px;
background: url(../images/ui-icons_444444_256x240.png) no-repeat -68px -17px;
}

.dataexplorer-tableview-editor-hide-info h1 span {
background-position: -36px -18px;
}

.dataexplorer-tableview-editor-hide-info p {
display: none;
}

.dataexplorer-tableview-hide-editor .dataexplorer-tableview-editor {
display: none;
}

.dataexplorer-tableview-hide-editor .dataexplorer-tableview-panel {
right: 0;
}

/* Style the preview buttons */
.preview {
width: 65px;
}

.preview .resource-preview-button {
border: 1px solid #eaeaea;
color: #444;
padding: 3px 6px 2px 21px;
font-size: 12px;
font-weight: bold;
background: #fff url(../images/icon-sprite.png) no-repeat 5px 6px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
-ms-border-radius: 4px;
-o-border-radius: 4px;
border-radius: 4px;
display: block;
margin: 0 -5px;
}

.preview .resource-preview-button:hover {
color: #000;
text-decoration: none;
border-color: #aaa;
background-color: #fafafa;
background-position: 5px -24px;
}

.preview .resource-preview-button:active {
color: #b22;
border-color: #b22;
background-position: 5px -54px;
}

.preview .resource-preview-chart {
background-position: 5px -83px;
}

.preview .resource-preview-chart:hover {
background-position: 5px -113px;
}

.preview .resource-preview-chart:active {
background-position: 5px -143px;
}

.preview .resource-preview-loading,
.preview .resource-preview-loading:hover,
.preview .resource-preview-loading:active {
color: #aaa;
border: 1px solid #eaeaea;
background-image: url(../images/loading.gif);
background-position: 3px 5px;
cursor: default;
}

/* Reduce the default size of the alert dialog */
.ui-dialog .ui-button-text-only .ui-button-text {
padding: 3px 16px 1px;
}

/* Extend the resize handle into the adjacent column */
.slick-resizable-handle {
width: 12px;
right: -6px;
}

/* Fix to crop the text correctly */
.slick-header-wrapper {
overflow: hidden;
display: inline-block;
width: 100%;
text-overflow: ellipsis;
}

.slick-columnpicker {
border-color: #888;
z-index: 99999!important;
}

.slick-columnpicker label,
.slick-columnpicker input {
cursor: pointer;
}

.dataexplorer-tableview-graph .legend table {
width: auto;
}

0 comments on commit 02f0bf3

Please sign in to comment.