diff --git a/client/src/app/admin/panel/tickets/admin-panel-custom-responses.js b/client/src/app/admin/panel/tickets/admin-panel-custom-responses.js
index 2394b37e..e47bdc78 100644
--- a/client/src/app/admin/panel/tickets/admin-panel-custom-responses.js
+++ b/client/src/app/admin/panel/tickets/admin-panel-custom-responses.js
@@ -12,15 +12,28 @@ class AdminPanelCustomResponses extends React.Component {
return (
-
-
-
-
-
-
- Custom response form
-
+ {(this.props.loaded) ? this.renderContent() : this.renderLoading()}
+
+ );
+ }
+
+ renderContent() {
+ return (
+
+
+
+
+ Custom response form
+
+
+ );
+ }
+
+ renderLoading() {
+ return (
+
+
);
}
diff --git a/client/src/app/admin/panel/tickets/admin-panel-custom-responses.scss b/client/src/app/admin/panel/tickets/admin-panel-custom-responses.scss
new file mode 100644
index 00000000..d82bbc65
--- /dev/null
+++ b/client/src/app/admin/panel/tickets/admin-panel-custom-responses.scss
@@ -0,0 +1,5 @@
+.admin-panel-custom-responses {
+ &__loading {
+ height: 300px;
+ }
+}
\ No newline at end of file
diff --git a/client/src/core-components/loading.js b/client/src/core-components/loading.js
index da79fb77..a9660614 100644
--- a/client/src/core-components/loading.js
+++ b/client/src/core-components/loading.js
@@ -2,18 +2,29 @@ import React from 'react';
import classNames from 'classnames';
class Loading extends React.Component {
+ static propTypes = {
+ backgrounded: React.PropTypes.bool,
+ size: React.PropTypes.oneOf(['small', 'medium', 'large'])
+ };
+
+ static defaultProps = {
+ size: 'small',
+ backgrounded: false
+ };
render() {
return (
-
+
);
}
getClass() {
let classes = {
- 'loading': true
+ 'loading': true,
+ 'loading_backgrounded': (this.props.backgrounded),
+ 'loading_large': (this.props.size === 'large')
};
classes[this.props.className] = (this.props.className);
diff --git a/client/src/core-components/loading.scss b/client/src/core-components/loading.scss
index 6273b184..ad48b7c6 100644
--- a/client/src/core-components/loading.scss
+++ b/client/src/core-components/loading.scss
@@ -6,7 +6,7 @@ $color: white;
height: 100%;
position: relative;
- &-icon {
+ &__icon {
position: absolute;
top: 0;
bottom: 0;
@@ -32,6 +32,24 @@ $color: white;
}
}
+ &_large {
+
+ .loading__icon,
+ .loading__icon:after {
+ font-size: 7px;
+ width: 60px;
+ height: 60px;
+ }
+ }
+
+ &_backgrounded {
+ display: block;
+ width: 100%;
+ height: 100%;
+ border-radius: 4px;
+ background-color: rgba(black, 0.2);
+ }
+
@-webkit-keyframes turnAnimation {
0% {
-webkit-transform: rotate(0deg);