Skip to content

Commit

Permalink
feat(datagrid-ui): add update tab notice for datagrid
Browse files Browse the repository at this point in the history
Template, styles, and translations.
  • Loading branch information
AleksueiR committed Apr 23, 2015
1 parent 91d7d19 commit d7d5345
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 8 deletions.
14 changes: 11 additions & 3 deletions src/css/side-panel/base.less
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,16 @@
}
}
}

.tab-notice {
position: absolute;
left: 12px;
top: 9px;
line-height: initial;

.update {
}
}
}

.tabpanels { // panel where the content of the tabs go
Expand Down Expand Up @@ -255,7 +265,6 @@
.record-row .record-details,
.record-row .record-controls,
.sort-handle {

color: #FFFFFF !important;

button {
Expand All @@ -277,7 +286,7 @@

td {
color: #FFFFFF !important;

> button {
color: #FFFFFF !important;
outline-color: #fff !important;
Expand Down Expand Up @@ -372,7 +381,6 @@
.checkbox-custom-inverted() {
.checkbox-custom {
&.checkbox-button button {

color: @light-light-grey-color !important;

&:hover {
Expand Down
9 changes: 7 additions & 2 deletions src/js/RAMP/Modules/templates/datagrid_template.json
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,13 @@
</div>",

// nested under datagrid_global_row_template; toggle button
"filter_button_Template":"<button class='btn button-none btn-xs small button-sort {%=o.classAddition%}' {%=o.someAttribute%}>{%=o.buttonLabel%}</button>"

"filter_button_Template":"<button class='btn button-none btn-xs small button-sort {%=o.classAddition%}' {%=o.someAttribute%}>{%=o.buttonLabel%}</button>",

"datagrid_notice_update":
"
<div class='tab-notice update _tooltip' title='{%= i18n.t('datagrid.notices.update') %}'>
<i class='fa fa-refresh fa-spin'></i>
</div>
"

}
3 changes: 2 additions & 1 deletion src/locales/en-CA/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,8 @@
},
"notices": {
"offScaleFullData": "Data is not visible at this zoom level.",
"offScaleSummary": "Some data is not visible at this zoom level."
"offScaleSummary": "Some data is not visible at this zoom level.",
"update": "Updating"
},
"sort": "Sort",
"zoomBack": "Zoom Back",
Expand Down
5 changes: 3 additions & 2 deletions src/locales/fr-CA/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,9 @@
"zoomBack": "Zoom arrière",
"details": "Détails",
"notices": {
"offScaleFullData": "Les données ne sont pas visibles à ce niveau du Zoom",
"offScaleSummary": "Quelques données ne sont pas visibles à ce niveau du Zoom"
"offScaleFullData": "Les données ne sont pas visibles à ce niveau du Zoom",
"offScaleSummary": "Quelques données ne sont pas visibles à ce niveau du Zoom",
"update": "Mise à jour"
},
"dataTabTitle": "Données",
"ex": {
Expand Down

0 comments on commit d7d5345

Please sign in to comment.