("An error occurred initializing", ex);
-
- ShowConnectionError();
- }
- }
- else
- {
- ShowConnectionError();
- }
- }
-
- private void ShowConnectionError()
- {
-
- var fb = new global::umbraco.uicontrols.Feedback
- {
- type = global::umbraco.uicontrols.Feedback.feedbacktype.error,
- Text = "No connection to repository. Starter Kits Designs could not be fetched from the repository as there was no connection to: '" + _repo.RepositoryUrl + "'"
- };
-
- pl_loadStarterKitDesigns.Controls.Clear();
- pl_loadStarterKitDesigns.Controls.Add(fb);
- }
-
- protected void SelectStarterKitDesign(object sender, EventArgs e)
- {
- InstallHelper.ClearProgress();
-
- var kitGuid = new Guid(((LinkButton)sender).CommandArgument);
-
- if (!global::umbraco.cms.businesslogic.skinning.Skinning.IsSkinInstalled(kitGuid))
- {
-
- InstallHelper.SetProgress(5, "Fetching starting kit from the repository", "");
-
- var installer = new global::umbraco.cms.businesslogic.packager.Installer();
-
- if (_repo.HasConnection())
- {
- var p = new global::umbraco.cms.businesslogic.packager.Installer();
-
- InstallHelper.SetProgress(15, "Connected to repository", "");
-
- string tempFile = p.Import(_repo.fetch(kitGuid.ToString()));
- p.LoadConfig(tempFile);
- int pID = p.CreateManifest(tempFile, kitGuid.ToString(), RepoGuid);
-
- InstallHelper.SetProgress(30, "Installing skin files", "");
- p.InstallFiles(pID, tempFile);
-
- InstallHelper.SetProgress(50, "Installing skin system objects", "");
- p.InstallBusinessLogic(pID, tempFile);
-
- InstallHelper.SetProgress(60, "Finishing skin installation", "");
- p.InstallCleanUp(pID, tempFile);
-
- library.RefreshContent();
-
- InstallHelper.SetProgress(80, "Activating skin", "");
- if (global::umbraco.cms.businesslogic.skinning.Skinning.GetAllSkins().Count > 0)
- {
- global::umbraco.cms.businesslogic.skinning.Skinning.ActivateAsCurrentSkin(
- global::umbraco.cms.businesslogic.skinning.Skinning.GetAllSkins()[0]);
- }
-
-
- InstallHelper.SetProgress(100, "Skin installation has been completed", "");
-
- try
- {
-
-
- if (string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus))
- {
- GlobalSettings.ConfigurationStatus = UmbracoVersion.Current.ToString(3);
- }
- }
- catch
- {
-
- }
-
- try
- {
- InstallHelper.RedirectToNextStep(Page, GetCurrentStep());
- }
- catch
- {
- OnStarterKitDesignInstalled();
- }
- }
- else
- {
- ShowConnectionError();
- }
-
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKitDesigns.ascx.designer.cs b/src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKitDesigns.ascx.designer.cs
deleted file mode 100644
index 7ee546bdd2..0000000000
--- a/src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKitDesigns.ascx.designer.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-namespace Umbraco.Web.UI.Install.Steps.Skinning {
-
-
- public partial class LoadStarterKitDesigns {
-
- ///
- /// pl_loadStarterKitDesigns control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.PlaceHolder pl_loadStarterKitDesigns;
-
- ///
- /// pl_CustomizeSkin control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Panel pl_CustomizeSkin;
-
- ///
- /// rep_starterKitDesigns control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Repeater rep_starterKitDesigns;
- }
-}
diff --git a/src/Umbraco.Web.UI/install/steps/StarterKits.ascx.cs b/src/Umbraco.Web.UI/install/steps/StarterKits.ascx.cs
index ffb4ad8e39..579f8b7413 100644
--- a/src/Umbraco.Web.UI/install/steps/StarterKits.ascx.cs
+++ b/src/Umbraco.Web.UI/install/steps/StarterKits.ascx.cs
@@ -10,10 +10,7 @@ namespace Umbraco.Web.UI.Install.Steps
protected void Page_Load(object sender, EventArgs e)
{
- if (!global::umbraco.cms.businesslogic.skinning.Skinning.IsStarterKitInstalled())
- ShowStarterKits();
- else
- ShowStarterKitDesigns((Guid)global::umbraco.cms.businesslogic.skinning.Skinning.StarterKitGuid());
+ ShowStarterKits();
}
@@ -26,19 +23,6 @@ namespace Umbraco.Web.UI.Install.Steps
}
-
- private void ShowStarterKitDesigns(Guid starterKitGuid)
- {
- var ctrl = (LoadStarterKitDesigns)LoadControl(SystemDirectories.Install + "/steps/Skinning/loadStarterKitDesigns.ascx");
- ctrl.ID = "StarterKitDesigns";
-
- ctrl.StarterKitGuid = starterKitGuid;
- ph_starterKitDesigns.Controls.Add(ctrl);
-
- pl_starterKit.Visible = false;
- pl_starterKitDesign.Visible = true;
- }
-
-
+
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/install/steps/TheEnd.ascx.cs b/src/Umbraco.Web.UI/install/steps/TheEnd.ascx.cs
index 8b824027f1..4053f0c782 100644
--- a/src/Umbraco.Web.UI/install/steps/TheEnd.ascx.cs
+++ b/src/Umbraco.Web.UI/install/steps/TheEnd.ascx.cs
@@ -20,10 +20,7 @@ namespace Umbraco.Web.UI.Install.Steps
// Update ClientDependency version
var clientDependencyConfig = new ClientDependencyConfiguration();
var clientDependencyUpdated = clientDependencyConfig.IncreaseVersionNumber();
-
- if (!global::umbraco.cms.businesslogic.skinning.Skinning.IsStarterKitInstalled())
- customizeSite.Visible = false;
-
+
}
}
diff --git a/src/Umbraco.Web.UI/install/steps/TheEnd.ascx.designer.cs b/src/Umbraco.Web.UI/install/steps/TheEnd.ascx.designer.cs
index 3d8ea899fc..2c7c5fe114 100644
--- a/src/Umbraco.Web.UI/install/steps/TheEnd.ascx.designer.cs
+++ b/src/Umbraco.Web.UI/install/steps/TheEnd.ascx.designer.cs
@@ -11,14 +11,5 @@ namespace Umbraco.Web.UI.Install.Steps {
public partial class TheEnd {
-
- ///
- /// customizeSite control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.HtmlControls.HtmlGenericControl customizeSite;
}
}
diff --git a/src/Umbraco.Web.UI/install/steps/theend.ascx b/src/Umbraco.Web.UI/install/steps/theend.ascx
index 2df9c738ca..11404d8608 100644
--- a/src/Umbraco.Web.UI/install/steps/theend.ascx
+++ b/src/Umbraco.Web.UI/install/steps/theend.ascx
@@ -31,8 +31,7 @@ jQuery(document).ready(function () {
source .NET CMS.
If you installed a starter kit you can start by configuring your new site, just click "Preview your new website" and follow the instructions. Or to start adding content right away click "Set up your new website"
-
- - &umbSkinning=true&umbSkinningConfigurator=true" target="_blank">Set up your new website
+
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Controls/Communicator.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Controls/Communicator.js
deleted file mode 100644
index 734bb0933d..0000000000
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Controls/Communicator.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Umbraco Live Editing: Communicator
-
-/********************* Communicator Constructor *********************/
-
- function UmbracoCommunicator() { }
-
-
-
-/********************* Communicator Methods *********************/
-
- // Sends a message to the client using the communicator.
- UmbracoCommunicator.prototype.SendClientMessage = function(type, message) {
- // find the communicator
- var divs = document.getElementsByTagName("div");
- var communicator = null;
- for (var i = 0; i < divs.length && communicator == null; i++)
- if (divs[i].className == "communicator")
- communicator = divs[i];
- Sys.Debug.assert(communicator != null, "LiveEditing: Communicator not found.");
-
- // send the message
- var typeBox = communicator.childNodes[0].childNodes[0];
- var messageBox = communicator.childNodes[0].childNodes[1];
- var submit = communicator.childNodes[0].childNodes[2];
- typeBox.value = type;
- messageBox.value = message;
- submit.click();
- }
-
-
-/********************* Communicator Instance *********************/
-
- var UmbracoCommunicator = new UmbracoCommunicator();
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Controls/LiveEditingToolbar.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Controls/LiveEditingToolbar.js
deleted file mode 100644
index ac5e9457f0..0000000000
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Controls/LiveEditingToolbar.js
+++ /dev/null
@@ -1,99 +0,0 @@
-Type.registerNamespace("umbraco.presentation.LiveEditing.Controls");
-
-/************************************ Toolbar class ***********************************/
-
-// Constructor.
-umbraco.presentation.LiveEditing.Controls.LiveEditingToolbar = function() {
- umbraco.presentation.LiveEditing.Controls.LiveEditingToolbar.initializeBase(this);
- this._inited = false;
-
- // init toolbar on application load
- var liveEditingToolbar = this;
- Sys.Application.add_load(function() { liveEditingToolbar._init(); });
-}
-
-umbraco.presentation.LiveEditing.Controls.LiveEditingToolbar.prototype = {
- // Initialize the toolbar.
- _init: function() {
- if (!this._inited) {
- var liveEditingToolbar = this;
- Sys.WebForms.PageRequestManager.getInstance().add_endRequest(function(sender, args) { liveEditingToolbar._handleError(sender, args); });
- this._inited = true;
- }
- },
-
- // Fires the Save event.
- _save: function() {
- var handler = this.get_events().getHandler("save");
- var args = new Sys.EventArgs();
- args.cancel = false;
- if (handler)
- handler(this, args);
-
- if (!args.cancel) {
- this.setDirty(false);
- UmbSpeechBubble.ShowMessage("Info", "Saving", "Save in progress...");
- }
- return !args.cancel;
-
- },
-
- // Adds a listener for the Save event.
- add_save: function(handler) {
- this.get_events().addHandler("save", handler);
- },
-
- // Removes a listener for the Save event.
- remove_save: function(handler) {
- this.get_events().removeHandler("save", handler);
- },
-
- // Fires the Save and Publish event.
- _saveAndPublish: function() {
- var handler = this.get_events().getHandler("saveAndPublish");
- var args = new Sys.EventArgs();
- args.cancel = false;
- if (handler)
- handler(this, args);
-
- if (!args.cancel) {
- this.setDirty(false);
- UmbSpeechBubble.ShowMessage("Info", "Publishing", "Save and publish in progress...");
- }
- return !args.cancel;
- },
-
- // Adds a listener for the Save and Publish event.
- add_saveAndPublish: function(handler) {
- this.get_events().addHandler("saveAndPublish", handler);
- },
-
- // Removes a listener for the Save and Publish event.
- remove_saveAndPublish: function(handler) {
- this.get_events().removeHandler("saveAndPublish", handler);
- },
-
- // Sets whether the pages has unsaved changes.
- setDirty: function(isDirty) {
- window.onbeforeunload = isDirty ? function() { return "You have unsaved changes."; } : null;
- },
-
- // Global error handler. Displays a tooltip with the error message.
- _handleError: function(sender, args) {
- if (args.get_error() != undefined) {
- var errorMessage;
- if (args.get_response().get_statusCode() == '200') {
- errorMessage = args.get_error().message;
- }
- else {
- errorMessage = "An unspecified error occurred.";
- }
- args.set_errorHandled(true);
- UmbSpeechBubble.ShowMessage("info", "Error", errorMessage);
- }
- }
-}
-
-// Register the class and create a global instance.
-umbraco.presentation.LiveEditing.Controls.LiveEditingToolbar.registerClass("umbraco.presentation.LiveEditing.Controls.LiveEditingToolbar", Sys.Component);
-var LiveEditingToolbar = new umbraco.presentation.LiveEditing.Controls.LiveEditingToolbar();
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Css/LiveEditing.css b/src/Umbraco.Web.UI/umbraco/LiveEditing/Css/LiveEditing.css
deleted file mode 100644
index f2dc632e6d..0000000000
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Css/LiveEditing.css
+++ /dev/null
@@ -1,370 +0,0 @@
-/*****************************************************************
-
- Live Editing placeholders
-
-/****************************************************************/
-
-umbraco\:iteminfo {
- cursor: pointer;
- border: 1px dashed #bbb;
- padding: 5px;
-}
-
-.liveEditingForceBlockMode {
- display: block;
-}
-
-umbraco\:iteminfo:hover
-{
- border: 2px dashed #f36f21;
- padding: 5px;
-}
-
-/*****************************************************************
-
- General Toolbar CSS
-
-/****************************************************************/
-
-html {
- margin-top: 30px !important;
-}
-
-#LiveEditingToolbar
-{
- font-family:"Trebuchet MS",verdana,arial;
- background: url(../../../umbraco_client/tabView/images/background.gif) !important;
- position: fixed !important;
- width: 100% !important;
- height: 34px !important;
- top: 0 !important;
- left: 0 !important;
- text-align: left !important;
- border-bottom: 1px solid #B0B0B0 !important;
-}
-
-#LiveEditingToolbar div {
- padding: 4px !important;
-}
-
-#LiveEditingToolbar div div {
- padding: inherit !important;
-}
-
-#LiveEditingToolbar div.ExtraMenuItems {
- display: inline !important;
-}
-
-#LiveEditingToolbar div {
- /*background: url(/umbraco/LiveEditing/Images/Canvas.gif) no-repeat right 4px; */
- width: 100%;
-}
-
-#LiveEditingToolbar * div {
- background: none;
- width: auto;
-}
-
-#LiveEditingToolbar input.button {
- cursor: hand !important;
- width: 22px !important;
- height: 23px !important;
- background: none !important;
- border: none !important;
-}
-
-#LiveEditingToolbar input.button:hover, #LiveEditingClientToolbar a.mceButtonEnabled:hover {
- background-image: url(../../../umbraco_client/menuicon/images/buttonbg.gif) !important;
- border: none !important;
-}
-
-#LiveEditingToolbar input.close {
- position: absolute !important;
- right: 7px !important;
- top: 6px !important;
- /*border: none !Important;
- background: none !Important; */
- color: #000;
- width: 150px;
-}
-
-#LiveEditingToolbar input.close:hover {
- opacity: 1 !important;
-}
-
-#LiveEditingToolbar img.about {
- margin: 0 5px 5px 5px !important;
-}
-
-#LiveEditingClientToolbar, #LiveEditingClientToolbar div {
- display: inline !important;
-}
-
-#LiveEditingToolbar span.separator {
- padding-right: 7px !important;
-}
-
-#LiveEditingToolbar span.separator span {
- border-left: 1px solid #999999 !important;
- border-right: 1px solid #EEEEEE !important;
- position: absolute !important;
- top: 7px !important;
- width: 0px !important;
- overflow: hidden !important;
-}
-
-#LiveEditingToolbar .umbLabelButton
-{
- cursor: hand !important;
- float: left;
- margin: 1px 5px 1px 1px;
- padding: 0 !important;
-}
-
-#LiveEditingToolbar .umbLabelButton:hover
-{
- background: #EAEAEA;
- border: 1px solid #CAC9C9 !Important;
- margin: 0px 4px 0px 0px;
-}
-
-#LiveEditingToolbar .umbLabelButton a
-{
- text-decoration: none;
- font-size: 80%;
- margin-right: 3px;
- padding: 5px 0;
-}
-
-
-#LiveEditingToolbar .umbLabelButton input.button {
- width: 22px !important;
- height: 23px !important;
- margin-right: 3px;
- background: none !important;
- border: none !important;
- vertical-align: middle;
-}
-
-#LiveEditingToolbar .umbLabelButton input.button:hover {
- background-image: none !important;
- border: none !important;
-}
-
-/*****************************************************************
-
- TinyMCE extra CSS
-
-/****************************************************************/
-
-/* hide the temporary TinyMCE container */
-.tinymceContainer {
- position: absolute !important;
- left: -1000px !important;
-}
-
-#LiveEditingClientToolbar .mceToolbarExternal table {
- display: inline !important;
- background: none !important;
- margin: 0 !important;
-}
-
-#LiveEditingClientToolbar .mceToolbarExternal {
- position: absolute !important;
- top: 0 !important;
-}
-
-#LiveEditingClientToolbar a.mceButtonEnabled {
- width: 22px !important;
- height: 23px !important;
-}
-
-/*****************************************************************
-
- Datatypes extra CSS
-
-/****************************************************************/
-
-.relatedlinksdatatype
-{
- background-color: #fff !important;
- border: 1px solid #999 !important;
-}
-
-/*****************************************************************
-
- Modal dialogs
-
-/****************************************************************/
-
-.umbModalBox h1
-{
- font-size: larger !important;
-}
-
-.umbModalBox h2
-{
- font-size: medium !important;
-}
-
-.umbModalBox label
-{
- padding-bottom: 2px !Important;
- display: block !Important;
- color: #666 !Important;
- font-family:Trebuchet MS,Lucida Grande,verdana,arial ! important;
-}
-
-.umbModalBox p
-{
- font-size: 12px !important;
- font-family:Trebuchet MS,Lucida Grande,verdana,arial ! important;
- color:Black ! important;
- margin-bottom:5px;
-}
-
-.umbModalBox p select
-{
- margin-bottom:10px ! important;
-}
-
-.umbModalBox p{font-size: 11px !Important}
-
-
-#skins ul{list-style: none; padding: 0px; display: block; clear: both; height: 200px;}
-#skins ul li{margin-right: 12px; float: left; border: 1px solid #efefef; padding: 5px; width: 120px; text-align: center; font-weight: normal;}
-
-
-/*****************************************************************
-
- Umbraco UI Components
-
-/****************************************************************/
-
-.propertypane {
- position: relative;
- display: block;
- line-height: 1.1;
- background: #fff url('/umbraco_client/propertypane/images/propertyBackground.gif') top repeat-x !Important;
- background-image:url(/umbraco_client/propertypane/images/propertyBackground.gif) !Important;
- padding: 5px;
- margin:7px 0px 0px 0px;
- border: 1px solid #d9d7d7;
- text-align:left;
- clear: both;
- float: none;
- color: black;
- font-size: 11px !Important;
- }
-
- .propertypane th
- {
- vertical-align: top;
- text-align:left;
- font-weight:bold;
- font-family: Trebuchet MS, Lucida Grande, verdana, arial;
- font-size:12px;
- width: 16%;
- }
-
- .propertypane,.propertypane td
- {
- font-family: Trebuchet MS, Lucida Grande, verdana, arial;
- font-size:12px;
- }
-
-
- .propertypane small
- {
- font-weight: normal;
- color: #666;
- }
-
- .propertypane div.propertyItem{
- padding-bottom: 5px;
- clear: both;
- font-family: Trebuchet MS, Lucida Grande, verdana, arial;
- font-size:12px;
- }
-
- .propertypane div.propertyItem .propertyItemheader{
- width: 16%;
- padding-right: 1%;
- padding-bottom: 10px;
- float: left;
- clear: left;
- font-weight:bold;
- }
-
- .propertypane div.propertyItem .propertyItemContent{
- float: left;
- padding-bottom: 5px;
- clear: right;
- }
-
- h2.propertypaneTitel{font-size: 14px; color: #999;margin: 7px 0px 0px 0px; padding-bottom: 0px; line-height: 14px;}
-
- div.propertyPaneFooter{clear: both; height: 1px; overflow: hidden; color: #fff;}
-
-#LiveEditingToolbar .ModuleSelector
-{
- background-color:#FFF !important;
- position:absolute;
- top:36px;
- left:270px;
- color:#000;
- border-left:5px solid #A3A3A3;
- border-right:5px solid #A3A3A3;
- border-bottom:5px solid #A3A3A3;
- z-index:100;
-}
-
-#LiveEditingToolbar #moduleSelectorContainer
-{
- padding:10px;
-}
-
-.umbModuleContainerSelector
-{
- cursor:pointer;
-}
-
-p#installingModule img
-{
- float:none;
- margin:0;
- padding:0;
-}
-
-#LiveEditingToolbar #modules ul
-{
- list-style-type:none;
- margin-left:0px;
- margin-right:0px;
-}
-
-#LiveEditingToolbar #modules ul li
-{
- display:block;
- padding-bottom:5px;
- padding-top:5px;
- border-bottom:1px solid #c3c3c3;
-}
-
- #LiveEditingToolbar .umbLabelButton a, #LiveEditingToolbar .umbLabelButton a:hover
-{
- color:Black !important;
-}
-
-.umbModalBox a, .umbModalBox a:hover
-{
- color:#888 !important;
-}
-
-/* skin customize dialog */
-#costumizeSkin #dependencies .propertypane
-{
- height:205px;
- overflow:scroll;
- overflow-x: hidden;
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Images/canvas.gif b/src/Umbraco.Web.UI/umbraco/LiveEditing/Images/canvas.gif
deleted file mode 100644
index cdc7bd0793..0000000000
Binary files a/src/Umbraco.Web.UI/umbraco/LiveEditing/Images/canvas.gif and /dev/null differ
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Images/dialog_background.png b/src/Umbraco.Web.UI/umbraco/LiveEditing/Images/dialog_background.png
deleted file mode 100644
index 208d9c259a..0000000000
Binary files a/src/Umbraco.Web.UI/umbraco/LiveEditing/Images/dialog_background.png and /dev/null differ
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/LiveEditing.cd b/src/Umbraco.Web.UI/umbraco/LiveEditing/LiveEditing.cd
deleted file mode 100644
index 0eef6089d2..0000000000
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/LiveEditing.cd
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
- AAACAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAgACAA=
- UmbracoContext.cs
-
-
-
-
-
-
-
-
- AAABAAAAQAAEIhAAEAEAAAAQAAAAAEQAAAAAFAgAEAA=
- umbraco\LiveEditing\Controls\LiveEditingManager.cs
-
-
-
-
-
-
-
-
-
-
- BAAAAAAAAAIAKBAAAGCAIAAQAAAAAAQAAFgAAAABAAA=
- umbraco\LiveEditing\Controls\LiveEditingToolbar.cs
-
-
-
-
-
- AAAAAAAAQAAAABAQAECAAAAgAAAAAAQAABBAAAAQAAA=
- umbraco\LiveEditing\Controls\Communicator.cs
-
-
-
-
-
- AAAAAAAAAAAAAIAAAAAAAAAAAAAIAAAAAAAAAgAAAAA=
- umbraco\LiveEditing\ILiveEditingContext.cs
-
-
-
-
-
-
-
-
-
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
- umbraco\LiveEditing\Menu\ILiveEditingMenu.cs
-
-
-
-
-
- AAIAAAAAAAAAAAABAAAAAGAAAAAAAAAAAgAAAAAAIAA=
- umbraco\LiveEditing\Updates\IUpdateList.cs
-
-
-
-
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/CreateModule/CreateModule.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/CreateModule/CreateModule.js
deleted file mode 100644
index e278c4b3ab..0000000000
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/CreateModule/CreateModule.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/********************* Live Editing CreateModule functions *********************/
-function CreateModuleOk()
-{
- UmbracoCommunicator.SendClientMessage('createcontent', '');
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/CreateModule/create.png b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/CreateModule/create.png
deleted file mode 100644
index ea3f06e5a6..0000000000
Binary files a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/CreateModule/create.png and /dev/null differ
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/DeleteModule/DeleteModule.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/DeleteModule/DeleteModule.js
deleted file mode 100644
index 91771b4616..0000000000
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/DeleteModule/DeleteModule.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/********************* Live Editing DeleteModule functions *********************/
-function DeleteModuleOk()
-{
- UmbracoCommunicator.SendClientMessage('deletecontent', '');
-}
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/DeleteModule/delete.png b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/DeleteModule/delete.png
deleted file mode 100644
index 183ddd1ce1..0000000000
Binary files a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/DeleteModule/delete.png and /dev/null differ
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/ItemEditing/ItemEditing.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/ItemEditing/ItemEditing.js
deleted file mode 100644
index b0644e5b3c..0000000000
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/ItemEditing/ItemEditing.js
+++ /dev/null
@@ -1,341 +0,0 @@
-// Umbraco Live Editing - ItemEditing: Item Editing
-var ItemEditing = null;
-
-Type.registerNamespace("umbraco.presentation.LiveEditing");
-
-/************************ ItemEditing class ************************/
-
-// Creates a new instance of the ItemEditing class.
-umbraco.presentation.LiveEditing.ItemEditing = function() {
- umbraco.presentation.LiveEditing.ItemEditing.initializeBase(this);
- this._inited = false;
- this._items = new Array();
- this._activeItem = null;
- this._editControl = null;
- this._submitControl = null;
-
- var _this = this;
- Sys.Debug.trace("Constructor, before init load");
- if (!this._inited) {
- _this.init();
- }
- Sys.Application.add_load(function() {
- _this.init();
- });
- Sys.Debug.trace("Constructor, after init load");
-
-}
-
-umbraco.presentation.LiveEditing.ItemEditing.prototype = {
- // Initializes this instance.
- init: function() {
- Sys.Debug.trace("In init...");
- if (!this._inited) {
- this._inited = true;
- Sys.Debug.trace("Live Editing - ItemEditing: Initialization.");
- Sys.Debug.assert(typeof (jQuery) == 'function', "jQuery is not loaded.");
-
- this.itemsEnable();
-
- var _this = this;
- LiveEditingToolbar.add_save(function(sender, args) { _this.delaySaveWhenEditing(args, "save"); });
- LiveEditingToolbar.add_saveAndPublish(function(sender, args) { _this.delaySaveWhenEditing(args, "saveAndPublish"); });
-
- this._inited = true;
- Sys.Debug.trace("Live Editing - ItemEditing: Ready.");
- }
- else {
- this.updateItems();
- this.updateControls();
- }
- },
-
- // Starts Live Editing the specified item.
- // This method is triggered by the server.
- startEdit: function(itemId) {
- Sys.Debug.trace("Live Editing - ItemEditing: Start editing of Item " + itemId + ".");
-
- this._activeItem = this._items[itemId];
- Sys.Debug.assert(this._activeItem != null, "Live Editing - ItemEditing: Could not find item with ID " + itemId + ".");
- this._editControl = this.getElementsByTagName("umbraco:control");
- Sys.Debug.assert(this._editControl.length > 0, "Live Editing - ItemEditing: Could not find the editor control.");
- //this._activeItem.jItem.fadeIn();
- this.moveChildControls(this._editControl, this._activeItem.jItem);
-
- // Only elements that are currently present, can cause item editing to stop.
- // This enables transparent use of dynamically created elements (such as context/dropdown menus)
- // as clicks on those elements will not trigger the stop edit signal.
- jQuery("*").each(function () { jQuery(this).data("canStopEditing", true); });
-
- // raise event
- var handler = this.get_events().getHandler("startEdit");
- if (handler)
- handler(this, Sys.EventArgs.Empty);
-
- this.ignoreChildClicks(this._activeItem.jItem);
-
- LiveEditingToolbar.setDirty(true);
- },
-
- // Stops the editing of a specified item, and raises the stopEdit event.
- stopEdit: function() {
- if (this._activeItem != null) {
- Sys.Debug.trace("Live Editing - ItemEditing: Stop editing of " + this._activeItem.toString() + ".");
-
- // raise event
- var handler = this.get_events().getHandler("stopEdit");
- if (handler)
- handler(this, Sys.EventArgs.Empty);
-
- // submit changes
- Sys.Debug.assert(this._submitControl != null, "Live Editing - ItemEditing: Submit button not set.");
- this._submitControl.click();
-
- // hide control
- //this._activeItem.jItem.fadeOut();
- this._activeItem = null;
- this._submitControl = null;
- this._editControl = null;
- }
- },
-
- // Adds an event handler to the startEdit event.
- add_startEdit: function(handler) {
- this.get_events().addHandler("startEdit", handler);
- },
-
- // Removes an event handler from the startEdit event.
- remove_startEdit: function(handler) {
- this.get_events().removeHandler("startEdit", handler);
- },
-
- // Adds an event handler to the stopEdit event.
- add_stopEdit: function(handler) {
- this.get_events().addHandler("stopEdit", handler);
- },
-
- // Removes an event handler from the stopEdit event.
- remove_stopEdit: function(handler) {
- this.get_events().removeHandler("stopEdit", handler);
- },
-
- // Cancels the save method when an item is active, and postpones it to the next postback.
- delaySaveWhenEditing: function(args, type) {
- if (this._activeItem != null) {
- this.stopEdit();
- args.cancel = true;
- (function() {
- var f = function() {
- Sys.Application.remove_load(f);
- setTimeout(function() {
- Sys.Debug.trace("Live Editing - Delayed Saving Changes to server");
- UmbracoCommunicator.SendClientMessage(type, "");
- }, 100);
- }
- Sys.Application.add_load(f);
- })();
- }
- else {
- Sys.Debug.trace("Live Editing - Saving Changes to server");
- if (!Sys.WebForms.PageRequestManager.getInstance().get_isInAsyncPostBack()) {
- UmbracoCommunicator.SendClientMessage(type, "");
- }
- else {
- Sys.WebForms.PageRequestManager.getInstance().add_endRequest(function() {
- UmbracoCommunicator.SendClientMessage(type, "");
- });
- }
- }
- },
-
- // Enables Live Editing of items.
- itemsEnable: function() {
- var items = this.getElementsByTagName("umbraco:iteminfo");
- Sys.Debug.trace(" Found " + items.length + " editable Umbraco item(s).");
-
- // enhance items with edit functionality
- var _this = this;
- var i = 0;
- items.each(function() {
- var item = new umbraco.presentation.LiveEditing.activeItem(jQuery(this));
- _this._items[item.itemId] = item;
- Sys.Debug.trace(" " + (++i) + ". " + item.toString() + " is Live Editing enabled.");
- });
- // disable hyperlinks to make them clickable for Live Editing
- this.disableHyperlinks();
-
- // add "stop editing" handler when clicking outside the item
- var _this = this;
- jQuery(document).mousedown(function(event) {
- Sys.Debug.trace("DOCUMENT CLICKED");
- // the canStopEditing property is set in startEdit
- if (_this._activeItem != null && jQuery(event.target).data("canStopEditing")) {
- if (!_this._activeItem.clicked)
- _this.stopEdit();
- else
- _this._activeItem.clicked = false;
- }
- });
- jQuery("#LiveEditingToolbar").mousedown(function() {
- Sys.Debug.trace("TOOLBAR CLICKED");
- if (_this._activeItem != null)
- _this._activeItem.clicked = true;
- });
- },
-
- // Update items that have changed.
- updateItems: function() {
- var itemUpdates = this.getElementsByTagName("umbraco:itemupdate");
- Sys.Debug.trace("Live Editing - ItemEditing: " + itemUpdates.length + " item update(s).");
-
- var _this = this;
- itemUpdates.each(function() {
- var itemUpdate = jQuery(this);
- var itemId = itemUpdate.attr("itemId");
- var item = _this._items[itemId];
-
- if (item != null) {
- Sys.Debug.trace(" Updating " + item.toString() + ".");
-
- // remove old children and add updates ones
- _this.moveChildControls(itemUpdate, item.jItem);
- //item.jItem.fadeIn();
-
- // disable hyperlinks to make them clickable for Live Editing
- _this.disableHyperlinks();
- }
- else {
- itemUpdate.html("");
- }
- });
- },
-
- // Update controls that have changed.
- updateControls: function() {
- Sys.Debug.trace("Live Editing - ItemEditing: In updatecontrols");
- var controlUpdates = this.getElementsByTagName("umbraco:control");
- Sys.Debug.trace("Live Editing - ItemEditing: " + controlUpdates.length + " control update(s).");
-
- if (controlUpdates.length == 1) {
- if (this._activeItem != null && controlUpdates.children().length > 0) {
- Sys.Debug.trace("Live Editing - ItemEditing: updating edit control.");
- this.moveChildControls(controlUpdates, this._activeItem.jItem);
- this.ignoreChildClicks();
- }
-
- this._submitControl = controlUpdates.next();
- Sys.Debug.assert(this._submitControl.length > 0, "Live Editing - ItemEditing: Submit button not found.");
- }
- },
-
- // ignores clicks on child elements of the control
- ignoreChildClicks: function() {
- var _this = this;
- this._activeItem.jItem.children().mousedown(function(e) {
- _this._activeItem.clicked = true;
- });
- },
-
- // Moves the child controls from source into destination, overwriting existing elements.
- moveChildControls: function(source, dest) {
- Sys.Debug.trace("Live Editing - Moving Child Controls");
-
- //remove contents in the destination
- dest.html("");
-
- //add the source to the destination
- dest.append(source.html());
-
- //remove teh contents from the source
- source.html("");
-
- },
-
- // Gets a list of elements with the specified tagname including namespaced ones
- getElementsByTagName: function(tagname) {
- var found = jQuery("body").find("*").filter(function(index) {
- if (this.nodeType != 3) {
- var nn = this.nodeName.toLowerCase();
- var ftn = tagname.toLowerCase();
- var ln = (ftn.indexOf(":") > 0 ? ftn.substr(ftn.indexOf(":") + 1) : ftn);
- return (nn == ftn
- || (typeof this.scopeName != "undefined" && nn == ln && this.scopeName.toLowerCase() == ftn.substr(0, ftn.indexOf(":"))));
- }
- return false;
- });
- Sys.Debug.trace("found " + found.length + " elements with selector: " + tagname);
- return found;
- },
-
- // Disables hyperlinks inside the specified element.
- disableHyperlinks: function() {
- jQuery("a").click(function() {
- return false;
- });
- }
-}
-
-umbraco.presentation.LiveEditing.ItemEditing.registerClass("umbraco.presentation.LiveEditing.ItemEditing", Sys.Component);
-
-//an object to store the information for the active item
-umbraco.presentation.LiveEditing.activeItem = function(item) {
- //error checking
- if (item != null && item.length != 1) {
- return null;
- }
- //create the object with values, wire up events and return it
- var obj = {
- jItem: item,
- nodeId: item.attr("nodeId"),
- fieldName: item.attr("name"),
- itemId: item.attr("itemId"),
- clicked: false,
- toString: function() {
- return "Item " + this.itemId + " (node " + this.nodeId + ": " + this.fieldName + ")";
- },
- // Activates an item for editing.
- activate: function() {
- ItemEditing._items[this.itemId] = this;
- if (this != ItemEditing._activeItem) {
- Sys.Debug.trace("Live Editing - ItemEditing: " + this.toString() + " was activated.");
- if (!Sys.WebForms.PageRequestManager.getInstance().get_isInAsyncPostBack()) {
- UmbracoCommunicator.SendClientMessage("edititem", this.itemId);
- }
- else {
- var itemId = this.itemId;
- Sys.WebForms.PageRequestManager.getInstance().add_endRequest(function() {
- if (itemId != 0) {
- UmbracoCommunicator.SendClientMessage("edititem", itemId);
- itemId = 0;
- }
- });
- }
- //this.jItem.fadeOut();
- }
- },
- // Item click handler.
- onClick: function(e) {
- if (ItemEditing._activeItem != null && ItemEditing._activeItem.itemId == this.itemId) {
- Sys.Debug.trace("Live Editing - ItemEditing: " + this.toString() + " click ignored because it is already active.");
- }
- else {
- Sys.Debug.trace("Live Editing - ItemEditing: " + this.toString() + " was clicked.");
- e.stopPropagation(); // disable click event propagation to parent elements
- this.activate();
- }
- }
- }
-
- //keep the scope on the click event method call
- obj.jItem.click(function(e) {
- obj.onClick.call(obj, e);
- });
-
- return obj;
-}
-
-
-// global instance of the ItemEditing class
-function initializeGlobalItemEditing() {
- ItemEditing = new umbraco.presentation.LiveEditing.ItemEditing();
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/ItemEditing/ItemEditingInvoke.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/ItemEditing/ItemEditingInvoke.js
deleted file mode 100644
index 47c371631d..0000000000
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/ItemEditing/ItemEditingInvoke.js
+++ /dev/null
@@ -1,3 +0,0 @@
-//this is simply used for live editing in order to invoke a method from a previously lazy loaded script;
-//alert("ItemEditingInvoke: " + initializeGlobalItemEditing);
-initializeGlobalItemEditing();
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/MacroModule/MacroModule.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/MacroModule/MacroModule.js
deleted file mode 100644
index 80721af012..0000000000
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/MacroModule/MacroModule.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/********************* Live Editing MacroModule functions *********************/
-
-function MacroOnDrop( sender, e )
-{
-var container = e.get_container();
-var item = e.get_droppedItem();
-var position = e.get_position();
-
-//alert( String.format( "Container: {0}, Item: {1}, Position: {2}", container.id, item.id, position ) );
-
-var instanceId = parseInt(item.getAttribute("InstanceId"));
-var columnNo = parseInt(container.getAttribute("columnNo"));
-var row = position;
-
-}
-
-function okAddMacro(sender, e)
-{
- $find('ModalMacro').hide();
- /*__doPostBack('AddMacro', e); */
-}
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/CssParser.aspx b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/CssParser.aspx
deleted file mode 100644
index 1ebd8692cf..0000000000
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/CssParser.aspx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CssParser.aspx.cs" Inherits="umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule.CssParser" %>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx
deleted file mode 100644
index 63e64045cc..0000000000
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx
+++ /dev/null
@@ -1,193 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ImageUploader.aspx.cs" Inherits="umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule.ImageUploader" %>
-<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx
deleted file mode 100644
index 253ce9ead3..0000000000
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ModuleInjectionMacroRenderer.aspx.cs" Inherits="umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule.ModuleInjectionMacroRenderer" %>
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx
deleted file mode 100644
index 8909fc1f36..0000000000
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx
+++ /dev/null
@@ -1,141 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ModuleInjector.aspx.cs" Inherits="umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule.ModuleInjector" %>
-<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<%@ Import Namespace="Umbraco.Core.Configuration" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx
deleted file mode 100644
index 48eb082bca..0000000000
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ModuleInstaller.aspx.cs" Inherits="umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule.ModuleInstaller" %>
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx
deleted file mode 100644
index 01e108cf36..0000000000
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx
+++ /dev/null
@@ -1,55 +0,0 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ModuleSelector.ascx.cs" Inherits="umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule.ModuleSelector" %>
-<%@ Import Namespace="umbraco.cms.businesslogic.packager.repositories" %>
-
-
-
-
-
-
-
-
Please select the module you wish to insert.
-
-
-
- -
-
-
-
Container.DataItem).Thumbnail) %>)
- <%# ((Package)Container.DataItem).Text %>
-
-
-
-
-
-
-
-
-
-
-Unable to fetch module, please try again later.
-
-
-
-
-  %>/LiveEditing/Modules/SkinModule/images/loader.gif)
Installing module...
-
-
-
-
-
- Select where to place the module
-
-
-
Cancel
-
Connection to repository failed...
-
-
-
-
-
-
-
-
->
-
-
- Personalize your skin, by defining colors, images and texts
-
-
-
-
-
-
-
-
- or Cancel
-
-
-
-
You could also change to another skin: Browse available skins
-
-
>
-
-
- Choose a skin from your local collection, or download one from the umbraco package repository
-
-
-
-
Skin is being updated...
-
-
-
-
-
-
-
- Container.DataItem).Thumbnail %>)
- <%# ((Skin)Container.DataItem).Text %>
-
-
-
-
-
-
-
-
-
-
-
-
-
Looks like there are also some local skins
-
-
-
-
-
-
- <%# ((string)Container.DataItem).ToString() %>
-
-
-
-
-
-
-
-
-
-
-
-
-
- Go back to your current skin
-
-
-
Insert module here
");
- }
-
- jQuery(this).append("Insert module here
");
-
- });
-
- jQuery(".umbModuleContainerSelector").click(function () {
-
- jQuery(".ModuleSelector").hide();
- Umbraco.Controls.ModalWindow().open(umbCurrentUmbracoDir + '/LiveEditing/Modules/SkinModule/ModuleInjector.aspx?macroAlias=' + umbModuleToInsertAlias + '&target=' + jQuery(this).parent().attr('id') + "&type=" + jQuery(this).attr('rel'), 'Insert ' + moduleName + ' module', true, 550, 550, 50, 0, ['.modalbuton'], null);
-
- });
-}
-
-function umbRemoveModuleContainerSelectors() {
- jQuery(".umbModuleContainerSelector").remove();
-}
-
-function umbInsertModule(container,macro,type) {
- umbRemoveModuleContainerSelectors();
-
- var working = "![](" + umbCurrentUmbracoDir + "/LiveEditing/Modules/SkinModule/images/loader.gif)
Inserting module...
" + macro + "
;" + type);
-
- //need to lose these replace calls
-
- jQuery.post(umbCurrentUmbracoDir + "/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx?tag=" + macro.replace('>', '').replace('<', '').replace('', '') + "&umbPageID=" + umbCurrentPageId,
- function (data) {
- jQuery(".umbModuleContainerPlaceHolder").html("" + data + "
;");
-
- UmbSpeechBubble.ShowMessage("Info", "Module", "Module inserted");
- });
-
- }
-
-
- function S4() {
- return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
- }
- function guid() {
- return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
- }
-
- //startup stuff
- umbMakeModulesSortable();
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/SkinModuleShowOnStartup.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/SkinModuleShowOnStartup.js
deleted file mode 100644
index f21e5aacd0..0000000000
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/SkinModuleShowOnStartup.js
+++ /dev/null
@@ -1 +0,0 @@
-ShowSkinModule();
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/disableInstallButtonsOnClick.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/disableInstallButtonsOnClick.js
deleted file mode 100644
index 4df5f81ad1..0000000000
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/disableInstallButtonsOnClick.js
+++ /dev/null
@@ -1,8 +0,0 @@
-jQuery('.selectskin').click(function () {
-
- jQuery('#skinupdateinprogress').show();
-
- jQuery('#skins').hide();
-
- jQuery('#localSkinsContainer').hide();
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/initcolorpicker.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/initcolorpicker.js
deleted file mode 100644
index 4a6e407296..0000000000
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/initcolorpicker.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var activecolorpicker;
-
-jQuery('input.skinningcolorpicker').ColorPicker({
- onSubmit: function (hsb, hex, rgb, el) {
- jQuery(el).val('#' + hex);
- jQuery(el).ColorPickerHide();
- jQuery(el).trigger('change');
- },
- onBeforeShow: function () {
- activecolorpicker = this;
- jQuery(this).ColorPickerSetColor(this.value);
- },
- onChange: function (hsb, hex, rgb) {
-
- jQuery(activecolorpicker).val('#' + hex);
- jQuery(activecolorpicker).trigger('change');
- }
-})
-.bind('keyup', function () {
- jQuery(this).ColorPickerSetColor(this.value);
-});
-
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/initslider.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/initslider.js
deleted file mode 100644
index 691a6b5001..0000000000
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/initslider.js
+++ /dev/null
@@ -1,19 +0,0 @@
-jQuery(".skinningslider").each(function () {
-
- var vals = jQuery(this).attr("rel").split(",");
-
- var minimum = vals[0];
- var maximum = vals[1];
- var initial = vals[2];
- var ratio = vals[3]
- var target = vals[4];
-
- jQuery(this).slider({
- change: function (event, ui) { if (ratio != "") { jQuery("#" + target).val(ui.value / ratio); } else { jQuery("#" + target).val(ui.value); } jQuery("#" + target).trigger("change"); },
- slide: function (event, ui) { if (ratio != "") { jQuery("#" + target).val(ui.value / ratio); } else { jQuery("#" + target).val(ui.value); } jQuery("#" + target).trigger("change"); },
- min: minimum,
- max: maximum,
- value: initial
- });
-
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/skin.png b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/skin.png
deleted file mode 100644
index ea3f06e5a6..0000000000
Binary files a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/skin.png and /dev/null differ
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/UnpublishModule/UnpublishModule.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/UnpublishModule/UnpublishModule.js
deleted file mode 100644
index 0fd382d9ae..0000000000
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/UnpublishModule/UnpublishModule.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/********************* Live Editing UnpublishModule functions *********************/
-function UnpublishModuleOk()
-{
- UmbracoCommunicator.SendClientMessage('unpublishcontent', '');
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/UnpublishModule/unpublish.png b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/UnpublishModule/unpublish.png
deleted file mode 100644
index 53302c4a91..0000000000
Binary files a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/UnpublishModule/unpublish.png and /dev/null differ
diff --git a/src/Umbraco.Web.UI/umbraco/canvas.aspx b/src/Umbraco.Web.UI/umbraco/canvas.aspx
deleted file mode 100644
index 28f22eeb16..0000000000
--- a/src/Umbraco.Web.UI/umbraco/canvas.aspx
+++ /dev/null
@@ -1,16 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="canvas.aspx.cs" Inherits="umbraco.presentation.LiveEditingEnabler" %>
-
-
-
-
-
- Untitled Page
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI/umbraco/css/umbLiveEditing.css b/src/Umbraco.Web.UI/umbraco/css/umbLiveEditing.css
deleted file mode 100644
index fa189266ea..0000000000
--- a/src/Umbraco.Web.UI/umbraco/css/umbLiveEditing.css
+++ /dev/null
@@ -1,14 +0,0 @@
-.umbEditItem:hover {
- border: 1px dotted orange;
- padding: 5px;
-}
-
-.umbLiveEditingToggleButton
-{
- display: none;
-}
-
-.umbLiveEditingCancelButton
-{
- margin-left: 10px;
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.cs b/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.cs
index d7298d09a1..af31f42143 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.cs
+++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.cs
@@ -13,10 +13,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages
protected void Page_Load(object sender, EventArgs e)
{
- if (!global::umbraco.cms.businesslogic.skinning.Skinning.IsStarterKitInstalled())
- ShowStarterKits();
- else
- ShowSkins((Guid)global::umbraco.cms.businesslogic.skinning.Skinning.StarterKitGuid());
+ ShowStarterKits();
}
private void ShowStarterKits()
@@ -40,22 +37,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages
StarterKitInstalled.Visible = false;
}
-
- public void ShowSkins(Guid starterKitGuid)
- {
-
- var ctrl = (LoadStarterKitDesigns)LoadControl(SystemDirectories.Install + "/steps/Skinning/loadStarterKitDesigns.ascx");
- ctrl.ID = "StarterKitDesigns";
-
- ctrl.StarterKitGuid = starterKitGuid;
- ctrl.StarterKitDesignInstalled += CtrlStarterKitDesignInstalled;
- ph_skins.Controls.Add(ctrl);
-
- StarterKitNotInstalled.Visible = false;
- StarterKitInstalled.Visible = true;
-
- }
-
+
void StarterkitsctrlStarterKitInstalled()
{
StarterKitNotInstalled.Visible = false;
@@ -65,13 +47,5 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages
}
- void CtrlStarterKitDesignInstalled()
- {
- StarterKitNotInstalled.Visible = false;
- StarterKitInstalled.Visible = false;
-
- installationCompleted.Visible = true;
- }
-
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/TemplateSkinning.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/TemplateSkinning.aspx
deleted file mode 100644
index 829ba939ef..0000000000
--- a/src/Umbraco.Web.UI/umbraco/dialogs/TemplateSkinning.aspx
+++ /dev/null
@@ -1,57 +0,0 @@
-<%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true" CodeBehind="TemplateSkinning.aspx.cs" Inherits="umbraco.presentation.umbraco.dialogs.TemplateSkinning" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<%@ Import Namespace="umbraco.cms.businesslogic.packager.repositories" %>
-
-
-
-
-
-
- Download more skins
-
-
-
-
-
-
-
-
-
- or Rollback current skin
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <%# ((Skin)Container.DataItem).Text %>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- or Rollback current skin
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <%# ((Skin)Container.DataItem).Text %>
-
-
-
-
-
-
-
-
-
-
-
-
-