+ ;
+ }
+}
+
+TranslatePageContent.propTypes = {
+ dispatch: PropTypes.func.isRequired,
+ pageList: PropTypes.array,
+ cultureCode: PropTypes.string,
+ onSelectChange: PropTypes.func,
+ portalId: PropTypes.number,
+ closePersonaBarPage: PropTypes.func,
+ languageDisplayMode: PropTypes.string,
+ languageBeingEdited: PropTypes.object
+};
+
+function mapStateToProps(state) {
+ return {
+ pageList: state.languages.pageList,
+ languageBeingEdited: state.languageEditor.languageBeingEdited,
+ languageDisplayMode: (state.languages.languageSettings && state.languages.languageSettings.LanguageDisplayMode) || "NATIVE",
+ portalId: state.siteInfo.settings ? state.siteInfo.portalId : undefined,
+ };
+}
+
+export default connect(mapStateToProps)(TranslatePageContent);
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/constants/actionTypes/index.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/constants/actionTypes/index.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/constants/actionTypes/index.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/constants/actionTypes/index.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/constants/actionTypes/languageEditor.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/constants/actionTypes/languageEditor.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/constants/actionTypes/languageEditor.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/constants/actionTypes/languageEditor.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/constants/actionTypes/languages.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/constants/actionTypes/languages.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/constants/actionTypes/languages.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/constants/actionTypes/languages.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/constants/actionTypes/pagination.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/constants/actionTypes/pagination.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/constants/actionTypes/pagination.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/constants/actionTypes/pagination.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/constants/actionTypes/search.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/constants/actionTypes/search.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/constants/actionTypes/search.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/constants/actionTypes/search.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/constants/actionTypes/siteBehavior.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/constants/actionTypes/siteBehavior.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/constants/actionTypes/siteBehavior.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/constants/actionTypes/siteBehavior.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/constants/actionTypes/siteInfo.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/constants/actionTypes/siteInfo.js
similarity index 98%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/constants/actionTypes/siteInfo.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/constants/actionTypes/siteInfo.js
index 068b1f25bcf..51d389094c0 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/constants/actionTypes/siteInfo.js
+++ b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/constants/actionTypes/siteInfo.js
@@ -1,8 +1,8 @@
-const siteInfoActionTypes = {
- RETRIEVED_SITESETTINGS_PORTAL_SETTINGS: "RETRIEVED_SITESETTINGS_PORTAL_SETTINGS",
- UPDATED_SITESETTINGS_PORTAL_SETTINGS: "UPDATED_SITESETTINGS_PORTAL_SETTINGS",
- SITESETTINGS_PORTAL_SETTINS_CLIENT_MODIFIED: "SITESETTINGS_PORTAL_SETTINS_CLIENT_MODIFIED",
- RETRIEVED_PORTALS: "RETRIEVED_PORTALS",
- CHANGED_PORTAL_ID: "CHANGED_PORTAL_ID"
-};
-export default siteInfoActionTypes;
+const siteInfoActionTypes = {
+ RETRIEVED_SITESETTINGS_PORTAL_SETTINGS: "RETRIEVED_SITESETTINGS_PORTAL_SETTINGS",
+ UPDATED_SITESETTINGS_PORTAL_SETTINGS: "UPDATED_SITESETTINGS_PORTAL_SETTINGS",
+ SITESETTINGS_PORTAL_SETTINS_CLIENT_MODIFIED: "SITESETTINGS_PORTAL_SETTINS_CLIENT_MODIFIED",
+ RETRIEVED_PORTALS: "RETRIEVED_PORTALS",
+ CHANGED_PORTAL_ID: "CHANGED_PORTAL_ID"
+};
+export default siteInfoActionTypes;
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/constants/actionTypes/visiblePanel.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/constants/actionTypes/visiblePanel.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/constants/actionTypes/visiblePanel.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/constants/actionTypes/visiblePanel.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/containers/DevTools.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/containers/DevTools.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/containers/DevTools.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/containers/DevTools.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/containers/Root.dev.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/containers/Root.dev.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/containers/Root.dev.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/containers/Root.dev.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/containers/Root.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/containers/Root.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/containers/Root.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/containers/Root.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/containers/Root.prod.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/containers/Root.prod.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/containers/Root.prod.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/containers/Root.prod.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/globals/application.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/globals/application.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/globals/application.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/globals/application.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/img/common/add.svg b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/img/common/add.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/img/common/add.svg
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/img/common/add.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/img/common/edit.svg b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/img/common/edit.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/img/common/edit.svg
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/img/common/edit.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/less/globals.less b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/less/globals.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/less/globals.less
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/less/globals.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/less/style.less b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/less/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/less/style.less
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/less/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/main.jsx b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/main.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/main.jsx
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/main.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/reducers/languageEditorReducer.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/reducers/languageEditorReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/reducers/languageEditorReducer.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/reducers/languageEditorReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/reducers/languagesReducer.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/reducers/languagesReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/reducers/languagesReducer.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/reducers/languagesReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/reducers/paginationReducer.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/reducers/paginationReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/reducers/paginationReducer.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/reducers/paginationReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/reducers/rootReducer.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/reducers/rootReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/reducers/rootReducer.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/reducers/rootReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/reducers/searchReducer.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/reducers/searchReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/reducers/searchReducer.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/reducers/searchReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/reducers/siteBehaviorReducer.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/reducers/siteBehaviorReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/reducers/siteBehaviorReducer.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/reducers/siteBehaviorReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/reducers/siteInfoReducer.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/reducers/siteInfoReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/reducers/siteInfoReducer.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/reducers/siteInfoReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/reducers/visiblePanelReducer.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/reducers/visiblePanelReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/reducers/visiblePanelReducer.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/reducers/visiblePanelReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/resources/index.jsx b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/resources/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/resources/index.jsx
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/resources/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/services/applicationService.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/services/applicationService.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/services/applicationService.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/services/applicationService.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/services/languageEditorService.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/services/languageEditorService.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/services/languageEditorService.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/services/languageEditorService.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/store/configureStore.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/store/configureStore.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/store/configureStore.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/store/configureStore.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/utils/index.jsx b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/utils/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/src/utils/index.jsx
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/utils/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/webpack.config.js b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/webpack.config.js
similarity index 91%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/webpack.config.js
rename to Dnn.AdminExperience/ClientSide/SiteSettings.Web/webpack.config.js
index bfdb4f97bc6..79be3371515 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/webpack.config.js
+++ b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/webpack.config.js
@@ -3,7 +3,7 @@ const packageJson = require("./package.json");
const path = require("path");
const isProduction = process.env.NODE_ENV === "production";
const webpackExternals = require("@dnnsoftware/dnn-react-common/WebpackExternals");
-const settings = require("../../../../../../settings.local.json");
+const settings = require("../../../settings.local.json");
module.exports = {
entry: "./src/main.jsx",
@@ -15,7 +15,7 @@ module.exports = {
isProduction || settings.WebsitePath == ""
? path.resolve(
__dirname,
- "../../admin/personaBar/Dnn.SiteSettings/scripts/bundles/"
+ "../../Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/scripts/bundles/"
)
: settings.WebsitePath +
"\\DesktopModules\\Admin\\Dnn.PersonaBar\\Modules\\Dnn.SiteSettings\\scripts\\bundles\\",
@@ -30,7 +30,7 @@ module.exports = {
modules: [
path.resolve("./src"), // Look in src first
path.resolve("./node_modules"), // Try local node_modules
- path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules
+ path.resolve("../../../node_modules") // Last fallback to workspaces node_modules
]
},
module: {
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/.babelrc b/Dnn.AdminExperience/ClientSide/Sites.Web/.babelrc
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/.babelrc
rename to Dnn.AdminExperience/ClientSide/Sites.Web/.babelrc
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/.eslintignore b/Dnn.AdminExperience/ClientSide/Sites.Web/.eslintignore
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/.eslintignore
rename to Dnn.AdminExperience/ClientSide/Sites.Web/.eslintignore
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/.eslintrc.js b/Dnn.AdminExperience/ClientSide/Sites.Web/.eslintrc.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/.eslintrc.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/.eslintrc.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/.eslintskipwords.js b/Dnn.AdminExperience/ClientSide/Sites.Web/.eslintskipwords.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/.eslintskipwords.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/.eslintskipwords.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/.gitignore b/Dnn.AdminExperience/ClientSide/Sites.Web/.gitignore
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/.gitignore
rename to Dnn.AdminExperience/ClientSide/Sites.Web/.gitignore
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/jsconfig.json b/Dnn.AdminExperience/ClientSide/Sites.Web/jsconfig.json
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/jsconfig.json
rename to Dnn.AdminExperience/ClientSide/Sites.Web/jsconfig.json
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/package.json b/Dnn.AdminExperience/ClientSide/Sites.Web/package.json
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/package.json
rename to Dnn.AdminExperience/ClientSide/Sites.Web/package.json
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/publish.bat b/Dnn.AdminExperience/ClientSide/Sites.Web/publish.bat
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/publish.bat
rename to Dnn.AdminExperience/ClientSide/Sites.Web/publish.bat
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/.babelrc b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/.babelrc
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/.babelrc
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/.babelrc
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/.eslintrc.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/.eslintrc.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/.eslintrc.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/.eslintrc.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/.vscode/settings.json b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/.vscode/settings.json
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/.vscode/settings.json
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/.vscode/settings.json
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/index.jsx b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/index.jsx
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/lib/SitesListView.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/lib/SitesListView.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/lib/SitesListView.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/lib/SitesListView.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/package.json b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/package.json
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/Components/ExportPortal/index.jsx b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/Components/ExportPortal/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/Components/ExportPortal/index.jsx
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/Components/ExportPortal/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/Components/ExportPortal/style.less b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/Components/ExportPortal/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/Components/ExportPortal/style.less
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/Components/ExportPortal/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/Components/ListView/PortalListItem/MainLabel.jsx b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/Components/ListView/PortalListItem/MainLabel.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/Components/ListView/PortalListItem/MainLabel.jsx
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/Components/ListView/PortalListItem/MainLabel.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/Components/ListView/PortalListItem/index.jsx b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/Components/ListView/PortalListItem/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/Components/ListView/PortalListItem/index.jsx
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/Components/ListView/PortalListItem/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/Components/ListView/PortalListItem/statistic.jsx b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/Components/ListView/PortalListItem/statistic.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/Components/ListView/PortalListItem/statistic.jsx
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/Components/ListView/PortalListItem/statistic.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/Components/ListView/PortalListItem/style.less b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/Components/ListView/PortalListItem/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/Components/ListView/PortalListItem/style.less
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/Components/ListView/PortalListItem/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/Components/ListView/index.jsx b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/Components/ListView/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/Components/ListView/index.jsx
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/Components/ListView/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/Components/ListView/style.less b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/Components/ListView/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/Components/ListView/style.less
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/Components/ListView/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/Components/index.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/Components/index.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/Components/index.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/Components/index.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/actionTypes/index.jsx b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/actionTypes/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/actionTypes/index.jsx
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/actionTypes/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/actionTypes/pagination.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/actionTypes/pagination.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/actionTypes/pagination.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/actionTypes/pagination.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/actionTypes/portal.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/actionTypes/portal.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/actionTypes/portal.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/actionTypes/portal.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/actionTypes/visiblePanel.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/actionTypes/visiblePanel.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/actionTypes/visiblePanel.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/actionTypes/visiblePanel.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/actions/exportPortal.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/actions/exportPortal.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/actions/exportPortal.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/actions/exportPortal.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/actions/index.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/actions/index.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/actions/index.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/actions/index.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/actions/pagination.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/actions/pagination.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/actions/pagination.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/actions/pagination.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/actions/portalList.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/actions/portalList.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/actions/portalList.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/actions/portalList.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/actions/visiblePanel.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/actions/visiblePanel.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/actions/visiblePanel.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/actions/visiblePanel.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/reducers/exportPortal.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/reducers/exportPortal.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/reducers/exportPortal.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/reducers/exportPortal.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/reducers/helpers.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/reducers/helpers.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/reducers/helpers.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/reducers/helpers.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/reducers/index.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/reducers/index.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/reducers/index.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/reducers/index.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/reducers/pagination.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/reducers/pagination.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/reducers/pagination.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/reducers/pagination.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/reducers/portal.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/reducers/portal.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/reducers/portal.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/reducers/portal.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/reducers/visiblePanel.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/reducers/visiblePanel.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/reducers/visiblePanel.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/reducers/visiblePanel.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/services/index.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/services/index.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/services/index.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/services/index.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/services/portal.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/services/portal.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/src/services/portal.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/src/services/portal.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/webpack.config.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/webpack.config.js
similarity index 86%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/webpack.config.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/webpack.config.js
index 334cf011955..23feda7affb 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables/webpack.config.js
+++ b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/webpack.config.js
@@ -1,5 +1,5 @@
const path = require("path");
-const settings = require("../../../../../../../../settings.local.json");
+const settings = require("../../../../../settings.local.json");
const isProduction = process.env.NODE_ENV === "production";
module.exports = {
@@ -14,7 +14,7 @@ module.exports = {
path:
isProduction || settings.WebsitePath == ""
? path.resolve(
- "../../../../admin/personaBar/Dnn.Sites/scripts/exportables/Sites"
+ "../../../../Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Sites/scripts/exportables/Sites"
)
: settings.WebsitePath +
"\\DesktopModules\\Admin\\Dnn.PersonaBar\\Modules\\Dnn.Sites\\scripts\\exportables\\Sites\\",
@@ -53,7 +53,7 @@ module.exports = {
path.resolve(__dirname, "../"),
path.resolve(__dirname, "node_modules"),
path.resolve(__dirname, "../../node_modules"),
- path.resolve(__dirname, "../../../../../../../../node_modules")
+ path.resolve(__dirname, "../../../../../node_modules")
]
}
};
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/actions/index.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/actions/index.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/actions/index.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/actions/index.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/actions/portal.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/actions/portal.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/actions/portal.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/actions/portal.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/components/App.jsx b/Dnn.AdminExperience/ClientSide/Sites.Web/src/components/App.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/components/App.jsx
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/components/App.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/components/CreatePortal/index.jsx b/Dnn.AdminExperience/ClientSide/Sites.Web/src/components/CreatePortal/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/components/CreatePortal/index.jsx
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/components/CreatePortal/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/components/CreatePortal/style.less b/Dnn.AdminExperience/ClientSide/Sites.Web/src/components/CreatePortal/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/components/CreatePortal/style.less
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/components/CreatePortal/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/components/PortalList/index.jsx b/Dnn.AdminExperience/ClientSide/Sites.Web/src/components/PortalList/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/components/PortalList/index.jsx
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/components/PortalList/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/components/PortalList/style.less b/Dnn.AdminExperience/ClientSide/Sites.Web/src/components/PortalList/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/components/PortalList/style.less
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/components/PortalList/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/containers/DevTools.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/containers/DevTools.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/containers/DevTools.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/containers/DevTools.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/containers/Root.dev.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/containers/Root.dev.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/containers/Root.dev.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/containers/Root.dev.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/containers/Root.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/containers/Root.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/containers/Root.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/containers/Root.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/containers/Root.prod.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/containers/Root.prod.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/containers/Root.prod.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/containers/Root.prod.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/globals/application.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/globals/application.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/globals/application.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/globals/application.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/card_view.svg b/Dnn.AdminExperience/ClientSide/Sites.Web/src/img/card_view.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/card_view.svg
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/img/card_view.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/common/add.svg b/Dnn.AdminExperience/ClientSide/Sites.Web/src/img/common/add.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/common/add.svg
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/img/common/add.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/common/edit.svg b/Dnn.AdminExperience/ClientSide/Sites.Web/src/img/common/edit.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/common/edit.svg
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/img/common/edit.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/eye.svg b/Dnn.AdminExperience/ClientSide/Sites.Web/src/img/eye.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/eye.svg
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/img/eye.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/gear.svg b/Dnn.AdminExperience/ClientSide/Sites.Web/src/img/gear.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/gear.svg
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/img/gear.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/list_view.svg b/Dnn.AdminExperience/ClientSide/Sites.Web/src/img/list_view.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/list_view.svg
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/img/list_view.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/pages.svg b/Dnn.AdminExperience/ClientSide/Sites.Web/src/img/pages.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/pages.svg
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/img/pages.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/site_template.svg b/Dnn.AdminExperience/ClientSide/Sites.Web/src/img/site_template.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/site_template.svg
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/img/site_template.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/traffic.svg b/Dnn.AdminExperience/ClientSide/Sites.Web/src/img/traffic.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/traffic.svg
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/img/traffic.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/trash.svg b/Dnn.AdminExperience/ClientSide/Sites.Web/src/img/trash.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/trash.svg
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/img/trash.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/users.svg b/Dnn.AdminExperience/ClientSide/Sites.Web/src/img/users.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/img/users.svg
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/img/users.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/less/globals.less b/Dnn.AdminExperience/ClientSide/Sites.Web/src/less/globals.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/less/globals.less
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/less/globals.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/less/style.less b/Dnn.AdminExperience/ClientSide/Sites.Web/src/less/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/less/style.less
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/less/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/localization/index.jsx b/Dnn.AdminExperience/ClientSide/Sites.Web/src/localization/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/localization/index.jsx
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/localization/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/main.jsx b/Dnn.AdminExperience/ClientSide/Sites.Web/src/main.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/main.jsx
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/main.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/reducers/rootReducer.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/reducers/rootReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/reducers/rootReducer.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/reducers/rootReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/services/index.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/services/index.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/services/index.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/services/index.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/services/portal.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/services/portal.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/services/portal.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/services/portal.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/store/configureStore.js b/Dnn.AdminExperience/ClientSide/Sites.Web/src/store/configureStore.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/store/configureStore.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/store/configureStore.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/utils/applicationSettings.jsx b/Dnn.AdminExperience/ClientSide/Sites.Web/src/utils/applicationSettings.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/utils/applicationSettings.jsx
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/utils/applicationSettings.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/utils/index.jsx b/Dnn.AdminExperience/ClientSide/Sites.Web/src/utils/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/utils/index.jsx
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/utils/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/utils/string.jsx b/Dnn.AdminExperience/ClientSide/Sites.Web/src/utils/string.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/utils/string.jsx
rename to Dnn.AdminExperience/ClientSide/Sites.Web/src/utils/string.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/webpack.config.js b/Dnn.AdminExperience/ClientSide/Sites.Web/webpack.config.js
similarity index 92%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/webpack.config.js
rename to Dnn.AdminExperience/ClientSide/Sites.Web/webpack.config.js
index 329a567f041..d69a6d6feb6 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/webpack.config.js
+++ b/Dnn.AdminExperience/ClientSide/Sites.Web/webpack.config.js
@@ -12,7 +12,7 @@ const languages = {
// "it": require("./localizations/it.json"),
// "nl": require("./localizations/nl.json")
};
-const settings = require("../../../../../../settings.local.json");
+const settings = require("../../../settings.local.json");
const moduleName = "sites";
module.exports = {
@@ -23,7 +23,7 @@ module.exports = {
output: {
path:
isProduction || settings.WebsitePath == ""
- ? path.resolve("../../admin/personaBar/Dnn.Sites/scripts/bundles/")
+ ? path.resolve("../../Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Sites/scripts/bundles/")
: settings.WebsitePath +
"\\DesktopModules\\Admin\\Dnn.PersonaBar\\Modules\\Dnn.Sites\\scripts\\bundles\\",
filename: moduleName + "-bundle.js",
@@ -70,7 +70,7 @@ module.exports = {
path.resolve("./src"), // Look in src first
path.resolve("./exportables"), // Look in exportables after
path.resolve("./node_modules"), // Try local node_modules
- path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules
+ path.resolve("../../../node_modules") // Last fallback to workspaces node_modules
]
},
externals: Object.assign(webpackExternals, {
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/.babelrc b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/.babelrc
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/.babelrc
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/.babelrc
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/.eslintignore b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/.eslintignore
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/.eslintignore
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/.eslintignore
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/.eslintrc.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/.eslintrc.js
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/.eslintrc.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/.eslintrc.js
index 324c97748b4..df51aab7a26 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/.eslintrc.js
+++ b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/.eslintrc.js
@@ -1,43 +1,43 @@
-module.exports = {
- "plugins": [
- "react"
- ],
- "env": {
- "browser": true,
- "commonjs": true
- },
- "extends": ["eslint:recommended", "plugin:react/recommended"],
- "settings": {
- "react":{
- "version": "16"
- }
- },
- "parserOptions": {
- "ecmaFeatures": {
- "jsx": true
- },
- "ecmaVersion": 2018,
- "sourceType": "module"
- },
- "globals": {
- "__": false,
- "Promise": false,
- "VERSION": false
- },
- "rules": {
- "semi": "error",
- "no-var": "error",
- "quotes": ["warn", "double" ],
- "indent": ["warn", 4, {"SwitchCase": 1}],
- "no-unused-vars": "warn",
- "no-console": "warn",
- "keyword-spacing": "warn",
- "eqeqeq": "warn",
- "space-before-function-paren": ["warn", { "anonymous": "always", "named": "never" }],
- "space-before-blocks": "warn",
- "no-multiple-empty-lines": "warn",
- "react/jsx-equals-spacing": ["warn", "never"],
- "id-match": ["error", "^([A-Za-z0-9_])+$", {"properties": true}],
- "no-debugger": "warn"
- }
-};
+module.exports = {
+ "plugins": [
+ "react"
+ ],
+ "env": {
+ "browser": true,
+ "commonjs": true
+ },
+ "extends": ["eslint:recommended", "plugin:react/recommended"],
+ "settings": {
+ "react":{
+ "version": "16"
+ }
+ },
+ "parserOptions": {
+ "ecmaFeatures": {
+ "jsx": true
+ },
+ "ecmaVersion": 2018,
+ "sourceType": "module"
+ },
+ "globals": {
+ "__": false,
+ "Promise": false,
+ "VERSION": false
+ },
+ "rules": {
+ "semi": "error",
+ "no-var": "error",
+ "quotes": ["warn", "double" ],
+ "indent": ["warn", 4, {"SwitchCase": 1}],
+ "no-unused-vars": "warn",
+ "no-console": "warn",
+ "keyword-spacing": "warn",
+ "eqeqeq": "warn",
+ "space-before-function-paren": ["warn", { "anonymous": "always", "named": "never" }],
+ "space-before-blocks": "warn",
+ "no-multiple-empty-lines": "warn",
+ "react/jsx-equals-spacing": ["warn", "never"],
+ "id-match": ["error", "^([A-Za-z0-9_])+$", {"properties": true}],
+ "no-debugger": "warn"
+ }
+};
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/jsconfig.json b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/jsconfig.json
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/jsconfig.json
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/jsconfig.json
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/package.json b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/package.json
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/actions/index.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/actions/index.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/actions/index.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/actions/index.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/actions/pagination.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/actions/pagination.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/actions/pagination.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/actions/pagination.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/actions/task.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/actions/task.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/actions/task.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/actions/task.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/actions/visiblePanel.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/actions/visiblePanel.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/actions/visiblePanel.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/actions/visiblePanel.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/App.jsx b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/App.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/App.jsx
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/App.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/body/index.jsx b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/body/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/body/index.jsx
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/body/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/body/style.less b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/body/style.less
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/body/style.less
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/body/style.less
index 0e4f72994af..fb2d68777bf 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/body/style.less
+++ b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/body/style.less
@@ -1,28 +1,28 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-#scheduler-container {
- .dnn-persona-bar-page-body {
- padding: 10px 30px 25px 30px;
- .persona-bar-page-body {
- padding: 0;
- border: none;
- background-color: @alabaster;
- .react-tabs {
- float: left;
- border: solid 1px @alto;
- width: 100%;
- box-sizing: border-box;
- .ReactTabs__TabPanel {
- float: left;
- background-color: #fff;
- width: 100%;
- }
- }
- .row-opened {
- margin-top: -1px;
- margin-bottom: -1px;
- border-top: 2px solid @curiousBlue;
- border-bottom: 2px solid @curiousBlue !important;
- }
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+#scheduler-container {
+ .dnn-persona-bar-page-body {
+ padding: 10px 30px 25px 30px;
+ .persona-bar-page-body {
+ padding: 0;
+ border: none;
+ background-color: @alabaster;
+ .react-tabs {
+ float: left;
+ border: solid 1px @alto;
+ width: 100%;
+ box-sizing: border-box;
+ .ReactTabs__TabPanel {
+ float: left;
+ background-color: #fff;
+ width: 100%;
+ }
+ }
+ .row-opened {
+ margin-top: -1px;
+ margin-bottom: -1px;
+ border-top: 2px solid @curiousBlue;
+ border-bottom: 2px solid @curiousBlue !important;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/history/index.jsx b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/history/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/history/index.jsx
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/history/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/history/style.less b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/history/style.less
similarity index 97%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/history/style.less
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/history/style.less
index ade3c0c1238..bb22adb1177 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/history/style.less
+++ b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/history/style.less
@@ -1,78 +1,78 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-#scheduler-container {
- .dnn-persona-bar-page-body {
- .react-tabs {
- .historyIcon {
- width: 18px;
- height: 18px;
- float: left;
- margin: 19px 10px 10px 15px;
- > svg {
- fill: @thunder;
- }
- }
- .taskHistoryList-title {
- padding: 19px 0 10px 0;
- margin: 0 15px 0 15px;
- border-bottom: solid 1px @alto;
- font-weight: bolder;
- color: @thunder;
- }
- .taskHistoryList-pager {
- width: 100%;
- padding: 0 15px;
- margin-bottom: 15px;
- box-sizing: border-box;
- float: left;
- * {
- box-sizing: border-box;
- }
- }
- .taskHistoryList-grid {
- border: solid 1px @alto;
- margin: 15px;
- float: left;
- width: 96%;
- .historyHeader-wrapper {
- &:not(:last-child) {
- border-bottom: 1px solid @alto;
- }
- width: 100%;
- float: left;
- padding: 15px 0 15px 0;
- }
- .historyHeader-LogNotes {
- width: 30%;
- float: left;
- margin-left: 15px;
- font-weight: bolder;
- }
- .historyHeader-Server {
- width: 15%;
- float: left;
- font-weight: bolder;
- margin-left: 10px;
- }
- .historyHeader-ElapsedTime {
- text-align: center;
- width: 15%;
- float: left;
- font-weight: bolder;
- margin-left: 10px;
- }
- .historyHeader-Succeeded {
- text-align: center;
- width: 12%;
- float: left;
- font-weight: bolder;
- margin-left: 10px;
- }
- .historyHeader-StartEnd {
- float: left;
- font-weight: bolder;
- margin-left: 10px;
- }
- }
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+#scheduler-container {
+ .dnn-persona-bar-page-body {
+ .react-tabs {
+ .historyIcon {
+ width: 18px;
+ height: 18px;
+ float: left;
+ margin: 19px 10px 10px 15px;
+ > svg {
+ fill: @thunder;
+ }
+ }
+ .taskHistoryList-title {
+ padding: 19px 0 10px 0;
+ margin: 0 15px 0 15px;
+ border-bottom: solid 1px @alto;
+ font-weight: bolder;
+ color: @thunder;
+ }
+ .taskHistoryList-pager {
+ width: 100%;
+ padding: 0 15px;
+ margin-bottom: 15px;
+ box-sizing: border-box;
+ float: left;
+ * {
+ box-sizing: border-box;
+ }
+ }
+ .taskHistoryList-grid {
+ border: solid 1px @alto;
+ margin: 15px;
+ float: left;
+ width: 96%;
+ .historyHeader-wrapper {
+ &:not(:last-child) {
+ border-bottom: 1px solid @alto;
+ }
+ width: 100%;
+ float: left;
+ padding: 15px 0 15px 0;
+ }
+ .historyHeader-LogNotes {
+ width: 30%;
+ float: left;
+ margin-left: 15px;
+ font-weight: bolder;
+ }
+ .historyHeader-Server {
+ width: 15%;
+ float: left;
+ font-weight: bolder;
+ margin-left: 10px;
+ }
+ .historyHeader-ElapsedTime {
+ text-align: center;
+ width: 15%;
+ float: left;
+ font-weight: bolder;
+ margin-left: 10px;
+ }
+ .historyHeader-Succeeded {
+ text-align: center;
+ width: 12%;
+ float: left;
+ font-weight: bolder;
+ margin-left: 10px;
+ }
+ .historyHeader-StartEnd {
+ float: left;
+ font-weight: bolder;
+ margin-left: 10px;
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/history/taskHistoryItemRow/index.jsx b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/history/taskHistoryItemRow/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/history/taskHistoryItemRow/index.jsx
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/history/taskHistoryItemRow/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/history/taskHistoryItemRow/style.less b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/history/taskHistoryItemRow/style.less
similarity index 95%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/history/taskHistoryItemRow/style.less
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/history/taskHistoryItemRow/style.less
index d300838519e..0f8b567e989 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/history/taskHistoryItemRow/style.less
+++ b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/history/taskHistoryItemRow/style.less
@@ -1,46 +1,46 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-:local(.taskHistoryItemRow) {
- float: left;
- width: 100%;
- color: @thunder;
- &:not(:last-child) {
- border-bottom: 1px solid @alto;
- }
- padding: 10px 0 10px 0;
- .term-label-logNotes {
- margin: 0 5px 0 15px;
- float: left;
- width: 30%;
- }
- .term-label-server {
- margin: 0 5px 0 5px;
- float: left;
- width: 15%;
- word-wrap: break-word;
- }
- .term-label-elapsedTime {
- text-align: center;
- margin: 0 5px 0 5px;
- width: 15%;
- float: left;
- }
- .term-label-succeeded {
- text-align: center;
- margin: 0 5px 0 5px;
- width: 12%;
- float: left;
- }
- .term-label-startEnd {
- margin: 0 0 0 5px;
- float: left;
- }
- .checkMarkIcon {
- width: 16px;
- height: 16px;
- margin-left: auto;
- margin-right: auto;
- > svg {
- fill: @thunder;
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+:local(.taskHistoryItemRow) {
+ float: left;
+ width: 100%;
+ color: @thunder;
+ &:not(:last-child) {
+ border-bottom: 1px solid @alto;
+ }
+ padding: 10px 0 10px 0;
+ .term-label-logNotes {
+ margin: 0 5px 0 15px;
+ float: left;
+ width: 30%;
+ }
+ .term-label-server {
+ margin: 0 5px 0 5px;
+ float: left;
+ width: 15%;
+ word-wrap: break-word;
+ }
+ .term-label-elapsedTime {
+ text-align: center;
+ margin: 0 5px 0 5px;
+ width: 15%;
+ float: left;
+ }
+ .term-label-succeeded {
+ text-align: center;
+ margin: 0 5px 0 5px;
+ width: 12%;
+ float: left;
+ }
+ .term-label-startEnd {
+ margin: 0 0 0 5px;
+ float: left;
+ }
+ .checkMarkIcon {
+ width: 16px;
+ height: 16px;
+ margin-left: auto;
+ margin-right: auto;
+ > svg {
+ fill: @thunder;
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/history/taskHistoryItemRow/svg/checkmark.svg b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/history/taskHistoryItemRow/svg/checkmark.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/history/taskHistoryItemRow/svg/checkmark.svg
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/history/taskHistoryItemRow/svg/checkmark.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/scheduler/index.jsx b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/scheduler/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/scheduler/index.jsx
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/scheduler/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/scheduler/schedulerEditor/index.jsx b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/scheduler/schedulerEditor/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/scheduler/schedulerEditor/index.jsx
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/scheduler/schedulerEditor/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/scheduler/schedulerEditor/style.less b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/scheduler/schedulerEditor/style.less
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/scheduler/schedulerEditor/style.less
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/scheduler/schedulerEditor/style.less
index cdbb21b1bf9..471151a0e24 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/scheduler/schedulerEditor/style.less
+++ b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/scheduler/schedulerEditor/style.less
@@ -1,117 +1,117 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-.scheduler-setting-editor {
- margin: 10px 0;
- .scheduler-item-container{
- display: flex;
- .scheduler-item-column{
- flex: 0 1 50%;
- }
- }
- .container {
- padding: 2% 8%;
- &.right-column {
- border-left: 1px solid @alto;
- }
- .title-row {
- width: 100%;
- float: left;
- font-weight: bold;
- text-transform: uppercase;
- margin-bottom: 10px;
- }
- .status-row {
- width: 100%;
- float: left;
- margin-bottom: 10px;
- .left {
- float: left;
- width: 50%;
- }
- .right {
- float: right;
- width: 50%;
- text-align: right;
- .checkbox {
- float: right;
- }
- }
- }
- .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;
- }
- .dnn-day-picker {
- width: 100%;
- margin-bottom: 32px;
- }
- .dnn-day-picker{
- width: 100%;
- select {
- padding: 0;
- }
- .calendar-text{
- width: ~"calc(100% - 37px)";
- }
- .clear-button{
- line-height: 28px;
- }
- }
- .switch-button{
- label{
- width: auto;
- }
- }
- }
- }
- .buttons-box {
- width: 100%;
- text-align: center;
- float: left;
- margin: 10px 0;
- .dnn-ui-common-button {
- margin: 5px;
- }
- .edit-icon {
- margin: 0px 10px 20px 10px;
- float: right;
- svg {
- width: 16px;
- float: left;
- height: 16px;
- }
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+.scheduler-setting-editor {
+ margin: 10px 0;
+ .scheduler-item-container{
+ display: flex;
+ .scheduler-item-column{
+ flex: 0 1 50%;
+ }
+ }
+ .container {
+ padding: 2% 8%;
+ &.right-column {
+ border-left: 1px solid @alto;
+ }
+ .title-row {
+ width: 100%;
+ float: left;
+ font-weight: bold;
+ text-transform: uppercase;
+ margin-bottom: 10px;
+ }
+ .status-row {
+ width: 100%;
+ float: left;
+ margin-bottom: 10px;
+ .left {
+ float: left;
+ width: 50%;
+ }
+ .right {
+ float: right;
+ width: 50%;
+ text-align: right;
+ .checkbox {
+ float: right;
+ }
+ }
+ }
+ .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;
+ }
+ .dnn-day-picker {
+ width: 100%;
+ margin-bottom: 32px;
+ }
+ .dnn-day-picker{
+ width: 100%;
+ select {
+ padding: 0;
+ }
+ .calendar-text{
+ width: ~"calc(100% - 37px)";
+ }
+ .clear-button{
+ line-height: 28px;
+ }
+ }
+ .switch-button{
+ label{
+ width: auto;
+ }
+ }
+ }
+ }
+ .buttons-box {
+ width: 100%;
+ text-align: center;
+ float: left;
+ margin: 10px 0;
+ .dnn-ui-common-button {
+ margin: 5px;
+ }
+ .edit-icon {
+ margin: 0px 10px 20px 10px;
+ float: right;
+ svg {
+ width: 16px;
+ float: left;
+ height: 16px;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/scheduler/schedulerRow/index.jsx b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/scheduler/schedulerRow/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/scheduler/schedulerRow/index.jsx
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/scheduler/schedulerRow/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/scheduler/schedulerRow/style.less b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/scheduler/schedulerRow/style.less
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/scheduler/schedulerRow/style.less
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/scheduler/schedulerRow/style.less
index a13d9f8b3c0..491971ea9c2 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/scheduler/schedulerRow/style.less
+++ b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/scheduler/schedulerRow/style.less
@@ -1,123 +1,123 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-.collapsible-component-scheduler {
- display: block;
- float: left;
- width: 100%;
- cursor: auto;
- &:not(:last-child) {
- border-bottom: 1px solid @alto;
- }
- div.collapsible-header-scheduler {
- width: 100%;
- float: left;
- position: relative;
- padding: 15px 0 10px 0;
- box-sizing: border-box;
- cursor: auto;
- .row {
- float: left;
- width: 100%;
- .item-row-name {
- width: 28%;
- float: left;
- padding-left: 15px;
- }
- .item-row-frequency {
- width: 17%;
- float: left;
- }
- .item-row-retryTimeLapse {
- width: 17%;
- float: left;
- }
- .item-row-nextStart {
- width: 19%;
- float: left;
- }
- .item-row-enabled {
- width: 10%;
- float: left;
- text-align: center;
- .checkMarkIcon {
- width: 16px;
- height: 16px;
- margin-left: auto;
- margin-right: auto;
- > svg {
- fill: @thunder;
- }
- }
- }
- .item-row-editButton {
- width: 3%;
- float: right;
- margin-right: 5px;
- .edit-icon {
- cursor: pointer;
- > svg {
- width: 22px;
- float: left;
- height: 22px;
- margin-top: -2px;
- &:hover {
- fill: @thunder;
- }
- fill: @alto;
- }
- }
- .edit-icon-active {
- cursor: pointer;
- > svg {
- width: 22px;
- float: left;
- height: 22px;
- margin-top: -2px;
- fill: @curiousBlue;
- }
- }
- }
- .item-row-historyButton {
- width: 3%;
- float: right;
- margin-right: 10px;
- .collapsible-content {
- -webkit-box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.2);
- -moz-box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.2);
- box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.2);
- z-index: 1000;
- background-color: @white;
- position: absolute;
- width: 810px;
- margin: -114px 0 0 -764px;
- text-align: left;
- }
- .history-icon {
- cursor: pointer;
- > svg {
- width: 22px;
- float: left;
- height: 22px;
- margin-top: -2px;
- &:hover {
- fill: @thunder;
- }
- fill: @alto;
- }
- }
- .history-icon-active {
- cursor: pointer;
- > svg {
- width: 22px;
- float: left;
- height: 22px;
- margin-top: -2px;
- fill: @curiousBlue;
- }
- }
- }
- .item-row-wrapper {
- padding: 0 5px 0 5px;
- }
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+.collapsible-component-scheduler {
+ display: block;
+ float: left;
+ width: 100%;
+ cursor: auto;
+ &:not(:last-child) {
+ border-bottom: 1px solid @alto;
+ }
+ div.collapsible-header-scheduler {
+ width: 100%;
+ float: left;
+ position: relative;
+ padding: 15px 0 10px 0;
+ box-sizing: border-box;
+ cursor: auto;
+ .row {
+ float: left;
+ width: 100%;
+ .item-row-name {
+ width: 28%;
+ float: left;
+ padding-left: 15px;
+ }
+ .item-row-frequency {
+ width: 17%;
+ float: left;
+ }
+ .item-row-retryTimeLapse {
+ width: 17%;
+ float: left;
+ }
+ .item-row-nextStart {
+ width: 19%;
+ float: left;
+ }
+ .item-row-enabled {
+ width: 10%;
+ float: left;
+ text-align: center;
+ .checkMarkIcon {
+ width: 16px;
+ height: 16px;
+ margin-left: auto;
+ margin-right: auto;
+ > svg {
+ fill: @thunder;
+ }
+ }
+ }
+ .item-row-editButton {
+ width: 3%;
+ float: right;
+ margin-right: 5px;
+ .edit-icon {
+ cursor: pointer;
+ > svg {
+ width: 22px;
+ float: left;
+ height: 22px;
+ margin-top: -2px;
+ &:hover {
+ fill: @thunder;
+ }
+ fill: @alto;
+ }
+ }
+ .edit-icon-active {
+ cursor: pointer;
+ > svg {
+ width: 22px;
+ float: left;
+ height: 22px;
+ margin-top: -2px;
+ fill: @curiousBlue;
+ }
+ }
+ }
+ .item-row-historyButton {
+ width: 3%;
+ float: right;
+ margin-right: 10px;
+ .collapsible-content {
+ -webkit-box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.2);
+ -moz-box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.2);
+ box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.2);
+ z-index: 1000;
+ background-color: @white;
+ position: absolute;
+ width: 810px;
+ margin: -114px 0 0 -764px;
+ text-align: left;
+ }
+ .history-icon {
+ cursor: pointer;
+ > svg {
+ width: 22px;
+ float: left;
+ height: 22px;
+ margin-top: -2px;
+ &:hover {
+ fill: @thunder;
+ }
+ fill: @alto;
+ }
+ }
+ .history-icon-active {
+ cursor: pointer;
+ > svg {
+ width: 22px;
+ float: left;
+ height: 22px;
+ margin-top: -2px;
+ fill: @curiousBlue;
+ }
+ }
+ }
+ .item-row-wrapper {
+ padding: 0 5px 0 5px;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/scheduler/style.less b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/scheduler/style.less
similarity index 97%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/scheduler/style.less
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/scheduler/style.less
index 0a197d38155..4ecc1528a08 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/scheduler/style.less
+++ b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/scheduler/style.less
@@ -1,133 +1,133 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-#scheduler-container {
- .dnn-persona-bar-page-body {
- .react-tabs {
- .schedule-items {
- width: 100%;
- display: block;
- float: left;
- padding: 0 20px;
- box-sizing: border-box;
- * {
- box-sizing: border-box;
- }
- .schedule-items-grid {
- border: solid 1px @alto;
- width: 100%;
- float: left;
- margin-bottom: 20px;
- }
- .header-row {
- border-bottom: 1px solid @alto;
- padding: 10px 0 10px 0;
- width: 100%;
- float: left;
- overflow: hidden;
- text-transform: uppercase;
- }
- .header-FriendlyName {
- width: 28%;
- float: left;
- font-weight: bolder;
- padding-left: 15px;
- }
- .header-Frequency {
- width: 17%;
- float: left;
- font-weight: bolder;
- }
- .header-RetryTimeLapse {
- width: 17%;
- float: left;
- font-weight: bolder;
- }
- .header-NextStart {
- width: 19%;
- float: left;
- font-weight: bolder;
- }
- .header-Enabled {
- width: 10%;
- float: left;
- font-weight: bolder;
- margin-left: 12px;
- }
- .header-LogSettingEditButton {
- float: left;
- font-weight: bolder;
- }
- .collapsible-component {
- .collapsible-header {
- text-align: right;
- text-transform: none;
- padding-right: 40px;
- .collapse-icon {
- display: none;
- &.collapsed {
- display: none;
- }
- }
- }
- }
- .servergroup-filter-container {
- width: 30%;
- float: left;
- margin: 10px 0 15px 0;
- border-bottom: 1px solid @alto;
- height: 37px;
- font-weight: bolder;
- }
- .AddItemRow {
- text-align: right;
- width: 70%;
- float: right;
- margin: 10px 0 15px 0;
- font-weight: bolder;
- border-bottom: 1px solid @alto;
- overflow: hidden;
- height: 37px;
- .AddItemBox {
- width: auto;
- float: right;
- color: @thunder;
- cursor: pointer;
- margin-top: 8px;
- .add-icon {
- margin-left: 20px;
- margin-right: 5px;
- float: left;
- cursor: pointer;
- svg {
- width: 16px;
- float: left;
- height: 16px;
- fill: @thunder;
- }
- }
- }
- .AddItemBox-active {
- width: auto;
- float: right;
- color: @curiousBlue;
- .add-icon {
- margin-left: 20px;
- margin-right: 5px;
- float: left;
- svg {
- width: 16px;
- float: left;
- height: 16px;
- fill: @curiousBlue;
- }
- }
- }
- }
- .schedule-item {
- color: @thunder;
- word-break: keep-all;
- word-wrap: break-word;
- }
- }
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+#scheduler-container {
+ .dnn-persona-bar-page-body {
+ .react-tabs {
+ .schedule-items {
+ width: 100%;
+ display: block;
+ float: left;
+ padding: 0 20px;
+ box-sizing: border-box;
+ * {
+ box-sizing: border-box;
+ }
+ .schedule-items-grid {
+ border: solid 1px @alto;
+ width: 100%;
+ float: left;
+ margin-bottom: 20px;
+ }
+ .header-row {
+ border-bottom: 1px solid @alto;
+ padding: 10px 0 10px 0;
+ width: 100%;
+ float: left;
+ overflow: hidden;
+ text-transform: uppercase;
+ }
+ .header-FriendlyName {
+ width: 28%;
+ float: left;
+ font-weight: bolder;
+ padding-left: 15px;
+ }
+ .header-Frequency {
+ width: 17%;
+ float: left;
+ font-weight: bolder;
+ }
+ .header-RetryTimeLapse {
+ width: 17%;
+ float: left;
+ font-weight: bolder;
+ }
+ .header-NextStart {
+ width: 19%;
+ float: left;
+ font-weight: bolder;
+ }
+ .header-Enabled {
+ width: 10%;
+ float: left;
+ font-weight: bolder;
+ margin-left: 12px;
+ }
+ .header-LogSettingEditButton {
+ float: left;
+ font-weight: bolder;
+ }
+ .collapsible-component {
+ .collapsible-header {
+ text-align: right;
+ text-transform: none;
+ padding-right: 40px;
+ .collapse-icon {
+ display: none;
+ &.collapsed {
+ display: none;
+ }
+ }
+ }
+ }
+ .servergroup-filter-container {
+ width: 30%;
+ float: left;
+ margin: 10px 0 15px 0;
+ border-bottom: 1px solid @alto;
+ height: 37px;
+ font-weight: bolder;
+ }
+ .AddItemRow {
+ text-align: right;
+ width: 70%;
+ float: right;
+ margin: 10px 0 15px 0;
+ font-weight: bolder;
+ border-bottom: 1px solid @alto;
+ overflow: hidden;
+ height: 37px;
+ .AddItemBox {
+ width: auto;
+ float: right;
+ color: @thunder;
+ cursor: pointer;
+ margin-top: 8px;
+ .add-icon {
+ margin-left: 20px;
+ margin-right: 5px;
+ float: left;
+ cursor: pointer;
+ svg {
+ width: 16px;
+ float: left;
+ height: 16px;
+ fill: @thunder;
+ }
+ }
+ }
+ .AddItemBox-active {
+ width: auto;
+ float: right;
+ color: @curiousBlue;
+ .add-icon {
+ margin-left: 20px;
+ margin-right: 5px;
+ float: left;
+ svg {
+ width: 16px;
+ float: left;
+ height: 16px;
+ fill: @curiousBlue;
+ }
+ }
+ }
+ }
+ .schedule-item {
+ color: @thunder;
+ word-break: keep-all;
+ word-wrap: break-word;
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/svg/checkmark.svg b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/svg/checkmark.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/svg/checkmark.svg
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/svg/checkmark.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/svg/edit.svg b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/svg/edit.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/svg/edit.svg
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/svg/edit.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/svg/history.svg b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/svg/history.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/svg/history.svg
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/svg/history.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/svg/nodata.svg b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/svg/nodata.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/svg/nodata.svg
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/svg/nodata.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/svg/x_thin.svg b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/svg/x_thin.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/svg/x_thin.svg
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/svg/x_thin.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/LeftPane/LeftPane.jsx b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/LeftPane/LeftPane.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/LeftPane/LeftPane.jsx
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/LeftPane/LeftPane.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/LeftPane/index.jsx b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/LeftPane/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/LeftPane/index.jsx
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/LeftPane/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/LeftPane/style.less b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/LeftPane/style.less
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/LeftPane/style.less
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/LeftPane/style.less
index 16e038ecedb..e4a6d64aa47 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/LeftPane/style.less
+++ b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/LeftPane/style.less
@@ -1,107 +1,107 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-:local(.taskStatusItemLeftPane) {
- padding: 5px 15px 5px 15px;
- display: block;
- box-sizing: border-box;
- float: left;
- width: 100%;
- height: auto;
- border-right: 1px solid @alto;
- margin: 10px 0 10px 0;
- .taskIcon {
- width: 35px;
- height: 35px;
- float: left;
- > svg {
- fill: @mountainMist;
- }
- }
- @-ms-keyframes spin {
- from {
- -ms-transform: rotate(360deg);
- }
- to {
- -ms-transform: rotate(0deg);
- }
- }
- @-moz-keyframes spin {
- from {
- -moz-transform: rotate(360deg);
- }
- to {
- -moz-transform: rotate(0deg);
- }
- }
- @-webkit-keyframes spin {
- from {
- -webkit-transform: rotate(360deg);
- }
- to {
- -webkit-transform: rotate(0deg);
- }
- }
- @keyframes spin {
- from {
- transform: rotate(360deg);
- }
- to {
- transform: rotate(0deg);
- }
- }
- .taskIconProcessing {
- width: 35px;
- height: 35px;
- float: left;
- > svg {
- fill: @curiousBlue;
- }
- -webkit-animation-name: spin;
- -webkit-animation-duration: 4000ms;
- -webkit-animation-iteration-count: infinite;
- -webkit-animation-timing-function: linear;
- -moz-animation-name: spin;
- -moz-animation-duration: 4000ms;
- -moz-animation-iteration-count: infinite;
- -moz-animation-timing-function: linear;
- -ms-animation-name: spin;
- -ms-animation-duration: 4000ms;
- -ms-animation-iteration-count: infinite;
- -ms-animation-timing-function: linear;
- animation-name: spin;
- animation-duration: 4000ms;
- animation-iteration-count: infinite;
- animation-timing-function: linear;
- }
- .taskDetail {
- padding: 10px 0 0 45px;
- > div {
- padding: 0 0 10px 0;
- float: left;
- width: 100%;
- }
- .taskDetail-name {
- font-weight: bolder;
- font-size: 15px;
- white-space: pre-wrap;
- white-space: -moz-pre-wrap;
- white-space: -pre-wrap;
- white-space: -o-pre-wrap;
- word-wrap: break-word;
- }
- .taskDetail-common {
- color: @thunder;
- .taskDetail-common-title {
- font-weight: bolder;
- float: left;
- }
- .taskDetail-common-value {
- float: right;
- }
- .taskDetail-common-title-processing {
- font-weight: bolder;
- float: left;
- color: @curiousBlue;
- }
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+:local(.taskStatusItemLeftPane) {
+ padding: 5px 15px 5px 15px;
+ display: block;
+ box-sizing: border-box;
+ float: left;
+ width: 100%;
+ height: auto;
+ border-right: 1px solid @alto;
+ margin: 10px 0 10px 0;
+ .taskIcon {
+ width: 35px;
+ height: 35px;
+ float: left;
+ > svg {
+ fill: @mountainMist;
+ }
+ }
+ @-ms-keyframes spin {
+ from {
+ -ms-transform: rotate(360deg);
+ }
+ to {
+ -ms-transform: rotate(0deg);
+ }
+ }
+ @-moz-keyframes spin {
+ from {
+ -moz-transform: rotate(360deg);
+ }
+ to {
+ -moz-transform: rotate(0deg);
+ }
+ }
+ @-webkit-keyframes spin {
+ from {
+ -webkit-transform: rotate(360deg);
+ }
+ to {
+ -webkit-transform: rotate(0deg);
+ }
+ }
+ @keyframes spin {
+ from {
+ transform: rotate(360deg);
+ }
+ to {
+ transform: rotate(0deg);
+ }
+ }
+ .taskIconProcessing {
+ width: 35px;
+ height: 35px;
+ float: left;
+ > svg {
+ fill: @curiousBlue;
+ }
+ -webkit-animation-name: spin;
+ -webkit-animation-duration: 4000ms;
+ -webkit-animation-iteration-count: infinite;
+ -webkit-animation-timing-function: linear;
+ -moz-animation-name: spin;
+ -moz-animation-duration: 4000ms;
+ -moz-animation-iteration-count: infinite;
+ -moz-animation-timing-function: linear;
+ -ms-animation-name: spin;
+ -ms-animation-duration: 4000ms;
+ -ms-animation-iteration-count: infinite;
+ -ms-animation-timing-function: linear;
+ animation-name: spin;
+ animation-duration: 4000ms;
+ animation-iteration-count: infinite;
+ animation-timing-function: linear;
+ }
+ .taskDetail {
+ padding: 10px 0 0 45px;
+ > div {
+ padding: 0 0 10px 0;
+ float: left;
+ width: 100%;
+ }
+ .taskDetail-name {
+ font-weight: bolder;
+ font-size: 15px;
+ white-space: pre-wrap;
+ white-space: -moz-pre-wrap;
+ white-space: -pre-wrap;
+ white-space: -o-pre-wrap;
+ word-wrap: break-word;
+ }
+ .taskDetail-common {
+ color: @thunder;
+ .taskDetail-common-title {
+ font-weight: bolder;
+ float: left;
+ }
+ .taskDetail-common-value {
+ float: right;
+ }
+ .taskDetail-common-title-processing {
+ font-weight: bolder;
+ float: left;
+ color: @curiousBlue;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/RightPane/RightPane.jsx b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/RightPane/RightPane.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/RightPane/RightPane.jsx
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/RightPane/RightPane.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/RightPane/index.jsx b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/RightPane/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/RightPane/index.jsx
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/RightPane/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/RightPane/style.less b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/RightPane/style.less
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/RightPane/style.less
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/RightPane/style.less
index a152bb8596e..1fa6c312621 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/RightPane/style.less
+++ b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/RightPane/style.less
@@ -1,45 +1,45 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-:local(.taskStatusItemRightPane) {
- padding: 5px 15px 15px 15px;
- display: block;
- box-sizing: border-box;
- float: left;
- width: 100%;
- height: auto;
- margin-top: 0px;
- .taskDetailRight {
- float: left;
- width: 100%;
- > div {
- padding: 0 0 10px 0;
- float: left;
- width: 100%;
- }
- .taskDetailRight-idWrapper {
- float: right;
- padding-bottom: 5px;
- color: @thunder;
- .taskDetailRight-id {
- font-weight: bolder;
- font-size: 15px;
- float: left;
- padding-left: 85%;
- }
- .taskDetailRight-id-value {
- float: right;
- padding-top: 2px;
- }
- }
- .taskDetailRight-common {
- padding: 0 0 10px 0;
- color: @thunder;
- .taskDetailRight-common-title {
- font-weight: bolder;
- float: left;
- }
- .taskDetailRight-common-value {
- float: right;
- }
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+:local(.taskStatusItemRightPane) {
+ padding: 5px 15px 15px 15px;
+ display: block;
+ box-sizing: border-box;
+ float: left;
+ width: 100%;
+ height: auto;
+ margin-top: 0px;
+ .taskDetailRight {
+ float: left;
+ width: 100%;
+ > div {
+ padding: 0 0 10px 0;
+ float: left;
+ width: 100%;
+ }
+ .taskDetailRight-idWrapper {
+ float: right;
+ padding-bottom: 5px;
+ color: @thunder;
+ .taskDetailRight-id {
+ font-weight: bolder;
+ font-size: 15px;
+ float: left;
+ padding-left: 85%;
+ }
+ .taskDetailRight-id-value {
+ float: right;
+ padding-top: 2px;
+ }
+ }
+ .taskDetailRight-common {
+ padding: 0 0 10px 0;
+ color: @thunder;
+ .taskDetailRight-common-title {
+ font-weight: bolder;
+ float: left;
+ }
+ .taskDetailRight-common-value {
+ float: right;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/index.jsx b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/index.jsx
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/style.less b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/style.less
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/style.less
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/style.less
index b546e65ea19..798918d8469 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/style.less
+++ b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/style.less
@@ -1,36 +1,36 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-#scheduler-container {
- .dnn-persona-bar-page-body {
- .react-tabs {
- [hidden] {
- display: none;
- }
- .noData {
- display: block;
- text-align: center;
- float: left;
- width: 100%;
- .noTasks {
- font-size: x-large;
- color: @thunder;
- margin-left: 40px;
- margin-right: 40px;
- margin-top: 60px;
- left: 0;
- right: 0;
- position: absolute;
- }
- .noTasksMessage {
- font-size: small;
- color: @alto;
- margin-left: 40px;
- margin-right: 40px;
- margin-top: 110px;
- left: 0;
- right: 0;
- position: absolute;
- }
- }
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+#scheduler-container {
+ .dnn-persona-bar-page-body {
+ .react-tabs {
+ [hidden] {
+ display: none;
+ }
+ .noData {
+ display: block;
+ text-align: center;
+ float: left;
+ width: 100%;
+ .noTasks {
+ font-size: x-large;
+ color: @thunder;
+ margin-left: 40px;
+ margin-right: 40px;
+ margin-top: 60px;
+ left: 0;
+ right: 0;
+ position: absolute;
+ }
+ .noTasksMessage {
+ font-size: small;
+ color: @alto;
+ margin-left: 40px;
+ margin-right: 40px;
+ margin-top: 110px;
+ left: 0;
+ right: 0;
+ position: absolute;
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/taskStatusItemRow/index.jsx b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/taskStatusItemRow/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/taskStatusItemRow/index.jsx
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/taskStatusItemRow/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/taskStatusItemRow/style.less b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/taskStatusItemRow/style.less
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/taskStatusItemRow/style.less
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/taskStatusItemRow/style.less
index 4280802546c..c357a0790cf 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/taskStatusItemRow/style.less
+++ b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/taskStatusItemRow/style.less
@@ -1,12 +1,12 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-:local(.taskStatusItemRow) {
- border: solid 1px @alto;
- margin: 15px 15px 0px 15px;
- float: left;
- &:not(:first-child) {
- margin-top: 15px;
- }
- &:last-child {
- margin-bottom: 15px;
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+:local(.taskStatusItemRow) {
+ border: solid 1px @alto;
+ margin: 15px 15px 0px 15px;
+ float: left;
+ &:not(:first-child) {
+ margin-top: 15px;
+ }
+ &:last-child {
+ margin-bottom: 15px;
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/taskStatusItemRow/svg/clock_stop.svg b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/taskStatusItemRow/svg/clock_stop.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/taskStatusItemRow/svg/clock_stop.svg
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/taskStatusItemRow/svg/clock_stop.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/taskStatusItemRow/svg/cycle.svg b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/taskStatusItemRow/svg/cycle.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/taskQueue/taskStatusItemRow/svg/cycle.svg
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/taskQueue/taskStatusItemRow/svg/cycle.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/topPane/index.jsx b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/topPane/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/topPane/index.jsx
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/topPane/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/topPane/modePanel/index.jsx b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/topPane/modePanel/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/topPane/modePanel/index.jsx
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/topPane/modePanel/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/topPane/modePanel/style.less b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/topPane/modePanel/style.less
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/topPane/modePanel/style.less
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/topPane/modePanel/style.less
index f0d9a6da11b..07d823ce922 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/topPane/modePanel/style.less
+++ b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/topPane/modePanel/style.less
@@ -1,62 +1,62 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-.collapsible-content-mode-hidden {
- .collapsible-content-mode;
- box-shadow: none;
-}
-
-.collapsible-content-mode {
- box-shadow: 0 0 17px 2px @alto;
- .modepanel-content-wrapper {
- padding: 20px 30px 20px 30px;
- .divider {
- padding-bottom: 15px;
- }
- .editor-row {
- float: left;
- width: 100%;
- label {
- font-weight: bolder;
- clear: both;
- float: left;
- text-align: left;
- margin-bottom: 5px;
- width: 120px;
- padding: 7px 0 0 0;
- }
- select {
- padding: 8px 16px 8px 5px;
- &.full {
- float: left;
- width: 100%;
- }
- &.two-fifth {
- float: left;
- width: 40%
- }
- &.one-fourth {
- float: left;
- width: 25%;
- }
- width: 220px;
- }
- .text-section {
- width: 5%;
- float: left;
- text-align: center;
- vertical-align: middle;
- margin-top: 9px;
- }
- input {
- float: left;
- width: 220px;
- }
- }
- .action-buttons {
- text-align: center;
- margin: 20px 0;
- button:first-child {
- margin-right: 15px;
- }
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+.collapsible-content-mode-hidden {
+ .collapsible-content-mode;
+ box-shadow: none;
+}
+
+.collapsible-content-mode {
+ box-shadow: 0 0 17px 2px @alto;
+ .modepanel-content-wrapper {
+ padding: 20px 30px 20px 30px;
+ .divider {
+ padding-bottom: 15px;
+ }
+ .editor-row {
+ float: left;
+ width: 100%;
+ label {
+ font-weight: bolder;
+ clear: both;
+ float: left;
+ text-align: left;
+ margin-bottom: 5px;
+ width: 120px;
+ padding: 7px 0 0 0;
+ }
+ select {
+ padding: 8px 16px 8px 5px;
+ &.full {
+ float: left;
+ width: 100%;
+ }
+ &.two-fifth {
+ float: left;
+ width: 40%
+ }
+ &.one-fourth {
+ float: left;
+ width: 25%;
+ }
+ width: 220px;
+ }
+ .text-section {
+ width: 5%;
+ float: left;
+ text-align: center;
+ vertical-align: middle;
+ margin-top: 9px;
+ }
+ input {
+ float: left;
+ width: 220px;
+ }
+ }
+ .action-buttons {
+ text-align: center;
+ margin: 20px 0;
+ button:first-child {
+ margin-right: 15px;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/topPane/style.less b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/topPane/style.less
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/topPane/style.less
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/topPane/style.less
index 2861c7096a1..f321e50a9a1 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/components/topPane/style.less
+++ b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/components/topPane/style.less
@@ -1,137 +1,137 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-:local(.topPaneWrapper) {
- .topPane-time {
- float: right;
- padding: 0 0 10px 0;
- color: @thunder;
- .topPane-time-name {
- float: left;
- }
- .topPane-time-value {
- float: right;
- width: 150px;
- text-align: right;
- }
- }
- .topPane {
- background-color: #fff;
- padding: 15px 15px 15px 15px;
- display: block;
- box-sizing: border-box;
- float: left;
- width: 100%;
- height: auto;
- border: 1px solid @alto;
- margin-bottom: 15px;
- .topPane-left {
- float: left;
- margin-right: 30px;
- font-weight: bolder;
- font-size: 14px;
- width: 40px;
- }
- .topPane-middle {
- float: left;
- padding-right: 50px;
- width: 35%;
- .topPane-middle-name {
- font-weight: bolder;
- font-size: 14px;
- padding: 0 0 9px 0;
- color: @curiousBlue;
- }
- .topPane-middle-name-stopped {
- font-weight: bolder;
- font-size: 14px;
- padding: 0 0 9px 0;
- color: @alizarinCrimson;
- }
- .topPane-middle-common {
- color: @thunder;
- width: 100%;
- float: left;
- padding: 0 0 10px 0;
- .topPane-middle-common-title {
- font-weight: bolder;
- float: left;
- max-width: 90%;
- }
- .topPane-middle-common-value {
- float: right;
- }
- .editIcon {
- width: 16px;
- height: 16px;
- float: right;
- padding-left: 3px;
- margin-right: -20px;
- cursor: pointer;
- > svg {
- &:hover {
- fill: @thunder;
- }
- fill: @alto;
- }
- }
- .editIconDisabled {
- width: 16px;
- height: 16px;
- float: right;
- padding-left: 3px;
- margin-right: -20px;
- > svg {
- fill: @alto;
- }
- }
- .collapsible-content {
- z-index: 1000;
- background-color: @white;
- position: absolute;
- width: 420px;
- margin: -45px 0 0 -92px;
- text-align: left;
- .collapsible-content-mode {
- > div {
- border: solid 1px @alto;
- }
- }
- }
- }
- }
- .topPane-right {
- float: left;
- border-right: solid 1px @alto;
- padding-right: 30px;
- width: 20%;
- .topPane-right-common {
- color: @thunder;
- width: 100%;
- float: left;
- padding: 0 0 10px 0;
- .topPane-right-common-title {
- font-weight: bolder;
- float: left;
- max-width: 90%;
- }
- .topPane-right-common-value {
- float: right;
- }
- }
- }
- .topPane-button {
- float: right;
- padding-top: 15px;
- margin-right: 10px;
- max-width: 155px;
- .dnn-ui-common-button {
- height: auto;
- padding-top: 6px;
- padding-bottom: 6px;
- }
- .topPane-button-start {
- border: 2px solid @alizarinCrimson;
- color: @alizarinCrimson;
- }
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+:local(.topPaneWrapper) {
+ .topPane-time {
+ float: right;
+ padding: 0 0 10px 0;
+ color: @thunder;
+ .topPane-time-name {
+ float: left;
+ }
+ .topPane-time-value {
+ float: right;
+ width: 150px;
+ text-align: right;
+ }
+ }
+ .topPane {
+ background-color: #fff;
+ padding: 15px 15px 15px 15px;
+ display: block;
+ box-sizing: border-box;
+ float: left;
+ width: 100%;
+ height: auto;
+ border: 1px solid @alto;
+ margin-bottom: 15px;
+ .topPane-left {
+ float: left;
+ margin-right: 30px;
+ font-weight: bolder;
+ font-size: 14px;
+ width: 40px;
+ }
+ .topPane-middle {
+ float: left;
+ padding-right: 50px;
+ width: 35%;
+ .topPane-middle-name {
+ font-weight: bolder;
+ font-size: 14px;
+ padding: 0 0 9px 0;
+ color: @curiousBlue;
+ }
+ .topPane-middle-name-stopped {
+ font-weight: bolder;
+ font-size: 14px;
+ padding: 0 0 9px 0;
+ color: @alizarinCrimson;
+ }
+ .topPane-middle-common {
+ color: @thunder;
+ width: 100%;
+ float: left;
+ padding: 0 0 10px 0;
+ .topPane-middle-common-title {
+ font-weight: bolder;
+ float: left;
+ max-width: 90%;
+ }
+ .topPane-middle-common-value {
+ float: right;
+ }
+ .editIcon {
+ width: 16px;
+ height: 16px;
+ float: right;
+ padding-left: 3px;
+ margin-right: -20px;
+ cursor: pointer;
+ > svg {
+ &:hover {
+ fill: @thunder;
+ }
+ fill: @alto;
+ }
+ }
+ .editIconDisabled {
+ width: 16px;
+ height: 16px;
+ float: right;
+ padding-left: 3px;
+ margin-right: -20px;
+ > svg {
+ fill: @alto;
+ }
+ }
+ .collapsible-content {
+ z-index: 1000;
+ background-color: @white;
+ position: absolute;
+ width: 420px;
+ margin: -45px 0 0 -92px;
+ text-align: left;
+ .collapsible-content-mode {
+ > div {
+ border: solid 1px @alto;
+ }
+ }
+ }
+ }
+ }
+ .topPane-right {
+ float: left;
+ border-right: solid 1px @alto;
+ padding-right: 30px;
+ width: 20%;
+ .topPane-right-common {
+ color: @thunder;
+ width: 100%;
+ float: left;
+ padding: 0 0 10px 0;
+ .topPane-right-common-title {
+ font-weight: bolder;
+ float: left;
+ max-width: 90%;
+ }
+ .topPane-right-common-value {
+ float: right;
+ }
+ }
+ }
+ .topPane-button {
+ float: right;
+ padding-top: 15px;
+ margin-right: 10px;
+ max-width: 155px;
+ .dnn-ui-common-button {
+ height: auto;
+ padding-top: 6px;
+ padding-bottom: 6px;
+ }
+ .topPane-button-start {
+ border: 2px solid @alizarinCrimson;
+ color: @alizarinCrimson;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/constants/actionTypes/index.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/constants/actionTypes/index.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/constants/actionTypes/index.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/constants/actionTypes/index.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/constants/actionTypes/pagination.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/constants/actionTypes/pagination.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/constants/actionTypes/pagination.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/constants/actionTypes/pagination.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/constants/actionTypes/task.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/constants/actionTypes/task.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/constants/actionTypes/task.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/constants/actionTypes/task.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/constants/actionTypes/visiblePanel.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/constants/actionTypes/visiblePanel.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/constants/actionTypes/visiblePanel.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/constants/actionTypes/visiblePanel.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/containers/DevTools.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/containers/DevTools.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/containers/DevTools.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/containers/DevTools.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/containers/Root.dev.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/containers/Root.dev.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/containers/Root.dev.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/containers/Root.dev.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/containers/Root.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/containers/Root.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/containers/Root.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/containers/Root.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/containers/Root.prod.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/containers/Root.prod.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/containers/Root.prod.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/containers/Root.prod.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/globals/application.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/globals/application.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/globals/application.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/globals/application.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/img/common/add.svg b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/img/common/add.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/img/common/add.svg
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/img/common/add.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/img/common/edit.svg b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/img/common/edit.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/img/common/edit.svg
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/img/common/edit.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/less/style.less b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/less/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/less/style.less
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/less/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/main.jsx b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/main.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/main.jsx
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/main.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/reducers/paginationReducer.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/reducers/paginationReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/reducers/paginationReducer.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/reducers/paginationReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/reducers/rootReducer.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/reducers/rootReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/reducers/rootReducer.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/reducers/rootReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/reducers/taskReducer.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/reducers/taskReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/reducers/taskReducer.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/reducers/taskReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/reducers/visiblePanelReducer.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/reducers/visiblePanelReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/reducers/visiblePanelReducer.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/reducers/visiblePanelReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/resources/index.jsx b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/resources/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/resources/index.jsx
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/resources/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/services/applicationService.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/services/applicationService.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/services/applicationService.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/services/applicationService.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/store/configureStore.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/store/configureStore.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/store/configureStore.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/store/configureStore.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/utils/index.jsx b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/utils/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/src/utils/index.jsx
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/src/utils/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/webpack.config.js b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/webpack.config.js
similarity index 90%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/webpack.config.js
rename to Dnn.AdminExperience/ClientSide/TaskScheduler.Web/webpack.config.js
index eb14fcc07ea..880bd1575d2 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/webpack.config.js
+++ b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/webpack.config.js
@@ -3,7 +3,7 @@ const packageJson = require("./package.json");
const isProduction = process.env.NODE_ENV === "production";
const path = require("path");
const webpackExternals = require("@dnnsoftware/dnn-react-common/WebpackExternals");
-const settings = require("../../../../../../settings.local.json");
+const settings = require("../../../settings.local.json");
module.exports = {
entry: "./src/main.jsx",
@@ -15,7 +15,7 @@ module.exports = {
isProduction || settings.WebsitePath == ""
? path.resolve(
__dirname,
- "../../admin/personaBar/Dnn.TaskScheduler/scripts/bundles/"
+ "../../Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/scripts/bundles/"
)
: settings.WebsitePath +
"\\DesktopModules\\Admin\\Dnn.PersonaBar\\Modules\\Dnn.TaskScheduler\\scripts\\bundles\\",
@@ -30,7 +30,7 @@ module.exports = {
modules: [
path.resolve("./src"), // Look in src first
path.resolve("./node_modules"), // Try local node_modules
- path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules
+ path.resolve("../../../node_modules") // Last fallback to workspaces node_modules
]
},
module: {
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/.babelrc b/Dnn.AdminExperience/ClientSide/Themes.Web/.babelrc
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/.babelrc
rename to Dnn.AdminExperience/ClientSide/Themes.Web/.babelrc
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/.eslintignore b/Dnn.AdminExperience/ClientSide/Themes.Web/.eslintignore
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/.eslintignore
rename to Dnn.AdminExperience/ClientSide/Themes.Web/.eslintignore
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/.eslintrc.js b/Dnn.AdminExperience/ClientSide/Themes.Web/.eslintrc.js
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/.eslintrc.js
rename to Dnn.AdminExperience/ClientSide/Themes.Web/.eslintrc.js
index ed1ad6eda83..4c73eb129dc 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/.eslintrc.js
+++ b/Dnn.AdminExperience/ClientSide/Themes.Web/.eslintrc.js
@@ -1,42 +1,42 @@
-module.exports = {
- "plugins": [
- "react"
- ],
- "env": {
- "browser": true,
- "commonjs": true
- },
- "extends": ["eslint:recommended", "plugin:react/recommended"],
- "settings": {
- "react": {
- "version": "16"
- }
- },
- "parserOptions": {
- "ecmaFeatures": {
- "jsx": true
- },
- "ecmaVersion": 2018,
- "sourceType": "module"
- },
- "globals": {
- "__": false,
- "Promise": false,
- "VERSION": false
- },
- "rules": {
- "semi": "error",
- "no-var": "error",
- "quotes": ["warn", "double" ],
- "indent": ["warn", 4, {"SwitchCase": 1}],
- "no-unused-vars": "warn",
- "no-console": "warn",
- "keyword-spacing": "warn",
- "eqeqeq": "warn",
- "space-before-function-paren": ["warn", { "anonymous": "always", "named": "never" }],
- "space-before-blocks": "warn",
- "no-multiple-empty-lines": "warn",
- "react/jsx-equals-spacing": ["warn", "never"],
- "id-match": ["error", "^([A-Za-z0-9_])+$", {"properties": true}]
- }
-};
+module.exports = {
+ "plugins": [
+ "react"
+ ],
+ "env": {
+ "browser": true,
+ "commonjs": true
+ },
+ "extends": ["eslint:recommended", "plugin:react/recommended"],
+ "settings": {
+ "react": {
+ "version": "16"
+ }
+ },
+ "parserOptions": {
+ "ecmaFeatures": {
+ "jsx": true
+ },
+ "ecmaVersion": 2018,
+ "sourceType": "module"
+ },
+ "globals": {
+ "__": false,
+ "Promise": false,
+ "VERSION": false
+ },
+ "rules": {
+ "semi": "error",
+ "no-var": "error",
+ "quotes": ["warn", "double" ],
+ "indent": ["warn", 4, {"SwitchCase": 1}],
+ "no-unused-vars": "warn",
+ "no-console": "warn",
+ "keyword-spacing": "warn",
+ "eqeqeq": "warn",
+ "space-before-function-paren": ["warn", { "anonymous": "always", "named": "never" }],
+ "space-before-blocks": "warn",
+ "no-multiple-empty-lines": "warn",
+ "react/jsx-equals-spacing": ["warn", "never"],
+ "id-match": ["error", "^([A-Za-z0-9_])+$", {"properties": true}]
+ }
+};
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/.gitignore b/Dnn.AdminExperience/ClientSide/Themes.Web/.gitignore
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/.gitignore
rename to Dnn.AdminExperience/ClientSide/Themes.Web/.gitignore
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/jsconfig.json b/Dnn.AdminExperience/ClientSide/Themes.Web/jsconfig.json
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/jsconfig.json
rename to Dnn.AdminExperience/ClientSide/Themes.Web/jsconfig.json
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/package.json b/Dnn.AdminExperience/ClientSide/Themes.Web/package.json
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/package.json
rename to Dnn.AdminExperience/ClientSide/Themes.Web/package.json
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/actions/index.js b/Dnn.AdminExperience/ClientSide/Themes.Web/src/actions/index.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/actions/index.js
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/actions/index.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/actions/theme.js b/Dnn.AdminExperience/ClientSide/Themes.Web/src/actions/theme.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/actions/theme.js
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/actions/theme.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/actions/visiblePanel.js b/Dnn.AdminExperience/ClientSide/Themes.Web/src/actions/visiblePanel.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/actions/visiblePanel.js
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/actions/visiblePanel.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/App.jsx b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/App.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/App.jsx
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/App.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/MiddleActions/RestoreTheme/index.jsx b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/MiddleActions/RestoreTheme/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/MiddleActions/RestoreTheme/index.jsx
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/MiddleActions/RestoreTheme/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/MiddleActions/RestoreTheme/style.less b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/MiddleActions/RestoreTheme/style.less
similarity index 95%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/MiddleActions/RestoreTheme/style.less
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/MiddleActions/RestoreTheme/style.less
index 1aab817958c..807d42c6b1d 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/MiddleActions/RestoreTheme/style.less
+++ b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/MiddleActions/RestoreTheme/style.less
@@ -1,8 +1,8 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-.restore-theme{
- button{
- border: none;
- background: none;
- padding: 0;
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+.restore-theme{
+ button{
+ border: none;
+ background: none;
+ padding: 0;
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/MiddleActions/index.jsx b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/MiddleActions/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/MiddleActions/index.jsx
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/MiddleActions/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/MiddleActions/style.less b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/MiddleActions/style.less
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/MiddleActions/style.less
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/MiddleActions/style.less
index 5c6d210d5c8..2f8f86c29dd 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/MiddleActions/style.less
+++ b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/MiddleActions/style.less
@@ -1,24 +1,24 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-.middle-actions{
- margin: 30px 0 15px 0;
- border-bottom: 1px solid @alto;
- padding-bottom: 10px;
- .search-filter {
- float: left;
- width: 100%;
- & > div {
- display: block !important;
- border-left: 1px solid @alto;
- input {
- display: block;
- width: 100%;
- position: inherit !important;
- border: none;
- border-radius: none;
- background-color: transparent;
- outline: none;
- padding-right: 45px;
- }
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+.middle-actions{
+ margin: 30px 0 15px 0;
+ border-bottom: 1px solid @alto;
+ padding-bottom: 10px;
+ .search-filter {
+ float: left;
+ width: 100%;
+ & > div {
+ display: block !important;
+ border-left: 1px solid @alto;
+ input {
+ display: block;
+ width: 100%;
+ position: inherit !important;
+ border: none;
+ border-radius: none;
+ background-color: transparent;
+ outline: none;
+ padding-right: 45px;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/CurrentTheme/index.jsx b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/CurrentTheme/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/CurrentTheme/index.jsx
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/CurrentTheme/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/CurrentTheme/style.less b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/CurrentTheme/style.less
similarity index 94%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/CurrentTheme/style.less
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/CurrentTheme/style.less
index 9a89d2d3e68..707fea2f499 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/CurrentTheme/style.less
+++ b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/CurrentTheme/style.less
@@ -1,16 +1,16 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-.current-theme{
- width: 168px;
- height: 168px;
- background-color: @mercury;
-
- img{
- vertical-align: top;
- width: 100%;
- }
- svg, &:hover svg{
- fill: @alto;
- }
-
-
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+.current-theme{
+ width: 168px;
+ height: 168px;
+ background-color: @mercury;
+
+ img{
+ vertical-align: top;
+ width: 100%;
+ }
+ svg, &:hover svg{
+ fill: @alto;
+ }
+
+
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeFileList/ThemeFile/index.jsx b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeFileList/ThemeFile/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeFileList/ThemeFile/index.jsx
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeFileList/ThemeFile/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeFileList/ThemeFile/style.less b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeFileList/ThemeFile/style.less
similarity index 95%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeFileList/ThemeFile/style.less
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeFileList/ThemeFile/style.less
index 3e651fd8229..5dca6597bc6 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeFileList/ThemeFile/style.less
+++ b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeFileList/ThemeFile/style.less
@@ -1,130 +1,130 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-.theme-file-skin, .theme-file-container{
- float: left;
- margin-left: 10px;
- img{
- width: 80px;
- height: 80px;
- }
-
- span.thumbnail{
- display: inline-block;
- width: 80px;
- height: 80px;
- margin: 9px 0;
- position: relative;
- vertical-align: top;
-
- &.empty{
- &:before{
- content: "";
- display: block;
- width: 80px;
- height: 80px;
- background-color: @mercury;
- }
- }
-
- svg{
- fill: @alto;
- width: 32px;
- position: absolute;
- left: 50%;
- top: 50%;
- transform: translate(-50%, -50%);
- }
-
- & > span.status{
- position: absolute;
- bottom: 5px;
-
- span{
- display: none;
- width: 16px;
- height: 16px;
- float: left;
- color: @white;
- position: relative;
-
- svg{
- width: 20px;
- fill: @white;
- }
- }
-
- span.status-site{
- background-color: @curiousBlue;
- }
- span.status-edit{
- background-color: @nonPhotoBlue;
- }
- }
-
- span.actions{
- position: absolute;
- display: block;
- opacity: 0;
- width: 100%;
- height: 100%;
- top: 0;
- left: 0;
- background-color: rgba(30, 136, 195, 0.6);
- padding: 15px 10px;
- transition: opacity 100ms linear;
-
- a{
- color: @white;
- font-family: inherit;
- font-size: 11px;
- line-height: 12px;
- text-decoration: none;
- height: 50%;
- display: block;
- font-weight: 600;
- }
- a.set-edit.split{
- border-top: 1px solid @white;
- padding: 5px 0;
- }
- }
-
- &:hover span.actions{
- opacity: 1;
- }
- }
-
- div.title{
- display: block;
- text-align: center;
- font-family: inherit;
- font-weight: 600;
- }
-
- &:first-child{
- margin-left: 0;
- }
-
- &.selected{
- span.thumbnail{
- border: 4px solid @nonPhotoBlue;
- margin: 0;
- width: 98px;
- height: 98px;
- padding: 5px;
- }
- }
-
- &.selected.site{
- span.thumbnail{
- border-color: @curiousBlue;
- }
- .status, .status-site{
- display: block;
- }
- }
- &.selected.edit{
- .status, .status-edit{
- display: block;
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+.theme-file-skin, .theme-file-container{
+ float: left;
+ margin-left: 10px;
+ img{
+ width: 80px;
+ height: 80px;
+ }
+
+ span.thumbnail{
+ display: inline-block;
+ width: 80px;
+ height: 80px;
+ margin: 9px 0;
+ position: relative;
+ vertical-align: top;
+
+ &.empty{
+ &:before{
+ content: "";
+ display: block;
+ width: 80px;
+ height: 80px;
+ background-color: @mercury;
+ }
+ }
+
+ svg{
+ fill: @alto;
+ width: 32px;
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%);
+ }
+
+ & > span.status{
+ position: absolute;
+ bottom: 5px;
+
+ span{
+ display: none;
+ width: 16px;
+ height: 16px;
+ float: left;
+ color: @white;
+ position: relative;
+
+ svg{
+ width: 20px;
+ fill: @white;
+ }
+ }
+
+ span.status-site{
+ background-color: @curiousBlue;
+ }
+ span.status-edit{
+ background-color: @nonPhotoBlue;
+ }
+ }
+
+ span.actions{
+ position: absolute;
+ display: block;
+ opacity: 0;
+ width: 100%;
+ height: 100%;
+ top: 0;
+ left: 0;
+ background-color: rgba(30, 136, 195, 0.6);
+ padding: 15px 10px;
+ transition: opacity 100ms linear;
+
+ a{
+ color: @white;
+ font-family: inherit;
+ font-size: 11px;
+ line-height: 12px;
+ text-decoration: none;
+ height: 50%;
+ display: block;
+ font-weight: 600;
+ }
+ a.set-edit.split{
+ border-top: 1px solid @white;
+ padding: 5px 0;
+ }
+ }
+
+ &:hover span.actions{
+ opacity: 1;
+ }
+ }
+
+ div.title{
+ display: block;
+ text-align: center;
+ font-family: inherit;
+ font-weight: 600;
+ }
+
+ &:first-child{
+ margin-left: 0;
+ }
+
+ &.selected{
+ span.thumbnail{
+ border: 4px solid @nonPhotoBlue;
+ margin: 0;
+ width: 98px;
+ height: 98px;
+ padding: 5px;
+ }
+ }
+
+ &.selected.site{
+ span.thumbnail{
+ border-color: @curiousBlue;
+ }
+ .status, .status-site{
+ display: block;
+ }
+ }
+ &.selected.edit{
+ .status, .status-edit{
+ display: block;
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeFileList/index.jsx b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeFileList/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeFileList/index.jsx
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeFileList/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeFileList/style.less b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeFileList/style.less
similarity index 95%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeFileList/style.less
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeFileList/style.less
index 42f5ab2d90c..69c8cf21645 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeFileList/style.less
+++ b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeFileList/style.less
@@ -1,18 +1,18 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-.theme-files-list{
- width: 560px;
- overflow: hidden;
-
- .theme-files-scroller{
- margin: 10px 0 0 0;
- & > div + div{
- bottom: 22px !important;
- }
- ul{
- margin: 0;
- padding: 0;
- list-style: none;
- height: 150px;
- }
- }
-}
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+.theme-files-list{
+ width: 560px;
+ overflow: hidden;
+
+ .theme-files-scroller{
+ margin: 10px 0 0 0;
+ & > div + div{
+ bottom: 22px !important;
+ }
+ ul{
+ margin: 0;
+ padding: 0;
+ list-style: none;
+ height: 150px;
+ }
+ }
+}
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/EditThemeAttributes/index.jsx b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/EditThemeAttributes/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/EditThemeAttributes/index.jsx
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/EditThemeAttributes/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/EditThemeAttributes/style.less b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/EditThemeAttributes/style.less
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/EditThemeAttributes/style.less
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/EditThemeAttributes/style.less
index 2e0a4a22796..ea804bf6181 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/EditThemeAttributes/style.less
+++ b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/EditThemeAttributes/style.less
@@ -1,67 +1,67 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-.edit-theme-attributes{
- & > .dnn-ui-common-button{
- display: block;
- margin: 0 auto;
- }
- .edit-popup{
- position: absolute;
- left: 0;
- top: 0;
- width: 565px;
- border: 1px solid @alto;
- border-radius: 3px;
- z-index: 50;
- background: white;
- -webkit-box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.2);
- -moz-box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.2);
- box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.2);
-
- & > div {
- margin: 35px 30px;
- }
-
- .dnn-grid-cell > .dnn-grid-cell{
- margin-bottom: 20px;
- padding-right: 25px;
- }
-
- h3 {
- font-size: 12px;
- font-weight: bold;
- text-transform: uppercase;
- }
-
- .dnn-grid-cell > .dnn-grid-cell.right-column{
- padding-right: 0;
- padding-left: 25px;
- border-left: none;
-
- .dnn-radio-buttons{
- margin-top: 28px;
- ul li label{
- margin-bottom: 10px;
- line-height: 20px;
- }
- }
- }
-
- .split{
- margin-bottom: 20px;
- border-top: 1px solid @alto;
- }
-
- .dnn-dropdown-with-error, .dnn-single-line-input-with-error {
- display: block;
- }
-
- .dnn-grid-cell.actions-cell {
- padding: 0;
- text-align: center;
-
- button:first-child {
- margin-right: 10px;
- }
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+.edit-theme-attributes{
+ & > .dnn-ui-common-button{
+ display: block;
+ margin: 0 auto;
+ }
+ .edit-popup{
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 565px;
+ border: 1px solid @alto;
+ border-radius: 3px;
+ z-index: 50;
+ background: white;
+ -webkit-box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.2);
+ -moz-box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.2);
+ box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.2);
+
+ & > div {
+ margin: 35px 30px;
+ }
+
+ .dnn-grid-cell > .dnn-grid-cell{
+ margin-bottom: 20px;
+ padding-right: 25px;
+ }
+
+ h3 {
+ font-size: 12px;
+ font-weight: bold;
+ text-transform: uppercase;
+ }
+
+ .dnn-grid-cell > .dnn-grid-cell.right-column{
+ padding-right: 0;
+ padding-left: 25px;
+ border-left: none;
+
+ .dnn-radio-buttons{
+ margin-top: 28px;
+ ul li label{
+ margin-bottom: 10px;
+ line-height: 20px;
+ }
+ }
+ }
+
+ .split{
+ margin-bottom: 20px;
+ border-top: 1px solid @alto;
+ }
+
+ .dnn-dropdown-with-error, .dnn-single-line-input-with-error {
+ display: block;
+ }
+
+ .dnn-grid-cell.actions-cell {
+ padding: 0;
+ text-align: center;
+
+ button:first-child {
+ margin-right: 10px;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/ParseThemePackage/index.jsx b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/ParseThemePackage/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/ParseThemePackage/index.jsx
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/ParseThemePackage/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/ParseThemePackage/style.less b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/ParseThemePackage/style.less
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/ParseThemePackage/style.less
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/ParseThemePackage/style.less
index ba0056c4d65..4093f5fe814 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/ParseThemePackage/style.less
+++ b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/ParseThemePackage/style.less
@@ -1,6 +1,6 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-.parse-theme-package{
- ul li label{
- line-height: 20px;
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+.parse-theme-package{
+ ul li label{
+ line-height: 20px;
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/index.jsx b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/index.jsx
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/style.less b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/style.less
similarity index 95%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/style.less
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/style.less
index fc866128e26..2b1c2312408 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/style.less
+++ b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/ThemeSettings/style.less
@@ -1,25 +1,25 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-.theme-settings{
- padding: 15px 15px 0 0;
- position: relative;
-
- & > .dnn-grid-cell > .left-column{
- padding-top: 20px;
- }
- & > .dnn-grid-cell > .right-column{
- border-left: 1px solid @alto;
- padding: 20px 0 0 65px;
-
- .dnn-radio-buttons{
- margin: 18px 0 0 0;
-
- ul li{
- margin-left: 0;
-
- &:first-child{
- margin-right: 30px;
- }
- }
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+.theme-settings{
+ padding: 15px 15px 0 0;
+ position: relative;
+
+ & > .dnn-grid-cell > .left-column{
+ padding-top: 20px;
+ }
+ & > .dnn-grid-cell > .right-column{
+ border-left: 1px solid @alto;
+ padding: 20px 0 0 65px;
+
+ .dnn-radio-buttons{
+ margin: 18px 0 0 0;
+
+ ul li{
+ margin-left: 0;
+
+ &:first-child{
+ margin-right: 30px;
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/index.jsx b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/index.jsx
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/style.less b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/style.less
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/style.less
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/style.less
index abd1cf03eb5..3f890387da7 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SiteTheme/style.less
+++ b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SiteTheme/style.less
@@ -1,37 +1,37 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-.site-theme {
- border: 1px solid @curiousBlue;
- padding: 30px 22px;
- min-height: 235px;
- background-color: @white;
- .site-theme-tabs {
- position: relative;
- .site-theme-title {
- text-transform: uppercase;
- font-weight: bold;
- line-height: 30px;
- position: absolute;
- top: 0;
- left: 0;
- span {
- margin-left: 13px;
- }
- }
- .dnn-tabs.react-tabs.secondary > ul {
- float: right;
- width: 100%;
- li {
- float: right;
- margin: 0 15px;
- padding-top: 5px;
- &:first-child {
- margin-right: 0;
- }
- &:last-child {
- margin-right: 15px;
- margin-left: 0;
- }
- }
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+.site-theme {
+ border: 1px solid @curiousBlue;
+ padding: 30px 22px;
+ min-height: 235px;
+ background-color: @white;
+ .site-theme-tabs {
+ position: relative;
+ .site-theme-title {
+ text-transform: uppercase;
+ font-weight: bold;
+ line-height: 30px;
+ position: absolute;
+ top: 0;
+ left: 0;
+ span {
+ margin-left: 13px;
+ }
+ }
+ .dnn-tabs.react-tabs.secondary > ul {
+ float: right;
+ width: 100%;
+ li {
+ float: right;
+ margin: 0 15px;
+ padding-top: 5px;
+ &:first-child {
+ margin-right: 0;
+ }
+ &:last-child {
+ margin-right: 15px;
+ margin-left: 0;
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SvgIcon/index.jsx b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SvgIcon/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SvgIcon/index.jsx
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SvgIcon/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SvgIcon/nodata.svg b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SvgIcon/nodata.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SvgIcon/nodata.svg
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SvgIcon/nodata.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SvgIcon/style.less b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SvgIcon/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/SvgIcon/style.less
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/SvgIcon/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/ThemeList/Theme/index.jsx b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/ThemeList/Theme/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/ThemeList/Theme/index.jsx
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/ThemeList/Theme/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/ThemeList/Theme/style.less b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/ThemeList/Theme/style.less
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/ThemeList/Theme/style.less
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/ThemeList/Theme/style.less
index 412517bca8f..15832e4f155 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/ThemeList/Theme/style.less
+++ b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/ThemeList/Theme/style.less
@@ -1,120 +1,120 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-.theme-skin, .theme-container{
-
- img {
- width: 168px;
- height: 168px;
- }
-
- span.thumbnail{
- display: inline-block;
- width: 168px;
- height: 168px;
- margin: 9px 0;
- position: relative;
- vertical-align: top;
-
- &.empty{
- &:before{
- content: "";
- display: block;
- width: 168px;
- height: 168px;
- background-color: @mercury;
- }
- }
-
- & > svg{
- fill: @alto;
- width: 128px;
- position: absolute;
- left: 50%;
- top: 50%;
- transform: translate(-50%, -50%);
- }
-
-
- span.actions{
- position: absolute;
- display: block;
- opacity: 0;
- width: 100%;
- height: 100%;
- top: 0;
- left: 0;
- background-color: rgba(30, 136, 195, 0.6);
- padding: 15px 10px;
- transition: opacity 100ms linear;
- text-align: center;
-
- ul{
- margin: 0;
- white-space: nowrap;
- padding: 0;
- list-style: none;
- height: 32px;
- position: absolute;
- left: 50%;
- top: 50%;
- transform: translate(-50%, -50%);
-
- li{
- width: 32px;
- height: 32px;
- margin-left: 10px;
- position: relative;
- cursor: pointer;
- display: inline-block;
- svg{
- width: 32px;
- fill: @white;
- position: absolute;
- left: 50%;
- top: 50%;
- transform: translate(-50%, -50%);
- }
- }
- li:first-child{
- margin-left: 0;
- }
- }
- }
-
- &:hover span.actions{
- opacity: 1;
- }
- }
-
- div.title{
- display: block;
- text-align: center;
- font-family: inherit;
- line-height: 36px;
- font-weight: 600;
- }
-
- &.selected{
- span.thumbnail{
- border: 4px solid @curiousBlue;
- margin: 0;
- width: 186px;
- height: 186px;
- padding: 5px;
- }
-
- span.checkmark{
- position: absolute;
- top: 5px;
- right: 5px;
- background-color: @curiousBlue;
- display: block;
- width: 20px;
- height: 20px;
-
- svg{
- width: 100%;
- fill: @white;
- }
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+.theme-skin, .theme-container{
+
+ img {
+ width: 168px;
+ height: 168px;
+ }
+
+ span.thumbnail{
+ display: inline-block;
+ width: 168px;
+ height: 168px;
+ margin: 9px 0;
+ position: relative;
+ vertical-align: top;
+
+ &.empty{
+ &:before{
+ content: "";
+ display: block;
+ width: 168px;
+ height: 168px;
+ background-color: @mercury;
+ }
+ }
+
+ & > svg{
+ fill: @alto;
+ width: 128px;
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%);
+ }
+
+
+ span.actions{
+ position: absolute;
+ display: block;
+ opacity: 0;
+ width: 100%;
+ height: 100%;
+ top: 0;
+ left: 0;
+ background-color: rgba(30, 136, 195, 0.6);
+ padding: 15px 10px;
+ transition: opacity 100ms linear;
+ text-align: center;
+
+ ul{
+ margin: 0;
+ white-space: nowrap;
+ padding: 0;
+ list-style: none;
+ height: 32px;
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%);
+
+ li{
+ width: 32px;
+ height: 32px;
+ margin-left: 10px;
+ position: relative;
+ cursor: pointer;
+ display: inline-block;
+ svg{
+ width: 32px;
+ fill: @white;
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%);
+ }
+ }
+ li:first-child{
+ margin-left: 0;
+ }
+ }
+ }
+
+ &:hover span.actions{
+ opacity: 1;
+ }
+ }
+
+ div.title{
+ display: block;
+ text-align: center;
+ font-family: inherit;
+ line-height: 36px;
+ font-weight: 600;
+ }
+
+ &.selected{
+ span.thumbnail{
+ border: 4px solid @curiousBlue;
+ margin: 0;
+ width: 186px;
+ height: 186px;
+ padding: 5px;
+ }
+
+ span.checkmark{
+ position: absolute;
+ top: 5px;
+ right: 5px;
+ background-color: @curiousBlue;
+ display: block;
+ width: 20px;
+ height: 20px;
+
+ svg{
+ width: 100%;
+ fill: @white;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/ThemeList/index.jsx b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/ThemeList/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/ThemeList/index.jsx
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/ThemeList/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/ThemeList/style.less b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/ThemeList/style.less
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/ThemeList/style.less
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/ThemeList/style.less
index 454fa5513f2..6fb468b1f1e 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/ThemeList/style.less
+++ b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/ThemeList/style.less
@@ -1,65 +1,65 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-.theme-list-wrapper {
- border: 1px solid @alto;
- border-radius: 3px;
- background-color: @white;
- float: left;
- width: 100%;
- .theme-list {
- & > div > .dnn-grid-cell {
- padding: 15px;
- }
- & > div:first-child + div {
- display: none;
- }
- .dnn-grid-cell {
- text-align: center;
- }
- }
- .theme-list-title {
- text-transform: uppercase;
- font-weight: bold;
- line-height: 30px;
- color: @bulgarianRose;
- padding: 20px 0 0 20px;
- }
- .theme-list-separator {
- color: @alto;
- background: @alto;
- height: 1px;
- border: none;
- margin: 0 20px;
- }
- .empty-state {
- display: block;
- text-align: center;
- float: left;
- width: 100%;
- .noThemes {
- font-size: x-large;
- color: @thunder;
- margin-left: 40px;
- margin-right: 40px;
- margin-top: 50px;
- left: 0;
- right: 0;
- position: absolute;
- }
- .noThemesMessage {
- font-size: small;
- color: @alto;
- margin-left: 40px;
- margin-right: 40px;
- margin-top: 100px;
- left: 0;
- right: 0;
- position: absolute;
- }
- .noThemesIcon {
- padding-top: 80px;
- width: 580px;
- margin-left: auto;
- margin-right: auto;
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+.theme-list-wrapper {
+ border: 1px solid @alto;
+ border-radius: 3px;
+ background-color: @white;
+ float: left;
+ width: 100%;
+ .theme-list {
+ & > div > .dnn-grid-cell {
+ padding: 15px;
+ }
+ & > div:first-child + div {
+ display: none;
+ }
+ .dnn-grid-cell {
+ text-align: center;
+ }
+ }
+ .theme-list-title {
+ text-transform: uppercase;
+ font-weight: bold;
+ line-height: 30px;
+ color: @bulgarianRose;
+ padding: 20px 0 0 20px;
+ }
+ .theme-list-separator {
+ color: @alto;
+ background: @alto;
+ height: 1px;
+ border: none;
+ margin: 0 20px;
+ }
+ .empty-state {
+ display: block;
+ text-align: center;
+ float: left;
+ width: 100%;
+ .noThemes {
+ font-size: x-large;
+ color: @thunder;
+ margin-left: 40px;
+ margin-right: 40px;
+ margin-top: 50px;
+ left: 0;
+ right: 0;
+ position: absolute;
+ }
+ .noThemesMessage {
+ font-size: small;
+ color: @alto;
+ margin-left: 40px;
+ margin-right: 40px;
+ margin-top: 100px;
+ left: 0;
+ right: 0;
+ position: absolute;
+ }
+ .noThemesIcon {
+ padding-top: 80px;
+ width: 580px;
+ margin-left: auto;
+ margin-right: auto;
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/index.jsx b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/index.jsx
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/style.less b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/style.less
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/style.less
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/style.less
index 805f7f63310..86cd8d2dbf3 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/components/Body/style.less
+++ b/Dnn.AdminExperience/ClientSide/Themes.Web/src/components/Body/style.less
@@ -1,7 +1,7 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-.themes-body{
- .persona-bar-page-body{
- border: none;
- background: none;
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+.themes-body{
+ .persona-bar-page-body{
+ border: none;
+ background: none;
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/constants/actionTypes/index.js b/Dnn.AdminExperience/ClientSide/Themes.Web/src/constants/actionTypes/index.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/constants/actionTypes/index.js
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/constants/actionTypes/index.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/constants/actionTypes/theme.js b/Dnn.AdminExperience/ClientSide/Themes.Web/src/constants/actionTypes/theme.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/constants/actionTypes/theme.js
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/constants/actionTypes/theme.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/constants/actionTypes/visiblePanel.js b/Dnn.AdminExperience/ClientSide/Themes.Web/src/constants/actionTypes/visiblePanel.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/constants/actionTypes/visiblePanel.js
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/constants/actionTypes/visiblePanel.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/containers/DevTools.js b/Dnn.AdminExperience/ClientSide/Themes.Web/src/containers/DevTools.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/containers/DevTools.js
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/containers/DevTools.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/containers/Root.dev.js b/Dnn.AdminExperience/ClientSide/Themes.Web/src/containers/Root.dev.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/containers/Root.dev.js
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/containers/Root.dev.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/containers/Root.js b/Dnn.AdminExperience/ClientSide/Themes.Web/src/containers/Root.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/containers/Root.js
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/containers/Root.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/containers/Root.prod.js b/Dnn.AdminExperience/ClientSide/Themes.Web/src/containers/Root.prod.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/containers/Root.prod.js
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/containers/Root.prod.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/globals/application.js b/Dnn.AdminExperience/ClientSide/Themes.Web/src/globals/application.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/globals/application.js
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/globals/application.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/less/style.less b/Dnn.AdminExperience/ClientSide/Themes.Web/src/less/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/less/style.less
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/less/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/localization/index.jsx b/Dnn.AdminExperience/ClientSide/Themes.Web/src/localization/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/localization/index.jsx
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/localization/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/main.jsx b/Dnn.AdminExperience/ClientSide/Themes.Web/src/main.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/main.jsx
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/main.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/reducers/rootReducer.js b/Dnn.AdminExperience/ClientSide/Themes.Web/src/reducers/rootReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/reducers/rootReducer.js
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/reducers/rootReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/reducers/themeReducer.js b/Dnn.AdminExperience/ClientSide/Themes.Web/src/reducers/themeReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/reducers/themeReducer.js
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/reducers/themeReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/reducers/visiblePanelReducer.js b/Dnn.AdminExperience/ClientSide/Themes.Web/src/reducers/visiblePanelReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/reducers/visiblePanelReducer.js
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/reducers/visiblePanelReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/services/themeService.js b/Dnn.AdminExperience/ClientSide/Themes.Web/src/services/themeService.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/services/themeService.js
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/services/themeService.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/store/configureStore.js b/Dnn.AdminExperience/ClientSide/Themes.Web/src/store/configureStore.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/store/configureStore.js
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/store/configureStore.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/utils/index.jsx b/Dnn.AdminExperience/ClientSide/Themes.Web/src/utils/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/utils/index.jsx
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/utils/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/utils/string.jsx b/Dnn.AdminExperience/ClientSide/Themes.Web/src/utils/string.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/src/utils/string.jsx
rename to Dnn.AdminExperience/ClientSide/Themes.Web/src/utils/string.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/webpack.config.js b/Dnn.AdminExperience/ClientSide/Themes.Web/webpack.config.js
similarity index 91%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/webpack.config.js
rename to Dnn.AdminExperience/ClientSide/Themes.Web/webpack.config.js
index 35ebdd4fdfe..b5ff5ddc6bd 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/webpack.config.js
+++ b/Dnn.AdminExperience/ClientSide/Themes.Web/webpack.config.js
@@ -12,7 +12,7 @@ const languages = {
// "it": require("./localizations/it.json"),
// "nl": require("./localizations/nl.json")
};
-const settings = require("../../../../../../settings.local.json");
+const settings = require("../../../settings.local.json");
const moduleName = "themes";
module.exports = {
@@ -25,7 +25,7 @@ module.exports = {
isProduction || settings.WebsitePath == ""
? path.resolve(
__dirname,
- "../../admin/personaBar/Dnn.Themes/scripts/bundles/"
+ "../../Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Themes/scripts/bundles/"
)
: settings.WebsitePath +
"\\DesktopModules\\Admin\\Dnn.PersonaBar\\Modules\\Dnn.Themes\\scripts\\bundles\\",
@@ -41,7 +41,7 @@ module.exports = {
path.resolve("./src"), // Look in src first
path.resolve("./exportables"), // Look in exportables after
path.resolve("./node_modules"), // Try local node_modules
- path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules
+ path.resolve("../../../node_modules") // Last fallback to workspaces node_modules
]
},
module: {
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/.babelrc b/Dnn.AdminExperience/ClientSide/Users.Web/.babelrc
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/.babelrc
rename to Dnn.AdminExperience/ClientSide/Users.Web/.babelrc
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/.eslintignore b/Dnn.AdminExperience/ClientSide/Users.Web/.eslintignore
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/.eslintignore
rename to Dnn.AdminExperience/ClientSide/Users.Web/.eslintignore
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/.eslintrc.js b/Dnn.AdminExperience/ClientSide/Users.Web/.eslintrc.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/.eslintrc.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/.eslintrc.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/.gitignore b/Dnn.AdminExperience/ClientSide/Users.Web/.gitignore
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/.gitignore
rename to Dnn.AdminExperience/ClientSide/Users.Web/.gitignore
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/jsconfig.json b/Dnn.AdminExperience/ClientSide/Users.Web/jsconfig.json
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/jsconfig.json
rename to Dnn.AdminExperience/ClientSide/Users.Web/jsconfig.json
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/package.json b/Dnn.AdminExperience/ClientSide/Users.Web/package.json
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/package.json
rename to Dnn.AdminExperience/ClientSide/Users.Web/package.json
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/.babelrc b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/.babelrc
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/.babelrc
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/.babelrc
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/.eslintrc.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/.eslintrc.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/.eslintrc.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/.eslintrc.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/index.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/index.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/package.json b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/package.json
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/actionTypes/index.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/actionTypes/index.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/actionTypes/index.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/actionTypes/index.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/actionTypes/users.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/actionTypes/users.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/actionTypes/users.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/actionTypes/users.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/actions/index.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/actions/index.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/actions/index.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/actions/index.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/actions/users.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/actions/users.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/actions/users.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/actions/users.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/CreateUserBox/index.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/CreateUserBox/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/CreateUserBox/index.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/CreateUserBox/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/CreateUserBox/style.less b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/CreateUserBox/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/CreateUserBox/style.less
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/CreateUserBox/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/FiltersBar/index.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/FiltersBar/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/FiltersBar/index.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/FiltersBar/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/FiltersBar/style.less b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/FiltersBar/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/FiltersBar/style.less
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/FiltersBar/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/ChangePassword/index.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/ChangePassword/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/ChangePassword/index.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/ChangePassword/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/ChangePassword/style.less b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/ChangePassword/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/ChangePassword/style.less
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/ChangePassword/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/DetailRow/index.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/DetailRow/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/DetailRow/index.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/DetailRow/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/DetailRow/style.less b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/DetailRow/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/DetailRow/style.less
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/DetailRow/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/EditProfile/index.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/EditProfile/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/EditProfile/index.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/EditProfile/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/EditProfile/style.less b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/EditProfile/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/EditProfile/style.less
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/EditProfile/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/HeaderRow/index.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/HeaderRow/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/HeaderRow/index.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/HeaderRow/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/HeaderRow/style.less b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/HeaderRow/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/HeaderRow/style.less
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/HeaderRow/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UserMenu/index.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UserMenu/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UserMenu/index.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UserMenu/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UserMenu/menu/Menu.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UserMenu/menu/Menu.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UserMenu/menu/Menu.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UserMenu/menu/Menu.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UserMenu/menu/MenuItem.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UserMenu/menu/MenuItem.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UserMenu/menu/MenuItem.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UserMenu/menu/MenuItem.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UserMenu/menu/style.less b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UserMenu/menu/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UserMenu/menu/style.less
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UserMenu/menu/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UserMenu/style.less b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UserMenu/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UserMenu/style.less
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UserMenu/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UserSettings/index.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UserSettings/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UserSettings/index.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UserSettings/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UserSettings/style.less b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UserSettings/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UserSettings/style.less
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UserSettings/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UsersRoles/RoleRow/index.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UsersRoles/RoleRow/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UsersRoles/RoleRow/index.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UsersRoles/RoleRow/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UsersRoles/RoleRow/style.less b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UsersRoles/RoleRow/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UsersRoles/RoleRow/style.less
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UsersRoles/RoleRow/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UsersRoles/index.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UsersRoles/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UsersRoles/index.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UsersRoles/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UsersRoles/style.less b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UsersRoles/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/UsersRoles/style.less
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/UsersRoles/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/columnSizes.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/columnSizes.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/columnSizes.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/columnSizes.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/index.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/index.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/style.less b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/UserTable/style.less
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/common/CollapsibleSwitcher/index.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/common/CollapsibleSwitcher/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/common/CollapsibleSwitcher/index.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/common/CollapsibleSwitcher/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/common/CollapsibleSwitcher/style.less b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/common/CollapsibleSwitcher/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/common/CollapsibleSwitcher/style.less
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/common/CollapsibleSwitcher/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/common/Password/index.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/common/Password/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/common/Password/index.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/common/Password/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/common/Password/style.less b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/common/Password/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/common/Password/style.less
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/common/Password/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/index.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/index.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/index.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/index.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/permissionHelpers.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/permissionHelpers.js
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/permissionHelpers.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/permissionHelpers.js
index 48464f12b03..6f2bb8d0773 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/components/permissionHelpers.js
+++ b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/permissionHelpers.js
@@ -1,41 +1,41 @@
-export function canManageRoles(settings, user) {
- return !user.isSuperUser && (settings.isAdmin || settings.permissions.MANAGE_ROLES);
-}
-
-export function canManageProfile(settings) {
- return settings.isAdmin || settings.permissions.MANAGE_PROFILE;
-}
-
-export function canViewSettings(settings) {
- return settings.isAdmin || settings.permissions.VIEW_SETTINGS;
-}
-
-export function canAddUser(settings) {
- return (settings.isAdmin || settings.permissions.ADD_USER);
-}
-
-export function canManagePassword(settings)
-{
- return (settings.isAdmin || settings.permissions.MANAGE_PASSWORD);
-}
-
-export function canEditSettings(settings)
-{
- return (settings.isAdmin || settings.permissions.EDIT_SETTINGS);
-}
-
-export function canDeleteUser(settings, userId)
-{
- return (settings.isAdmin || settings.permissions.DELETE_USER)
- && userId!==settings.userId;
-}
-
-export function canAuthorizeUnAuthorizeUser(settings, userId)
-{
- return (settings.isAdmin || settings.permissions.AUTHORIZE_UNAUTHORIZE_USER)
- && userId!==settings.userId;
-}
-
-export function canPromoteDemote(settings, userId) {
- return settings.isHost && userId!==settings.userId;
+export function canManageRoles(settings, user) {
+ return !user.isSuperUser && (settings.isAdmin || settings.permissions.MANAGE_ROLES);
+}
+
+export function canManageProfile(settings) {
+ return settings.isAdmin || settings.permissions.MANAGE_PROFILE;
+}
+
+export function canViewSettings(settings) {
+ return settings.isAdmin || settings.permissions.VIEW_SETTINGS;
+}
+
+export function canAddUser(settings) {
+ return (settings.isAdmin || settings.permissions.ADD_USER);
+}
+
+export function canManagePassword(settings)
+{
+ return (settings.isAdmin || settings.permissions.MANAGE_PASSWORD);
+}
+
+export function canEditSettings(settings)
+{
+ return (settings.isAdmin || settings.permissions.EDIT_SETTINGS);
+}
+
+export function canDeleteUser(settings, userId)
+{
+ return (settings.isAdmin || settings.permissions.DELETE_USER)
+ && userId!==settings.userId;
+}
+
+export function canAuthorizeUnAuthorizeUser(settings, userId)
+{
+ return (settings.isAdmin || settings.permissions.AUTHORIZE_UNAUTHORIZE_USER)
+ && userId!==settings.userId;
+}
+
+export function canPromoteDemote(settings, userId) {
+ return settings.isHost && userId!==settings.userId;
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/helpers.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/helpers.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/helpers.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/helpers.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/reducers/index.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/reducers/index.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/reducers/index.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/reducers/index.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/reducers/users.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/reducers/users.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/reducers/users.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/reducers/users.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/services/index.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/services/index.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/services/index.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/services/index.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/services/users.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/services/users.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/src/services/users.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/services/users.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/webpack.config.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/webpack.config.js
similarity index 89%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/webpack.config.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/webpack.config.js
index 122f09d063f..562fc59c0df 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/webpack.config.js
+++ b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/webpack.config.js
@@ -1,5 +1,5 @@
const path = require("path");
-const settings = require("../../../../../../../../settings.local.json");
+const settings = require("../../../../../settings.local.json");
const isProduction = process.env.NODE_ENV === "production";
module.exports = {
@@ -14,7 +14,7 @@ module.exports = {
path:
isProduction || settings.WebsitePath == ""
? path.resolve(
- "../../../../admin/personaBar/Dnn.Users/scripts/exportables/Users"
+ "../../../../Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/scripts/exportables/Users"
)
: settings.WebsitePath +
"\\DesktopModules\\Admin\\Dnn.PersonaBar\\Modules\\Dnn.Users\\scripts\\exportables\\Users\\",
@@ -70,7 +70,7 @@ module.exports = {
path.resolve(__dirname, "../"),
path.resolve(__dirname, "node_modules"),
path.resolve(__dirname, "../../node_modules"),
- path.resolve(__dirname, "../../../../../../../../node_modules")
+ path.resolve(__dirname, "../../../../../node_modules")
]
},
devtool: "source-map"
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/actions/index.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/actions/index.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/actions/index.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/actions/index.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/actions/users.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/actions/users.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/actions/users.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/actions/users.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/components/App.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/components/App.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/components/App.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/components/App.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/components/Body/index.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/components/Body/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/components/Body/index.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/components/Body/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/components/Body/style.less b/Dnn.AdminExperience/ClientSide/Users.Web/src/components/Body/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/components/Body/style.less
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/components/Body/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/containers/DevTools.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/containers/DevTools.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/containers/DevTools.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/containers/DevTools.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/containers/Root.dev.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/containers/Root.dev.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/containers/Root.dev.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/containers/Root.dev.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/containers/Root.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/containers/Root.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/containers/Root.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/containers/Root.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/containers/Root.prod.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/containers/Root.prod.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/containers/Root.prod.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/containers/Root.prod.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/globals/application.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/globals/application.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/globals/application.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/globals/application.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/img/common/add.svg b/Dnn.AdminExperience/ClientSide/Users.Web/src/img/common/add.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/img/common/add.svg
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/img/common/add.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/img/common/edit.svg b/Dnn.AdminExperience/ClientSide/Users.Web/src/img/common/edit.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/img/common/edit.svg
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/img/common/edit.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/less/style.less b/Dnn.AdminExperience/ClientSide/Users.Web/src/less/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/less/style.less
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/less/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/localization/index.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/localization/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/localization/index.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/localization/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/main.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/main.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/main.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/main.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/reducers/rootReducer.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/reducers/rootReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/reducers/rootReducer.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/reducers/rootReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/services/index.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/services/index.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/services/index.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/services/index.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/services/userService.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/services/userService.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/services/userService.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/services/userService.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/store/configureStore.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/store/configureStore.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/store/configureStore.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/store/configureStore.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/utils/PasswordStrength.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/utils/PasswordStrength.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/utils/PasswordStrength.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/utils/PasswordStrength.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/utils/PasswordStrength.test.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/utils/PasswordStrength.test.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/utils/PasswordStrength.test.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/utils/PasswordStrength.test.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/utils/applicationSettings.js b/Dnn.AdminExperience/ClientSide/Users.Web/src/utils/applicationSettings.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/utils/applicationSettings.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/utils/applicationSettings.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/utils/index.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/utils/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/utils/index.jsx
rename to Dnn.AdminExperience/ClientSide/Users.Web/src/utils/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/webpack.config.js b/Dnn.AdminExperience/ClientSide/Users.Web/webpack.config.js
similarity index 91%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/webpack.config.js
rename to Dnn.AdminExperience/ClientSide/Users.Web/webpack.config.js
index 3259b7954e5..5e66aa1bbfd 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/webpack.config.js
+++ b/Dnn.AdminExperience/ClientSide/Users.Web/webpack.config.js
@@ -3,7 +3,7 @@ const path = require("path");
const packageJson = require("./package.json");
const isProduction = process.env.NODE_ENV === "production";
const webpackExternals = require("@dnnsoftware/dnn-react-common/WebpackExternals");
-const settings = require("../../../../../../settings.local.json");
+const settings = require("../../../settings.local.json");
module.exports = {
entry: "./src/main.jsx",
@@ -13,7 +13,7 @@ module.exports = {
output: {
path:
isProduction || settings.WebsitePath == ""
- ? path.resolve("../../admin/personaBar/Dnn.Users/scripts/bundles/")
+ ? path.resolve("../../Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/scripts/bundles/")
: settings.WebsitePath +
"\\DesktopModules\\Admin\\Dnn.PersonaBar\\Modules\\Dnn.Users\\scripts\\bundles\\",
filename: "users-bundle.js",
@@ -72,7 +72,7 @@ module.exports = {
path.resolve(__dirname, "./node_modules"), // Try local node_modules
path.resolve(__dirname, "./src/_exportables/src"),
path.resolve(__dirname, "./src/_exportables/node_modules"),
- path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules
+ path.resolve("../../../node_modules") // Last fallback to workspaces node_modules
]
},
externals: Object.assign(webpackExternals, {
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/.babelrc b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/.babelrc
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/.babelrc
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/.babelrc
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/Bundle.Web/.eslintignore b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/.eslintignore
similarity index 100%
rename from Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/Bundle.Web/.eslintignore
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/.eslintignore
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/.eslintrc.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/.eslintrc.js
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/.eslintrc.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/.eslintrc.js
index ae1c003ce9f..038f277191f 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/.eslintrc.js
+++ b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/.eslintrc.js
@@ -1,42 +1,42 @@
-module.exports = {
- "plugins": [
- "react"
- ],
- "env": {
- "browser": true,
- "commonjs": true
- },
- "settings": {
- "react":{
- "version": "16"
- }
- },
- "extends": ["eslint:recommended", "plugin:react/recommended"],
- "parserOptions": {
- "ecmaFeatures": {
- "jsx": true
- },
- "ecmaVersion": 2018,
- "sourceType": "module"
- },
- "globals": {
- "__": false,
- "Promise": false,
- "VERSION": false
- },
- "rules": {
- "semi": "error",
- "no-var": "error",
- "quotes": ["warn", "double" ],
- "indent": ["warn", 4, {"SwitchCase": 1}],
- "no-unused-vars": "warn",
- "no-console": "warn",
- "keyword-spacing": "warn",
- "eqeqeq": "warn",
- "space-before-function-paren": ["warn", { "anonymous": "always", "named": "never" }],
- "space-before-blocks": "warn",
- "no-multiple-empty-lines": "warn",
- "react/jsx-equals-spacing": ["warn", "never"],
- "id-match": ["error", "^([A-Za-z0-9_])+$", {"properties": true}]
- }
-};
+module.exports = {
+ "plugins": [
+ "react"
+ ],
+ "env": {
+ "browser": true,
+ "commonjs": true
+ },
+ "settings": {
+ "react":{
+ "version": "16"
+ }
+ },
+ "extends": ["eslint:recommended", "plugin:react/recommended"],
+ "parserOptions": {
+ "ecmaFeatures": {
+ "jsx": true
+ },
+ "ecmaVersion": 2018,
+ "sourceType": "module"
+ },
+ "globals": {
+ "__": false,
+ "Promise": false,
+ "VERSION": false
+ },
+ "rules": {
+ "semi": "error",
+ "no-var": "error",
+ "quotes": ["warn", "double" ],
+ "indent": ["warn", 4, {"SwitchCase": 1}],
+ "no-unused-vars": "warn",
+ "no-console": "warn",
+ "keyword-spacing": "warn",
+ "eqeqeq": "warn",
+ "space-before-function-paren": ["warn", { "anonymous": "always", "named": "never" }],
+ "space-before-blocks": "warn",
+ "no-multiple-empty-lines": "warn",
+ "react/jsx-equals-spacing": ["warn", "never"],
+ "id-match": ["error", "^([A-Za-z0-9_])+$", {"properties": true}]
+ }
+};
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/Bundle.Web/jsconfig.json b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/jsconfig.json
similarity index 100%
rename from Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/Bundle.Web/jsconfig.json
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/jsconfig.json
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/package.json b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/package.json
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/actions/index.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/actions/index.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/actions/index.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/actions/index.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/actions/pagination.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/actions/pagination.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/actions/pagination.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/actions/pagination.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/actions/visiblePanel.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/actions/visiblePanel.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/actions/visiblePanel.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/actions/visiblePanel.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/actions/vocabulary.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/actions/vocabulary.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/actions/vocabulary.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/actions/vocabulary.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/actions/vocabularyTermList.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/actions/vocabularyTermList.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/actions/vocabularyTermList.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/actions/vocabularyTermList.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/App.jsx b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/App.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/App.jsx
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/App.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/CreateVocabulary/index.jsx b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/CreateVocabulary/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/CreateVocabulary/index.jsx
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/CreateVocabulary/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/CreateVocabulary/style.less b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/CreateVocabulary/style.less
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/CreateVocabulary/style.less
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/CreateVocabulary/style.less
index 9d6fc2699d5..b9f096da601 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/CreateVocabulary/style.less
+++ b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/CreateVocabulary/style.less
@@ -1,57 +1,57 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-:local(.createVocabulary) {
- .create-box {
- padding: 25px 50px;
- .dnn-single-line-input-with-error,
- .dnn-multi-line-input-with-error {
- width: 100%;
- }
-
- label {
- float: left;
- margin-right: 15px;
- font-weight: bold;
- }
- .dnn-radio-buttons {
- float: left;
- width: 100%;
- label:first-child {
- width: 65px;
- word-wrap: break-word;
- margin-bottom: 15px;
- }
- }
- .dnn-ui-common-input-group {
- margin-bottom: 15px;
- float: left;
- width: 100%;
- > label {
- font-weight: bold;
- }
- input, textarea, select {
- border-radius: 0px;
- width: 100%;
- }
- textarea {
- height: 100px;
- padding: 5px;
- }
- }
- .action-buttons {
- float: left;
- width: 100%;
- text-align: center;
- margin: 20px 0;
- position: relative;
- .required-help-text {
- position: absolute;
- top: 15px;
- left: 0;
- color: @rollingStone;
- }
- button:first-child {
- margin-right: 15px;
- }
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+:local(.createVocabulary) {
+ .create-box {
+ padding: 25px 50px;
+ .dnn-single-line-input-with-error,
+ .dnn-multi-line-input-with-error {
+ width: 100%;
+ }
+
+ label {
+ float: left;
+ margin-right: 15px;
+ font-weight: bold;
+ }
+ .dnn-radio-buttons {
+ float: left;
+ width: 100%;
+ label:first-child {
+ width: 65px;
+ word-wrap: break-word;
+ margin-bottom: 15px;
+ }
+ }
+ .dnn-ui-common-input-group {
+ margin-bottom: 15px;
+ float: left;
+ width: 100%;
+ > label {
+ font-weight: bold;
+ }
+ input, textarea, select {
+ border-radius: 0px;
+ width: 100%;
+ }
+ textarea {
+ height: 100px;
+ padding: 5px;
+ }
+ }
+ .action-buttons {
+ float: left;
+ width: 100%;
+ text-align: center;
+ margin: 20px 0;
+ position: relative;
+ .required-help-text {
+ position: absolute;
+ top: 15px;
+ left: 0;
+ color: @rollingStone;
+ }
+ button:first-child {
+ margin-right: 15px;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/LeftPane/LeftPane.jsx b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/LeftPane/LeftPane.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/LeftPane/LeftPane.jsx
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/LeftPane/LeftPane.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/LeftPane/index.jsx b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/LeftPane/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/LeftPane/index.jsx
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/LeftPane/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/LeftPane/style.less b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/LeftPane/style.less
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/LeftPane/style.less
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/LeftPane/style.less
index 14e15f43ef2..de47c7926b2 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/LeftPane/style.less
+++ b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/LeftPane/style.less
@@ -1,14 +1,14 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-:local(.vocabulariesLeftPane) {
- padding: 0 30px 30px 40px;
- display: block;
- box-sizing: border-box;
- float: left;
- width: 100%;
- height: auto;
- border-right: 1px solid #ddd;
- margin-bottom: 15px;
- .dnn-editable-field:first-child{
- padding-top: 2px;
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+:local(.vocabulariesLeftPane) {
+ padding: 0 30px 30px 40px;
+ display: block;
+ box-sizing: border-box;
+ float: left;
+ width: 100%;
+ height: auto;
+ border-right: 1px solid #ddd;
+ margin-bottom: 15px;
+ .dnn-editable-field:first-child{
+ padding-top: 2px;
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/RightPane/AddTermBox/index.jsx b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/RightPane/AddTermBox/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/RightPane/AddTermBox/index.jsx
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/RightPane/AddTermBox/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/RightPane/AddTermBox/style.less b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/RightPane/AddTermBox/style.less
similarity index 95%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/RightPane/AddTermBox/style.less
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/RightPane/AddTermBox/style.less
index 205e25d43a8..62764598066 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/RightPane/AddTermBox/style.less
+++ b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/RightPane/AddTermBox/style.less
@@ -1,55 +1,55 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-:local(.addTermBox) {
- background: #FAFAFA;
- padding: 15px 25px;
- .add-term-title {
- font-size: 13px;
- text-transform: uppercase;
- font-weight: bold;
- margin-bottom: 15px;
- }
- .parent-display {
- padding: 8px;
- background-color: white;
- border: 1px solid #bfbfbf;
- cursor: pointer;
- }
- .parent-tree {
- background: white;
- padding: 15px 25px;
- .term-name:hover {
- color: #2FA5EB;
- }
- }
- .dnn-single-line-input-with-error,
- .dnn-multi-line-input-with-error {
- width: 100%;
- }
- .add-term-footer {
- text-align: right;
- button {
- margin-right: 11px;
- &:last-child {
- margin-right: 0;
- }
- }
- }
- .dnn-ui-common-input-group {
- > label {
- font-weight: bold;
- margin-bottom: 5px;
- display: block;
- color: @bulgarianRose;
- }
- input, textarea, select {
- color: @bulgarianRose;
- border-radius: 0px;
- width: 100%;
- }
- textarea {
- height: 60px;
- padding: 5px;
- margin-bottom: 0;
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+:local(.addTermBox) {
+ background: #FAFAFA;
+ padding: 15px 25px;
+ .add-term-title {
+ font-size: 13px;
+ text-transform: uppercase;
+ font-weight: bold;
+ margin-bottom: 15px;
+ }
+ .parent-display {
+ padding: 8px;
+ background-color: white;
+ border: 1px solid #bfbfbf;
+ cursor: pointer;
+ }
+ .parent-tree {
+ background: white;
+ padding: 15px 25px;
+ .term-name:hover {
+ color: #2FA5EB;
+ }
+ }
+ .dnn-single-line-input-with-error,
+ .dnn-multi-line-input-with-error {
+ width: 100%;
+ }
+ .add-term-footer {
+ text-align: right;
+ button {
+ margin-right: 11px;
+ &:last-child {
+ margin-right: 0;
+ }
+ }
+ }
+ .dnn-ui-common-input-group {
+ > label {
+ font-weight: bold;
+ margin-bottom: 5px;
+ display: block;
+ color: @bulgarianRose;
+ }
+ input, textarea, select {
+ color: @bulgarianRose;
+ border-radius: 0px;
+ width: 100%;
+ }
+ textarea {
+ height: 60px;
+ padding: 5px;
+ margin-bottom: 0;
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/RightPane/Term/index.jsx b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/RightPane/Term/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/RightPane/Term/index.jsx
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/RightPane/Term/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/RightPane/Term/style.less b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/RightPane/Term/style.less
similarity index 95%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/RightPane/Term/style.less
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/RightPane/Term/style.less
index 818cac32805..7130791421b 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/RightPane/Term/style.less
+++ b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/RightPane/Term/style.less
@@ -1,47 +1,47 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-:local(.termLi) {
- cursor: pointer;
- &.selected > div > div > span {
- color: @cerulean;
- * {
- color: #333;
- }
- }
- > div {
- &:first-child {
- display: inline-block;
- position: relative;
- padding-right: 25px;
- &:hover .edit-button {
- display: block;
- }
- }
- }
- .edit-svg {
- margin-right: 5px;
- position: absolute;
- left: -17px;
- top: 3px;
- svg {
- width: 12px;
- height: 12px;
- fill: @rollingStone;
- }
- }
- span {
- font-size: 15px;
- font-weight: bold;
- display: block;
- margin-bottom: 5px;
- color: @rollingStone;
- }
- .edit-button {
- width: 16px;
- height: 16px;
- position: absolute;
- right: 0;
- top: 0;
- margin-left: 10px;
- display: none;
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+:local(.termLi) {
+ cursor: pointer;
+ &.selected > div > div > span {
+ color: @cerulean;
+ * {
+ color: #333;
+ }
+ }
+ > div {
+ &:first-child {
+ display: inline-block;
+ position: relative;
+ padding-right: 25px;
+ &:hover .edit-button {
+ display: block;
+ }
+ }
+ }
+ .edit-svg {
+ margin-right: 5px;
+ position: absolute;
+ left: -17px;
+ top: 3px;
+ svg {
+ width: 12px;
+ height: 12px;
+ fill: @rollingStone;
+ }
+ }
+ span {
+ font-size: 15px;
+ font-weight: bold;
+ display: block;
+ margin-bottom: 5px;
+ color: @rollingStone;
+ }
+ .edit-button {
+ width: 16px;
+ height: 16px;
+ position: absolute;
+ right: 0;
+ top: 0;
+ margin-left: 10px;
+ display: none;
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/RightPane/index.jsx b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/RightPane/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/RightPane/index.jsx
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/RightPane/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/RightPane/style.less b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/RightPane/style.less
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/RightPane/style.less
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/RightPane/style.less
index e21a8078913..ac5fcf3bd64 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/RightPane/style.less
+++ b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/RightPane/style.less
@@ -1,74 +1,74 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-:local(.vocabulariesRightPane) {
- .term-list-label {
- font-weight: bold;
- text-transform: uppercase;
- }
- .add-term-button {
- float: right;
- font-weight: bold;
- cursor: pointer;
- color: @alto;
- &:hover{
- color: @rollingStone;
- svg{
- fill: @rollingStone;
- }
- }
- &:active{
- color: @curiousBlue;
- svg{
- fill: @curiousBlue;
- }
- }
- svg {
- width: 16px;
- height: 16px;
- float: left;
- margin-right: 5px;
- }
- }
- .term-list {
- padding: 0 30px 15px;
- position: relative;
- .term-list-content {
- transition: .5s;
- ul.root-level {
- list-style: none;
- padding: 5px 15px;
- min-height: 285px;
- margin-top: 5px;
- &.Hierarchy{
- padding: 5px 25px
- }
- ul {
- padding: 0 15px;
- list-style: none;
- }
- }
- &.closed {
- opacity: 0;
- z-index: -1;
- }
- &.open {
- opacity: 1;
- z-index: 10;
- transition-delay: .5s;
- }
- }
- .term-ul {
- padding: 0 15px;
- list-style: none;
- &.root-level {
- padding: 5px 25px;
- }
- &.term-list-level {
- li {
- &.selected > div > div > span {
- color: @rollingStone;
- }
- }
- }
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+:local(.vocabulariesRightPane) {
+ .term-list-label {
+ font-weight: bold;
+ text-transform: uppercase;
+ }
+ .add-term-button {
+ float: right;
+ font-weight: bold;
+ cursor: pointer;
+ color: @alto;
+ &:hover{
+ color: @rollingStone;
+ svg{
+ fill: @rollingStone;
+ }
+ }
+ &:active{
+ color: @curiousBlue;
+ svg{
+ fill: @curiousBlue;
+ }
+ }
+ svg {
+ width: 16px;
+ height: 16px;
+ float: left;
+ margin-right: 5px;
+ }
+ }
+ .term-list {
+ padding: 0 30px 15px;
+ position: relative;
+ .term-list-content {
+ transition: .5s;
+ ul.root-level {
+ list-style: none;
+ padding: 5px 15px;
+ min-height: 285px;
+ margin-top: 5px;
+ &.Hierarchy{
+ padding: 5px 25px
+ }
+ ul {
+ padding: 0 15px;
+ list-style: none;
+ }
+ }
+ &.closed {
+ opacity: 0;
+ z-index: -1;
+ }
+ &.open {
+ opacity: 1;
+ z-index: 10;
+ transition-delay: .5s;
+ }
+ }
+ .term-ul {
+ padding: 0 15px;
+ list-style: none;
+ &.root-level {
+ padding: 5px 25px;
+ }
+ &.term-list-level {
+ li {
+ &.selected > div > div > span {
+ color: @rollingStone;
+ }
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/TermHeader/index.jsx b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/TermHeader/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/TermHeader/index.jsx
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/TermHeader/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/TermHeader/style.less b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/TermHeader/style.less
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/TermHeader/style.less
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/TermHeader/style.less
index a024e643e99..06e9a2d2de2 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/TermHeader/style.less
+++ b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/TermHeader/style.less
@@ -1,123 +1,123 @@
-@import "~@dnnsoftware/dnn-react-common/styles/index";
-:local(.collapsibleComponent) {
- display: table;
- width: 100%;
- &.false {
- border-top: 2px solid @curiousBlue;
- border-bottom: 2px solid @curiousBlue;
- position: relative;
- top: -1px;
- }
- &:not(:last-child) {
- div.collapsible-header {
- border-bottom: 1px solid @alto;
- }
- }
- div.collapsible-header {
- text-transform: uppercase;
- color: rgb(178, 189, 195);
- width: 100%;
- float: left;
- position: relative;
- padding: 22px 22px 16px;
- box-sizing: border-box;
- cursor: pointer;
- * {
- pointer-events: none;
- }
- .delete-button {
- pointer-events: all;
- }
- &.false {
- border-bottom: none;
- }
- .collapse-icon {
- position: absolute;
- right: 20px;
- top: 21px;
- font-size: 30px;
- line-height: 16px;
- cursor: pointer;
- user-select: none;
- -webkit-touch-callout: none;
- /* iOS Safari */
- -webkit-user-select: none;
- /* Chrome/Safari/Opera */
- -khtml-user-select: none;
- /* Konqueror */
- -moz-user-select: none;
- /* Firefox */
- -ms-user-select: none;
- /* IE/Edge */
- user-select: none;
- &:after {
- border: 6px solid transparent;
- border-bottom: 6px solid @thunder;
- content: "";
- position: absolute;
- left: -15px;
- top: 0;
- }
- &.collapsed {
- &:after {
- border-top: 6px solid @thunder;
- border-bottom: 6px solid transparent;
- top: 5px;
- }
- }
- }
- }
- .term-header-collapsible {
- > div {
- float: left;
- > .dnn-grid-system {
- padding: 45px 0;
- transition: none;
- }
- }
- }
- .vocab-footer {
- text-align: center;
- padding-bottom: 55px;
- > .dnn-ui-common-button {
- margin-left: 11px;
- }
- }
-}
-
-.term-header {
- .term-icon {
- svg {
- width: 25px;
- float: left;
- height: 25px;
- margin-right: 15px;
- margin-top: -5px;
- fill: @rollingStone;
- }
- }
- .term-label {
- color: @bulgarianRose;
- .dnn-text-overflow-wrapper {
- font-size: 10pt;
- }
- * {
- pointer-events: all !important;
- }
- }
- //force pointer-event to fire on SVG.
- .delete-button {
- display: inline;
- pointer-events: none !important;
- svg {
- pointer-events: all !important;
- g, polygon {
- pointer-events: none !important;
- }
- margin-left: 10px;
- margin-bottom: -2px;
- width: 16px;
- height: 16px;
- }
- }
+@import "~@dnnsoftware/dnn-react-common/styles/index";
+:local(.collapsibleComponent) {
+ display: table;
+ width: 100%;
+ &.false {
+ border-top: 2px solid @curiousBlue;
+ border-bottom: 2px solid @curiousBlue;
+ position: relative;
+ top: -1px;
+ }
+ &:not(:last-child) {
+ div.collapsible-header {
+ border-bottom: 1px solid @alto;
+ }
+ }
+ div.collapsible-header {
+ text-transform: uppercase;
+ color: rgb(178, 189, 195);
+ width: 100%;
+ float: left;
+ position: relative;
+ padding: 22px 22px 16px;
+ box-sizing: border-box;
+ cursor: pointer;
+ * {
+ pointer-events: none;
+ }
+ .delete-button {
+ pointer-events: all;
+ }
+ &.false {
+ border-bottom: none;
+ }
+ .collapse-icon {
+ position: absolute;
+ right: 20px;
+ top: 21px;
+ font-size: 30px;
+ line-height: 16px;
+ cursor: pointer;
+ user-select: none;
+ -webkit-touch-callout: none;
+ /* iOS Safari */
+ -webkit-user-select: none;
+ /* Chrome/Safari/Opera */
+ -khtml-user-select: none;
+ /* Konqueror */
+ -moz-user-select: none;
+ /* Firefox */
+ -ms-user-select: none;
+ /* IE/Edge */
+ user-select: none;
+ &:after {
+ border: 6px solid transparent;
+ border-bottom: 6px solid @thunder;
+ content: "";
+ position: absolute;
+ left: -15px;
+ top: 0;
+ }
+ &.collapsed {
+ &:after {
+ border-top: 6px solid @thunder;
+ border-bottom: 6px solid transparent;
+ top: 5px;
+ }
+ }
+ }
+ }
+ .term-header-collapsible {
+ > div {
+ float: left;
+ > .dnn-grid-system {
+ padding: 45px 0;
+ transition: none;
+ }
+ }
+ }
+ .vocab-footer {
+ text-align: center;
+ padding-bottom: 55px;
+ > .dnn-ui-common-button {
+ margin-left: 11px;
+ }
+ }
+}
+
+.term-header {
+ .term-icon {
+ svg {
+ width: 25px;
+ float: left;
+ height: 25px;
+ margin-right: 15px;
+ margin-top: -5px;
+ fill: @rollingStone;
+ }
+ }
+ .term-label {
+ color: @bulgarianRose;
+ .dnn-text-overflow-wrapper {
+ font-size: 10pt;
+ }
+ * {
+ pointer-events: all !important;
+ }
+ }
+ //force pointer-event to fire on SVG.
+ .delete-button {
+ display: inline;
+ pointer-events: none !important;
+ svg {
+ pointer-events: all !important;
+ g, polygon {
+ pointer-events: none !important;
+ }
+ margin-left: 10px;
+ margin-bottom: -2px;
+ width: 16px;
+ height: 16px;
+ }
+ }
}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/TermHeader/svg/vocabulary_hierarchy.svg b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/TermHeader/svg/vocabulary_hierarchy.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/TermHeader/svg/vocabulary_hierarchy.svg
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/TermHeader/svg/vocabulary_hierarchy.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/TermHeader/svg/vocabulary_simple.svg b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/TermHeader/svg/vocabulary_simple.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/TermHeader/svg/vocabulary_simple.svg
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/TermHeader/svg/vocabulary_simple.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/index.jsx b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/index.jsx
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/style.less b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/components/VocabularyList/style.less
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/constants/actionTypes/index.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/constants/actionTypes/index.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/constants/actionTypes/index.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/constants/actionTypes/index.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/constants/actionTypes/pagination.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/constants/actionTypes/pagination.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/constants/actionTypes/pagination.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/constants/actionTypes/pagination.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/constants/actionTypes/visiblePanel.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/constants/actionTypes/visiblePanel.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/constants/actionTypes/visiblePanel.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/constants/actionTypes/visiblePanel.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/constants/actionTypes/vocabulary.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/constants/actionTypes/vocabulary.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/constants/actionTypes/vocabulary.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/constants/actionTypes/vocabulary.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/constants/actionTypes/vocabularyTermList.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/constants/actionTypes/vocabularyTermList.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/constants/actionTypes/vocabularyTermList.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/constants/actionTypes/vocabularyTermList.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/containers/DevTools.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/containers/DevTools.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/containers/DevTools.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/containers/DevTools.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/containers/Root.dev.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/containers/Root.dev.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/containers/Root.dev.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/containers/Root.dev.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/containers/Root.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/containers/Root.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/containers/Root.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/containers/Root.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/containers/Root.prod.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/containers/Root.prod.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/containers/Root.prod.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/containers/Root.prod.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/globals/taxonomy.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/globals/taxonomy.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/globals/taxonomy.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/globals/taxonomy.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/img/common/add.svg b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/img/common/add.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/img/common/add.svg
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/img/common/add.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/img/common/edit.svg b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/img/common/edit.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/img/common/edit.svg
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/img/common/edit.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/less/style.less b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/less/style.less
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/less/style.less
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/less/style.less
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/main.jsx b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/main.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/main.jsx
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/main.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/reducers/paginationReducer.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/reducers/paginationReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/reducers/paginationReducer.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/reducers/paginationReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/reducers/rootReducer.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/reducers/rootReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/reducers/rootReducer.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/reducers/rootReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/reducers/visiblePanelReducer.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/reducers/visiblePanelReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/reducers/visiblePanelReducer.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/reducers/visiblePanelReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/reducers/vocabularyReducer.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/reducers/vocabularyReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/reducers/vocabularyReducer.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/reducers/vocabularyReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/reducers/vocabularyTermListReducer.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/reducers/vocabularyTermListReducer.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/reducers/vocabularyTermListReducer.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/reducers/vocabularyTermListReducer.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/resources/index.jsx b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/resources/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/resources/index.jsx
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/resources/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/services/vocabularyService.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/services/vocabularyService.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/services/vocabularyService.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/services/vocabularyService.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/services/vocabularyTermService.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/services/vocabularyTermService.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/services/vocabularyTermService.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/services/vocabularyTermService.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/store/configureStore.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/store/configureStore.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/store/configureStore.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/store/configureStore.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/utils/index.jsx b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/utils/index.jsx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/src/utils/index.jsx
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/utils/index.jsx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/webpack.config.js b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/webpack.config.js
similarity index 90%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/webpack.config.js
rename to Dnn.AdminExperience/ClientSide/Vocabularies.Web/webpack.config.js
index 00f65af0430..eb4cd13d2d9 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/webpack.config.js
+++ b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/webpack.config.js
@@ -3,7 +3,7 @@ const path = require("path");
const packageJson = require("./package.json");
const isProduction = process.env.NODE_ENV === "production";
const moduleName = "vocabulary";
-const settings = require("../../../../../../settings.local.json");
+const settings = require("../../../settings.local.json");
module.exports = {
entry: "./src/main.jsx",
@@ -15,7 +15,7 @@ module.exports = {
isProduction || settings.WebsitePath == ""
? path.resolve(
__dirname,
- "../../admin/personaBar/Dnn.Vocabularies/scripts/bundles/"
+ "../../Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Vocabularies/scripts/bundles/"
)
: settings.WebsitePath +
"\\DesktopModules\\Admin\\Dnn.PersonaBar\\Modules\\Dnn.Vocabularies\\scripts\\bundles\\",
@@ -30,7 +30,7 @@ module.exports = {
modules: [
path.resolve("./src"), // Look in src first
path.resolve("./node_modules"), // Try local node_modules
- path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules
+ path.resolve("../../../node_modules") // Last fallback to workspaces node_modules
]
},
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/App_LocalResources/EditLogTypes.ascx.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/App_LocalResources/EditLogTypes.ascx.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/App_LocalResources/EditLogTypes.ascx.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/App_LocalResources/EditLogTypes.ascx.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/App_LocalResources/LogViewer.ascx.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/App_LocalResources/LogViewer.ascx.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/App_LocalResources/LogViewer.ascx.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/App_LocalResources/LogViewer.ascx.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Common/ControllerBase.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Common/ControllerBase.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Common/ControllerBase.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Common/ControllerBase.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Common/PortalHelper.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Common/PortalHelper.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Common/PortalHelper.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Common/PortalHelper.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/AdminLogs/AdminLogsController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/AdminLogs/AdminLogsController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/AdminLogs/AdminLogsController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/AdminLogs/AdminLogsController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/AdminLogs/Constants.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/AdminLogs/Constants.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/AdminLogs/Constants.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/AdminLogs/Constants.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/BusinessController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/BusinessController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/BusinessController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/BusinessController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/ConfigConsole/ConfigConsoleController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/ConfigConsole/ConfigConsoleController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/ConfigConsole/ConfigConsoleController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/ConfigConsole/ConfigConsoleController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Connectors/Constants.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Connectors/Constants.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Connectors/Constants.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Connectors/Constants.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Constants.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Constants.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Constants.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Constants.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/CreateModuleController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/CreateModuleController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/CreateModuleController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/CreateModuleController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/AvailablePackagesDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/AvailablePackagesDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/AvailablePackagesDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/AvailablePackagesDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/CreateModuleDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/CreateModuleDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/CreateModuleDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/CreateModuleDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/CreatePackageDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/CreatePackageDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/CreatePackageDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/CreatePackageDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/DeletePackageDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/DeletePackageDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/DeletePackageDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/DeletePackageDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/DownloadPackageDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/DownloadPackageDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/DownloadPackageDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/DownloadPackageDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/AuthSystemPackageDetailDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/AuthSystemPackageDetailDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/AuthSystemPackageDetailDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/AuthSystemPackageDetailDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/CoreLanguagePackageDetailDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/CoreLanguagePackageDetailDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/CoreLanguagePackageDetailDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/CoreLanguagePackageDetailDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ExtensionLanguagePackageDetailDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ExtensionLanguagePackageDetailDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ExtensionLanguagePackageDetailDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ExtensionLanguagePackageDetailDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/JsLibraryPackageDetailDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/JsLibraryPackageDetailDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/JsLibraryPackageDetailDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/JsLibraryPackageDetailDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ListItemDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ListItemDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ListItemDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ListItemDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ModuleControlDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ModuleControlDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ModuleControlDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ModuleControlDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ModuleDefinitionDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ModuleDefinitionDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ModuleDefinitionDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ModuleDefinitionDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ModulePackageDetailDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ModulePackageDetailDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ModulePackageDetailDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ModulePackageDetailDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ModulePackagePermissionsDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ModulePackagePermissionsDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ModulePackagePermissionsDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/ModulePackagePermissionsDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/PermissionsDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/PermissionsDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/PermissionsDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/PermissionsDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/SkinObjectPackageDetailDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/SkinObjectPackageDetailDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/SkinObjectPackageDetailDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/SkinObjectPackageDetailDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/SkinPackageDetailDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/SkinPackageDetailDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/SkinPackageDetailDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/SkinPackageDetailDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/UsedByPackage.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/UsedByPackage.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/UsedByPackage.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/Editors/UsedByPackage.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/InstallResultDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/InstallResultDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/InstallResultDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/InstallResultDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/InstallerLogEntry.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/InstallerLogEntry.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/InstallerLogEntry.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/InstallerLogEntry.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/ModuleFolderDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/ModuleFolderDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/ModuleFolderDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/ModuleFolderDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageFilesQueryDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageFilesQueryDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageFilesQueryDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageFilesQueryDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageInfoDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageInfoDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageInfoDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageInfoDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageInfoSlimDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageInfoSlimDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageInfoSlimDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageInfoSlimDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageManifestDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageManifestDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageManifestDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageManifestDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageSettingsDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageSettingsDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageSettingsDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageSettingsDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/ParseResultDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/ParseResultDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/ParseResultDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/ParseResultDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/AuthSystemPackageEditor.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/AuthSystemPackageEditor.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/AuthSystemPackageEditor.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/AuthSystemPackageEditor.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/CoreLanguagePackageEditor.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/CoreLanguagePackageEditor.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/CoreLanguagePackageEditor.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/CoreLanguagePackageEditor.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/ExtensionLanguagePackageEditor.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/ExtensionLanguagePackageEditor.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/ExtensionLanguagePackageEditor.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/ExtensionLanguagePackageEditor.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/IPackageEditor.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/IPackageEditor.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/IPackageEditor.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/IPackageEditor.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/JsLibraryPackageEditor.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/JsLibraryPackageEditor.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/JsLibraryPackageEditor.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/JsLibraryPackageEditor.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/ModulePackageEditor.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/ModulePackageEditor.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/ModulePackageEditor.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/ModulePackageEditor.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/PackageEditorFactory.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/PackageEditorFactory.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/PackageEditorFactory.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/PackageEditorFactory.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/SkinObjectPackageEditor.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/SkinObjectPackageEditor.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/SkinObjectPackageEditor.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/SkinObjectPackageEditor.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/SkinPackageEditor.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/SkinPackageEditor.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/SkinPackageEditor.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/SkinPackageEditor.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/ExtensionsController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/ExtensionsController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/ExtensionsController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/ExtensionsController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/ICreateModuleController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/ICreateModuleController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/ICreateModuleController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/ICreateModuleController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/IInstallController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/IInstallController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/IInstallController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/IInstallController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/InstallController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/InstallController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/InstallController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/InstallController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Utility.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Utility.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Utility.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Utility.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/BulkPagesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/BulkPagesController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/BulkPagesController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/BulkPagesController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/CloneModuleExecutionContext.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/CloneModuleExecutionContext.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/CloneModuleExecutionContext.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/CloneModuleExecutionContext.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Constants.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Constants.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Constants.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Constants.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Converters.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Converters.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Converters.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Converters.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/DefaultPortalThemeController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/DefaultPortalThemeController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/DefaultPortalThemeController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/DefaultPortalThemeController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Dto/PageUrlResult.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Dto/PageUrlResult.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Dto/PageUrlResult.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Dto/PageUrlResult.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Dto/Template.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Dto/Template.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Dto/Template.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Dto/Template.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Dto/UrlIdDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Dto/UrlIdDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Dto/UrlIdDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Dto/UrlIdDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/BulkPagesException.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/BulkPagesException.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/BulkPagesException.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/BulkPagesException.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/PageException.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/PageException.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/PageException.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/PageException.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/PageModuleNotFoundException.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/PageModuleNotFoundException.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/PageModuleNotFoundException.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/PageModuleNotFoundException.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/PageNotFoundException.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/PageNotFoundException.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/PageNotFoundException.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/PageNotFoundException.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/PageValidationException.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/PageValidationException.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/PageValidationException.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/PageValidationException.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/TemplateException.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/TemplateException.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/TemplateException.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Exceptions/TemplateException.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/FriendlyUrlWrapper.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/FriendlyUrlWrapper.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/FriendlyUrlWrapper.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/FriendlyUrlWrapper.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/IBulkPagesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/IBulkPagesController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/IBulkPagesController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/IBulkPagesController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/ICloneModuleExecutionContext.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/ICloneModuleExecutionContext.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/ICloneModuleExecutionContext.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/ICloneModuleExecutionContext.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/IDefaultPortalThemeController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/IDefaultPortalThemeController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/IDefaultPortalThemeController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/IDefaultPortalThemeController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/IFriendlyUrlWrapper.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/IFriendlyUrlWrapper.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/IFriendlyUrlWrapper.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/IFriendlyUrlWrapper.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/IPageManagementController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/IPageManagementController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/IPageManagementController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/IPageManagementController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/IPageUrlsController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/IPageUrlsController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/IPageUrlsController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/IPageUrlsController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/IPagesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/IPagesController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/IPagesController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/IPagesController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/ITemplateController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/ITemplateController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/ITemplateController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/ITemplateController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/IUrlRewriterUtilsWrapper.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/IUrlRewriterUtilsWrapper.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/IUrlRewriterUtilsWrapper.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/IUrlRewriterUtilsWrapper.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Localization.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Localization.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Localization.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Localization.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/PageManagementController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/PageManagementController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/PageManagementController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/PageManagementController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/PageUrlsController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/PageUrlsController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/PageUrlsController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/PageUrlsController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/PagesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/PagesController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/PagesController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/PagesController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/PagesControllerImpl.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/PagesControllerImpl.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/PagesControllerImpl.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/PagesControllerImpl.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/DeletePage.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/DeletePage.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/DeletePage.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/DeletePage.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/GetPage.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/GetPage.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/GetPage.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/GetPage.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/GotoPage.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/GotoPage.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/GotoPage.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/GotoPage.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/ListPages.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/ListPages.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/ListPages.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/ListPages.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/NewPage.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/NewPage.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/NewPage.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/NewPage.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/SetPage.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/SetPage.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/SetPage.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Commands/SetPage.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Models/PageModel.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Models/PageModel.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Models/PageModel.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Models/PageModel.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Models/PageModelBase.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Models/PageModelBase.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Models/PageModelBase.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Prompt/Models/PageModelBase.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/PublishStatus.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/PublishStatus.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/PublishStatus.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/PublishStatus.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Security/ISecurityService.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Security/ISecurityService.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Security/ISecurityService.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Security/ISecurityService.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Security/SecurityService.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Security/SecurityService.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Security/SecurityService.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Security/SecurityService.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/TemplateController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/TemplateController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/TemplateController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/TemplateController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/TermHelper.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/TermHelper.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/TermHelper.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/TermHelper.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/UrlRewriterUtilsWrapper.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/UrlRewriterUtilsWrapper.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/UrlRewriterUtilsWrapper.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/UrlRewriterUtilsWrapper.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/WorkflowHelper.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/WorkflowHelper.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/WorkflowHelper.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/WorkflowHelper.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/XssCleaner.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/XssCleaner.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/XssCleaner.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/XssCleaner.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Application/RestartApplication.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Application/RestartApplication.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Application/RestartApplication.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Application/RestartApplication.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/ClearHistory.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/ClearHistory.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/ClearHistory.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/ClearHistory.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/ClearScreen.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/ClearScreen.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/ClearScreen.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/ClearScreen.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/Clh.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/Clh.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/Clh.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/Clh.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/Cls.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/Cls.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/Cls.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/Cls.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/Exit.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/Exit.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/Exit.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/Exit.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/Reload.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/Reload.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/Reload.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/Reload.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/SetMode.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/SetMode.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/SetMode.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Client/SetMode.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Commands/ListCommands.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Commands/ListCommands.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Commands/ListCommands.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Commands/ListCommands.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Host/ClearCache.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Host/ClearCache.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Host/ClearCache.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Host/ClearCache.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Host/GetHost.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Host/GetHost.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Host/GetHost.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Host/GetHost.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/AddModule.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/AddModule.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/AddModule.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/AddModule.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/CopyModule.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/CopyModule.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/CopyModule.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/CopyModule.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/DeleteModule.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/DeleteModule.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/DeleteModule.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/DeleteModule.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/GetModule.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/GetModule.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/GetModule.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/GetModule.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/ListModules.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/ListModules.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/ListModules.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/ListModules.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/MoveModule.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/MoveModule.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/MoveModule.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/MoveModule.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Portal/ClearLog.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Portal/ClearLog.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Portal/ClearLog.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Portal/ClearLog.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Portal/GetPortal.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Portal/GetPortal.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Portal/GetPortal.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Portal/GetPortal.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Portal/GetSite.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Portal/GetSite.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Portal/GetSite.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Portal/GetSite.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Portal/ListPortals.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Portal/ListPortals.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Portal/ListPortals.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Portal/ListPortals.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Portal/ListSites.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Portal/ListSites.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Portal/ListSites.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Portal/ListSites.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Utilities/Echo.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Utilities/Echo.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Utilities/Echo.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Utilities/Echo.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Constants.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Constants.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Constants.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Constants.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/IModulesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/IModulesController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/IModulesController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/IModulesController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Models/Command.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Models/Command.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Models/Command.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Models/Command.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Models/CommandHelp.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Models/CommandHelp.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Models/CommandHelp.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Models/CommandHelp.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Models/CommandInputModel.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Models/CommandInputModel.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Models/CommandInputModel.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Models/CommandInputModel.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Models/CommandOption.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Models/CommandOption.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Models/CommandOption.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Models/CommandOption.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Models/HostModel.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Models/HostModel.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Models/HostModel.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Models/HostModel.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Models/ModuleInfoModel.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Models/ModuleInfoModel.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Models/ModuleInfoModel.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Models/ModuleInfoModel.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Models/ModuleInstanceModel.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Models/ModuleInstanceModel.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Models/ModuleInstanceModel.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Models/ModuleInstanceModel.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Models/PortalModel.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Models/PortalModel.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Models/PortalModel.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Models/PortalModel.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Models/PortalModelBase.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Models/PortalModelBase.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Models/PortalModelBase.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Models/PortalModelBase.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/ModulesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/ModulesController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/ModulesController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/ModulesController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Repositories/CommandRepository.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Repositories/CommandRepository.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Repositories/CommandRepository.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Repositories/CommandRepository.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Repositories/ICommandRepository.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Repositories/ICommandRepository.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Repositories/ICommandRepository.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Repositories/ICommandRepository.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Utilities.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Utilities.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Prompt/Utilities.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Utilities.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/Constants.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/Constants.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/Constants.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/Constants.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/Dto/ModuleItem.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/Dto/ModuleItem.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/Dto/ModuleItem.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/Dto/ModuleItem.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/Dto/PageItem.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/Dto/PageItem.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/Dto/PageItem.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/Dto/PageItem.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/Dto/UserItem.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/Dto/UserItem.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/Dto/UserItem.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/Dto/UserItem.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/IRecyclebinController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/IRecyclebinController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/IRecyclebinController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/IRecyclebinController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/PurgeModule.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/PurgeModule.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/PurgeModule.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/PurgeModule.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/PurgePage.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/PurgePage.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/PurgePage.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/PurgePage.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/PurgeUser.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/PurgeUser.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/PurgeUser.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/PurgeUser.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/RestoreModule.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/RestoreModule.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/RestoreModule.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/RestoreModule.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/RestorePage.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/RestorePage.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/RestorePage.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/RestorePage.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/RestoreUser.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/RestoreUser.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/RestoreUser.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/Prompt/Commands/RestoreUser.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/RecyclebinController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/RecyclebinController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Recyclebin/RecyclebinController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Recyclebin/RecyclebinController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/Constants.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/Constants.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/Constants.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/Constants.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/IRolesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/IRolesController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/IRolesController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/IRolesController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/DeleteRole.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/DeleteRole.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/DeleteRole.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/DeleteRole.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/GetRole.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/GetRole.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/GetRole.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/GetRole.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/ListRoles.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/ListRoles.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/ListRoles.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/ListRoles.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/NewRole.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/NewRole.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/NewRole.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/NewRole.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/SetRole.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/SetRole.cs
similarity index 97%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/SetRole.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/SetRole.cs
index c5dbd554eb0..742f8bf7e18 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/SetRole.cs
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Commands/SetRole.cs
@@ -1,124 +1,124 @@
-//
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the MIT License. See LICENSE file in the project root for full license information.
-//
-using System;
-using System.Collections.Generic;
-using System.Net;
-using Dnn.PersonaBar.Library.Prompt;
-using Dnn.PersonaBar.Library.Prompt.Attributes;
-using Dnn.PersonaBar.Library.Prompt.Models;
-using Dnn.PersonaBar.Roles.Components.Prompt.Models;
-using Dnn.PersonaBar.Roles.Components.Prompt.Exceptions;
-using Dnn.PersonaBar.Roles.Services.DTO;
-using DotNetNuke.Entities.Portals;
-using DotNetNuke.Entities.Users;
-using DotNetNuke.Instrumentation;
-using DotNetNuke.Security.Roles;
-
-namespace Dnn.PersonaBar.Roles.Components.Prompt.Commands
-{
- [ConsoleCommand("set-role", Constants.RolesCategory, "Prompt_SetRole_Description")]
- public class SetRole : ConsoleCommandBase
- {
- public override string LocalResourceFile => Constants.LocalResourcesFile;
-
- private static readonly ILog Logger = LoggerSource.Instance.GetLogger(typeof(SetRole));
- [FlagParameter("id", "Prompt_SetRole_FlagId", "Integer", true)]
- private const string FlagId = "id";
- [FlagParameter("public", "Prompt_SetRole_FlagIsPublic", "Boolean")]
- private const string FlagIsPublic = "public";
- [FlagParameter("autoassign", "Prompt_SetRole_FlagAutoAssign", "Boolean")]
- private const string FlagAutoAssign = "autoassign";
- [FlagParameter("name", "Prompt_SetRole_FlagRoleName", "String")]
- private const string FlagRoleName = "name";
- [FlagParameter("description", "Prompt_SetRole_FlagDescription", "String")]
- private const string FlagDescription = "description";
- [FlagParameter("status", "Prompt_SetRole_FlagStatus", "Boolean")]
- private const string FlagStatus = "status";
-
-
- public int RoleId { get; set; }
- public string RoleName { get; set; }
- public string Description { get; set; }
- public bool? IsPublic { get; set; }
- public bool? AutoAssign { get; set; }
- public RoleStatus? Status { get; set; }
-
-
- public override void Init(string[] args, PortalSettings portalSettings, UserInfo userInfo, int activeTabId)
- {
-
- RoleId = GetFlagValue(FlagId, "Role Id", -1, true, true, true);
- RoleName = GetFlagValue(FlagRoleName, "Role Name", string.Empty);
- Description = GetFlagValue(FlagDescription, "Description", string.Empty);
- IsPublic = GetFlagValue(FlagIsPublic, "Is Public", null);
- AutoAssign = GetFlagValue(FlagAutoAssign, "Auto Assign", null);
- var status = GetFlagValue(FlagStatus, "Status", string.Empty);
- switch (status)
- {
- case "pending":
- Status = RoleStatus.Pending;
- break;
- case "approved":
- Status = RoleStatus.Approved;
- break;
- case "disabled":
- Status = RoleStatus.Disabled;
- break;
- default:
- Status = null;
- break;
- }
+//
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for full license information.
+//
+using System;
+using System.Collections.Generic;
+using System.Net;
+using Dnn.PersonaBar.Library.Prompt;
+using Dnn.PersonaBar.Library.Prompt.Attributes;
+using Dnn.PersonaBar.Library.Prompt.Models;
+using Dnn.PersonaBar.Roles.Components.Prompt.Models;
+using Dnn.PersonaBar.Roles.Components.Prompt.Exceptions;
+using Dnn.PersonaBar.Roles.Services.DTO;
+using DotNetNuke.Entities.Portals;
+using DotNetNuke.Entities.Users;
+using DotNetNuke.Instrumentation;
+using DotNetNuke.Security.Roles;
+
+namespace Dnn.PersonaBar.Roles.Components.Prompt.Commands
+{
+ [ConsoleCommand("set-role", Constants.RolesCategory, "Prompt_SetRole_Description")]
+ public class SetRole : ConsoleCommandBase
+ {
+ public override string LocalResourceFile => Constants.LocalResourcesFile;
+
+ private static readonly ILog Logger = LoggerSource.Instance.GetLogger(typeof(SetRole));
+ [FlagParameter("id", "Prompt_SetRole_FlagId", "Integer", true)]
+ private const string FlagId = "id";
+ [FlagParameter("public", "Prompt_SetRole_FlagIsPublic", "Boolean")]
+ private const string FlagIsPublic = "public";
+ [FlagParameter("autoassign", "Prompt_SetRole_FlagAutoAssign", "Boolean")]
+ private const string FlagAutoAssign = "autoassign";
+ [FlagParameter("name", "Prompt_SetRole_FlagRoleName", "String")]
+ private const string FlagRoleName = "name";
+ [FlagParameter("description", "Prompt_SetRole_FlagDescription", "String")]
+ private const string FlagDescription = "description";
+ [FlagParameter("status", "Prompt_SetRole_FlagStatus", "Boolean")]
+ private const string FlagStatus = "status";
+
+
+ public int RoleId { get; set; }
+ public string RoleName { get; set; }
+ public string Description { get; set; }
+ public bool? IsPublic { get; set; }
+ public bool? AutoAssign { get; set; }
+ public RoleStatus? Status { get; set; }
+
+
+ public override void Init(string[] args, PortalSettings portalSettings, UserInfo userInfo, int activeTabId)
+ {
+
+ RoleId = GetFlagValue(FlagId, "Role Id", -1, true, true, true);
+ RoleName = GetFlagValue(FlagRoleName, "Role Name", string.Empty);
+ Description = GetFlagValue(FlagDescription, "Description", string.Empty);
+ IsPublic = GetFlagValue(FlagIsPublic, "Is Public", null);
+ AutoAssign = GetFlagValue(FlagAutoAssign, "Auto Assign", null);
+ var status = GetFlagValue(FlagStatus, "Status", string.Empty);
+ switch (status)
+ {
+ case "pending":
+ Status = RoleStatus.Pending;
+ break;
+ case "approved":
+ Status = RoleStatus.Approved;
+ break;
+ case "disabled":
+ Status = RoleStatus.Disabled;
+ break;
+ default:
+ Status = null;
+ break;
+ }
if ((string.IsNullOrEmpty(RoleName)) && string.IsNullOrEmpty(Description) && !IsPublic.HasValue && !AutoAssign.HasValue && string.IsNullOrEmpty(status))
- {
- AddMessage(LocalizeString("Prompt_NothingToUpdate"));
- }
- }
-
- public override ConsoleResultModel Run()
- {
- try
- {
-
- var existingRole = RoleController.Instance.GetRoleById(PortalId, RoleId);
+ {
+ AddMessage(LocalizeString("Prompt_NothingToUpdate"));
+ }
+ }
+
+ public override ConsoleResultModel Run()
+ {
+ try
+ {
+
+ var existingRole = RoleController.Instance.GetRoleById(PortalId, RoleId);
if (existingRole.IsSystemRole)
{
throw new SetRoleException("Cannot modify System Roles.");
}
- var roleDto = new RoleDto
- {
- Id = RoleId,
- Name = !string.IsNullOrEmpty(RoleName) ? RoleName : existingRole?.RoleName,
- Description = !string.IsNullOrEmpty(Description) ? Description : existingRole?.Description,
- AutoAssign = AutoAssign ?? existingRole?.AutoAssignment ?? false,
- IsPublic = IsPublic ?? existingRole?.IsPublic ?? false,
- GroupId = existingRole?.RoleGroupID ?? -1,
- IsSystem = existingRole?.IsSystemRole ?? false,
- SecurityMode = existingRole?.SecurityMode ?? SecurityMode.SecurityRole,
- Status = Status ?? (existingRole?.Status ?? RoleStatus.Approved)
- };
- KeyValuePair message;
- var success = RolesController.Instance.SaveRole(PortalSettings, roleDto, false, out message);
- if (!success) return new ConsoleErrorResultModel(message.Value);
-
- var lstResults = new List
- {
- new RoleModel(RoleController.Instance.GetRoleById(PortalId, roleDto.Id))
- };
- return new ConsoleResultModel(LocalizeString("RoleUpdated.Message")) { Data = lstResults, Records = lstResults.Count };
- }
+ var roleDto = new RoleDto
+ {
+ Id = RoleId,
+ Name = !string.IsNullOrEmpty(RoleName) ? RoleName : existingRole?.RoleName,
+ Description = !string.IsNullOrEmpty(Description) ? Description : existingRole?.Description,
+ AutoAssign = AutoAssign ?? existingRole?.AutoAssignment ?? false,
+ IsPublic = IsPublic ?? existingRole?.IsPublic ?? false,
+ GroupId = existingRole?.RoleGroupID ?? -1,
+ IsSystem = existingRole?.IsSystemRole ?? false,
+ SecurityMode = existingRole?.SecurityMode ?? SecurityMode.SecurityRole,
+ Status = Status ?? (existingRole?.Status ?? RoleStatus.Approved)
+ };
+ KeyValuePair message;
+ var success = RolesController.Instance.SaveRole(PortalSettings, roleDto, false, out message);
+ if (!success) return new ConsoleErrorResultModel(message.Value);
+
+ var lstResults = new List
+ {
+ new RoleModel(RoleController.Instance.GetRoleById(PortalId, roleDto.Id))
+ };
+ return new ConsoleResultModel(LocalizeString("RoleUpdated.Message")) { Data = lstResults, Records = lstResults.Count };
+ }
catch (SetRoleException se)
{
Logger.Error(se);
return new ConsoleErrorResultModel(LocalizeString("RoleUpdated.SystemRoleError"));
- }
- catch (Exception ex)
- {
+ }
+ catch (Exception ex)
+ {
Logger.Error(ex);
- return new ConsoleErrorResultModel(LocalizeString("RoleUpdated.Error"));
- }
- }
- }
-}
+ return new ConsoleErrorResultModel(LocalizeString("RoleUpdated.Error"));
+ }
+ }
+ }
+}
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Exceptions/SetRoleException.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Exceptions/SetRoleException.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Exceptions/SetRoleException.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Exceptions/SetRoleException.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Models/RoleModel.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Models/RoleModel.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Models/RoleModel.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Models/RoleModel.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Models/RoleModelBase.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Models/RoleModelBase.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Models/RoleModelBase.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/Prompt/Models/RoleModelBase.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/RolesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/RolesController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Roles/RolesController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Roles/RolesController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Attributes/AuthProviderSupportedAttribute.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Attributes/AuthProviderSupportedAttribute.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Attributes/AuthProviderSupportedAttribute.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Attributes/AuthProviderSupportedAttribute.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Attributes/CultureCodeExistAttribute.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Attributes/CultureCodeExistAttribute.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Attributes/CultureCodeExistAttribute.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Attributes/CultureCodeExistAttribute.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Attributes/RegistrationFieldsAttribute.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Attributes/RegistrationFieldsAttribute.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Attributes/RegistrationFieldsAttribute.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Attributes/RegistrationFieldsAttribute.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Attributes/RegistrationFormTypeOptionAttribute.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Attributes/RegistrationFormTypeOptionAttribute.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Attributes/RegistrationFormTypeOptionAttribute.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Attributes/RegistrationFormTypeOptionAttribute.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Attributes/TabExistAttribute.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Attributes/TabExistAttribute.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Attributes/TabExistAttribute.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Attributes/TabExistAttribute.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Attributes/UserEmailAsUsernameAttribute.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Attributes/UserEmailAsUsernameAttribute.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Attributes/UserEmailAsUsernameAttribute.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Attributes/UserEmailAsUsernameAttribute.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Attributes/UserExistAttribute.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Attributes/UserExistAttribute.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Attributes/UserExistAttribute.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Attributes/UserExistAttribute.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Attributes/UserRegistrationOptionAttribute.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Attributes/UserRegistrationOptionAttribute.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Attributes/UserRegistrationOptionAttribute.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Attributes/UserRegistrationOptionAttribute.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/AuditChecks.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/AuditChecks.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/AuditChecks.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/AuditChecks.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/CheckResult.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/CheckResult.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/CheckResult.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/CheckResult.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckAllowableFileExtensions.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckAllowableFileExtensions.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckAllowableFileExtensions.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckAllowableFileExtensions.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckBiography.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckBiography.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckBiography.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckBiography.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckDebug.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckDebug.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckDebug.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckDebug.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckDefaultPage.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckDefaultPage.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckDefaultPage.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckDefaultPage.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckDiskAcccessPermissions.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckDiskAcccessPermissions.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckDiskAcccessPermissions.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckDiskAcccessPermissions.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckHiddenSystemFiles.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckHiddenSystemFiles.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckHiddenSystemFiles.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckHiddenSystemFiles.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckModuleHeaderAndFooter.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckModuleHeaderAndFooter.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckModuleHeaderAndFooter.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckModuleHeaderAndFooter.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckPasswordFormat.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckPasswordFormat.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckPasswordFormat.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckPasswordFormat.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckRarelyUsedSuperuser.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckRarelyUsedSuperuser.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckRarelyUsedSuperuser.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckRarelyUsedSuperuser.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckSiteRegistration.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckSiteRegistration.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckSiteRegistration.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckSiteRegistration.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckSqlRisk.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckSqlRisk.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckSqlRisk.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckSqlRisk.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckSuperuserOldPassword.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckSuperuserOldPassword.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckSuperuserOldPassword.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckSuperuserOldPassword.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckTelerikVulnerability.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckTelerikVulnerability.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckTelerikVulnerability.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckTelerikVulnerability.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckTracing.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckTracing.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckTracing.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckTracing.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckUnexpectedExtensions.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckUnexpectedExtensions.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckUnexpectedExtensions.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckUnexpectedExtensions.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckViewstatemac.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckViewstatemac.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckViewstatemac.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckViewstatemac.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Constants.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Constants.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Constants.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Constants.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Helper/RegistrationSettingsHelper.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Helper/RegistrationSettingsHelper.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Helper/RegistrationSettingsHelper.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Helper/RegistrationSettingsHelper.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/IAuditCheck.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/IAuditCheck.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/IAuditCheck.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/IAuditCheck.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Resources/CheckFileExists.resources b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Resources/CheckFileExists.resources
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Resources/CheckFileExists.resources
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Resources/CheckFileExists.resources
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Resources/ExecuteCommand.resources b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Resources/ExecuteCommand.resources
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Resources/ExecuteCommand.resources
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Resources/ExecuteCommand.resources
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Resources/GetFolderTree.resources b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Resources/GetFolderTree.resources
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Resources/GetFolderTree.resources
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Resources/GetFolderTree.resources
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Resources/RegRead.resources b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Resources/RegRead.resources
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Resources/RegRead.resources
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Resources/RegRead.resources
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Resources/SysAdmin.resources b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Resources/SysAdmin.resources
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Resources/SysAdmin.resources
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Resources/SysAdmin.resources
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Resources/sums.resources b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Resources/sums.resources
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Resources/sums.resources
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Resources/sums.resources
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/SecurityController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/SecurityController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/SecurityController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/SecurityController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/SeverityEnum.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/SeverityEnum.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/SeverityEnum.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/SeverityEnum.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Utility.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Utility.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Utility.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Utility.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Seo/ExtensionMenuController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Seo/ExtensionMenuController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Seo/ExtensionMenuController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Seo/ExtensionMenuController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Seo/SeoController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Seo/SeoController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Seo/SeoController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Seo/SeoController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Seo/UrlRewritingResult.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Seo/UrlRewritingResult.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Seo/UrlRewritingResult.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Seo/UrlRewritingResult.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Servers/Constants.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Servers/Constants.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Servers/Constants.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Servers/Constants.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/BackupInfo.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/BackupInfo.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/BackupInfo.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/BackupInfo.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/DataService.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/DataService.cs
similarity index 96%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/DataService.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/DataService.cs
index 2066a6dbecd..f465c1ffbde 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/DataService.cs
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/DataService.cs
@@ -1,4 +1,4 @@
-//
+//
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the MIT License. See LICENSE file in the project root for full license information.
//
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/DatabaseController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/DatabaseController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/DatabaseController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/DatabaseController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/DbFileInfo.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/DbFileInfo.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/DbFileInfo.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/DbFileInfo.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/DbInfo.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/DbInfo.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/DbInfo.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Servers/DatabaseServer/DbInfo.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Servers/Log/LogController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Servers/Log/LogController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Servers/Log/LogController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Servers/Log/LogController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Servers/PerformanceSettings/PerformanceController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Servers/PerformanceSettings/PerformanceController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Servers/PerformanceSettings/PerformanceController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Servers/PerformanceSettings/PerformanceController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Servers/WebServer/ServerInfo.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Servers/WebServer/ServerInfo.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Servers/WebServer/ServerInfo.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Servers/WebServer/ServerInfo.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SiteImportExport/Constants.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/SiteImportExport/Constants.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SiteImportExport/Constants.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/SiteImportExport/Constants.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SiteImportExport/SiteImportExportController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/SiteImportExport/SiteImportExportController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SiteImportExport/SiteImportExportController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/SiteImportExport/SiteImportExportController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SiteSettings/Constants/Constants.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/SiteSettings/Constants/Constants.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SiteSettings/Constants/Constants.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/SiteSettings/Constants/Constants.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SiteSettings/Constants/LanguageResourceEnums.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/SiteSettings/Constants/LanguageResourceEnums.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SiteSettings/Constants/LanguageResourceEnums.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/SiteSettings/Constants/LanguageResourceEnums.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SiteSettings/LanguagesControllerTasks.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/SiteSettings/LanguagesControllerTasks.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SiteSettings/LanguagesControllerTasks.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/SiteSettings/LanguagesControllerTasks.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SiteSettings/SiteSettingsController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/SiteSettings/SiteSettingsController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SiteSettings/SiteSettingsController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/SiteSettings/SiteSettingsController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Sites/Constants.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Sites/Constants.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Sites/Constants.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Sites/Constants.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Sites/Dto/HttpAliasDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Sites/Dto/HttpAliasDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Sites/Dto/HttpAliasDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Sites/Dto/HttpAliasDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Sites/SitesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Sites/SitesController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Sites/SitesController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Sites/SitesController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SqlConsole/AdHocSqlQuery.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/SqlConsole/AdHocSqlQuery.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SqlConsole/AdHocSqlQuery.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/SqlConsole/AdHocSqlQuery.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SqlConsole/ISqlQueryController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/SqlConsole/ISqlQueryController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SqlConsole/ISqlQueryController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/SqlConsole/ISqlQueryController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SqlConsole/SqlConsoleController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/SqlConsole/SqlConsoleController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SqlConsole/SqlConsoleController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/SqlConsole/SqlConsoleController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SqlConsole/SqlConsoleQuery.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/SqlConsole/SqlConsoleQuery.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SqlConsole/SqlConsoleQuery.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/SqlConsole/SqlConsoleQuery.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Constants.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Constants.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Constants.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Constants.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Prompt/Commands/GetTask.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Prompt/Commands/GetTask.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Prompt/Commands/GetTask.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Prompt/Commands/GetTask.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Prompt/Commands/ListTask.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Prompt/Commands/ListTask.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Prompt/Commands/ListTask.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Prompt/Commands/ListTask.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Prompt/Commands/SetTask.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Prompt/Commands/SetTask.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Prompt/Commands/SetTask.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Prompt/Commands/SetTask.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Prompt/Models/TaskModel.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Prompt/Models/TaskModel.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Prompt/Models/TaskModel.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Prompt/Models/TaskModel.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Prompt/Models/TaskModelBase.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Prompt/Models/TaskModelBase.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Prompt/Models/TaskModelBase.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/TaskScheduler/Prompt/Models/TaskModelBase.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/TaskScheduler/TaskSchedulerController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/TaskScheduler/TaskSchedulerController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/TaskScheduler/TaskSchedulerController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/TaskScheduler/TaskSchedulerController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/ApplyThemeScope.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/ApplyThemeScope.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/ApplyThemeScope.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/ApplyThemeScope.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/Constants.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/Constants.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/Constants.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/Constants.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ApplyDefaultThemeInfo.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ApplyDefaultThemeInfo.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ApplyDefaultThemeInfo.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ApplyDefaultThemeInfo.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ApplyThemeInfo.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ApplyThemeInfo.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ApplyThemeInfo.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ApplyThemeInfo.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ListItemInfo.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ListItemInfo.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ListItemInfo.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ListItemInfo.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ParseThemeInfo.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ParseThemeInfo.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ParseThemeInfo.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ParseThemeInfo.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ThemeFileInfo.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ThemeFileInfo.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ThemeFileInfo.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ThemeFileInfo.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ThemeInfo.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ThemeInfo.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ThemeInfo.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/DTO/ThemeInfo.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/DTO/UpdateThemeInfo.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/DTO/UpdateThemeInfo.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/DTO/UpdateThemeInfo.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/DTO/UpdateThemeInfo.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/IThemesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/IThemesController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/IThemesController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/IThemesController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/ParseType.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/ParseType.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/ParseType.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/ParseType.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/ThemeLevel.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/ThemeLevel.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/ThemeLevel.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/ThemeLevel.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/ThemeType.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/ThemeType.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/ThemeType.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/ThemeType.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/ThemesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/ThemesController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Themes/ThemesController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Themes/ThemesController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Constants.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Constants.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Constants.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Constants.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Contracts/CreateUserContract.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Contracts/CreateUserContract.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Contracts/CreateUserContract.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Contracts/CreateUserContract.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Contracts/GetUsersContract.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Contracts/GetUsersContract.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Contracts/GetUsersContract.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Contracts/GetUsersContract.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Contracts/RegisterationDetails.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Contracts/RegisterationDetails.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Contracts/RegisterationDetails.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Contracts/RegisterationDetails.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/ChangePasswordDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/ChangePasswordDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/ChangePasswordDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/ChangePasswordDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/PasswordSettingsDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/PasswordSettingsDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/PasswordSettingsDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/PasswordSettingsDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/ProfileDefinitionDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/ProfileDefinitionDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/ProfileDefinitionDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/ProfileDefinitionDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/ProfileVisibilityDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/ProfileVisibilityDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/ProfileVisibilityDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/ProfileVisibilityDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/RelationshipDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/RelationshipDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/RelationshipDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/RelationshipDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserBasicDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserBasicDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserBasicDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserBasicDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserBasicDto2.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserBasicDto2.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserBasicDto2.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserBasicDto2.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserDetailDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserDetailDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserDetailDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserDetailDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserFilters.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserFilters.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserFilters.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserFilters.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserRoleDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserRoleDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserRoleDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserRoleDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Helpers/SearchTextFilter.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Helpers/SearchTextFilter.cs
similarity index 97%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Helpers/SearchTextFilter.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Helpers/SearchTextFilter.cs
index 2013aefa5aa..27908aa9225 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Helpers/SearchTextFilter.cs
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Helpers/SearchTextFilter.cs
@@ -1,115 +1,115 @@
-//
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the MIT License. See LICENSE file in the project root for full license information.
-//
-using System.Text;
-using System.Text.RegularExpressions;
-
-namespace Dnn.PersonaBar.Users.Components.Helpers
-{
- public class SearchTextFilter
- {
-
- public static string CleanWildcards(string searchText)
- {
- if (string.IsNullOrEmpty(searchText) || searchText.Equals("*") || searchText.Equals("%"))
- {
- return null;
- }
- var pattern = "";
-
- var prefixWildcard = searchText.StartsWith("%") || searchText.StartsWith("*");
- var suffixWildcard = searchText.EndsWith("%") || searchText.EndsWith("*");
-
- bool IN_STRING = true == prefixWildcard && true == suffixWildcard;
- bool PREFIX = true == prefixWildcard && false == suffixWildcard;
- bool SUFFIX = true == suffixWildcard && false == prefixWildcard;
- bool EXACT = false == suffixWildcard && false == prefixWildcard;
-
- if (EXACT)
- {
- pattern = searchText.Replace("*", "").Replace("%", "");
- }
- else
- {
-
- if (IN_STRING == true)
- {
- pattern = GetInStringSearchPattern(searchText);
- }
- else if (PREFIX == true)
- {
- pattern = GetPrefixSearchPattern(searchText);
- }
- else if (SUFFIX == true)
- {
- pattern = GetSuffixSearchPattern(searchText);
- }
- }
-
- return pattern;
- }
-
- private static string GetInStringSearchPattern(string searchText)
- {
- var pattern = new StringBuilder();
- var regexOptions = RegexOptions.IgnoreCase | RegexOptions.Compiled;
- var inStringRegex = "^(\\*|%)?([\\w\\-_\\s\\*\\%\\.\\@]+)(\\*|%)$";
- var regex = new Regex(inStringRegex, regexOptions);
- var matches = regex.Matches(searchText);
-
- if (matches.Count > 0)
- {
- var matchText = matches[0].Groups[2].Value;
- if (matchText != null && !string.IsNullOrEmpty(matchText))
- {
- pattern.Append("%");
- pattern.Append(matchText.Replace("*", "").Replace("%", ""));
- pattern.Append("%");
-
- }
- }
- return pattern.ToString();
- }
-
- private static string GetPrefixSearchPattern(string searchText)
- {
- var regexOptions = RegexOptions.IgnoreCase | RegexOptions.Compiled;
- var pattern = new StringBuilder();
- var prefixRegex = "^(\\*|%)?([\\w\\-_\\s\\*\\%\\.\\@]+)";
- var regex = new Regex(prefixRegex, regexOptions);
- var matches = regex.Matches(searchText);
-
- if (matches.Count > 0)
- {
- var matchText = matches[0].Groups[2].Value;
- if (matchText != null && !string.IsNullOrEmpty(matchText))
- {
- pattern.Append("%");
- pattern.Append(matchText.Replace("*", "").Replace("%", ""));
- }
- }
- return pattern.ToString();
- }
-
- private static string GetSuffixSearchPattern(string searchText)
- {
- var pattern = new StringBuilder();
- var regexOptions = RegexOptions.IgnoreCase | RegexOptions.Compiled;
- var suffixRegex = "([\\w\\-_\\*\\s\\%\\.\\@]+)(\\*|%)$";
- var regex = new Regex(suffixRegex, regexOptions);
- var matches = regex.Matches(searchText);
-
- if (matches.Count > 0)
- {
- var matchText = matches[0].Groups[1].Value;
- if (matchText != null && !string.IsNullOrEmpty(matchText))
- {
- pattern.Append(matchText.Replace("*", "").Replace("%", ""));
- pattern.Append("%");
- }
- }
- return pattern.ToString();
- }
- }
-}
+//
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for full license information.
+//
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace Dnn.PersonaBar.Users.Components.Helpers
+{
+ public class SearchTextFilter
+ {
+
+ public static string CleanWildcards(string searchText)
+ {
+ if (string.IsNullOrEmpty(searchText) || searchText.Equals("*") || searchText.Equals("%"))
+ {
+ return null;
+ }
+ var pattern = "";
+
+ var prefixWildcard = searchText.StartsWith("%") || searchText.StartsWith("*");
+ var suffixWildcard = searchText.EndsWith("%") || searchText.EndsWith("*");
+
+ bool IN_STRING = true == prefixWildcard && true == suffixWildcard;
+ bool PREFIX = true == prefixWildcard && false == suffixWildcard;
+ bool SUFFIX = true == suffixWildcard && false == prefixWildcard;
+ bool EXACT = false == suffixWildcard && false == prefixWildcard;
+
+ if (EXACT)
+ {
+ pattern = searchText.Replace("*", "").Replace("%", "");
+ }
+ else
+ {
+
+ if (IN_STRING == true)
+ {
+ pattern = GetInStringSearchPattern(searchText);
+ }
+ else if (PREFIX == true)
+ {
+ pattern = GetPrefixSearchPattern(searchText);
+ }
+ else if (SUFFIX == true)
+ {
+ pattern = GetSuffixSearchPattern(searchText);
+ }
+ }
+
+ return pattern;
+ }
+
+ private static string GetInStringSearchPattern(string searchText)
+ {
+ var pattern = new StringBuilder();
+ var regexOptions = RegexOptions.IgnoreCase | RegexOptions.Compiled;
+ var inStringRegex = "^(\\*|%)?([\\w\\-_\\s\\*\\%\\.\\@]+)(\\*|%)$";
+ var regex = new Regex(inStringRegex, regexOptions);
+ var matches = regex.Matches(searchText);
+
+ if (matches.Count > 0)
+ {
+ var matchText = matches[0].Groups[2].Value;
+ if (matchText != null && !string.IsNullOrEmpty(matchText))
+ {
+ pattern.Append("%");
+ pattern.Append(matchText.Replace("*", "").Replace("%", ""));
+ pattern.Append("%");
+
+ }
+ }
+ return pattern.ToString();
+ }
+
+ private static string GetPrefixSearchPattern(string searchText)
+ {
+ var regexOptions = RegexOptions.IgnoreCase | RegexOptions.Compiled;
+ var pattern = new StringBuilder();
+ var prefixRegex = "^(\\*|%)?([\\w\\-_\\s\\*\\%\\.\\@]+)";
+ var regex = new Regex(prefixRegex, regexOptions);
+ var matches = regex.Matches(searchText);
+
+ if (matches.Count > 0)
+ {
+ var matchText = matches[0].Groups[2].Value;
+ if (matchText != null && !string.IsNullOrEmpty(matchText))
+ {
+ pattern.Append("%");
+ pattern.Append(matchText.Replace("*", "").Replace("%", ""));
+ }
+ }
+ return pattern.ToString();
+ }
+
+ private static string GetSuffixSearchPattern(string searchText)
+ {
+ var pattern = new StringBuilder();
+ var regexOptions = RegexOptions.IgnoreCase | RegexOptions.Compiled;
+ var suffixRegex = "([\\w\\-_\\*\\s\\%\\.\\@]+)(\\*|%)$";
+ var regex = new Regex(suffixRegex, regexOptions);
+ var matches = regex.Matches(searchText);
+
+ if (matches.Count > 0)
+ {
+ var matchText = matches[0].Groups[1].Value;
+ if (matchText != null && !string.IsNullOrEmpty(matchText))
+ {
+ pattern.Append(matchText.Replace("*", "").Replace("%", ""));
+ pattern.Append("%");
+ }
+ }
+ return pattern.ToString();
+ }
+ }
+}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/IRegisterController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/IRegisterController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/IRegisterController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/IRegisterController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/IUserControllerWrapper.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/IUserControllerWrapper.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/IUserControllerWrapper.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/IUserControllerWrapper.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/IUserValidator.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/IUserValidator.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/IUserValidator.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/IUserValidator.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/IUsersController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/IUsersController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/IUsersController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/IUsersController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/AddRoles.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/AddRoles.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/AddRoles.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/AddRoles.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/DeleteUser.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/DeleteUser.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/DeleteUser.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/DeleteUser.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/GetUser.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/GetUser.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/GetUser.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/GetUser.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/ListUsers.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/ListUsers.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/ListUsers.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/ListUsers.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/NewUser.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/NewUser.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/NewUser.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/NewUser.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/ResetPassword.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/ResetPassword.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/ResetPassword.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/ResetPassword.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/SetUser.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/SetUser.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/SetUser.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Commands/SetUser.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Models/UserModel.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Models/UserModel.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Models/UserModel.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Models/UserModel.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Models/UserModelBase.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Models/UserModelBase.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Models/UserModelBase.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Models/UserModelBase.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Models/UserRoleModel.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Models/UserRoleModel.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Models/UserRoleModel.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Models/UserRoleModel.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Utilities.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Utilities.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Utilities.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Prompt/Utilities.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/RegisterController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/RegisterController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/RegisterController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/RegisterController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/UserControllerWrapper.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/UserControllerWrapper.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/UserControllerWrapper.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/UserControllerWrapper.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/UserValidator.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/UserValidator.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/UserValidator.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/UserValidator.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/UsersController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/UsersController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/UsersController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/UsersController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/UsersMenuController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/UsersMenuController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/UsersMenuController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/UsersMenuController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Vocabularies/Constants.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Vocabularies/Constants.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Vocabularies/Constants.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Vocabularies/Constants.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Vocabularies/Exceptions/TermValidationException.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Vocabularies/Exceptions/TermValidationException.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Vocabularies/Exceptions/TermValidationException.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Vocabularies/Exceptions/TermValidationException.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Vocabularies/Exceptions/VocabulariesException.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Vocabularies/Exceptions/VocabulariesException.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Vocabularies/Exceptions/VocabulariesException.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Vocabularies/Exceptions/VocabulariesException.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Vocabularies/Exceptions/VocabularyNameAlreadyExistsException.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Vocabularies/Exceptions/VocabularyNameAlreadyExistsException.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Vocabularies/Exceptions/VocabularyNameAlreadyExistsException.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Vocabularies/Exceptions/VocabularyNameAlreadyExistsException.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Vocabularies/Exceptions/VocabularyValidationException.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Vocabularies/Exceptions/VocabularyValidationException.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Vocabularies/Exceptions/VocabularyValidationException.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Vocabularies/Exceptions/VocabularyValidationException.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Vocabularies/Validators/VocabularyNameValidator.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Vocabularies/Validators/VocabularyNameValidator.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Vocabularies/Validators/VocabularyNameValidator.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Vocabularies/Validators/VocabularyNameValidator.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Vocabularies/VocabulariesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Vocabularies/VocabulariesController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Vocabularies/VocabulariesController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Vocabularies/VocabulariesController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Data/IUsersDataService.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Data/IUsersDataService.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Data/IUsersDataService.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Data/IUsersDataService.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Data/UsersDataService.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Data/UsersDataService.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Data/UsersDataService.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Data/UsersDataService.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.csproj b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.csproj
similarity index 95%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.csproj
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.csproj
index d4e781dcf9c..2fd244b2e38 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.csproj
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.csproj
@@ -1,6 +1,6 @@
-
+ Debug
@@ -52,7 +52,7 @@
-
+
SolutionInfo.cs
@@ -580,31 +580,31 @@
-
+ {6928A9B1-F88A-4581-A132-D3EB38669BB0}DotNetNuke.Abstractions
-
+ {3cd5f6b8-8360-4862-80b6-f402892db7dd}DotNetNuke.Instrumentation
-
+ {03e3afa5-ddc9-48fb-a839-ad4282ce237e}DotNetNuke.Web.Client
-
+ {ee1329fe-fd88-4e1a-968c-345e394ef080}DotNetNuke.Web
-
+ {3d9c3f5f-1d2d-4d89-995b-438055a5e3a6}DotNetNuke.HttpModules
-
+ {6b29aded-7b56-4484-bea5-c0e09079535b}DotNetNuke.Library
-
+ {8b50ba8b-0a08-41b8-81b8-ea70707c7379}Dnn.PersonaBar.Library
@@ -682,19 +682,19 @@
- ..\..\..\..\Packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll
+ ..\..\Packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll
- ..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.2.1.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll
+ ..\..\Packages\Microsoft.Extensions.DependencyInjection.2.1.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll
- ..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+ ..\..\Packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dllFalse
- ..\..\..\..\Packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll
+ ..\..\Packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll
@@ -705,7 +705,7 @@
False
- ..\..\..\..\Packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll
+ ..\..\Packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll
@@ -713,11 +713,11 @@
False
- ..\..\..\..\Packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll
+ ..\..\Packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dllFalse
- ..\..\..\..\Packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll
+ ..\..\Packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll
@@ -740,8 +740,8 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
-
+
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/License.txt b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/License.txt
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/License.txt
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/License.txt
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/AdminMenuController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/AdminMenuController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/AdminMenuController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/AdminMenuController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/ConfigConsoleMenuController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/ConfigConsoleMenuController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/ConfigConsoleMenuController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/ConfigConsoleMenuController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/CssEditorMenuController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/CssEditorMenuController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/CssEditorMenuController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/CssEditorMenuController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/ExtensionMenuController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/ExtensionMenuController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/ExtensionMenuController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/ExtensionMenuController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/LicensingMenuController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/LicensingMenuController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/LicensingMenuController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/LicensingMenuController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/PagesMenuController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/PagesMenuController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/PagesMenuController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/PagesMenuController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/PromptMenuController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/PromptMenuController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/PromptMenuController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/PromptMenuController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/SecurityMenuController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/SecurityMenuController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/SecurityMenuController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/SecurityMenuController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/ServersMenuController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/ServersMenuController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/ServersMenuController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/ServersMenuController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/SiteImportExportMenuController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/SiteImportExportMenuController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/SiteImportExportMenuController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/SiteImportExportMenuController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/SiteSettingsMenuController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/SiteSettingsMenuController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/SiteSettingsMenuController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/SiteSettingsMenuController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/SitesMenuController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/SitesMenuController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/SitesMenuController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/SitesMenuController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/SqlConsoleMenuController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/SqlConsoleMenuController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/SqlConsoleMenuController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/SqlConsoleMenuController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/TaskSchedulerMenuController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/TaskSchedulerMenuController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/TaskSchedulerMenuController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/TaskSchedulerMenuController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/ThemeMenuController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/ThemeMenuController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/ThemeMenuController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/ThemeMenuController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Module.build b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Module.build
similarity index 58%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Module.build
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Module.build
index 48bee10d812..eed61a77015 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Module.build
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Module.build
@@ -1,21 +1,21 @@
-
-
-
- $(MSBuildProjectDirectory)\..\..\..\..
-
-
-
-
-
-
-
- zip
- Dnn.PersonaBar.Extensions
- Dnn.PersonaBar.Extensions
- $(WebsitePath)\DesktopModules\admin\Dnn.PersonaBar\Modules\
- $(WebsiteInstallPath)\Module
- ..\..\..\..\package.json
-
-
+
+
+
+ $(MSBuildProjectDirectory)\..\..
+
+
+
+
+
+
+
+ zip
+ Dnn.PersonaBar.Extensions
+ Dnn.PersonaBar.Extensions
+ $(WebsitePath)\DesktopModules\admin\Dnn.PersonaBar\Modules\
+ $(WebsiteInstallPath)\Module
+ ..\..\package.json
+
+
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Properties/AssemblyInfo.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Properties/AssemblyInfo.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Properties/AssemblyInfo.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Properties/AssemblyInfo.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/ReleaseNotes.txt b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/ReleaseNotes.txt
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/ReleaseNotes.txt
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/ReleaseNotes.txt
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/AdminLogsController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/AdminLogsController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/AdminLogsController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/AdminLogsController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/CommandController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/CommandController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/CommandController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/CommandController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ConfigConsoleController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ConfigConsoleController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ConfigConsoleController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ConfigConsoleController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ConnectorsController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ConnectorsController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ConnectorsController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ConnectorsController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/CssEditorController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/CssEditorController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/CssEditorController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/CssEditorController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/BulkPage.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/BulkPage.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/BulkPage.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/BulkPage.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/BulkPageResponse.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/BulkPageResponse.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/BulkPageResponse.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/BulkPageResponse.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/BulkPageResponseItem.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/BulkPageResponseItem.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/BulkPageResponseItem.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/BulkPageResponseItem.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/ConfigFileDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/ConfigFileDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/ConfigFileDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/ConfigFileDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/CopyPermissionsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/CopyPermissionsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/CopyPermissionsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/CopyPermissionsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/CopyThemeRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/CopyThemeRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/CopyThemeRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/CopyThemeRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/CreatePortalRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/CreatePortalRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/CreatePortalRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/CreatePortalRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/DeleteLogItemsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/DeleteLogItemsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/DeleteLogItemsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/DeleteLogItemsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/DeleteLogSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/DeleteLogSettingsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/DeleteLogSettingsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/DeleteLogSettingsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/DnnModuleDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/DnnModuleDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/DnnModuleDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/DnnModuleDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/DnnModulesDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/DnnModulesDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/DnnModulesDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/DnnModulesDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/DnnModulesRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/DnnModulesRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/DnnModulesRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/DnnModulesRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/DnnPageDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/DnnPageDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/DnnPageDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/DnnPageDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/DnnPagesDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/DnnPagesDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/DnnPagesDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/DnnPagesDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/DnnPagesRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/DnnPagesRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/DnnPagesRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/DnnPagesRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/EmailLogItemsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/EmailLogItemsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/EmailLogItemsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/EmailLogItemsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/ExportTemplateRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/ExportTemplateRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/ExportTemplateRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/ExportTemplateRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/FileDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/FileDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/FileDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/FileDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/ModuleCopyType.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/ModuleCopyType.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/ModuleCopyType.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/ModuleCopyType.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/ModuleItem.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/ModuleItem.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/ModuleItem.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/ModuleItem.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/PageFolderTemplate.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/PageFolderTemplate.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/PageFolderTemplate.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/PageFolderTemplate.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/PageItem.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/PageItem.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/PageItem.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/PageItem.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/PageModuleItem.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/PageModuleItem.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/PageModuleItem.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/PageModuleItem.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/PageMoveRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/PageMoveRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/PageMoveRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/PageMoveRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/PagePermissions.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/PagePermissions.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/PagePermissions.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/PagePermissions.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/PageSettings.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/PageSettings.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/PageSettings.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/PageSettings.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/PageTemplate.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/PageTemplate.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/PageTemplate.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/PageTemplate.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/DTO/ResetTermsAgreementRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/ResetTermsAgreementRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/DTO/ResetTermsAgreementRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/ResetTermsAgreementRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/RestoreCssRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/RestoreCssRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/RestoreCssRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/RestoreCssRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/DTO/RoleDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/RoleDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/DTO/RoleDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/RoleDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/DTO/RoleGroupDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/RoleGroupDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/DTO/RoleGroupDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/RoleGroupDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/ScheduleDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/ScheduleDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/ScheduleDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/ScheduleDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SendTestEmailRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SendTestEmailRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SendTestEmailRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SendTestEmailRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SeoUrl.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SeoUrl.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SeoUrl.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SeoUrl.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SettingsDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SettingsDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SettingsDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SettingsDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/CreateLanguagePackRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/CreateLanguagePackRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/CreateLanguagePackRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/CreateLanguagePackRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/FileDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/FileDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/FileDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/FileDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/LanguageTabDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/LanguageTabDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/LanguageTabDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/LanguageTabDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/LocalizationEntry.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/LocalizationEntry.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/LocalizationEntry.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/LocalizationEntry.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/LocalizationProgress.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/LocalizationProgress.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/LocalizationProgress.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/LocalizationProgress.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateBasicSearchSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateBasicSearchSettingsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateBasicSearchSettingsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateBasicSearchSettingsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateDefaultPagesSettings.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateDefaultPagesSettings.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateDefaultPagesSettings.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateDefaultPagesSettings.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateIgnoreWordsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateIgnoreWordsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateIgnoreWordsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateIgnoreWordsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateLanguageRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateLanguageRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateLanguageRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateLanguageRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateLanguageSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateLanguageSettingsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateLanguageSettingsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateLanguageSettingsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateListEntryOrdersRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateListEntryOrdersRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateListEntryOrdersRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateListEntryOrdersRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateListEntryRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateListEntryRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateListEntryRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateListEntryRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateMessagingSettings.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateMessagingSettings.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateMessagingSettings.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateMessagingSettings.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateOtherSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateOtherSettingsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateOtherSettingsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateOtherSettingsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdatePrivacySettings.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdatePrivacySettings.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdatePrivacySettings.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdatePrivacySettings.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateProfilePropertyLocalizationRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateProfilePropertyLocalizationRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateProfilePropertyLocalizationRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateProfilePropertyLocalizationRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateProfilePropertyOrdersRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateProfilePropertyOrdersRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateProfilePropertyOrdersRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateProfilePropertyOrdersRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateProfilePropertyRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateProfilePropertyRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateProfilePropertyRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateProfilePropertyRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateProfileSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateProfileSettingsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateProfileSettingsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateProfileSettingsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateSiteAliasRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateSiteAliasRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateSiteAliasRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateSiteAliasRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateSiteSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateSiteSettingsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateSiteSettingsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateSiteSettingsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateSynonymsGroupRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateSynonymsGroupRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateSynonymsGroupRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateSynonymsGroupRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateTransaltionsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateTransaltionsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateTransaltionsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateTransaltionsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateUrlMappingSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateUrlMappingSettingsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/SiteSettings/UpdateUrlMappingSettingsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateUrlMappingSettingsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/TabDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/TabDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/TabDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/TabDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/TermDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/TermDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/TermDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/TermDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/Theme.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/Theme.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/Theme.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/Theme.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/TranslatorsComment.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/TranslatorsComment.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/TranslatorsComment.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/TranslatorsComment.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateBasicLoginSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateBasicLoginSettingsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateBasicLoginSettingsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateBasicLoginSettingsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateCachingSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateCachingSettingsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateCachingSettingsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateCachingSettingsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateCssRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateCssRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateCssRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateCssRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateExtensionUrlProviderStatusRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateExtensionUrlProviderStatusRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateExtensionUrlProviderStatusRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateExtensionUrlProviderStatusRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateGeneralSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateGeneralSettingsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateGeneralSettingsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateGeneralSettingsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateIpFilterRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateIpFilterRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateIpFilterRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateIpFilterRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateLogSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateLogSettingsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateLogSettingsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateLogSettingsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateMemberSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateMemberSettingsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateMemberSettingsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateMemberSettingsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateOtherSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateOtherSettingsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateOtherSettingsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateOtherSettingsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdatePerfSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdatePerfSettingsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdatePerfSettingsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdatePerfSettingsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateRegexSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateRegexSettingsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateRegexSettingsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateRegexSettingsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateRegistrationSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateRegistrationSettingsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateRegistrationSettingsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateRegistrationSettingsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateSMTPSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateSMTPSettingsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateSMTPSettingsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateSMTPSettingsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateSSLOffloadHeaderRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateSSLOffloadHeaderRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateSSLOffloadHeaderRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateSSLOffloadHeaderRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateSettingsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateSettingsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateSettingsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateSitemapProviderRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateSitemapProviderRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateSitemapProviderRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateSitemapProviderRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateSitemapSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateSitemapSettingsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateSitemapSettingsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateSitemapSettingsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateSslSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateSslSettingsRequest.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/UpdateSslSettingsRequest.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateSslSettingsRequest.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/Url.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/Url.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/Url.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/Url.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/DTO/UserRoleDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UserRoleDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/DTO/UserRoleDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UserRoleDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/VocabularyDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/VocabularyDto.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/Dto/VocabularyDto.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/VocabularyDto.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ExtensionsController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ExtensionsController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ExtensionsController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ExtensionsController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/LanguagesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/LanguagesController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/LanguagesController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/LanguagesController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/LicensingController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/LicensingController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/LicensingController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/LicensingController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/PagesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/PagesController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/PagesController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/PagesController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/RecyclebinController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/RecyclebinController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/RecyclebinController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/RecyclebinController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/RolesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/RolesController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/RolesController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/RolesController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SecurityController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SecurityController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SecurityController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SecurityController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SeoController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SeoController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SeoController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SeoController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ServerController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ServerController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ServerController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ServerController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ServerSettingsLogsController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ServerSettingsLogsController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ServerSettingsLogsController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ServerSettingsLogsController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ServerSettingsPerformanceController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ServerSettingsPerformanceController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ServerSettingsPerformanceController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ServerSettingsPerformanceController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ServerSettingsSmtpAdminController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ServerSettingsSmtpAdminController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ServerSettingsSmtpAdminController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ServerSettingsSmtpAdminController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ServerSettingsSmtpHostController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ServerSettingsSmtpHostController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ServerSettingsSmtpHostController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ServerSettingsSmtpHostController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SiteImportExportController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteImportExportController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SiteImportExportController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteImportExportController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SitesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SitesController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SitesController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SitesController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SqlConsoleController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SqlConsoleController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SqlConsoleController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SqlConsoleController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SystemInfoApplicationAdminController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SystemInfoApplicationAdminController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SystemInfoApplicationAdminController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SystemInfoApplicationAdminController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SystemInfoApplicationHostController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SystemInfoApplicationHostController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SystemInfoApplicationHostController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SystemInfoApplicationHostController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SystemInfoDatabaseController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SystemInfoDatabaseController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SystemInfoDatabaseController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SystemInfoDatabaseController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SystemInfoWebController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SystemInfoWebController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SystemInfoWebController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SystemInfoWebController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/TaskSchedulerController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/TaskSchedulerController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/TaskSchedulerController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/TaskSchedulerController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ThemesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ThemesController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ThemesController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ThemesController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/UsersController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/UsersController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/UsersController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/UsersController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/VocabulariesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/VocabulariesController.cs
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/VocabulariesController.cs
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/VocabulariesController.cs
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/SqlDataProvider/01.00.00.SqlDataProvider b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/SqlDataProvider/01.00.00.SqlDataProvider
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/SqlDataProvider/01.00.00.SqlDataProvider
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/SqlDataProvider/01.00.00.SqlDataProvider
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/SqlDataProvider/01.01.00.SqlDataProvider b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/SqlDataProvider/01.01.00.SqlDataProvider
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/SqlDataProvider/01.01.00.SqlDataProvider
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/SqlDataProvider/01.01.00.SqlDataProvider
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/SqlDataProvider/01.02.00.SqlDataProvider b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/SqlDataProvider/01.02.00.SqlDataProvider
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/SqlDataProvider/01.02.00.SqlDataProvider
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/SqlDataProvider/01.02.00.SqlDataProvider
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/SqlDataProvider/01.03.00.SqlDataProvider b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/SqlDataProvider/01.03.00.SqlDataProvider
similarity index 97%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/SqlDataProvider/01.03.00.SqlDataProvider
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/SqlDataProvider/01.03.00.SqlDataProvider
index a994dfc7b56..f21817ddd6b 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/SqlDataProvider/01.03.00.SqlDataProvider
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/SqlDataProvider/01.03.00.SqlDataProvider
@@ -1,99 +1,99 @@
-/************************************************************/
-/***** SqlDataProvider *****/
-/***** *****/
-/***** *****/
-/***** Note: To manually execute this script you must *****/
-/***** perform a search and replace operation *****/
-/***** for {databaseOwner} and {objectQualifier} *****/
-/***** *****/
-/************************************************************/
-
-IF EXISTS (SELECT * FROM dbo.sysobjects where id = object_id(N'{databaseOwner}{objectQualifier}PersonaBar_GetDbBackups') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
- DROP PROCEDURE {databaseOwner}[{objectQualifier}PersonaBar_GetDbBackups]
-GO
-
-CREATE PROCEDURE {databaseOwner}[{objectQualifier}PersonaBar_GetDbBackups]
-AS
- DECLARE @ProductEdition INT
- SET @ProductEdition = CAST(SERVERPROPERTY('EngineEdition') AS INT)
-
- IF (@ProductEdition = 5) --Check for SQL Azure
- BEGIN
- SELECT
- 'Unsupported' AS name,
- NULL AS StartDate,
- NULL AS FinishDate,
- 0 AS size,
- NULL AS database_name,
- 'UNKNOWN' AS BackupType
- END
- ELSE
- BEGIN
- EXEC('SELECT TOP 20
- name,
- backup_start_date as StartDate,
- backup_finish_date as FinishDate,
- backup_size/1024 as size,
- database_name,
- CASE type
- WHEN ''D'' THEN ''Database''
- WHEN ''I'' THEN ''Differential database''
- WHEN ''L'' THEN ''Log''
- WHEN ''F'' THEN ''File or filegroup''
- WHEN ''G'' THEN ''Differential file''
- WHEN ''P'' THEN ''Partial''
- WHEN ''Q'' THEN ''Differential partial''
- END AS BackupType
- FROM
- msdb..backupset
- WHERE
- database_name = DB_NAME()
- ORDER BY backup_start_date DESC')
- END
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects where id = object_id(N'{databaseOwner}{objectQualifier}PersonaBar_GetDbFileInfo') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
- DROP PROCEDURE {databaseOwner}[{objectQualifier}PersonaBar_GetDbFileInfo]
-GO
-
-CREATE PROCEDURE {databaseOwner}[{objectQualifier}PersonaBar_GetDbFileInfo]
-AS
- IF OBJECT_ID('sys.database_files') IS NULL
- BEGIN
- SELECT 'Total Size' AS FileType,
- 'Total' AS Name,
- SUM(reserved_page_count)*8 AS Size,
- 'n/a' AS FileName
- FROM sys.dm_db_partition_stats
- END
- ELSE
- BEGIN
- SELECT CASE LOWER(RIGHT(physical_name,3))
- WHEN 'mdf' THEN 'DATA'
- WHEN 'ldf' THEN 'LOG'
- ELSE 'UNKNOWN'
- END AS FileType,
- name AS Name,
- size*8 AS Size,
- physical_name AS FileName
- FROM sys.database_files
- END
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects where id = object_id(N'{databaseOwner}{objectQualifier}PersonaBar_GetDbInfo') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
- DROP PROCEDURE {databaseOwner}[{objectQualifier}PersonaBar_GetDbInfo]
-GO
-
-CREATE PROCEDURE {databaseOwner}[{objectQualifier}PersonaBar_GetDbInfo]
-AS
-
- SELECT
- SERVERPROPERTY('ProductVersion') AS ProductVersion,
- SERVERPROPERTY('ProductLevel') AS ServicePack,
- SERVERPROPERTY('Edition') AS ProductEdition,
- @@VERSION AS SoftwarePlatform
-GO
-
-/************************************************************/
-/***** SqlDataProvider *****/
+/************************************************************/
+/***** SqlDataProvider *****/
+/***** *****/
+/***** *****/
+/***** Note: To manually execute this script you must *****/
+/***** perform a search and replace operation *****/
+/***** for {databaseOwner} and {objectQualifier} *****/
+/***** *****/
+/************************************************************/
+
+IF EXISTS (SELECT * FROM dbo.sysobjects where id = object_id(N'{databaseOwner}{objectQualifier}PersonaBar_GetDbBackups') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
+ DROP PROCEDURE {databaseOwner}[{objectQualifier}PersonaBar_GetDbBackups]
+GO
+
+CREATE PROCEDURE {databaseOwner}[{objectQualifier}PersonaBar_GetDbBackups]
+AS
+ DECLARE @ProductEdition INT
+ SET @ProductEdition = CAST(SERVERPROPERTY('EngineEdition') AS INT)
+
+ IF (@ProductEdition = 5) --Check for SQL Azure
+ BEGIN
+ SELECT
+ 'Unsupported' AS name,
+ NULL AS StartDate,
+ NULL AS FinishDate,
+ 0 AS size,
+ NULL AS database_name,
+ 'UNKNOWN' AS BackupType
+ END
+ ELSE
+ BEGIN
+ EXEC('SELECT TOP 20
+ name,
+ backup_start_date as StartDate,
+ backup_finish_date as FinishDate,
+ backup_size/1024 as size,
+ database_name,
+ CASE type
+ WHEN ''D'' THEN ''Database''
+ WHEN ''I'' THEN ''Differential database''
+ WHEN ''L'' THEN ''Log''
+ WHEN ''F'' THEN ''File or filegroup''
+ WHEN ''G'' THEN ''Differential file''
+ WHEN ''P'' THEN ''Partial''
+ WHEN ''Q'' THEN ''Differential partial''
+ END AS BackupType
+ FROM
+ msdb..backupset
+ WHERE
+ database_name = DB_NAME()
+ ORDER BY backup_start_date DESC')
+ END
+GO
+
+IF EXISTS (SELECT * FROM dbo.sysobjects where id = object_id(N'{databaseOwner}{objectQualifier}PersonaBar_GetDbFileInfo') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
+ DROP PROCEDURE {databaseOwner}[{objectQualifier}PersonaBar_GetDbFileInfo]
+GO
+
+CREATE PROCEDURE {databaseOwner}[{objectQualifier}PersonaBar_GetDbFileInfo]
+AS
+ IF OBJECT_ID('sys.database_files') IS NULL
+ BEGIN
+ SELECT 'Total Size' AS FileType,
+ 'Total' AS Name,
+ SUM(reserved_page_count)*8 AS Size,
+ 'n/a' AS FileName
+ FROM sys.dm_db_partition_stats
+ END
+ ELSE
+ BEGIN
+ SELECT CASE LOWER(RIGHT(physical_name,3))
+ WHEN 'mdf' THEN 'DATA'
+ WHEN 'ldf' THEN 'LOG'
+ ELSE 'UNKNOWN'
+ END AS FileType,
+ name AS Name,
+ size*8 AS Size,
+ physical_name AS FileName
+ FROM sys.database_files
+ END
+GO
+
+IF EXISTS (SELECT * FROM dbo.sysobjects where id = object_id(N'{databaseOwner}{objectQualifier}PersonaBar_GetDbInfo') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
+ DROP PROCEDURE {databaseOwner}[{objectQualifier}PersonaBar_GetDbInfo]
+GO
+
+CREATE PROCEDURE {databaseOwner}[{objectQualifier}PersonaBar_GetDbInfo]
+AS
+
+ SELECT
+ SERVERPROPERTY('ProductVersion') AS ProductVersion,
+ SERVERPROPERTY('ProductLevel') AS ServicePack,
+ SERVERPROPERTY('Edition') AS ProductEdition,
+ @@VERSION AS SoftwarePlatform
+GO
+
+/************************************************************/
+/***** SqlDataProvider *****/
/************************************************************/
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/SqlDataProvider/01.05.00.SqlDataProvider b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/SqlDataProvider/01.05.00.SqlDataProvider
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/SqlDataProvider/01.05.00.SqlDataProvider
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/SqlDataProvider/01.05.00.SqlDataProvider
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/SqlDataProvider/03.00.00.SqlDataProvider b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/SqlDataProvider/03.00.00.SqlDataProvider
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/SqlDataProvider/03.00.00.SqlDataProvider
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/SqlDataProvider/03.00.00.SqlDataProvider
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/SqlDataProvider/09.04.01.SqlDataProvider b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/SqlDataProvider/09.04.01.SqlDataProvider
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/SqlDataProvider/09.04.01.SqlDataProvider
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/SqlDataProvider/09.04.01.SqlDataProvider
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/SqlDataProvider/Uninstall.SqlDataProvider b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/SqlDataProvider/Uninstall.SqlDataProvider
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/SqlDataProvider/Uninstall.SqlDataProvider
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/SqlDataProvider/Uninstall.SqlDataProvider
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.AdminLogs/AdminLogs.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.AdminLogs/AdminLogs.html
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.AdminLogs/AdminLogs.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.AdminLogs/AdminLogs.html
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.AdminLogs/App_LocalResources/AdminLogs.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.AdminLogs/App_LocalResources/AdminLogs.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.AdminLogs/App_LocalResources/AdminLogs.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.AdminLogs/App_LocalResources/AdminLogs.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.AdminLogs/css/AdminLogs.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.AdminLogs/css/AdminLogs.css
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.AdminLogs/css/AdminLogs.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.AdminLogs/css/AdminLogs.css
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.AdminLogs/scripts/AdminLogs.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.AdminLogs/scripts/AdminLogs.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.AdminLogs/scripts/AdminLogs.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.AdminLogs/scripts/AdminLogs.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.ConfigConsole/App_LocalResources/ConfigConsole.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.ConfigConsole/App_LocalResources/ConfigConsole.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.ConfigConsole/App_LocalResources/ConfigConsole.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.ConfigConsole/App_LocalResources/ConfigConsole.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.ConfigConsole/ConfigConsole.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.ConfigConsole/ConfigConsole.html
similarity index 98%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.ConfigConsole/ConfigConsole.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.ConfigConsole/ConfigConsole.html
index d8e2b6b9d07..f28a542d956 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.ConfigConsole/ConfigConsole.html
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.ConfigConsole/ConfigConsole.html
@@ -1,47 +1,47 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.ConfigConsole/css/ConfigConsole.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.ConfigConsole/css/ConfigConsole.css
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.ConfigConsole/css/ConfigConsole.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.ConfigConsole/css/ConfigConsole.css
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.ConfigConsole/scripts/ConfigConsole.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.ConfigConsole/scripts/ConfigConsole.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.ConfigConsole/scripts/ConfigConsole.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.ConfigConsole/scripts/ConfigConsole.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/App_LocalResources/Connectors.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/App_LocalResources/Connectors.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/App_LocalResources/Connectors.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/App_LocalResources/Connectors.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/Connectors.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/Connectors.html
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/Connectors.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/Connectors.html
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/css/Connectors.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/css/Connectors.css
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/css/Connectors.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/css/Connectors.css
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/images/edit.svg b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/images/edit.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/images/edit.svg
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/images/edit.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/images/icon-connector-verified.png b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/images/icon-connector-verified.png
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/images/icon-connector-verified.png
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/images/icon-connector-verified.png
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/images/trash.svg b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/images/trash.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/images/trash.svg
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/images/trash.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/scripts/Connectors.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/scripts/Connectors.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/scripts/Connectors.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/scripts/Connectors.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.CssEditor/App_LocalResources/CssEditor.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.CssEditor/App_LocalResources/CssEditor.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.CssEditor/App_LocalResources/CssEditor.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.CssEditor/App_LocalResources/CssEditor.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.CssEditor/CssEditor.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.CssEditor/CssEditor.html
similarity index 98%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.CssEditor/CssEditor.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.CssEditor/CssEditor.html
index 766a3fc01bf..4ed4738d695 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.CssEditor/CssEditor.html
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.CssEditor/CssEditor.html
@@ -1,20 +1,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.CssEditor/css/CssEditor.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.CssEditor/css/CssEditor.css
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.CssEditor/css/CssEditor.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.CssEditor/css/CssEditor.css
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.CssEditor/scripts/CssEditor.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.CssEditor/scripts/CssEditor.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.CssEditor/scripts/CssEditor.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.CssEditor/scripts/CssEditor.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/App_LocalResources/Extensions.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/App_LocalResources/Extensions.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/App_LocalResources/Extensions.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/App_LocalResources/Extensions.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Licensing/css/Licensing.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/css/extensions.css
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Licensing/css/Licensing.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/css/extensions.css
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/data/ModuleControlTemplate.resources b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/data/ModuleControlTemplate.resources
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/data/ModuleControlTemplate.resources
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/data/ModuleControlTemplate.resources
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/extensions.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/extensions.html
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/extensions.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/extensions.html
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/scripts/bundles/rw-widgets.eot b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/scripts/bundles/rw-widgets.eot
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/scripts/bundles/rw-widgets.eot
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/scripts/bundles/rw-widgets.eot
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/scripts/bundles/rw-widgets.svg b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/scripts/bundles/rw-widgets.svg
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/scripts/bundles/rw-widgets.svg
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/scripts/bundles/rw-widgets.svg
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/scripts/bundles/rw-widgets.ttf b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/scripts/bundles/rw-widgets.ttf
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/scripts/bundles/rw-widgets.ttf
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/scripts/bundles/rw-widgets.ttf
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/scripts/extensions.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/scripts/extensions.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/scripts/extensions.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/scripts/extensions.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Licensing/App_LocalResources/Licensing.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Licensing/App_LocalResources/Licensing.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Licensing/App_LocalResources/Licensing.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Licensing/App_LocalResources/Licensing.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Licensing/Licensing.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Licensing/Licensing.html
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Licensing/Licensing.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Licensing/Licensing.html
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/css/Security.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Licensing/css/Licensing.css
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/css/Security.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Licensing/css/Licensing.css
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Licensing/scripts/Licensing.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Licensing/scripts/Licensing.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Licensing/scripts/Licensing.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Licensing/scripts/Licensing.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Pages/App_LocalResources/Pages.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Pages/App_LocalResources/Pages.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Pages/App_LocalResources/Pages.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Pages/App_LocalResources/Pages.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Pages/Pages.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Pages/Pages.html
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Pages/Pages.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Pages/Pages.html
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Pages/css/Pages.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Pages/css/Pages.css
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Pages/css/Pages.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Pages/css/Pages.css
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Pages/scripts/Pages.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Pages/scripts/Pages.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Pages/scripts/Pages.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Pages/scripts/Pages.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/App_LocalResources/Prompt.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/App_LocalResources/Prompt.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/App_LocalResources/Prompt.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/App_LocalResources/Prompt.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/Prompt.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/Prompt.html
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/Prompt.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/Prompt.html
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/css/Prompt.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/css/Prompt.css
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/css/Prompt.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/css/Prompt.css
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/css/Prompt.css.map b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/css/Prompt.css.map
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/css/Prompt.css.map
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/css/Prompt.css.map
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/scripts/Prompt.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/scripts/Prompt.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/scripts/Prompt.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/scripts/Prompt.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/App_LocalResources/Recyclebin.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/App_LocalResources/Recyclebin.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/App_LocalResources/Recyclebin.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/App_LocalResources/Recyclebin.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/Recyclebin.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/Recyclebin.html
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/Recyclebin.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/Recyclebin.html
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/css/RecycleBin.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/css/RecycleBin.css
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/css/RecycleBin.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/css/RecycleBin.css
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/Icon-Empty-Modules-white.png b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/Icon-Empty-Modules-white.png
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/Icon-Empty-Modules-white.png
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/Icon-Empty-Modules-white.png
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/Icon-Empty-Pages-white.png b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/Icon-Empty-Pages-white.png
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/Icon-Empty-Pages-white.png
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/Icon-Empty-Pages-white.png
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/Icons-RecycleBin.png b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/Icons-RecycleBin.png
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/Icons-RecycleBin.png
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/Icons-RecycleBin.png
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/fallback-thumbnail.png b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/fallback-thumbnail.png
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/fallback-thumbnail.png
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/fallback-thumbnail.png
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/icon-empty-state-modules.png b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/icon-empty-state-modules.png
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/icon-empty-state-modules.png
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/icon-empty-state-modules.png
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/icon-empty-state-pages.png b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/icon-empty-state-pages.png
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/icon-empty-state-pages.png
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/images/icon-empty-state-pages.png
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/scripts/RecycleBin.ViewModel.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/scripts/RecycleBin.ViewModel.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/scripts/RecycleBin.ViewModel.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/scripts/RecycleBin.ViewModel.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/scripts/Recyclebin.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/scripts/Recyclebin.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/scripts/Recyclebin.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Recyclebin/scripts/Recyclebin.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/App_LocalResources/Roles.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/App_LocalResources/Roles.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/App_LocalResources/Roles.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/App_LocalResources/Roles.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/Roles.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/Roles.html
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/Roles.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/Roles.html
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/css/Roles.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/css/Roles.css
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/css/Roles.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/css/Roles.css
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/Roles.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/Roles.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/Roles.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/Roles.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/bundles/rw-widgets.eot b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/bundles/rw-widgets.eot
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/bundles/rw-widgets.eot
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/bundles/rw-widgets.eot
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/bundles/rw-widgets.svg b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/bundles/rw-widgets.svg
new file mode 100644
index 00000000000..7ba4f3c5b7d
--- /dev/null
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/bundles/rw-widgets.svg
@@ -0,0 +1,24 @@
+
+
+
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/bundles/rw-widgets.ttf b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/bundles/rw-widgets.ttf
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/bundles/rw-widgets.ttf
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/bundles/rw-widgets.ttf
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/App_LocalResources/Security.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/App_LocalResources/Security.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/App_LocalResources/Security.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/App_LocalResources/Security.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/Security.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/Security.html
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/Security.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/Security.html
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Seo/css/Seo.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/css/Security.css
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Seo/css/Seo.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/css/Security.css
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/scripts/Security.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/scripts/Security.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/scripts/Security.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/scripts/Security.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Seo/App_LocalResources/Seo.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Seo/App_LocalResources/Seo.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Seo/App_LocalResources/Seo.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Seo/App_LocalResources/Seo.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Seo/Seo.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Seo/Seo.html
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Seo/Seo.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Seo/Seo.html
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteImportExport/css/SiteImportExport.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Seo/css/Seo.css
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteImportExport/css/SiteImportExport.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Seo/css/Seo.css
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Seo/scripts/Seo.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Seo/scripts/Seo.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Seo/scripts/Seo.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Seo/scripts/Seo.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Servers/App_LocalResources/Servers.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Servers/App_LocalResources/Servers.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Servers/App_LocalResources/Servers.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Servers/App_LocalResources/Servers.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Servers/Servers.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Servers/Servers.html
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Servers/Servers.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Servers/Servers.html
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Servers/css/Servers.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Servers/css/Servers.css
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Servers/css/Servers.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Servers/css/Servers.css
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Servers/scripts/Servers.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Servers/scripts/Servers.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Servers/scripts/Servers.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Servers/scripts/Servers.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteImportExport/App_LocalResources/SiteImportExport.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteImportExport/App_LocalResources/SiteImportExport.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteImportExport/App_LocalResources/SiteImportExport.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteImportExport/App_LocalResources/SiteImportExport.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteImportExport/SiteImportExport.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteImportExport/SiteImportExport.html
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteImportExport/SiteImportExport.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteImportExport/SiteImportExport.html
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/css/SiteSettings.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteImportExport/css/SiteImportExport.css
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/css/SiteSettings.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteImportExport/css/SiteImportExport.css
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteImportExport/scripts/SiteImportExport.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteImportExport/scripts/SiteImportExport.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteImportExport/scripts/SiteImportExport.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteImportExport/scripts/SiteImportExport.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/SiteSettings.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/SiteSettings.html
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/SiteSettings.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/SiteSettings.html
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Sites/css/Sites.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/css/SiteSettings.css
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Sites/css/Sites.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/css/SiteSettings.css
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/scripts/SiteSettings.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/scripts/SiteSettings.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/scripts/SiteSettings.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/scripts/SiteSettings.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Sites/App_LocalResources/Sites.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Sites/App_LocalResources/Sites.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Sites/App_LocalResources/Sites.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Sites/App_LocalResources/Sites.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Sites/Sites.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Sites/Sites.html
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Sites/Sites.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Sites/Sites.html
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Themes/css/Themes.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Sites/css/Sites.css
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Themes/css/Themes.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Sites/css/Sites.css
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Sites/scripts/Sites.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Sites/scripts/Sites.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Sites/scripts/Sites.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Sites/scripts/Sites.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/App_LocalResources/SqlConsole.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/App_LocalResources/SqlConsole.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/App_LocalResources/SqlConsole.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/App_LocalResources/SqlConsole.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/SqlConsole.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/SqlConsole.html
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/SqlConsole.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/SqlConsole.html
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/css/SqlConsole.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/css/SqlConsole.css
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/css/SqlConsole.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/css/SqlConsole.css
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/images/icon-search.png b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/images/icon-search.png
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/images/icon-search.png
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/images/icon-search.png
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/images/query-cancel.png b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/images/query-cancel.png
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/images/query-cancel.png
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/images/query-cancel.png
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/images/query-save.png b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/images/query-save.png
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/images/query-save.png
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/images/query-save.png
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/images/query-trash.png b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/images/query-trash.png
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/images/query-trash.png
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/images/query-trash.png
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/FileSaver.min.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/FileSaver.min.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/FileSaver.min.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/FileSaver.min.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/SqlConsole.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/SqlConsole.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/SqlConsole.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/SqlConsole.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/clipboard.min.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/clipboard.min.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/clipboard.min.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/clipboard.min.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/exportData.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/exportData.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/exportData.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/exportData.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/html2canvas.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/html2canvas.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/html2canvas.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/html2canvas.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/jspdf.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/jspdf.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/jspdf.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/jspdf.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/sort.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/sort.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/sort.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SqlConsole/scripts/sort.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/App_LocalResources/TaskScheduler.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/App_LocalResources/TaskScheduler.resx
similarity index 97%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/App_LocalResources/TaskScheduler.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/App_LocalResources/TaskScheduler.resx
index 39814797bdc..e778ac00308 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/App_LocalResources/TaskScheduler.resx
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/App_LocalResources/TaskScheduler.resx
@@ -1,995 +1,995 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- View Schedule Status
-
-
- View Schedule History
-
-
- Full Class Name and Assembly
-
-
- Enable Schedule
-
-
- Frequency
-
-
- Set the time period to determine how frequently this task will run.
-
-
- Minutes
-
-
- Days
-
-
- Hours
-
-
- Weeks
-
-
- Months
-
-
- Years
-
-
- Retry Time Lapse
-
-
- Set the time period to rerun this task after a failure.
-
-
- Retain Schedule History
-
-
- Select the number of items to be retained in the schedule history.
-
-
- Run on Event
-
-
- Select "Application Start" to run this event when the web app starts. Note that events run on APPLICATION_END may not run reliably on some hosts.
-
-
- None
-
-
- All
-
-
- APPLICATION_START
-
-
- Catch Up Tasks
-
-
- Check this box to run this event once for each frequency that was missed during any server downtime.
-
-
- Object Dependencies
-
-
- Enter the tables or other objects that this event is dependent on. E.g. "Users,UsersOnline"
-
-
- Your changes have been saved.
-
-
- The schedule item has been deleted.
-
-
- Could not delete the schedule item. Please try later.
-
-
- Edit Task
-
-
- <h1>About Schedule</h1><p>Allows you to schedule tasks to be run at specified intervals.</p>
-
-
- This is the full class name followed by the assembly name. E.g. "DotNetNuke.Entities.Users.PurgeUsersOnline, DOTNETNUKE"
-
-
- Server Name:
-
-
- Filter scheduled tasks by a single server or choose All to view all tasks.
-
-
- Seconds
-
-
- Check this box to enable the schedule for this job.
-
-
- Enter a name for the scheduled job.
-
-
- Friendly Name
-
-
- Run Now
-
-
- Delete
-
-
- Item added to schedule for immediate execution.
-
-
- The type of schedule item is required.
-
-
- Frequency range is from 1 to 999999.
-
-
- You must set Frequency value from 1 to 999999.
-
-
- Retry Frequency range is from 1 to 999999.
-
-
- Schedule Start Date/Time
-
-
- Enter the start date/time for scheduled job. Note: If the server is down at the scheduled time or other jobs are already running, then the job will run as soon as the server comes back on online.
-
-
- The values for frequency and retry are invalid as the retry interval exceeds the frequency interval.
-
-
- Add Item To Schedule
-
-
- Type
-
-
- ENABLED
-
-
- Enabled
-
-
- FREQUENCY
-
-
- RETRY TIME LAPSE
-
-
- Next Start
-
-
- Next Start
-
-
- History
-
-
- Every
-
-
- Minute
-
-
- Hour
-
-
- Day
-
-
- n/a
-
-
- Schedule
-
-
- Task Name
-
-
- View History
-
-
- View Status
-
-
- Log
-
-
- Scheduler Mode:
-
-
- The Timer Method maintains a separate thread to execute scheduled tasks while the worker process is alive. Alternatively, the Request Method executes tasks when HTTP Requests are made. You can also disable the scheduler by selecting Disabled.
-
-
- Disabled
-
-
- Timer Method
-
-
- Request Method
-
-
- Settings
-
-
- Schedule Delay:
-
-
- Number of minutes the system should wait before it runs any scheduled jobs after a restart. Default is 1 min.
-
-
- Value should be in minutes.
-
-
- Started
-
-
- Ended
-
-
- Duration (seconds)
-
-
- Succeeded
-
-
- Start/End/Next Start
-
-
- Notes
-
-
- Task History
-
-
- Description
-
-
- Start/End/Next
-
-
- Ran On Server
-
-
- Status:
-
-
- Max Threads:
-
-
- Active Threads:
-
-
- Free Threads:
-
-
- Command:
-
-
- Items Processing
-
-
- ID:
-
-
- Object Dependencies:
-
-
- Triggered By:
-
-
- Thread:
-
-
- Servers:
-
-
- Items in Queue
-
-
- Overdue (seconds):
-
-
- Time Remaining:
-
-
- There are no tasks in the queue
-
-
- Whenever you have tasks in queue or processing, they will appear here.
-
-
- Scheduler is currently disabled.
-
-
- Manually stopped from scheduler status page
-
-
- Start
-
-
- Stop
-
-
- Save
-
-
- Schedule Status
-
-
- Stop
-
-
- TASK QUEUE
-
-
- SCHEDULER
-
-
- HISTORY
-
-
- Schedule History
-
-
- Task History:
-
-
- Cancel
-
-
- Update
-
-
- NOT SET
-
-
- WAITING FOR OPEN THREAD
-
-
- RUNNING EVENT SCHEDULE
-
-
- RUNNING TIMER SCHEDULE
-
-
- RUNNING REQUEST SCHEDULE
-
-
- WAITING FOR REQUEST
-
-
- SHUTTING DOWN
-
-
- STOPPED
-
-
- Scheduler settings updated successfully.
-
-
- Could not update schedule settings. Please try later.
-
-
- Scheduler started successfully.
-
-
- Could not start scheduler. Please try later.
-
-
- Scheduler stopped successfully.
-
-
- Could not stop scheduler. Please try later.
-
-
- Start Schedule
-
-
- Stop Schedule
-
-
- Schedule Start Delay (mins):
-
-
- Processing ...
-
-
- Could not add this item to schedule. Please try later.
-
-
- DESCRIPTION
-
-
- RAN ON SERVER
-
-
- DURATION (SECS)
-
-
- SUCCEEDED
-
-
- START/END
-
-
- Scheduler
-
-
- Schedule item updated successfully.
-
-
- Could not update the schedule item. Please try later.
-
-
- Schedule item created successfully.
-
-
- Could not create the schedule item. Please try later.
-
-
- Are you sure you want to delete this schedule item?
-
-
- Yes
-
-
- No
-
-
- Are you sure you want to cancel your changes?
-
-
- Server Time:
-
-
- Add Task
-
-
- {0} results per page
-
-
- Showing {0}-{1} of {2} results
-
-
- Servers
-
-
- less than a minute
-
-
- minute
-
-
- minutes
-
-
- hour
-
-
- hours
-
-
- day
-
-
- days
-
-
- Failed to fetch the task details. Please see event log for more details.
-
-
- When specified, the --{0} flag cannot be empty.\n
-
-
- When specified, the --{0} flag must be a number.\n
-
-
- When specified, the --{0} flag must be True or False.\n
-
-
- The --{0} flag is required.\n
-
-
- You must specify the scheduled item's ID using the --{0} flag or by passing the number as the first argument.\n
-
-
- Task is already disabled.
-
-
- Task is already enabled.
-
-
- No task not found with id {0}.
-
-
- Task {0} has been found.
-
-
- {0} tasks found.
-
-
- Task updated successfully.
-
-
- Failed to update the task.
-
-
- Retrieves details for the specified Scheduler Task. DNN refers to these as schedules or scheduler items. Prompt refers to them as tasks.
-
-
- The Schedule ID for the item you want to retrieve. If you pass the ID as the first value after the command name, you do not need to explicitly use the <span class="mono">--id</span> flag name.
-
-
- <h4>Get A Task</h4>
- <code class="block">
- get-task 11
- </code>
- OR
- <code class="block">
- get-task --id 11
- </code>
-
- <h4>Results</h4>
- <table class="command-result-tbl">
- <tr>
- <td>ScheduleId</td>
- <td>:</td>
- <td>11</td>
- </tr>
- <tr>
- <td>FreindlyName</td>
- <td>:</td>
- <td>Messaging Dispatch</td>
- </tr>
- <tr>
- <td>TypeName</td>
- <td>:</td>
- <td>DotNteNuke.Services.Social.Messaging.Scheduler.CoreMessagingScheduler,DotNetNuke</td>
- </tr>
- <tr>
- <td>NextStart</td>
- <td>:</td>
- <td>2017-01-02T08:19:49.53</td>
- </tr>
- <tr>
- <td>Enabled</td>
- <td>:</td>
- <td>true</td>
- </tr>
- <tr>
- <td>CatchUp</td>
- <td>:</td>
- <td>false</td>
- </tr>
- <tr>
- <td>Created</td>
- <td>:</td>
- <td>0001-01-01T00:00:00</td>
- </tr>
- <tr>
- <td>StartDate</td>
- <td>:</td>
- <td>0001-01-01T00:00:00</td>
- </tr>
- </table>
-
-
- Retrieves a list of scheduled tasks based on the specified criteria. DNN refers to these as schedules or scheduler items. Prompt refers to them as tasks.
-
-
- When specified, Prompt will return tasks that are enabled (if this flag is set to true) or disabled (if this is set to false). If this flag is not specified, Prompt will return tasks regardless of their enabled status.
-
-
- When specified, Prompt will return tasks whose Friendly Name matches the expression. This supports wildcard matching via the asterisk ( <span class="mono">*</span> ) to represent zero (0) or more characters.
-
-
- <h4>List All Tasks</h4>
- <code class="block">
- list-tasks
- </code>
-
- <h4>Results</h4>
- <table class="command-result-tbl">
- <thead>
- <tr>
- <th>ScheduleId</th>
- <th>FriendlyName</th>
- <th>NextStart</th>
- <th>Enabled</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>11</td>
- <td>MessagingDispatch</td>
- <td>2017-01-02T08:19:49.53</td>
- <td>true</td>
- </tr>
- <tr>
- <td>9</td>
- <td>Purge Cache</td>
- <td>2017-01-02T08:08:07.4342281-07:00</td>
- <td>false</td>
- </tr>
- <tr>
- <td>12</td>
- <td>Purge Client Dependency Files</td>
- <td>2017-01-02T08:08:07.4342281-07:00</td>
- <td>false</td>
- </tr>
- <tr>
- <td>4</td>
- <td>Purge Log Buffer</td>
- <td>2017-01-02T08:08:07.4342281-07:00</td>
- <td>false</td>
- </tr>
- <tr>
- <td>10</td>
- <td>Purge Module Cache</td>
- <td>2017-01-02T08:19:50.533</td>
- <td>true</td>
- </tr>
- <tr>
- <td colspan="4">...</td>
- </tr>
- <tr>
- <td colspan="4">10 tasks found</td>
- </tr>
- </tbody>
- </table>
-
- <h4>List All Enabled Tasks</h4>
- <code class="block">
- list-tasks true
- </code>
- OR
- <code class="block">
- list-tasks --enabled true
- </code>
-
- <h4>Results</h4>
- <table class="command-result-tbl">
- <thead>
- <tr>
- <th>ScheduleId</th>
- <th>FriendlyName</th>
- <th>NextStart</th>
- <th>Enabled</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>11</td>
- <td>MessagingDispatch</td>
- <td>2017-01-02T08:19:49.53</td>
- <td class="bg-info">true</td>
- </tr>
- <tr>
- <td>10</td>
- <td>Purge Module Cache</td>
- <td>2017-01-02T08:19:50.533</td>
- <td class="bg-info">true</td>
- </tr>
- <tr>
- <td>3</td>
- <td>Purge Schedule History</td>
- <td>2017-01-03T08:08:10.45</td>
- <td class="bg-info">true</td>
- </tr>
- <tr>
- <td>6</td>
- <td>Search: Site Crawler</td>
- <td>2017-01-02T09:09:09.94</td>
- <td class="bg-info">true</td>
- </tr>
- <tr>
- <td colspan="4">4 tasks found</td>
- </tr>
- </tbody>
- </table>
-
- <h4>List All Tasks Whose Name Begins With "purge"</h4>
- <code class="block">
- list-tasks purge*
- </code>
- OR
- <code class="block">
- list-tasks --name purge*
- </code>
-
- <h4>Results</h4>
- <table class="command-result-tbl">
- <thead>
- <tr>
- <th>ScheduleId</th>
- <th>FriendlyName</th>
- <th>NextStart</th>
- <th>Enabled</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>9</td>
- <td class="bg-info">Purge Cache</td>
- <td>2017-01-02T09:08:55.2867143-07:00</td>
- <td>false</td>
- </tr>
- <tr>
- <td>12</td>
- <td class="bg-info">Purge Client Dependency Files</td>
- <td>2017-01-02T09:08:55.2867143-07:00</td>
- <td>false</td>
- </tr>
- <tr>
- <td>4</td>
- <td class="bg-info">Purge Log Buffer</td>
- <td>2017-01-02T09:08:55.2867143-07:00</td>
- <td>false</td>
- </tr>
- <tr>
- <td>10</td>
- <td class="bg-info">Purge Module Cache</td>
- <td>2017-01-02T09:17:20.48</td>
- <td>true</td>
- </tr>
- <tr>
- <td>13</td>
- <td class="bg-info">Purge Output Cache</td>
- <td>2017-01-02T09:08:55.2867143-07:00</td>
- <td>false</td>
- </tr>
- <tr>
- <td>3</td>
- <td class="bg-info">Purge Schedule History</td>
- <td>2017-01-03T08:08:10.45</td>
- <td>true</td>
- </tr>
- <tr>
- <td>1</td>
- <td class="bg-info">Purge Users Online</td>
- <td>2017-01-02T09:08:55.2867143-07:00</td>
- <td>false</td>
- </tr>
- <tr>
- <td colspan="4">7 tasks found</td>
- </tr>
- </tbody>
- </table>
-
- <h4>List All Enabled Tasks Whose Name Begins With "purge"</h4>
- <code class="block">
- list-tasks purge* --enabled true
- </code>
- OR
- <code class="block">
- list-tasks true --name purge*
- </code>
- OR
- <code class="block">
- list-tasks --enabled true --name purge*
- </code>
-
- <h4>Results</h4>
- <table class="command-result-tbl">
- <thead>
- <tr>
- <th>ScheduleId</th>
- <th>FriendlyName</th>
- <th>NextStart</th>
- <th>Enabled</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>10</td>
- <td class="bg-info">Purge Module Cache</td>
- <td>2017-01-02T09:17:20.48</td>
- <td class="bg-info">true</td>
- </tr>
- <tr>
- <td>3</td>
- <td class="bg-info">Purge Schedule History</td>
- <td>2017-01-03T08:08:10.45</td>
- <td class="bg-info">true</td>
- </tr>
- <tr>
- <td colspan="4">2 tasks found</td>
- </tr>
- </tbody>
- </table>
-
-
- Set or update properties on the specified Scheduled task.
-
-
- When true, the specified task will be enabled. When false, the specified task will be disabled.
-
-
- The Schedule ID of the task you want to update. You can avoid explicitly typing the <span class="mono">--id</span> flag by just passing the Schedule ID as the first argument.
-
-
- <h4>Disable the "Purge Schedule History" Task</h4>
- <code class="block">
- set-task 3 --enabled false
- </code>
- OR
- <code class="block">
- set-task --id 3 --enabled false
- </code>
-
- <h4>Results</h4>
- <table class="command-result-tbl">
- <tr>
- <td>ScheduleId</td>
- <td>:</td>
- <td>3</td>
- </tr>
- <tr>
- <td>FreindlyName</td>
- <td>:</td>
- <td>Purge Schedule History</td>
- </tr>
- <tr>
- <td>TypeName</td>
- <td>:</td>
- <td>DotNetNuke.Services.Scheduling.PurgeScheduleHistory, DOTNETNUKE</td>
- </tr>
- <tr>
- <td>NextStart</td>
- <td>:</td>
- <td>2017-01-02T09:08:55.2867143-07:00</td>
- </tr>
- <tr>
- <td>Enabled</td>
- <td>:</td>
- <td>false</td>
- </tr>
- <tr>
- <td>CatchUp</td>
- <td>:</td>
- <td>false</td>
- </tr>
- <tr>
- <td>Created</td>
- <td>:</td>
- <td>0001-01-01T00:00:00</td>
- </tr>
- <tr>
- <td>StartDate</td>
- <td>:</td>
- <td>2017-01-02T09:47:31.79</td>
- </tr>
- <tr>
- <td colspan="3">
- 1 task updated
- </td>
- </tr>
- </table>
-
-
- Scheduler Commands
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ View Schedule Status
+
+
+ View Schedule History
+
+
+ Full Class Name and Assembly
+
+
+ Enable Schedule
+
+
+ Frequency
+
+
+ Set the time period to determine how frequently this task will run.
+
+
+ Minutes
+
+
+ Days
+
+
+ Hours
+
+
+ Weeks
+
+
+ Months
+
+
+ Years
+
+
+ Retry Time Lapse
+
+
+ Set the time period to rerun this task after a failure.
+
+
+ Retain Schedule History
+
+
+ Select the number of items to be retained in the schedule history.
+
+
+ Run on Event
+
+
+ Select "Application Start" to run this event when the web app starts. Note that events run on APPLICATION_END may not run reliably on some hosts.
+
+
+ None
+
+
+ All
+
+
+ APPLICATION_START
+
+
+ Catch Up Tasks
+
+
+ Check this box to run this event once for each frequency that was missed during any server downtime.
+
+
+ Object Dependencies
+
+
+ Enter the tables or other objects that this event is dependent on. E.g. "Users,UsersOnline"
+
+
+ Your changes have been saved.
+
+
+ The schedule item has been deleted.
+
+
+ Could not delete the schedule item. Please try later.
+
+
+ Edit Task
+
+
+ <h1>About Schedule</h1><p>Allows you to schedule tasks to be run at specified intervals.</p>
+
+
+ This is the full class name followed by the assembly name. E.g. "DotNetNuke.Entities.Users.PurgeUsersOnline, DOTNETNUKE"
+
+
+ Server Name:
+
+
+ Filter scheduled tasks by a single server or choose All to view all tasks.
+
+
+ Seconds
+
+
+ Check this box to enable the schedule for this job.
+
+
+ Enter a name for the scheduled job.
+
+
+ Friendly Name
+
+
+ Run Now
+
+
+ Delete
+
+
+ Item added to schedule for immediate execution.
+
+
+ The type of schedule item is required.
+
+
+ Frequency range is from 1 to 999999.
+
+
+ You must set Frequency value from 1 to 999999.
+
+
+ Retry Frequency range is from 1 to 999999.
+
+
+ Schedule Start Date/Time
+
+
+ Enter the start date/time for scheduled job. Note: If the server is down at the scheduled time or other jobs are already running, then the job will run as soon as the server comes back on online.
+
+
+ The values for frequency and retry are invalid as the retry interval exceeds the frequency interval.
+
+
+ Add Item To Schedule
+
+
+ Type
+
+
+ ENABLED
+
+
+ Enabled
+
+
+ FREQUENCY
+
+
+ RETRY TIME LAPSE
+
+
+ Next Start
+
+
+ Next Start
+
+
+ History
+
+
+ Every
+
+
+ Minute
+
+
+ Hour
+
+
+ Day
+
+
+ n/a
+
+
+ Schedule
+
+
+ Task Name
+
+
+ View History
+
+
+ View Status
+
+
+ Log
+
+
+ Scheduler Mode:
+
+
+ The Timer Method maintains a separate thread to execute scheduled tasks while the worker process is alive. Alternatively, the Request Method executes tasks when HTTP Requests are made. You can also disable the scheduler by selecting Disabled.
+
+
+ Disabled
+
+
+ Timer Method
+
+
+ Request Method
+
+
+ Settings
+
+
+ Schedule Delay:
+
+
+ Number of minutes the system should wait before it runs any scheduled jobs after a restart. Default is 1 min.
+
+
+ Value should be in minutes.
+
+
+ Started
+
+
+ Ended
+
+
+ Duration (seconds)
+
+
+ Succeeded
+
+
+ Start/End/Next Start
+
+
+ Notes
+
+
+ Task History
+
+
+ Description
+
+
+ Start/End/Next
+
+
+ Ran On Server
+
+
+ Status:
+
+
+ Max Threads:
+
+
+ Active Threads:
+
+
+ Free Threads:
+
+
+ Command:
+
+
+ Items Processing
+
+
+ ID:
+
+
+ Object Dependencies:
+
+
+ Triggered By:
+
+
+ Thread:
+
+
+ Servers:
+
+
+ Items in Queue
+
+
+ Overdue (seconds):
+
+
+ Time Remaining:
+
+
+ There are no tasks in the queue
+
+
+ Whenever you have tasks in queue or processing, they will appear here.
+
+
+ Scheduler is currently disabled.
+
+
+ Manually stopped from scheduler status page
+
+
+ Start
+
+
+ Stop
+
+
+ Save
+
+
+ Schedule Status
+
+
+ Stop
+
+
+ TASK QUEUE
+
+
+ SCHEDULER
+
+
+ HISTORY
+
+
+ Schedule History
+
+
+ Task History:
+
+
+ Cancel
+
+
+ Update
+
+
+ NOT SET
+
+
+ WAITING FOR OPEN THREAD
+
+
+ RUNNING EVENT SCHEDULE
+
+
+ RUNNING TIMER SCHEDULE
+
+
+ RUNNING REQUEST SCHEDULE
+
+
+ WAITING FOR REQUEST
+
+
+ SHUTTING DOWN
+
+
+ STOPPED
+
+
+ Scheduler settings updated successfully.
+
+
+ Could not update schedule settings. Please try later.
+
+
+ Scheduler started successfully.
+
+
+ Could not start scheduler. Please try later.
+
+
+ Scheduler stopped successfully.
+
+
+ Could not stop scheduler. Please try later.
+
+
+ Start Schedule
+
+
+ Stop Schedule
+
+
+ Schedule Start Delay (mins):
+
+
+ Processing ...
+
+
+ Could not add this item to schedule. Please try later.
+
+
+ DESCRIPTION
+
+
+ RAN ON SERVER
+
+
+ DURATION (SECS)
+
+
+ SUCCEEDED
+
+
+ START/END
+
+
+ Scheduler
+
+
+ Schedule item updated successfully.
+
+
+ Could not update the schedule item. Please try later.
+
+
+ Schedule item created successfully.
+
+
+ Could not create the schedule item. Please try later.
+
+
+ Are you sure you want to delete this schedule item?
+
+
+ Yes
+
+
+ No
+
+
+ Are you sure you want to cancel your changes?
+
+
+ Server Time:
+
+
+ Add Task
+
+
+ {0} results per page
+
+
+ Showing {0}-{1} of {2} results
+
+
+ Servers
+
+
+ less than a minute
+
+
+ minute
+
+
+ minutes
+
+
+ hour
+
+
+ hours
+
+
+ day
+
+
+ days
+
+
+ Failed to fetch the task details. Please see event log for more details.
+
+
+ When specified, the --{0} flag cannot be empty.\n
+
+
+ When specified, the --{0} flag must be a number.\n
+
+
+ When specified, the --{0} flag must be True or False.\n
+
+
+ The --{0} flag is required.\n
+
+
+ You must specify the scheduled item's ID using the --{0} flag or by passing the number as the first argument.\n
+
+
+ Task is already disabled.
+
+
+ Task is already enabled.
+
+
+ No task not found with id {0}.
+
+
+ Task {0} has been found.
+
+
+ {0} tasks found.
+
+
+ Task updated successfully.
+
+
+ Failed to update the task.
+
+
+ Retrieves details for the specified Scheduler Task. DNN refers to these as schedules or scheduler items. Prompt refers to them as tasks.
+
+
+ The Schedule ID for the item you want to retrieve. If you pass the ID as the first value after the command name, you do not need to explicitly use the <span class="mono">--id</span> flag name.
+
+
+ <h4>Get A Task</h4>
+ <code class="block">
+ get-task 11
+ </code>
+ OR
+ <code class="block">
+ get-task --id 11
+ </code>
+
+ <h4>Results</h4>
+ <table class="command-result-tbl">
+ <tr>
+ <td>ScheduleId</td>
+ <td>:</td>
+ <td>11</td>
+ </tr>
+ <tr>
+ <td>FreindlyName</td>
+ <td>:</td>
+ <td>Messaging Dispatch</td>
+ </tr>
+ <tr>
+ <td>TypeName</td>
+ <td>:</td>
+ <td>DotNteNuke.Services.Social.Messaging.Scheduler.CoreMessagingScheduler,DotNetNuke</td>
+ </tr>
+ <tr>
+ <td>NextStart</td>
+ <td>:</td>
+ <td>2017-01-02T08:19:49.53</td>
+ </tr>
+ <tr>
+ <td>Enabled</td>
+ <td>:</td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>CatchUp</td>
+ <td>:</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>Created</td>
+ <td>:</td>
+ <td>0001-01-01T00:00:00</td>
+ </tr>
+ <tr>
+ <td>StartDate</td>
+ <td>:</td>
+ <td>0001-01-01T00:00:00</td>
+ </tr>
+ </table>
+
+
+ Retrieves a list of scheduled tasks based on the specified criteria. DNN refers to these as schedules or scheduler items. Prompt refers to them as tasks.
+
+
+ When specified, Prompt will return tasks that are enabled (if this flag is set to true) or disabled (if this is set to false). If this flag is not specified, Prompt will return tasks regardless of their enabled status.
+
+
+ When specified, Prompt will return tasks whose Friendly Name matches the expression. This supports wildcard matching via the asterisk ( <span class="mono">*</span> ) to represent zero (0) or more characters.
+
+
+ <h4>List All Tasks</h4>
+ <code class="block">
+ list-tasks
+ </code>
+
+ <h4>Results</h4>
+ <table class="command-result-tbl">
+ <thead>
+ <tr>
+ <th>ScheduleId</th>
+ <th>FriendlyName</th>
+ <th>NextStart</th>
+ <th>Enabled</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>11</td>
+ <td>MessagingDispatch</td>
+ <td>2017-01-02T08:19:49.53</td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>9</td>
+ <td>Purge Cache</td>
+ <td>2017-01-02T08:08:07.4342281-07:00</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>12</td>
+ <td>Purge Client Dependency Files</td>
+ <td>2017-01-02T08:08:07.4342281-07:00</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>4</td>
+ <td>Purge Log Buffer</td>
+ <td>2017-01-02T08:08:07.4342281-07:00</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>10</td>
+ <td>Purge Module Cache</td>
+ <td>2017-01-02T08:19:50.533</td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td colspan="4">...</td>
+ </tr>
+ <tr>
+ <td colspan="4">10 tasks found</td>
+ </tr>
+ </tbody>
+ </table>
+
+ <h4>List All Enabled Tasks</h4>
+ <code class="block">
+ list-tasks true
+ </code>
+ OR
+ <code class="block">
+ list-tasks --enabled true
+ </code>
+
+ <h4>Results</h4>
+ <table class="command-result-tbl">
+ <thead>
+ <tr>
+ <th>ScheduleId</th>
+ <th>FriendlyName</th>
+ <th>NextStart</th>
+ <th>Enabled</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>11</td>
+ <td>MessagingDispatch</td>
+ <td>2017-01-02T08:19:49.53</td>
+ <td class="bg-info">true</td>
+ </tr>
+ <tr>
+ <td>10</td>
+ <td>Purge Module Cache</td>
+ <td>2017-01-02T08:19:50.533</td>
+ <td class="bg-info">true</td>
+ </tr>
+ <tr>
+ <td>3</td>
+ <td>Purge Schedule History</td>
+ <td>2017-01-03T08:08:10.45</td>
+ <td class="bg-info">true</td>
+ </tr>
+ <tr>
+ <td>6</td>
+ <td>Search: Site Crawler</td>
+ <td>2017-01-02T09:09:09.94</td>
+ <td class="bg-info">true</td>
+ </tr>
+ <tr>
+ <td colspan="4">4 tasks found</td>
+ </tr>
+ </tbody>
+ </table>
+
+ <h4>List All Tasks Whose Name Begins With "purge"</h4>
+ <code class="block">
+ list-tasks purge*
+ </code>
+ OR
+ <code class="block">
+ list-tasks --name purge*
+ </code>
+
+ <h4>Results</h4>
+ <table class="command-result-tbl">
+ <thead>
+ <tr>
+ <th>ScheduleId</th>
+ <th>FriendlyName</th>
+ <th>NextStart</th>
+ <th>Enabled</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>9</td>
+ <td class="bg-info">Purge Cache</td>
+ <td>2017-01-02T09:08:55.2867143-07:00</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>12</td>
+ <td class="bg-info">Purge Client Dependency Files</td>
+ <td>2017-01-02T09:08:55.2867143-07:00</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>4</td>
+ <td class="bg-info">Purge Log Buffer</td>
+ <td>2017-01-02T09:08:55.2867143-07:00</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>10</td>
+ <td class="bg-info">Purge Module Cache</td>
+ <td>2017-01-02T09:17:20.48</td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>13</td>
+ <td class="bg-info">Purge Output Cache</td>
+ <td>2017-01-02T09:08:55.2867143-07:00</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>3</td>
+ <td class="bg-info">Purge Schedule History</td>
+ <td>2017-01-03T08:08:10.45</td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>1</td>
+ <td class="bg-info">Purge Users Online</td>
+ <td>2017-01-02T09:08:55.2867143-07:00</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td colspan="4">7 tasks found</td>
+ </tr>
+ </tbody>
+ </table>
+
+ <h4>List All Enabled Tasks Whose Name Begins With "purge"</h4>
+ <code class="block">
+ list-tasks purge* --enabled true
+ </code>
+ OR
+ <code class="block">
+ list-tasks true --name purge*
+ </code>
+ OR
+ <code class="block">
+ list-tasks --enabled true --name purge*
+ </code>
+
+ <h4>Results</h4>
+ <table class="command-result-tbl">
+ <thead>
+ <tr>
+ <th>ScheduleId</th>
+ <th>FriendlyName</th>
+ <th>NextStart</th>
+ <th>Enabled</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>10</td>
+ <td class="bg-info">Purge Module Cache</td>
+ <td>2017-01-02T09:17:20.48</td>
+ <td class="bg-info">true</td>
+ </tr>
+ <tr>
+ <td>3</td>
+ <td class="bg-info">Purge Schedule History</td>
+ <td>2017-01-03T08:08:10.45</td>
+ <td class="bg-info">true</td>
+ </tr>
+ <tr>
+ <td colspan="4">2 tasks found</td>
+ </tr>
+ </tbody>
+ </table>
+
+
+ Set or update properties on the specified Scheduled task.
+
+
+ When true, the specified task will be enabled. When false, the specified task will be disabled.
+
+
+ The Schedule ID of the task you want to update. You can avoid explicitly typing the <span class="mono">--id</span> flag by just passing the Schedule ID as the first argument.
+
+
+ <h4>Disable the "Purge Schedule History" Task</h4>
+ <code class="block">
+ set-task 3 --enabled false
+ </code>
+ OR
+ <code class="block">
+ set-task --id 3 --enabled false
+ </code>
+
+ <h4>Results</h4>
+ <table class="command-result-tbl">
+ <tr>
+ <td>ScheduleId</td>
+ <td>:</td>
+ <td>3</td>
+ </tr>
+ <tr>
+ <td>FreindlyName</td>
+ <td>:</td>
+ <td>Purge Schedule History</td>
+ </tr>
+ <tr>
+ <td>TypeName</td>
+ <td>:</td>
+ <td>DotNetNuke.Services.Scheduling.PurgeScheduleHistory, DOTNETNUKE</td>
+ </tr>
+ <tr>
+ <td>NextStart</td>
+ <td>:</td>
+ <td>2017-01-02T09:08:55.2867143-07:00</td>
+ </tr>
+ <tr>
+ <td>Enabled</td>
+ <td>:</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>CatchUp</td>
+ <td>:</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>Created</td>
+ <td>:</td>
+ <td>0001-01-01T00:00:00</td>
+ </tr>
+ <tr>
+ <td>StartDate</td>
+ <td>:</td>
+ <td>2017-01-02T09:47:31.79</td>
+ </tr>
+ <tr>
+ <td colspan="3">
+ 1 task updated
+ </td>
+ </tr>
+ </table>
+
+
+ Scheduler Commands
+
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/TaskScheduler.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/TaskScheduler.html
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/TaskScheduler.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/TaskScheduler.html
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/css/TaskScheduler.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/css/TaskScheduler.css
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/css/TaskScheduler.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/css/TaskScheduler.css
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/active.png b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/active.png
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/active.png
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/active.png
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/btn-edit.png b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/btn-edit.png
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/btn-edit.png
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/btn-edit.png
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/btn-run.png b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/btn-run.png
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/btn-run.png
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/btn-run.png
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/icon-add.png b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/icon-add.png
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/icon-add.png
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/icon-add.png
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/icon-calendar.png b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/icon-calendar.png
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/icon-calendar.png
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/icon-calendar.png
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/icon-enabled.png b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/icon-enabled.png
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/icon-enabled.png
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/icon-enabled.png
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/icon-history.png b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/icon-history.png
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/icon-history.png
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/icon-history.png
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/wait.png b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/wait.png
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/wait.png
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/images/wait.png
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/scripts/TaskScheduler.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/scripts/TaskScheduler.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/scripts/TaskScheduler.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.TaskScheduler/scripts/TaskScheduler.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Themes/App_LocalResources/Themes.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Themes/App_LocalResources/Themes.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Themes/App_LocalResources/Themes.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Themes/App_LocalResources/Themes.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Themes/Themes.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Themes/Themes.html
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Themes/Themes.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Themes/Themes.html
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/css/Users.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Themes/css/Themes.css
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/css/Users.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Themes/css/Themes.css
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Themes/scripts/Themes.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Themes/scripts/Themes.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Themes/scripts/Themes.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Themes/scripts/Themes.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/App_LocalResources/Users.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/App_LocalResources/Users.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/App_LocalResources/Users.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/App_LocalResources/Users.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/Users.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/Users.html
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/Users.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/Users.html
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Vocabularies/css/vocabularies.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/css/Users.css
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Vocabularies/css/vocabularies.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/css/Users.css
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/scripts/Users.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/scripts/Users.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/scripts/Users.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/scripts/Users.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Vocabularies/App_LocalResources/Vocabularies.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Vocabularies/App_LocalResources/Vocabularies.resx
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Vocabularies/App_LocalResources/Vocabularies.resx
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Vocabularies/App_LocalResources/Vocabularies.resx
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/css/extensions.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Vocabularies/css/vocabularies.css
similarity index 85%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/css/extensions.css
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Vocabularies/css/vocabularies.css
index f7cca53ae97..46800d16adb 100644
--- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/css/extensions.css
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Vocabularies/css/vocabularies.css
@@ -1,2 +1,2 @@
-body {
-}
+body {
+}
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Vocabularies/scripts/vocabularies.js b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Vocabularies/scripts/vocabularies.js
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Vocabularies/scripts/vocabularies.js
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Vocabularies/scripts/vocabularies.js
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Vocabularies/vocabularies.html b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Vocabularies/vocabularies.html
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Vocabularies/vocabularies.html
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Vocabularies/vocabularies.html
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/images/module_icon_32x32.png b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/images/module_icon_32x32.png
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/images/module_icon_32x32.png
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/images/module_icon_32x32.png
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/packages.config b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/packages.config
similarity index 100%
rename from Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/packages.config
rename to Dnn.AdminExperience/Dnn.PersonaBar.Extensions/packages.config
diff --git a/Dnn.AdminExperience/Extensions/.vs/VSWorkspaceState.json b/Dnn.AdminExperience/Extensions/.vs/VSWorkspaceState.json
deleted file mode 100644
index 84d9f183d6b..00000000000
--- a/Dnn.AdminExperience/Extensions/.vs/VSWorkspaceState.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "ExpandedNodes": [
- "",
- "\\src",
- "\\src\\Modules",
- "\\src\\Modules\\Prompt",
- "\\src\\Modules\\Prompt\\Dnn.PersonaBar.Prompt"
- ],
- "SelectedNode": "\\src\\Dnn.PersonaBar.Extensions.sln",
- "PreviewInSolutionExplorer": false
-}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Extensions/.vs/slnx.sqlite b/Dnn.AdminExperience/Extensions/.vs/slnx.sqlite
deleted file mode 100644
index 60882f1e430..00000000000
Binary files a/Dnn.AdminExperience/Extensions/.vs/slnx.sqlite and /dev/null differ
diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/Dnn.PersonaBar.Pages.Tests.csproj b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/Dnn.PersonaBar.Pages.Tests.csproj
index b6e3987640e..1dd8408c125 100644
--- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/Dnn.PersonaBar.Pages.Tests.csproj
+++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/Dnn.PersonaBar.Pages.Tests.csproj
@@ -70,7 +70,7 @@
{8B50BA8B-0A08-41B8-81B8-EA70707C7379}Dnn.PersonaBar.Library
-
+ {9CCA271F-CFAA-42A3-B577-7D5CBB38C646}Dnn.PersonaBar.Extensions
diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj
index f0f94ac2bcc..093d22fd51b 100644
--- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj
+++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj
@@ -65,7 +65,7 @@
{8b50ba8b-0a08-41b8-81b8-ea70707c7379}Dnn.PersonaBar.Library
-
+ {9cca271f-cfaa-42a3-b577-7d5cbb38c646}Dnn.PersonaBar.Extensions
diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj
index 5c627590404..4df919869c4 100644
--- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj
+++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj
@@ -79,7 +79,7 @@
{8B50BA8B-0A08-41B8-81B8-EA70707C7379}Dnn.PersonaBar.Library
-
+ {9cca271f-cfaa-42a3-b577-7d5cbb38c646}Dnn.PersonaBar.Extensions
diff --git a/package.json b/package.json
index fbfc886e579..dfc9f26d277 100644
--- a/package.json
+++ b/package.json
@@ -3,26 +3,26 @@
"version": "1.0.0",
"private": true,
"workspaces": [
- "Dnn.AdminExperience/Dnn.React.Common",
- "Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/Bundle.Web",
- "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/AdminLogs.Web",
- "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Extensions.Web",
- "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Licensing.Web",
- "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Pages.Web",
- "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Prompt.Web",
- "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Roles.Web",
- "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Security.Web",
- "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Seo.Web",
- "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Servers.Web",
- "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteImportExport.Web",
- "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web",
- "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/src/_exportables",
- "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web",
- "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web",
- "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web",
- "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web",
- "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables",
- "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web"
+ "Dnn.AdminExperience/ClientSide/AdminLogs.Web",
+ "Dnn.AdminExperience/ClientSide/Bundle.Web",
+ "Dnn.AdminExperience/ClientSide/Dnn.React.Common",
+ "Dnn.AdminExperience/ClientSide/Extensions.Web",
+ "Dnn.AdminExperience/ClientSide/Licensing.Web",
+ "Dnn.AdminExperience/ClientSide/Pages.Web",
+ "Dnn.AdminExperience/ClientSide/Prompt.Web",
+ "Dnn.AdminExperience/ClientSide/Roles.Web",
+ "Dnn.AdminExperience/ClientSide/Security.Web",
+ "Dnn.AdminExperience/ClientSide/Seo.Web",
+ "Dnn.AdminExperience/ClientSide/Servers.Web",
+ "Dnn.AdminExperience/ClientSide/SiteImportExport.Web",
+ "Dnn.AdminExperience/ClientSide/Sites.Web",
+ "Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables",
+ "Dnn.AdminExperience/ClientSide/SiteSettings.Web",
+ "Dnn.AdminExperience/ClientSide/TaskScheduler.Web",
+ "Dnn.AdminExperience/ClientSide/Themes.Web",
+ "Dnn.AdminExperience/ClientSide/Users.Web",
+ "Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables",
+ "Dnn.AdminExperience/ClientSide/Vocabularies.Web"
],
"devDependencies": {
"lerna": "^3.16.4"