diff --git a/app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs b/app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs index 42c5819..063090b 100644 --- a/app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs +++ b/app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs @@ -16,8 +16,8 @@ using Umbraco.Web.Models.ContentEditing; namespace Archetype.PropertyEditors { - [PropertyEditorAsset(ClientDependencyType.Javascript, "/App_Plugins/Archetype/js/archetype.js")] - [PropertyEditor(Constants.PropertyEditorAlias, "Archetype", "/App_Plugins/Archetype/views/archetype.html", ValueType = "JSON")] + [PropertyEditorAsset(ClientDependencyType.Javascript, "~/App_Plugins/Archetype/js/archetype.js")] + [PropertyEditor(Constants.PropertyEditorAlias, "Archetype", "~/App_Plugins/Archetype/views/archetype.html", ValueType = "JSON")] public class ArchetypePropertyEditor : PropertyEditor { #region Pre Value Editor @@ -29,7 +29,7 @@ namespace Archetype.PropertyEditors internal class ArchetypePreValueEditor : PreValueEditor { - [PreValueField("archetypeConfig", "Config", "/App_Plugins/Archetype/views/archetype.config.html", + [PreValueField("archetypeConfig", "Config", "~/App_Plugins/Archetype/views/archetype.config.html", Description = "(Required) Describe your Archetype.")] public string Config { get; set; } @@ -187,6 +187,6 @@ namespace Archetype.PropertyEditors } } - #endregion + #endregion } } diff --git a/app/controllers/config.controller.js b/app/controllers/config.controller.js index 11ecd42..ebf2111 100644 --- a/app/controllers/config.controller.js +++ b/app/controllers/config.controller.js @@ -290,5 +290,5 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio } //archetype css - assetsService.loadCss("/App_Plugins/Archetype/css/archetype.css"); + assetsService.loadCss("../App_Plugins/Archetype/css/archetype.css"); }); diff --git a/app/controllers/controller.js b/app/controllers/controller.js index 191ba6a..09c23d6 100644 --- a/app/controllers/controller.js +++ b/app/controllers/controller.js @@ -390,7 +390,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc } //archetype css - assetsService.loadCss("/App_Plugins/Archetype/css/archetype.css"); + assetsService.loadCss("../App_Plugins/Archetype/css/archetype.css"); //custom css if($scope.model.config.customCssPath) diff --git a/app/resources/archetypePropertyEditorResource.js b/app/resources/archetypePropertyEditorResource.js index 9243212..a335fe2 100644 --- a/app/resources/archetypePropertyEditorResource.js +++ b/app/resources/archetypePropertyEditorResource.js @@ -3,24 +3,24 @@ angular.module('umbraco.resources').factory('archetypePropertyEditorResource', f getAllDataTypes: function() { // Hack - grab DataTypes from Tree API, as `dataTypeService.getAll()` isn't implemented yet return umbRequestHelper.resourcePromise( - $http.get("/umbraco/backoffice/ArchetypeApi/ArchetypeDataType/GetAll"), 'Failed to retrieve datatypes from tree service' + $http.get("backoffice/ArchetypeApi/ArchetypeDataType/GetAll"), 'Failed to retrieve datatypes from tree service' ); }, getDataType: function (guid, useDeepDatatypeLookup, contentTypeAlias, propertyTypeAlias, archetypeAlias, nodeId) { if(useDeepDatatypeLookup) { return umbRequestHelper.resourcePromise( - $http.get("/umbraco/backoffice/ArchetypeApi/ArchetypeDataType/GetByGuid?guid=" + guid + "&contentTypeAlias=" + contentTypeAlias + "&propertyTypeAlias=" + propertyTypeAlias + "&archetypeAlias=" + archetypeAlias + "&nodeId=" + nodeId), 'Failed to retrieve datatype' + $http.get("backoffice/ArchetypeApi/ArchetypeDataType/GetByGuid?guid=" + guid + "&contentTypeAlias=" + contentTypeAlias + "&propertyTypeAlias=" + propertyTypeAlias + "&archetypeAlias=" + archetypeAlias + "&nodeId=" + nodeId), 'Failed to retrieve datatype' ); } else { return umbRequestHelper.resourcePromise( - $http.get("/umbraco/backoffice/ArchetypeApi/ArchetypeDataType/GetByGuid?guid=" + guid , { cache: true }), 'Failed to retrieve datatype' + $http.get("backoffice/ArchetypeApi/ArchetypeDataType/GetByGuid?guid=" + guid , { cache: true }), 'Failed to retrieve datatype' ); } }, getPropertyEditorMapping: function(alias) { return umbRequestHelper.resourcePromise( - $http.get("/umbraco/backoffice/ArchetypeApi/ArchetypeDataType/GetAllPropertyEditors", { cache: true }), 'Failed to retrieve datatype mappings' + $http.get("backoffice/ArchetypeApi/ArchetypeDataType/GetAllPropertyEditors", { cache: true }), 'Failed to retrieve datatype mappings' ).then(function (data) { var result = _.find(data, function(d) { return d.alias === alias; diff --git a/app/services/archetypeLocalizationService.js b/app/services/archetypeLocalizationService.js index 56baaae..c0c7a6b 100644 --- a/app/services/archetypeLocalizationService.js +++ b/app/services/archetypeLocalizationService.js @@ -24,7 +24,7 @@ angular.module('umbraco.services').factory('archetypeLocalizationService', funct initLocalizedResources:function () { var deferred = $q.defer(); userService.getCurrentUser().then(function(user){ - $http.get("/App_plugins/Archetype/langs/" + user.locale + ".js", { cache: true }) + $http.get("../App_plugins/Archetype/langs/" + user.locale + ".js", { cache: true }) .then(function(response){ service.resourceFileLoaded = true; service.dictionary = response.data;