Skip to content
This repository has been archived by the owner on Dec 13, 2020. It is now read-only.

Commit

Permalink
#437 Saved indicator logic (lack of icon)
Browse files Browse the repository at this point in the history
  • Loading branch information
@damianprzygodzki
damianprzygodzki committed Mar 6, 2017
1 parent e498e83 commit 114b4a0
Show file tree
Hide file tree
Showing 8 changed files with 191 additions and 156 deletions.
23 changes: 14 additions & 9 deletions src/actions/WindowActions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,13 @@ export function initLayoutSuccess(layout, scope) {
}
}

export function initDataSuccess(data, scope, docId) {
export function initDataSuccess(data, scope, docId, saveStatus) {
return {
type: types.INIT_DATA_SUCCESS,
data: data,
scope: scope,
docId: docId
data,
scope,
docId,
saveStatus
}
}

Expand All @@ -63,11 +64,12 @@ export function addRowData(data, scope) {
}
}

export function updateDataSuccess(item, scope) {
export function updateDataSuccess(item, scope, saveStatus) {
return {
type: types.UPDATE_DATA_SUCCESS,
item: item,
scope: scope
item,
saveStatus,
scope
}
}

Expand Down Expand Up @@ -206,7 +208,10 @@ export function createWindow(windowType, docId = 'NEW', tabId, rowId, isModal =
docId = response.data[elem].id;
const preparedData = parseToDisplay(response.data[elem].fields);

dispatch(initDataSuccess(preparedData, getScope(isModal), docId));
dispatch(initDataSuccess(
preparedData, getScope(isModal), docId,
response.data[0].saveStatus
));

if (isModal && rowId === 'NEW') {
dispatch(mapDataToState([response.data[0]], false, 'NEW', docId, windowType))
Expand Down Expand Up @@ -345,7 +350,7 @@ function mapDataToState(data, isModal, rowId, id, windowType) {
dispatch(updateRowSuccess(field, item.tabid, item.rowId, getScope(false)));
}

dispatch(updateDataSuccess(field, getScope(isModal)));
dispatch(updateDataSuccess(field, getScope(isModal), data[0].saveStatus));
}
});
}
Expand Down
167 changes: 85 additions & 82 deletions src/assets/css/font-meta.css
View file
Original file line number Diff line number Diff line change
@@ -1,199 +1,202 @@
@charset 'UTF-8';
@charset "UTF-8";

@font-face {
font-family: 'meta';
src:url('fonts/meta.eot');
src:url('fonts/meta.eot?#iefix') format('embedded-opentype'),url('fonts/meta.woff') format('woff'),url('fonts/meta.ttf') format('truetype'),url('fonts/meta.svg#meta') format('svg');
font-weight: normal;
font-style: normal;

font-family: "meta";
src:url("fonts/meta.eot");
src:url("fonts/meta.eot?#iefix") format("embedded-opentype"),
url("fonts/meta.woff") format("woff"),
url("fonts/meta.ttf") format("truetype"),
url("fonts/meta.svg#meta") format("svg");
font-weight: normal;
font-style: normal;

}

[data-icon]:before {
font-family: 'meta' !important;
content: attr(data-icon);
font-style: normal !important;
font-weight: normal !important;
font-variant: normal !important;
text-transform: none !important;
speak: none;
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-family: "meta" !important;
content: attr(data-icon);
font-style: normal !important;
font-weight: normal !important;
font-variant: normal !important;
text-transform: none !important;
speak: none;
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}

