+
+
}
- );
- }
-
- /* eslint-disable react/no-danger */
- render() {
- const { state, props } = this;
- const columnOneLeft = state.privacySettings ? (
-
-
-
- }
- />
-
-
-
-
- }
- />
-
-
-
- ) : (
-
- );
- const columnOneRight = (
-
- {state.privacySettings && (
-
-
- }
- className="dnn-label-long"
- />
-
-
- )}
-
- );
- const columnTwoLeft = (
-
- {state.privacySettings && (
-
-
-
-
- )}
-
- );
- const columnTwoRight = (
-
- {state.privacySettings && (
-
-
-
-
- )}
-
- );
+ />
+
+
+
+
+ }
+ />
+
+
+
+ ) : (
+
-
- {resx.get("PrivacyCommunicationSettings")}
-
-
{[columnOneLeft, columnOneRight]}
-
- {resx.get("PrivacyCookieConsentSettings")}
-
-
{[columnTwoLeft, columnTwoRight]}
-
-
-
-
-
- );
- }
+ return (
+
+
+ {resx.get("PrivacyCommunicationSettings")}
+
+
+ {[columnOneLeft, columnOneRight]}
+
+
+ {resx.get("PrivacyCookieConsentSettings")}
+
+
+ {[columnTwoLeft, columnTwoRight]}
+
+
{resx.get("DataConsentSettings")}
+
+ {[columnThreeLeft, columnThreeRight]}
+
+
+
+
+
+
+ );
+ }
}
PrivacySettingsPanelBody.propTypes = {
- dispatch: PropTypes.func.isRequired,
- tabIndex: PropTypes.number,
- privacySettings: PropTypes.object,
- privacySettingsClientModified: PropTypes.bool,
- portalId: PropTypes.number,
- cultureCode: PropTypes.string
+ dispatch: PropTypes.func.isRequired,
+ tabIndex: PropTypes.number,
+ privacySettings: PropTypes.object,
+ privacySettingsClientModified: PropTypes.bool,
+ portalId: PropTypes.number,
+ cultureCode: PropTypes.string
};
function mapStateToProps(state) {
- return {
- tabIndex: state.pagination.tabIndex,
- privacySettings: state.siteBehavior.privacySettings,
- privacySettingsClientModified: state.siteBehavior.privacySettingsClientModified,
- portalId: state.siteInfo ? state.siteInfo.portalId : undefined,
- };
+ return {
+ tabIndex: state.pagination.tabIndex,
+ privacySettings: state.siteBehavior.privacySettings,
+ privacySettingsClientModified:
+ state.siteBehavior.privacySettingsClientModified,
+ portalId: state.siteInfo ? state.siteInfo.portalId : undefined
+ };
}
export default connect(mapStateToProps)(PrivacySettingsPanelBody);
diff --git a/Extensions/Settings/Dnn.PersonaBar.SiteSettings/SiteSettings.Web/src/components/privacySettings/style.less b/Extensions/Settings/Dnn.PersonaBar.SiteSettings/SiteSettings.Web/src/components/privacySettings/style.less
index 96d6615f9..e287d4663 100644
--- a/Extensions/Settings/Dnn.PersonaBar.SiteSettings/SiteSettings.Web/src/components/privacySettings/style.less
+++ b/Extensions/Settings/Dnn.PersonaBar.SiteSettings/SiteSettings.Web/src/components/privacySettings/style.less
@@ -69,4 +69,67 @@
border-left: 1px solid @alto;
}
}
+ .warning {
+ text-transform: uppercase;
+ font-size: larger;
+ }
+ .warningBox {
+ border: 1px solid @alto;
+ background-color: @gallery;
+ width: 100%;
+ padding: 15px;
+ .warningText {
+ font-weight: bolder;
+ color: @thunder;
+ }
+ .warningButton {
+ width: 100%;
+ .dnn-ui-common-button {
+ width: 100%;
+ padding-top: 6px;
+ padding-bottom: 6px;
+ &:first-child {
+ margin-top: 15px;
+ }
+ }
+ }
+ }
+ .editor-row {
+ float: left;
+ width: 100%;
+ label {
+ font-weight: bolder;
+ clear: both;
+ float: left;
+ text-align: left;
+ width: 100%;
+ margin-bottom: 5px;
+ }
+ select {
+ padding: 8px 16px 8px 5px;
+ &.full {
+ float: left;
+ width: 100%;
+ }
+ &.two-fifth {
+ float: left;
+ width: 40%
+ }
+ &.one-fourth {
+ float: left;
+ width: 25%;
+ }
+ }
+ .dnn-dropdown {
+ width: 100%;
+ margin-bottom: 30px;
+ }
+ .text-section {
+ width: 5%;
+ float: left;
+ text-align: center;
+ vertical-align: middle;
+ margin-top: 9px;
+ }
+ }
}
\ No newline at end of file
diff --git a/Extensions/Settings/Dnn.PersonaBar.SiteSettings/SiteSettings.Web/src/services/applicationService.js b/Extensions/Settings/Dnn.PersonaBar.SiteSettings/SiteSettings.Web/src/services/applicationService.js
index 67caeca95..80d665f98 100644
--- a/Extensions/Settings/Dnn.PersonaBar.SiteSettings/SiteSettings.Web/src/services/applicationService.js
+++ b/Extensions/Settings/Dnn.PersonaBar.SiteSettings/SiteSettings.Web/src/services/applicationService.js
@@ -148,6 +148,11 @@ class ApplicationService {
sf.post("UpdatePrivacySettings", payload, callback, failureCallback);
}
+ resetTermsAgreement(payload, callback, failureCallback) {
+ const sf = this.getServiceFramework("SiteSettings");
+ sf.post("ResetTermsAgreement", payload, callback, failureCallback);
+ }
+
compactSearchIndex(callback, failureCallback) {
const sf = this.getServiceFramework("SiteSettings");
sf.post("CompactSearchIndex", {}, callback, failureCallback);
diff --git a/Extensions/Settings/Dnn.PersonaBar.SiteSettings/admin/personaBar/App_LocalResources/SiteSettings.resx b/Extensions/Settings/Dnn.PersonaBar.SiteSettings/admin/personaBar/App_LocalResources/SiteSettings.resx
index 7ced03d34..80fc133c4 100644
--- a/Extensions/Settings/Dnn.PersonaBar.SiteSettings/admin/personaBar/App_LocalResources/SiteSettings.resx
+++ b/Extensions/Settings/Dnn.PersonaBar.SiteSettings/admin/personaBar/App_LocalResources/SiteSettings.resx
@@ -1072,7 +1072,7 @@