Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jdf/bigcz style #2087

Merged
merged 5 commits into from
Jul 31, 2017
Merged

Jdf/bigcz style #2087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
880af74
Style observation loading message
Jul 27, 2017
81d18ae
Frontend styling
Jul 27, 2017
f46f8e1
Set back to original value
Jul 27, 2017
8b6c961
Truncate search result details, limit to one line
Jul 27, 2017
d5fddc8
Style fixes
Jul 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/mmw/js/src/core/layerPicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ var LayerPickerGroupView = Marionette.LayoutView.extend({
if (this.model.get('error')) {
message = this.model.get('error');
} else if (this.model.get('polling')) {
message = 'Loading...';
message = '<div class="layerpicker-loading">Loading...</div>';
}
return {
layerGroupName: this.model.get('name'),
Expand Down
28 changes: 12 additions & 16 deletions src/mmw/js/src/data_catalog/templates/cuahsiSearchResult.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
<h3 class="resource-title">
{{ id }}
</h3>
<div>
{% if details_url %}
<a href="{{ details_url }}" target="_blank" rel="noreferrer noopener">
{{ title }}</a>.
{% else %}
{{ title }}.
{% endif %}
Observations on {{ sample_mediums }}.
<div class="resource-detail">
<i class="fa fa-map-marker"></i> {{ title }}
</div>
<div class="resource-detail">
<i class="fa fa-eyedropper"></i> {{ sample_mediums }}
</div>
<div>
Variables: {{ concept_keywords }}
<div class="resource-detail">
<i class="fa fa-subscript"></i> {{ concept_keywords }}
</div>
<div>
From <a href="{{ service_url }}" target="_blank" rel="noreferrer noopener">
{{ service_org }} - {{ service_code }}</a> web service.
<div class="resource-detail">
<i class="fa fa-file-text-o"></i> {{ service_org }}<!-- , {{ service_code }} -->
</div>
<div>
<div class="resource-detail">
{% if begin_date == end_date %}
Date for site: {{ begin_date|toFriendlyDate }}
<i class="fa fa-calendar"></i> {{ begin_date|toFriendlyDate }}
{% else %}
Date range for site: {{ begin_date|toFriendlyDate }} - {{ end_date|toFriendlyDate }}
<i class="fa fa-calendar"></i> {{ begin_date|toFriendlyDate }}-{{ end_date|toFriendlyDate }}
{% endif %}
</div>
8 changes: 4 additions & 4 deletions src/mmw/js/src/data_catalog/templates/form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h5>Data collected between:</h5>
/>
{% if fromDate %}
<a href="javascript:0;" class="data-catalog-clear-icon" title="Clear">
<i class=" fa fa-times"></i>
<i class="fa fa-times"></i>
</a>
{% endif %}
</div>
Expand All @@ -21,8 +21,8 @@ <h5>Data collected between:</h5>
value="{{toDate}}"
/>
{% if toDate %}
<a href="javascript:0;" title="Clear">
<i class="data-catalog-clear-icon fa fa-times"></i>
<a href="javascript:0;" class="data-catalog-clear-icon" title="Clear">
<i class="fa fa-times"></i>
</a>
{% endif %}
</div>
Expand All @@ -34,7 +34,7 @@ <h5>Data collected between:</h5>

{% endif %}

<div>
<div class="data-catalog-search-component">
<i class="data-catalog-search-icon fa fa-search"></i>
<input
class="data-catalog-search-input"
Expand Down
4 changes: 2 additions & 2 deletions src/mmw/js/src/data_catalog/templates/searchResult.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ <h3 class="resource-title">
</div>
{% if created_at %}
<div class="resource-date">
{{ created_at|toDateFullYear }}
<i class="fa fa-calendar"></i> {{ created_at|toDateFullYear }}
</div>
{% endif %}
{% if author %}
<div class="resource-author">
{{ author }}
<i class="fa fa-user"></i> {{ author }}
</div>
{% endif %}
4 changes: 2 additions & 2 deletions src/mmw/js/src/data_catalog/templates/tabContent.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@

<div class="error-region"></div>

<div class="pager-region"></div>

<div class="result-region"></div>

<div class="pager-region"></div>
5 changes: 5 additions & 0 deletions src/mmw/sass/components/_layerpicker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,3 +172,8 @@
top: 6px;
}
}

.layerpicker-loading {
font-size: 13px;
padding: 0 0 8px 6px;
}
127 changes: 104 additions & 23 deletions src/mmw/sass/pages/_data-catalog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,82 @@
.data-catalog-window {
width: $sidebar-width;
transition: all 200ms;
overflow-y: auto;
background-color: $ui-light;
background-color: #E6E6E6;
display: flex;
flex-direction: column;
position: absolute;
bottom: 0;
top: 44px;

.tab-contents-region {
background-color: rgba(0, 0, 0, 0.06);
flex: 1;
overflow: hidden;
position: relative;
}

.result-region {
padding-top: 6px;
}

.pager-region {
padding: 10px 0;
background-color: #e6e6e6;

.row {
margin-left: -5px !important;
margin-right: -5px !important;
}
}

.data-catalog-title {
margin: 0.5em 0;
padding: 0.5em;
margin: 10px 0 0;
padding: 10px;
}

.data-catalog-search-dates {
background-color: #D8D8D8;
padding: 12px 10px;
margin: 0 -10px 10px;

h5 {
margin-top: 0;
font-weight: 600;
}
}

.data-catalog-form {
position: relative;
padding: 0.5em;
padding: 4px 10px;

.data-catalog-search-component {
position: relative;
}

.data-catalog-search-input {
width: 99%;
height: 38px;
border: none;
border-radius: 0;
padding-left: 38px;
font-size: 0.8em;
padding-left: 31px;
}
.data-catalog-clearable-input {
display: inline;
display: inline-block;
position: relative;
}
.data-catalog-date-input {
width: 42%;
width: 202px;
height: 38px;
border: none;
border-radius: 0;
display: inline;
}
.data-catalog-clear-icon {
color: $ui-grey;
color: $ui-secondary;
position: relative;
right: 25px;
font-size: 18px;
font-size: 13px;
position: absolute;
right: 10px;
top: 10px;
}
&:hover {
text-decoration: none;
Expand All @@ -46,8 +87,8 @@
}
.data-catalog-search-icon {
color: $ui-grey;
position: relative;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was previously set to relative to account for the changing height when toggling the date filters. Using absolute keeps it fixed even when the search box itself is pushed down.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what this means, Matt. I'm going to need some developer support to get the pagination fixed in the correct way. Previously, the pagination didn't move, which was good, but there were other issues with the sidebar layout. I fixed the other issues but I need help to get the pagination working right.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have a card to fix pagination #2091. The date filter opens and closes correctly, pushing things down and up as it should. Don't think this is an issue here.

top: 30px;
position: absolute;
top: 10px;
left: 8px;
font-size: 18px;
}
Expand All @@ -57,18 +98,34 @@
.date-filter-toggle {
position: absolute;
right: 0;
top: -45px;
top: -36px;
color: $brand-primary;
}
}

.intro-text {
padding: 10px;
}

.output-tabs-wrapper {
flex: 1;
display: flex;
flex-direction: column;
overflow-y: auto;
}

.tab-pane {
position: absolute;
top: 0;
bottom: 0;
width: 100%;
}

.tab-content {
padding: 0;
background: $ui-light;
height: 100vh;
background: #E6E6E6;
top: 0;
bottom: 0;

.loading-panel,
.no-results-panel {
Expand All @@ -82,19 +139,43 @@
padding: 10px;
}

.resource-description {
color: $ui-grey;
font-size: $font-size-h5;
padding-bottom: 3px;
}

.resource-date {
font-size: $font-size-h5;
}

.resource-detail {
font-size: $font-size-h5;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}

.resource {
background: $paper;
padding: 10px;
margin-bottom: 1px;
margin: 0 10px 3px 10px;
cursor: pointer;

&:hover {
background: $paper-12;
background: #F3F3F3;
}

.resource-title {
font-size: 1em;
font-weight: 500;
margin-bottom: 0.5em;
font-size: $font-size-h4;
font-weight: 600;
margin-bottom: 4px;
}

i.fa {
width: 14px;
text-align: center;
margin-right: 4px;
}
}
}