[class^='meta-']:before,
[class*=' meta-']:before {
font-family: 'meta' !important;
font-style: normal !important;
font-weight: normal !important;
font-variant: normal !important;
text-transform: none !important;
speak: none;
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
[class^="meta-"]:before,
[class*=" meta-"]:before {
font-family: "meta" !important;
font-style: normal !important;
font-weight: normal !important;
font-variant: normal !important;
text-transform: none !important;
speak: none;
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}

.meta-icon-add:before {
content: '\61';
content: "\61";
}
.meta-icon-attachments:before {
content: '\62';
content: "\62";
}
.meta-icon-calendar:before {
content: '\63';
content: "\63";
}
.meta-icon-close-alt:before {
content: '\66';
content: "\66";
}
.meta-icon-delete:before {
content: '\67';
content: "\67";
}
.meta-icon-duplicate:before {
content: '\69';
content: "\69";
}
.meta-icon-edit:before {
content: '\6a';
content: "\6a";
}
.meta-icon-file:before {
content: '\6b';
content: "\6b";
}
.meta-icon-fullscreen:before {
content: '\6c';
content: "\6c";
}
.meta-icon-generate:before {
content: '\6d';
content: "\6d";
}
.meta-icon-list:before {
content: '\6e';
content: "\6e";
}
.meta-icon-logout:before {
content: '\6f';
content: "\6f";
}
.meta-icon-message:before {
content: '\70';
content: "\70";
}
.meta-icon-more:before {
content: '\71';
content: "\71";
}
.meta-icon-preview:before {
content: '\72';
content: "\72";
}
.meta-icon-print:before {
content: '\73';
content: "\73";
}
.meta-icon-profile:before {
content: '\74';
content: "\74";
}
.meta-icon-report:before {
content: '\75';
content: "\75";
}
.meta-icon-report-1:before {
content: '\76';
content: "\76";
}
.meta-icon-settings:before {
content: '\77';
content: "\77";
}
.meta-icon-share:before {
content: '\78';
content: "\78";
}
.meta-icon-trash:before {
content: '\79';
content: "\79";
}
.meta-icon-chevron-1:before {
content: '\7a';
content: "\7a";
}
.meta-icon-close-1:before {
content: '\41';
content: "\41";
}
.meta-icon-down-1:before {
content: '\42';
content: "\42";
}
.meta-icon-checkbox:before {
content: '\64';
content: "\64";
}
.meta-icon-checkbox-1:before {
content: '\65';
content: "\65";
}
.meta-icon-left:before {
content: '\68';
content: "\68";
}
.meta-icon-menu:before {
content: '\43';
content: "\43";
}
.meta-icon-notifications:before {
content: '\44';
content: "\44";
}
.meta-icon-right:before {
content: '\45';
content: "\45";
}
.meta-icon-listing-down:before {
content: '\46';
content: "\46";
}
.meta-icon-listing-up:before {
content: '\47';
content: "\47";
}
.meta-icon-beschaffung:before {
content: '\48';
content: "\48";
}
.meta-icon-crm:before {
content: '\49';
content: "\49";
}
.meta-icon-fakturierung:before {
content: '\4a';
content: "\4a";
}
.meta-icon-finanzen:before {
content: '\4b';
content: "\4b";
}
.meta-icon-langerverwaltung:before {
content: '\4c';
content: "\4c";
}
.meta-icon-lieferung:before {
content: '\4d';
content: "\4d";
}
.meta-icon-production:before {
content: '\4e';
content: "\4e";
}
.meta-icon-produktverwaltung:before {
content: '\4f';
content: "\4f";
}
.meta-icon-sales:before {
content: '\50';
content: "\50";
}
.meta-icon-system:before {
content: '\51';
content: "\51";
}
.meta-icon-vertragsverwaltung:before {
content: '\52';
content: "\52";
}
.meta-icon-wareneingang:before {
content: '\53';
content: "\53";
}
.meta-icon-important:before {
content: '\54';
content: "\54";
}
.meta-icon-collapse:before {
content: '\55';
content: "\55";
}
.meta-icon-package:before {
content: '\56';
content: "\56";
}
.meta-icon-palette:before {
content: '\57';
content: "\57";
}
.meta-icon-product:before {
content: '\58';
content: "\58";
}
.meta-icon-photo:before {
content: '\59';
content: "\59";
}
.meta-icon-upload:before {
content: '\5a';
content: "\5a";
}
.meta-icon-accept:before {
content: '\30';
content: "\30";
}
.meta-icon-upload-1:before {
content: '\31';
content: "\31";
}
Loading

0 comments on commit 114b4a0

Please sign in to comment.