diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js index 5e31e10a5e..111b343019 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js @@ -32,7 +32,7 @@ angular.module("umbraco.directives") if(!hideheader){ template +='
' + - '
{{tree.name}}
' + + '
{{tree.name}}
' + '' + '
'; } diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js index 053cfabca5..a986d37f56 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js @@ -551,7 +551,6 @@ angular.module('umbraco.services') * hides any open navigation panes and resets the tree, actions and the currently selected node */ hideNavigation: function () { - this.ui.currentSection = ""; this.ui.actions = []; this.ui.currentNode = undefined; setMode("default"); diff --git a/src/Umbraco.Web.UI.Client/src/less/listview.less b/src/Umbraco.Web.UI.Client/src/less/listview.less index a82d72b1b0..22535fc4d3 100644 --- a/src/Umbraco.Web.UI.Client/src/less/listview.less +++ b/src/Umbraco.Web.UI.Client/src/less/listview.less @@ -90,6 +90,8 @@ .umb-listview .selected input[type="checkbox"], .umb-listview tr:hover input[type="checkbox"]{display: inline-block;} .umb-listview .inactive{color: @grayLight;} +.umb-listview .selected td{font-weight: bold;} + .umb-listview table thead { font-size: 11px; font-weight: 600; diff --git a/src/Umbraco.Web.UI.Client/src/less/tree.less b/src/Umbraco.Web.UI.Client/src/less/tree.less index 6e3d534e2a..cd77f81cf0 100644 --- a/src/Umbraco.Web.UI.Client/src/less/tree.less +++ b/src/Umbraco.Web.UI.Client/src/less/tree.less @@ -297,7 +297,6 @@ div.has-unpublished-version:before{ .umb-actions-child li { display: block; - width: 100%; } .umb-actions-child a { diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.controller.js index 6a12182b48..34dda19761 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.controller.js @@ -7,7 +7,7 @@ angular.module("umbraco").controller("Umbraco.Dialogs.ContentPickerController", $scope.selectResult = function(result){ entityResource.getById(result.id, "Document").then(function(ent){ - if(dialogOptions && dialogOptions.multipicker){ + if(dialogOptions && dialogOptions.multiPicker){ $scope.showSearch = false; $scope.results = []; @@ -42,13 +42,20 @@ angular.module("umbraco").controller("Umbraco.Dialogs.ContentPickerController", args.event.stopPropagation(); eventsService.publish("Umbraco.Dialogs.ContentPickerController.Select", args).then(function(args){ - if(dialogOptions && dialogOptions.multipicker){ + if(dialogOptions && dialogOptions.multiPicker){ var c = $(args.event.target.parentElement); if(!args.node.selected){ args.node.selected = true; - c.find("i.umb-tree-icon").hide() - .after(""); + + var temp = ""; + var icon = c.find("i.umb-tree-icon"); + if(icon.length > 0){ + icon.hide().after(temp); + }else{ + c.prepend(temp); + } + }else{ args.node.selected = false; c.find(".temporary").remove(); diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html index 2b61e549a0..715f49395f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html @@ -1,6 +1,5 @@
-
@@ -14,7 +13,7 @@
-
+
    @@ -28,4 +27,13 @@
+
+
+
+ + Cancel + +
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js index 2c21f85a70..a8bd8817d7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js @@ -61,14 +61,13 @@ angular.module("umbraco") }); $scope.clickHandler = function(image, ev){ - if (image.contentTypeAlias.toLowerCase() == 'folder') { $scope.options.formData.currentFolder = image.id; $scope.gotoFolder(image.id); }else if (image.contentTypeAlias.toLowerCase() == 'image') { eventsService.publish("Umbraco.Dialogs.MediaPickerController.Select", image).then(function(image){ - if(dialogOptions && dialogOptions.multipicker){ + if(dialogOptions && dialogOptions.multiPicker){ $scope.select(image); image.cssclass = ($scope.dialogData.selection.indexOf(image) > -1) ? "selected" : ""; }else{ @@ -87,7 +86,7 @@ angular.module("umbraco") }else if (image.contentTypeAlias.toLowerCase() == 'image') { eventsService.publish("Umbraco.Dialogs.MediaPickerController.Select", image).then(function(image){ - if(dialogOptions && dialogOptions.multipicker){ + if(dialogOptions && dialogOptions.multiPicker){ $scope.select(image); }else{ $scope.submit(image); diff --git a/src/Umbraco.Web.UI.Client/src/views/common/navigation.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/navigation.controller.js index ed8fa32a3d..b299ece618 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/navigation.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/navigation.controller.js @@ -32,8 +32,6 @@ function NavigationController($scope,$rootScope, $location, $log, $routeParams, $scope.treeEventHandler = $({}); $scope.selectedId = navigationService.currentId; - - //This reacts to clicks passed to the body element which emits a global call to close all dialogs $rootScope.$on("closeDialogs", function (event) { @@ -86,14 +84,10 @@ function NavigationController($scope,$rootScope, $location, $log, $routeParams, //this reacts to tree items themselves being clicked //the tree directive should not contain any handling, simply just bubble events $scope.treeEventHandler.bind("treeNodeSelect", function (ev, args) { + var n = args.node; ev.stopPropagation(); ev.preventDefault(); - var n = args.node; - - /*if(n.metaData && n.metaData.application){ - $location.path(n.metaData.application).search(""); - }else*/ if (n.metaData && n.metaData["jsClickCallback"] && angular.isString(n.metaData["jsClickCallback"]) && n.metaData["jsClickCallback"] !== "") { //this is a legacy tree node! @@ -121,8 +115,8 @@ function NavigationController($scope,$rootScope, $location, $log, $routeParams, historyService.add({ name: n.name, link: n.routePath, icon: n.icon }); //not legacy, lets just set the route value and clear the query string if there is one. $location.path(n.routePath).search(""); - }else if(n.metaData && n.metaData.application){ - $location.path("#/" + n.metaData.application); + } else if(args.element.section){ + $location.path(args.element.section).search(""); } navigationService.hideNavigation(); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js index b9a9cc5715..31d142f1f5 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js @@ -35,7 +35,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl $scope.add = function() { dialogService.mediaPicker({ - multipicker: true, + multiPicker: true, callback: function(data) { _.each(data.selection, function(media, i) { //shortcuts diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js index 0714ef25d4..7aa6e42995 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js @@ -6,7 +6,7 @@ angular.module('umbraco') function($scope, dialogService, entityResource, $log, iconHelper){ $scope.ids = $scope.model.value.split(','); $scope.renderModel = []; - $scope.multipicker = true; + $scope.multiPicker = true; entityResource.getByIds($scope.ids, "Member").then(function(data){ $(data).each(function(i, item){ @@ -16,7 +16,7 @@ angular.module('umbraco') }); $scope.openMemberPicker =function(){ - var d = dialogService.memberPicker({scope: $scope, multipicker: $scope.multipicker, callback: populate}); + var d = dialogService.memberPicker({scope: $scope, multiPicker: $scope.multiPicker, callback: populate}); }; $scope.remove =function(index){ diff --git a/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx b/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx index 4762d9f41d..a21396c5a0 100644 --- a/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx +++ b/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx @@ -47,7 +47,7 @@ jQuery(document).ready(function() { dataUrl: "<%#global::Umbraco.Core.IO.IOHelper.ResolveUrl(global::Umbraco.Core.IO.SystemDirectories.Umbraco)%>/webservices/TreeDataService.ashx", serviceUrl: "<%#global::Umbraco.Core.IO.IOHelper.ResolveUrl(global::Umbraco.Core.IO.SystemDirectories.Umbraco)%>/webservices/TreeClientService.asmx/GetInitAppTreeData"}); - //add event handler for ajax errors, this will refresh the whole application + /*add event handler for ajax errors, this will refresh the whole application var mainTree = UmbClientMgr.mainTree(); if (mainTree != null) { mainTree.addEventHandler("ajaxError", function(e) { @@ -55,7 +55,7 @@ jQuery(document).ready(function() { UmbClientMgr.mainWindow("umbraco.aspx"); } }); - } + }*/ <%#GetLegacyIActionJavascript()%> diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx b/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx index 04d4f23748..82746bb7c2 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx +++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx @@ -141,7 +141,7 @@ + CssClass="btn btn-danger" /> @@ -152,11 +152,12 @@ Text='' /> - + + + runat="server" CssClass="btn" /> @@ -173,7 +174,7 @@ - + diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx b/src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx index d624d4c7f9..3604a110ac 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx +++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx @@ -1,170 +1,158 @@ <%@ Page Language="C#" MasterPageFile="../../masterpages/umbracoPage.Master" AutoEventWireup="true" CodeBehind="installedPackage.aspx.cs" Inherits="umbraco.presentation.developer.packages.installedPackage" %> <%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %> - - - - - + if (div.style.display == "none") + div.style.display = "block"; + + else + div.style.display = "none"; + } + + function openDemo(link, id) { + UmbClientMgr.openModalWindow("http://packages.umbraco.org/viewPackageData.aspx?id=" + id, link.innerHTML, true, 750, 550) + } + + + + - - - - -
-

<%= umbraco.ui.Text("packager", "packageUninstalledText") %>

-
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - -
- - - -           - - -
- - - -
- - <%= umbraco.ui.Text("packager", "packageNoItemsText") %> - -

- -

-
- - - - + - - - - - - + +

+ +

+ +

+ +

+ + + + +
+ + <%= umbraco.ui.Text("packager", "packageNoItemsText") %> + +

+ +

+
+ + + + + +

+ <%= umbraco.ui.Text("packager", "packageUninstallText") %> +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ +

+

+ + + + +
+

<%= umbraco.ui.Text("packager", "packageUninstalledText") %>

+
+ + + diff --git a/src/Umbraco.Web.UI/umbraco/users/NodePermissions.ascx b/src/Umbraco.Web.UI/umbraco/users/NodePermissions.ascx index 25f480a284..64b6717579 100644 --- a/src/Umbraco.Web.UI/umbraco/users/NodePermissions.ascx +++ b/src/Umbraco.Web.UI/umbraco/users/NodePermissions.ascx @@ -1,21 +1,21 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="NodePermissions.ascx.cs" Inherits="umbraco.cms.presentation.user.NodePermissions" %> -

- <%=umbraco.ui.Text("user", "permissionSelectedPages")%> +

+ <%=umbraco.ui.Text("user", "permissionSelectedPages")%>
- - - -

+ +

+

-

+ @@ -24,7 +24,7 @@
  • /> -
    • diff --git a/src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx b/src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx index 48a2f1acfb..815a420f88 100644 --- a/src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx +++ b/src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx @@ -19,7 +19,8 @@
    -
    + +
    diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 4be0a1c630..a2aa6a10e3 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -1834,7 +1834,9 @@ ASPXCodeBehind - + + ASPXCodeBehind + @@ -1896,7 +1898,9 @@ - + + ASPXCodeBehind + ASPXCodeBehind @@ -1952,9 +1956,6 @@ ASPXCodeBehind - - ASPXCodeBehind - ASPXCodeBehind diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx index 04d4f23748..bd34c32478 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx @@ -141,7 +141,7 @@ + CssClass="btn btn-danger" /> @@ -152,11 +152,11 @@ Text='' /> - + + runat="server" CssClass="btn" /> diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs index 0be95f6fa1..6e5467b5b0 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs @@ -404,27 +404,21 @@ namespace umbraco.presentation.developer.packages packageActions = TabView1.NewTabPage("Package Actions"); packageActions.Controls.Add(Pane4); - int count = 1; - foreach (uicontrols.TabPage tp in TabView1.GetPanels()) { - ImageButton saves = tp.Menu.NewImageButton(); - saves.ImageUrl = SystemDirectories.Umbraco + "/images/editor/save.gif"; - saves.CommandName = "save"; - saves.AlternateText = "Save package"; - saves.Command += new CommandEventHandler(saveOrPublish); - saves.ID = "save_" + count; - - tp.BorderStyle = BorderStyle.None; - tp.Style["background"] = "none !Important"; - - ImageButton publishes = tp.Menu.NewImageButton(); - publishes.ImageUrl = SystemDirectories.Umbraco + "/images/editor/saveAndPublish.gif"; - publishes.CommandName = "publish"; - publishes.Command += new CommandEventHandler(saveOrPublish); - publishes.AlternateText = "Save and publish the package as a .umb file"; - count++; - } + var pubs = TabView1.Menu.NewButton(); + pubs.Text = ui.Text("publish"); + pubs.CommandName = "publish"; + pubs.Command += new CommandEventHandler(saveOrPublish); + pubs.ID = "saveAndPublish"; + + var saves = TabView1.Menu.NewButton(); + saves.Text = ui.Text("save"); + saves.CommandName = "save"; + saves.Command += new CommandEventHandler(saveOrPublish); + saves.ButtonType = uicontrols.MenuButtonType.Primary; + saves.ID = "save"; + + - base.OnInit(e); } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx index 990e4394ae..2547040969 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx @@ -1,170 +1,156 @@ <%@ Page Language="C#" MasterPageFile="../../masterpages/umbracoPage.Master" AutoEventWireup="true" CodeBehind="installedPackage.aspx.cs" Inherits="umbraco.presentation.developer.packages.installedPackage" %> <%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %> - - - - - + if (div.style.display == "none") + div.style.display = "block"; + + else + div.style.display = "none"; + } + + function openDemo(link, id) { + UmbClientMgr.openModalWindow("http://packages.umbraco.org/viewPackageData.aspx?id=" + id, link.innerHTML, true, 750, 550) + } + + + + - - - - -
    -

    <%= umbraco.ui.Text("packager", "packageUninstalledText") %>

    -
    - -     - -     - - - - - - - - - - - - - - -
    -     - - -     - - - - - - - - - - -
    - - - -           - - -
    -     - - -
    - - <%= umbraco.ui.Text("packager", "packageNoItemsText") %> - -

    - -

    -
    - -     - - + - - -     - - -     + +

    + +

    + +

    + +

    +     + + + +
    + + <%= umbraco.ui.Text("packager", "packageNoItemsText") %> + +

    + +

    +
    + +     + + + +

    + <%= umbraco.ui.Text("packager", "packageUninstallText") %> +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    + + +

    +     +     + + +
    +

    <%= umbraco.ui.Text("packager", "packageUninstalledText") %>

    +
    +     + +     diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs index 8e75bdaae1..ed88c2de73 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs @@ -257,18 +257,11 @@ namespace umbraco.presentation.developer.packages { if (repoPackage.HasUpgrade && repoPackage.UpgradeVersion != _pack.Data.Version) { - bt_update.Visible = true; - bt_update.Text = "Update available: version: " + repoPackage.UpgradeVersion; + pane_upgrade.Visible = true; lt_upgradeReadme.Text = repoPackage.UpgradeReadMe; bt_gotoUpgrade.OnClientClick = "window.location.href = 'browseRepository.aspx?url=" + repoPackage.Url + "'; return true;"; - lt_noUpdate.Visible = false; } - else - { - bt_update.Visible = false; - lt_noUpdate.Visible = true; - } - + if (!string.IsNullOrEmpty(repoPackage.Demo)) { lb_demoLink.OnClientClick = "openDemo(this, '" + _pack.Data.PackageGuid + "'); return false;"; @@ -285,8 +278,7 @@ namespace umbraco.presentation.developer.packages } catch { - bt_update.Visible = false; - lt_noUpdate.Visible = true; + pane_upgrade.Visible = false; } } @@ -332,7 +324,6 @@ namespace umbraco.presentation.developer.packages if (deletePackage) { pane_noItems.Visible = true; - bt_uninstall.Visible = false; pane_uninstall.Visible = false; } @@ -372,8 +363,8 @@ namespace umbraco.presentation.developer.packages protected void delPack(object sender, EventArgs e) { _pack.Delete(); - packageUninstalled.Visible = true; - installedPackagePanel.Visible = false; + pane_uninstalled.Visible = true; + pane_uninstall.Visible = false; } @@ -554,11 +545,11 @@ namespace umbraco.presentation.developer.packages } } _pack.Save(); - _pack.Delete(); - packageUninstalled.Visible = true; - installedPackagePanel.Visible = false; + pane_uninstalled.Visible = true; + pane_uninstall.Visible = false; + } // refresh cache @@ -619,22 +610,24 @@ namespace umbraco.presentation.developer.packages hl_docLink.Text = ui.Text("packager", "packageDocumentation"); lb_demoLink.Text = ui.Text("packager", "packageDemonstration"); - pane_options.Text = ui.Text("packager", "packageOptions"); - lt_noUpdate.Text = ui.Text("packager", "packageNoUpgrades"); - bt_update.Text = ui.Text("packager", "packageUpgradeHeader"); - pp_upgradeInstruction.Text = ui.Text("packager", "packageUpgradeInstructions"); - bt_gotoUpgrade.Text = ui.Text("packager", "packageUpgradeDownload"); - pane_versions.Text = ui.Text("packager", "packageVersionHistory"); - pane_noItems.Text = ui.Text("packager", "packageNoItemsHeader"); pane_uninstall.Text = ui.Text("packager", "packageUninstallHeader"); - bt_uninstall.Text = ui.Text("packager", "packageUninstallHeader"); bt_deletePackage.Text = ui.Text("packager", "packageUninstallHeader"); bt_confirmUninstall.Text = ui.Text("packager", "packageUninstallConfirm"); pane_uninstalled.Text = ui.Text("packager", "packageUninstalledHeader"); + + var general = Panel1.NewTabPage(ui.Text("packager", "packageName")); + general.Controls.Add(pane_meta); + general.Controls.Add(pane_versions); + + + var uninstall = Panel1.NewTabPage(ui.Text("packager", "packageUninstallHeader")); + uninstall.Controls.Add(pane_noItems); + uninstall.Controls.Add(pane_uninstall); + uninstall.Controls.Add(pane_uninstalled); } } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.designer.cs index e6dfc46646..10c933e861 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.designer.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.designer.cs @@ -19,34 +19,7 @@ namespace umbraco.presentation.developer.packages { /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::umbraco.uicontrols.UmbracoPanel Panel1; - - /// - /// packageUninstalled control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel packageUninstalled; - - /// - /// pane_uninstalled control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.Pane pane_uninstalled; - - /// - /// installedPackagePanel control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel installedPackagePanel; + protected global::umbraco.uicontrols.TabView Panel1; /// /// pane_meta control. @@ -201,60 +174,6 @@ namespace umbraco.presentation.developer.packages { /// protected global::System.Web.UI.WebControls.Repeater rptr_versions; - /// - /// pane_options control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.Pane pane_options; - - /// - /// lt_noUpdate control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Literal lt_noUpdate; - - /// - /// bt_update control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button bt_update; - - /// - /// bt_uninstall control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button bt_uninstall; - - /// - /// pane_noItems control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.Pane pane_noItems; - - /// - /// bt_deletePackage control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button bt_deletePackage; - /// /// pane_upgrade control. /// @@ -291,6 +210,24 @@ namespace umbraco.presentation.developer.packages { /// protected global::System.Web.UI.WebControls.Button bt_gotoUpgrade; + /// + /// pane_noItems control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.uicontrols.Pane pane_noItems; + + /// + /// bt_deletePackage control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button bt_deletePackage; + /// /// pane_uninstall control. /// @@ -452,5 +389,14 @@ namespace umbraco.presentation.developer.packages { /// To modify move field declaration from designer file to code-behind file. /// protected global::umbraco.uicontrols.ProgressBar progbar; + + /// + /// pane_uninstalled control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.uicontrols.Pane pane_uninstalled; } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx index 25f480a284..64b6717579 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx @@ -1,21 +1,21 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="NodePermissions.ascx.cs" Inherits="umbraco.cms.presentation.user.NodePermissions" %> -

    - <%=umbraco.ui.Text("user", "permissionSelectedPages")%> +

    + <%=umbraco.ui.Text("user", "permissionSelectedPages")%>
    - - - -

    + +

    +

    -

    + @@ -24,7 +24,7 @@
  • /> -
    • diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx.designer.cs index b92a83ffcf..c981de682b 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx.designer.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.1433 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs index 1a8a0a37cc..20bad2ea93 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs @@ -53,6 +53,7 @@ namespace umbraco.cms.presentation.user var save = pnlUmbraco.Menu.NewButton(); save.ID = "btnSave"; + save.ButtonType = uicontrols.MenuButtonType.Primary; save.OnClientClick = "SavePermissions(); return false;"; save.Text = ui.Text("save"); save.ToolTip = ui.Text("save");