From 26f32bab8edb68df49db7ff230cc64035dff236e Mon Sep 17 00:00:00 2001 From: leekelleher Date: Fri, 14 Sep 2012 11:41:30 -0100 Subject: [PATCH] Dashboard controls: Tidied up the UI. Made use of ClientDependency for CSS/JS includes. CSS tweaks for success/notice/error messages. Removed from "Umbraco.Web.UI" project, master version now in "Umbraco.Web"; (confirmed with Seb) (MediaDashboardFolderBrowser.ascx was missing from "Umbraco.Web" - added) --- .../config/Dashboard.Release.config | 2 +- src/Umbraco.Web.UI/config/Dashboard.config | 22 +--- .../umbraco/dashboard/ChangePassword.ascx | 52 -------- .../dashboard/DesktopMediaUploader.ascx | 48 ------- .../dashboard/DeveloperDashboardIntro.ascx | 36 ------ .../dashboard/DeveloperDashboardVideos.ascx | 120 ------------------ .../umbraco/dashboard/FeedProxy.aspx | 2 - .../umbraco/dashboard/LatestEdits.ascx | 20 --- .../dashboard/MediaDashboardIntro.ascx | 29 ----- .../dashboard/MediaDashboardVideos.ascx | 119 ----------------- .../dashboard/MembersDashboardIntro.ascx | 25 ---- .../dashboard/MembersDashboardVideos.ascx | 119 ----------------- .../dashboard/SettingsDashboardIntro.ascx | 36 ------ .../dashboard/SettingsDashboardVideos.ascx | 119 ----------------- .../dashboard/StartupDashboardIntro.ascx | 62 --------- .../dashboard/StartupDashboardKits.ascx | 25 ---- .../dashboard/StartupDashboardVideos.ascx | 119 ----------------- .../umbraco_client/ui/default.css | 3 +- .../umbraco/dashboard/ChangePassword.ascx | 101 ++++++++------- .../dashboard/DesktopMediaUploader.ascx | 12 +- .../dashboard/DeveloperDashboardIntro.ascx | 40 +++--- .../dashboard/DeveloperDashboardVideos.ascx | 35 ++--- .../umbraco/dashboard/LatestEdits.ascx | 30 ++--- .../MediaDashboardFolderBrowser.ascx | 0 .../dashboard/MediaDashboardIntro.ascx | 18 ++- .../dashboard/MediaDashboardVideos.ascx | 34 ++--- .../dashboard/MembersDashboardIntro.ascx | 23 ++-- .../dashboard/MembersDashboardVideos.ascx | 34 ++--- .../dashboard/SettingsDashboardIntro.ascx | 39 +++--- .../dashboard/SettingsDashboardVideos.ascx | 34 ++--- .../dashboard/StartupDashboardIntro.ascx | 61 ++++----- .../dashboard/StartupDashboardKits.ascx | 26 ++-- .../dashboard/StartupDashboardVideos.ascx | 35 ++--- 33 files changed, 217 insertions(+), 1263 deletions(-) delete mode 100644 src/Umbraco.Web.UI/umbraco/dashboard/ChangePassword.ascx delete mode 100644 src/Umbraco.Web.UI/umbraco/dashboard/DesktopMediaUploader.ascx delete mode 100644 src/Umbraco.Web.UI/umbraco/dashboard/DeveloperDashboardIntro.ascx delete mode 100644 src/Umbraco.Web.UI/umbraco/dashboard/DeveloperDashboardVideos.ascx delete mode 100644 src/Umbraco.Web.UI/umbraco/dashboard/FeedProxy.aspx delete mode 100644 src/Umbraco.Web.UI/umbraco/dashboard/LatestEdits.ascx delete mode 100644 src/Umbraco.Web.UI/umbraco/dashboard/MediaDashboardIntro.ascx delete mode 100644 src/Umbraco.Web.UI/umbraco/dashboard/MediaDashboardVideos.ascx delete mode 100644 src/Umbraco.Web.UI/umbraco/dashboard/MembersDashboardIntro.ascx delete mode 100644 src/Umbraco.Web.UI/umbraco/dashboard/MembersDashboardVideos.ascx delete mode 100644 src/Umbraco.Web.UI/umbraco/dashboard/SettingsDashboardIntro.ascx delete mode 100644 src/Umbraco.Web.UI/umbraco/dashboard/SettingsDashboardVideos.ascx delete mode 100644 src/Umbraco.Web.UI/umbraco/dashboard/StartupDashboardIntro.ascx delete mode 100644 src/Umbraco.Web.UI/umbraco/dashboard/StartupDashboardKits.ascx delete mode 100644 src/Umbraco.Web.UI/umbraco/dashboard/StartupDashboardVideos.ascx rename src/{Umbraco.Web.UI => Umbraco.Web/umbraco.presentation}/umbraco/dashboard/MediaDashboardFolderBrowser.ascx (100%) diff --git a/src/Umbraco.Web.UI/config/Dashboard.Release.config b/src/Umbraco.Web.UI/config/Dashboard.Release.config index 475ab40f4a..f5643c7110 100644 --- a/src/Umbraco.Web.UI/config/Dashboard.Release.config +++ b/src/Umbraco.Web.UI/config/Dashboard.Release.config @@ -69,7 +69,7 @@ - /umbraco/dashboard/latestEdits.ascx + /umbraco/dashboard/latestEdits.ascx /umbraco/dashboard/changepassword.ascx diff --git a/src/Umbraco.Web.UI/config/Dashboard.config b/src/Umbraco.Web.UI/config/Dashboard.config index 8c9e46d8e6..b8dcc88442 100644 --- a/src/Umbraco.Web.UI/config/Dashboard.config +++ b/src/Umbraco.Web.UI/config/Dashboard.config @@ -66,7 +66,7 @@ - /umbraco/dashboard/latestEdits.ascx + /umbraco/dashboard/latestEdits.ascx /umbraco/dashboard/changepassword.ascx @@ -104,24 +104,4 @@ /umbraco/plugins/uGoLive/Dashboard.ascx -
- - default - content - - - /usercontrols/dashboards/ContactForm_logs.ascx - - - /usercontrols/dashboards/EmailAFriendForm_logs.ascx - -
-
- - content - - - /usercontrols/blog/CommentModeration.ascx - -
\ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/ChangePassword.ascx b/src/Umbraco.Web.UI/umbraco/dashboard/ChangePassword.ascx deleted file mode 100644 index 3190d91ecf..0000000000 --- a/src/Umbraco.Web.UI/umbraco/dashboard/ChangePassword.ascx +++ /dev/null @@ -1,52 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ChangePassword.ascx.cs" Inherits="umbraco.presentation.umbraco.dashboard.ChangePassword" %> -<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> -

<%=umbraco.ui.Text("changePassword") %>

- - -

<%=umbraco.ui.Text("changePasswordDescription") %>

- -

- -
    - -
  1. - <%=umbraco.ui.Text("username") %>: <%=umbraco.BusinessLogic.User.GetCurrent().Name%> -
    2. -
  2. - <%=umbraco.ui.Text("passwordEnterNew") %>: - - * -
    3. -
  3. - <%=umbraco.ui.Text("passwordConfirm") %>: - - * - <%=umbraco.ui.Text("passwordMismatch") %> -
    4. -
- -

- -

- - - - -


-

<%=umbraco.ui.Text("passwordChanged") %>!

- - diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/DesktopMediaUploader.ascx b/src/Umbraco.Web.UI/umbraco/dashboard/DesktopMediaUploader.ascx deleted file mode 100644 index 3ec017249f..0000000000 --- a/src/Umbraco.Web.UI/umbraco/dashboard/DesktopMediaUploader.ascx +++ /dev/null @@ -1,48 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="DesktopMediaUploader.ascx.cs" Inherits="umbraco.presentation.umbraco.dashboard.DesktopMediaUploader" %> - -
-

Desktop Media Uploader

- Umbraco -

Desktop Media Uploader is a small desktop application that you can install on your computer which allows you to easily upload media items directly to the media section.

-

The badge below will auto configure itself based upon whether you already have Desktop Media Uploader installed or not.

-

Just click the Install Now / Upgrade Now / Launch Now link to perform that action.

-
-
-
- - - -

-

- Download Desktop Media Uploader now.

This application requires Adobe® AIR™ to be installed for Mac OS or Windows. -
-

- - -
-
-
-
\ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/DeveloperDashboardIntro.ascx b/src/Umbraco.Web.UI/umbraco/dashboard/DeveloperDashboardIntro.ascx deleted file mode 100644 index c4c789f5d8..0000000000 --- a/src/Umbraco.Web.UI/umbraco/dashboard/DeveloperDashboardIntro.ascx +++ /dev/null @@ -1,36 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - -
-

- Start here

- Umbraco -

- This section contains the tools to add advanced features to your Umbraco site

-

- From here you can explore and install packages, create macros, add data types, and - much more. Start by exploring the below links or videos. -

-

- Find out more:

-
-
-
- -
-
-
-
diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/DeveloperDashboardVideos.ascx b/src/Umbraco.Web.UI/umbraco/dashboard/DeveloperDashboardVideos.ascx deleted file mode 100644 index 94adae2e51..0000000000 --- a/src/Umbraco.Web.UI/umbraco/dashboard/DeveloperDashboardVideos.ascx +++ /dev/null @@ -1,120 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - - - - - -
-

Watch and learn

- Videos -

Hours of Umbraco training videos are only a click away

-

- Want to master Umbraco Macros and more? Spend a couple of minutes learning some best practices - by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

-

To get you started:

-
- Loading... -
-
\ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/FeedProxy.aspx b/src/Umbraco.Web.UI/umbraco/dashboard/FeedProxy.aspx deleted file mode 100644 index 78c02767e2..0000000000 --- a/src/Umbraco.Web.UI/umbraco/dashboard/FeedProxy.aspx +++ /dev/null @@ -1,2 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="FeedProxy.aspx.cs" Inherits="dashboardUtilities.FeedProxy" %> -<%@ OutputCache Duration="1800" VaryByParam="url" %> diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/LatestEdits.ascx b/src/Umbraco.Web.UI/umbraco/dashboard/LatestEdits.ascx deleted file mode 100644 index 456178456e..0000000000 --- a/src/Umbraco.Web.UI/umbraco/dashboard/LatestEdits.ascx +++ /dev/null @@ -1,20 +0,0 @@ -<%@ Control Language="c#" AutoEventWireup="True" Codebehind="LatestEdits.ascx.cs" Inherits="dashboardUtilities.LatestEdits" TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %> - - - - -
-
-

<%=umbraco.ui.Text("defaultdialogs", "lastEdited")%>:

- - - - <%# PrintNodeName(DataBinder.Eval(Container.DataItem, "NodeId"), DataBinder.Eval(Container.DataItem, "datestamp")) %> - - - -
-
- - - diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/MediaDashboardIntro.ascx b/src/Umbraco.Web.UI/umbraco/dashboard/MediaDashboardIntro.ascx deleted file mode 100644 index b7776c8417..0000000000 --- a/src/Umbraco.Web.UI/umbraco/dashboard/MediaDashboardIntro.ascx +++ /dev/null @@ -1,29 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - -
-

- Start here

- Umbraco -

- Get started with Media right now

-

- Use the tool below to upload your images or documents to a media folder. -

-

- Follow these steps:

-
-
-
-
    -
  • Click Install and follow the on screen instructions to install the Desktop Media Uploader
    • -
  • Enter your login details for the site and click Sign In
    • -
  • Choose a media folder to upload files to from the Upload files to... dropdown list
    • -
  • Drag the files and folders you wish to upload directly into the Desktop Media Uploader application
    • -
  • Click Upload to start uploading
    • -
-

For a more thorough guide on how to use the Desktop Media Uploader, checkout this video.

-
-
-
-
diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/MediaDashboardVideos.ascx b/src/Umbraco.Web.UI/umbraco/dashboard/MediaDashboardVideos.ascx deleted file mode 100644 index 6567a0fd6e..0000000000 --- a/src/Umbraco.Web.UI/umbraco/dashboard/MediaDashboardVideos.ascx +++ /dev/null @@ -1,119 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - - - - -
-

Watch and learn

- Videos -

Hours of Umbraco training videos are only a click away

-

- Want to master Umbraco? Spend a couple of minutes learning some best practices - by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

-

To get you started:

-
- Loading... -
-
\ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/MembersDashboardIntro.ascx b/src/Umbraco.Web.UI/umbraco/dashboard/MembersDashboardIntro.ascx deleted file mode 100644 index 99532caaee..0000000000 --- a/src/Umbraco.Web.UI/umbraco/dashboard/MembersDashboardIntro.ascx +++ /dev/null @@ -1,25 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - -
-

- Start here

- Umbraco -

- Get started with Members right now

-

- Use the tool below to search for an existing member. -

-

- More about members

-
-
-
- -
-
-
-
diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/MembersDashboardVideos.ascx b/src/Umbraco.Web.UI/umbraco/dashboard/MembersDashboardVideos.ascx deleted file mode 100644 index 153fbcf2b4..0000000000 --- a/src/Umbraco.Web.UI/umbraco/dashboard/MembersDashboardVideos.ascx +++ /dev/null @@ -1,119 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - - - - -
-

Watch and learn

- Videos -

Hours of Umbraco training videos are only a click away

-

- Want to master Umbraco Members? Spend a couple of minutes learning some best practices - by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

-

To get you started:

-
- Loading... -
-
\ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/SettingsDashboardIntro.ascx b/src/Umbraco.Web.UI/umbraco/dashboard/SettingsDashboardIntro.ascx deleted file mode 100644 index 18751c9d79..0000000000 --- a/src/Umbraco.Web.UI/umbraco/dashboard/SettingsDashboardIntro.ascx +++ /dev/null @@ -1,36 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - -
-

- Start here

- Umbraco -

- This section contains the building blocks for your Umbraco site

-

- Follow the below links to find out more about working with the items in the Setings - section: -

-

- Find out more:

-
-
-
- -
-
-
-
diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/SettingsDashboardVideos.ascx b/src/Umbraco.Web.UI/umbraco/dashboard/SettingsDashboardVideos.ascx deleted file mode 100644 index d11dcebb96..0000000000 --- a/src/Umbraco.Web.UI/umbraco/dashboard/SettingsDashboardVideos.ascx +++ /dev/null @@ -1,119 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - - - - -
-

Watch and learn

- Videos -

Hours of Umbraco training videos are only a click away

-

- Want to master Umbraco? Spend a couple of minutes learning some best practices - by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

-

To get you started:

-
- Loading... -
-
\ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/StartupDashboardIntro.ascx b/src/Umbraco.Web.UI/umbraco/dashboard/StartupDashboardIntro.ascx deleted file mode 100644 index 0de0c753a1..0000000000 --- a/src/Umbraco.Web.UI/umbraco/dashboard/StartupDashboardIntro.ascx +++ /dev/null @@ -1,62 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - -
-

Start Here

- Umbraco -

Thank you for choosing Umbraco!

-

- We think this could be the beginning of something beautiful. You have made a great - choice, to help you get started here are some links to addtional information: -

-

- Find out more:

- -
-
-
-

- New to Umbraco

- -
-
-

- Go further

- -
-
-

- Get support

- -
-
-
-
diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/StartupDashboardKits.ascx b/src/Umbraco.Web.UI/umbraco/dashboard/StartupDashboardKits.ascx deleted file mode 100644 index be166e1d02..0000000000 --- a/src/Umbraco.Web.UI/umbraco/dashboard/StartupDashboardKits.ascx +++ /dev/null @@ -1,25 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - -
-

Make it look great

- Umbraco Starter Kits Rock! -

Install a Starter Site and Skin

-

- If you haven't already installed one of our Starter Kits, we think you should do that now. This is one of the best ways to start working with Umbraco. - After you install a Starter Kit, you can select a skin to make it look great and customize the kit to your liking. -

-

Starter Kits:

-
-
-
- -
-
-
-
\ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/StartupDashboardVideos.ascx b/src/Umbraco.Web.UI/umbraco/dashboard/StartupDashboardVideos.ascx deleted file mode 100644 index 6567a0fd6e..0000000000 --- a/src/Umbraco.Web.UI/umbraco/dashboard/StartupDashboardVideos.ascx +++ /dev/null @@ -1,119 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - - - - -
-

Watch and learn

- Videos -

Hours of Umbraco training videos are only a click away

-

- Want to master Umbraco? Spend a couple of minutes learning some best practices - by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

-

To get you started:

-
- Loading... -
-
\ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco_client/ui/default.css b/src/Umbraco.Web.UI/umbraco_client/ui/default.css index d9ffc94a2f..1322524ecf 100644 --- a/src/Umbraco.Web.UI/umbraco_client/ui/default.css +++ b/src/Umbraco.Web.UI/umbraco_client/ui/default.css @@ -547,7 +547,7 @@ guiEditor { .umbNitroList div h3{margin: 0px;} /* Generel error / success / notice classes, as seen in the umbraco installer. */ -.error, .notice, .success {padding:.8em; padding-top: 0em; padding-bottom: 0em; margin-bottom:.5em;border:2px solid #ddd;} +.error, .notice, .success {padding:0 .6em;margin-bottom:.5em;border:2px solid #ddd;} .error {background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;} .notice {background:#FFF6BF;color:#514721;border-color:#FFD324;} .success {background:#E6EFC2;color:#264409;border-color:#C6D880;} @@ -556,6 +556,7 @@ guiEditor { .notice a {color:#514721;} .success a {color:#264409;} +.error p, .notice p, .success p {margin: 0.6em 0 !important;} .sprTree { /*background-color: #fff;*/ diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/ChangePassword.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/ChangePassword.ascx index 3190d91ecf..7c28c9ff46 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/ChangePassword.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/ChangePassword.ascx @@ -1,52 +1,61 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ChangePassword.ascx.cs" Inherits="umbraco.presentation.umbraco.dashboard.ChangePassword" %> <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> -

<%=umbraco.ui.Text("changePassword") %>

- + + -

<%=umbraco.ui.Text("changePasswordDescription") %>

- -

- -
    -
  1. - <%=umbraco.ui.Text("username") %>: <%=umbraco.BusinessLogic.User.GetCurrent().Name%> -
    2. -
  2. - <%=umbraco.ui.Text("passwordEnterNew") %>: - - * -
    3. -
  3. - <%=umbraco.ui.Text("passwordConfirm") %>: - - * - <%=umbraco.ui.Text("passwordMismatch") %> -
    4. -
- -

- -

- - - -


-

<%=umbraco.ui.Text("passwordChanged") %>!

- + jQuery(document).ready(function () { + jQuery("#<%= password.ClientID %>").passStrength({ + shortPass: "error", + badPass: "error", + goodPass: "success", + strongPass: "success", + baseStyle: "passtestresult", + userid: "<%=umbraco.BusinessLogic.User.GetCurrent().Name%>", + messageloc: 1 + }); + }); + +
+

<%=umbraco.ui.Text("changePassword") %>

+ Users + +

<%=umbraco.ui.Text("changePasswordDescription") %>

+ +
+

+
+ +
    +
  1. + + <%=umbraco.ui.Text("username") %>: + <%=umbraco.BusinessLogic.User.GetCurrent().Name%> + +
    2. +
  2. + + <%=umbraco.ui.Text("passwordEnterNew") %>: + + * + +
    3. +
  3. + + <%=umbraco.ui.Text("passwordConfirm") %>: + + * + <%=umbraco.ui.Text("passwordMismatch") %> + +
    4. +
+

+ +

+ + +

<%=umbraco.ui.Text("passwordChanged") %>!

+ +
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DesktopMediaUploader.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DesktopMediaUploader.ascx index 3ec017249f..3869aa8547 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DesktopMediaUploader.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DesktopMediaUploader.ascx @@ -1,5 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="DesktopMediaUploader.ascx.cs" Inherits="umbraco.presentation.umbraco.dashboard.DesktopMediaUploader" %> - +<%@ Register Assembly="controls" Namespace="umbraco.uicontrols" TagPrefix="umb" %> +<%@ Register Assembly="ClientDependency.Core" Namespace="ClientDependency.Core.Controls" TagPrefix="umb" %> + + + +

Desktop Media Uploader

Umbraco @@ -9,8 +14,7 @@
- - +

@@ -19,7 +23,6 @@

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DeveloperDashboardIntro.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DeveloperDashboardIntro.ascx index c4c789f5d8..f8222e3b60 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DeveloperDashboardIntro.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DeveloperDashboardIntro.ascx @@ -1,34 +1,26 @@ <%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - + +<%@ Register Assembly="controls" Namespace="umbraco.uicontrols" TagPrefix="umb" %> +<%@ Register Assembly="ClientDependency.Core" Namespace="ClientDependency.Core.Controls" TagPrefix="umb" %> + + +
-

- Start here

+

Start here

Umbraco -

- This section contains the tools to add advanced features to your Umbraco site

-

- From here you can explore and install packages, create macros, add data types, and - much more. Start by exploring the below links or videos. -

-

- Find out more:

+

This section contains the tools to add advanced features to your Umbraco site

+

From here you can explore and install packages, create macros, add data types, and much more. Start by exploring the below links or videos.

+

Find out more:

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DeveloperDashboardVideos.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DeveloperDashboardVideos.ascx index 94adae2e51..8e10849640 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DeveloperDashboardVideos.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DeveloperDashboardVideos.ascx @@ -1,7 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - - +<%@ Register Assembly="controls" Namespace="umbraco.uicontrols" TagPrefix="umb" %> +<%@ Register Assembly="ClientDependency.Core" Namespace="ClientDependency.Core.Controls" TagPrefix="umb" %> + + + + - -
+

Watch and learn

Videos -

Hours of Umbraco training videos are only a click away

-

- Want to master Umbraco Macros and more? Spend a couple of minutes learning some best practices - by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

-

To get you started:

-
- Loading... -
+

Hours of Umbraco training videos are only a click away

+

Want to master Umbraco Macros and more? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

+

To get you started:

+
Loading...
\ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/LatestEdits.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/LatestEdits.ascx index 456178456e..48ad25fec3 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/LatestEdits.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/LatestEdits.ascx @@ -1,20 +1,14 @@ -<%@ Control Language="c#" AutoEventWireup="True" Codebehind="LatestEdits.ascx.cs" Inherits="dashboardUtilities.LatestEdits" TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %> - +<%@ Control Language="c#" AutoEventWireup="True" Codebehind="LatestEdits.ascx.cs" Inherits="dashboardUtilities.LatestEdits" %> +<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> - - -
-
-

<%=umbraco.ui.Text("defaultdialogs", "lastEdited")%>:

- - - - <%# PrintNodeName(DataBinder.Eval(Container.DataItem, "NodeId"), DataBinder.Eval(Container.DataItem, "datestamp")) %> - - - -
-
- + - +
+

<%=umbraco.ui.Text("defaultdialogs", "lastEdited")%>

+ Umbraco + + + <%# PrintNodeName(DataBinder.Eval(Container.DataItem, "NodeId"), DataBinder.Eval(Container.DataItem, "datestamp")) %> + + +
diff --git a/src/Umbraco.Web.UI/umbraco/dashboard/MediaDashboardFolderBrowser.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MediaDashboardFolderBrowser.ascx similarity index 100% rename from src/Umbraco.Web.UI/umbraco/dashboard/MediaDashboardFolderBrowser.ascx rename to src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MediaDashboardFolderBrowser.ascx diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MediaDashboardIntro.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MediaDashboardIntro.ascx index b7776c8417..f659eadd29 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MediaDashboardIntro.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MediaDashboardIntro.ascx @@ -1,17 +1,15 @@ <%@ Control Language="C#" AutoEventWireup="true" %> <%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - +<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> + + +
-

- Start here

+

Start here

Umbraco -

- Get started with Media right now

-

- Use the tool below to upload your images or documents to a media folder. -

-

- Follow these steps:

+

Get started with Media right now

+

Use the tool below to upload your images or documents to a media folder.

+

Follow these steps:

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MediaDashboardVideos.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MediaDashboardVideos.ascx index 6567a0fd6e..22372642e2 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MediaDashboardVideos.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MediaDashboardVideos.ascx @@ -1,7 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - - +<%@ Register Assembly="controls" Namespace="umbraco.uicontrols" TagPrefix="umb" %> +<%@ Register Assembly="ClientDependency.Core" Namespace="ClientDependency.Core.Controls" TagPrefix="umb" %> + + + +

Watch and learn

Videos -

Hours of Umbraco training videos are only a click away

-

- Want to master Umbraco? Spend a couple of minutes learning some best practices - by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

-

To get you started:

-
- Loading... -
-
\ No newline at end of file +

Hours of Umbraco training videos are only a click away

+

Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

+

To get you started:

+
Loading...
+
\ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MembersDashboardIntro.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MembersDashboardIntro.ascx index 99532caaee..4e78fb0540 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MembersDashboardIntro.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MembersDashboardIntro.ascx @@ -1,23 +1,20 @@ <%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - +<%@ Register Assembly="controls" Namespace="umbraco.uicontrols" TagPrefix="umb" %> +<%@ Register Assembly="ClientDependency.Core" Namespace="ClientDependency.Core.Controls" TagPrefix="umb" %> + + +
-

- Start here

+

Start here

Umbraco -

- Get started with Members right now

-

- Use the tool below to search for an existing member. -

-

- More about members

+

Get started with Members right now

+

Use the tool below to search for an existing member.

+

More about members

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MembersDashboardVideos.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MembersDashboardVideos.ascx index 153fbcf2b4..80845d0e65 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MembersDashboardVideos.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/MembersDashboardVideos.ascx @@ -1,7 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - - +<%@ Register Assembly="controls" Namespace="umbraco.uicontrols" TagPrefix="umb" %> +<%@ Register Assembly="ClientDependency.Core" Namespace="ClientDependency.Core.Controls" TagPrefix="umb" %> + + + + -
+

Watch and learn

Videos -

Hours of Umbraco training videos are only a click away

-

- Want to master Umbraco Members? Spend a couple of minutes learning some best practices - by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

-

To get you started:

-
- Loading... -
+

Hours of Umbraco training videos are only a click away

+

Want to master Umbraco Members? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

+

To get you started:

+
Loading...
\ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/SettingsDashboardIntro.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/SettingsDashboardIntro.ascx index 18751c9d79..e9e24dde8a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/SettingsDashboardIntro.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/SettingsDashboardIntro.ascx @@ -1,34 +1,25 @@ <%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - +<%@ Register Assembly="controls" Namespace="umbraco.uicontrols" TagPrefix="umb" %> +<%@ Register Assembly="ClientDependency.Core" Namespace="ClientDependency.Core.Controls" TagPrefix="umb" %> + + +
-

- Start here

+

Start here

Umbraco -

- This section contains the building blocks for your Umbraco site

-

- Follow the below links to find out more about working with the items in the Setings - section: -

-

- Find out more:

+

This section contains the building blocks for your Umbraco site

+

Follow the below links to find out more about working with the items in the Setings section:

+

Find out more:

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/SettingsDashboardVideos.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/SettingsDashboardVideos.ascx index d11dcebb96..4a7a1c1e38 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/SettingsDashboardVideos.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/SettingsDashboardVideos.ascx @@ -1,7 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - - +<%@ Register Assembly="controls" Namespace="umbraco.uicontrols" TagPrefix="umb" %> +<%@ Register Assembly="ClientDependency.Core" Namespace="ClientDependency.Core.Controls" TagPrefix="umb" %> + + + +

Watch and learn

Videos -

Hours of Umbraco training videos are only a click away

-

- Want to master Umbraco? Spend a couple of minutes learning some best practices - by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

-

To get you started:

-
- Loading... -
-
\ No newline at end of file +

Hours of Umbraco training videos are only a click away

+

Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

+

To get you started:

+
Loading...
+
\ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardIntro.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardIntro.ascx index 0de0c753a1..5b12233286 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardIntro.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardIntro.ascx @@ -1,60 +1,43 @@ <%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - +<%@ Register Assembly="controls" Namespace="umbraco.uicontrols" TagPrefix="umb" %> +<%@ Register Assembly="ClientDependency.Core" Namespace="ClientDependency.Core.Controls" TagPrefix="umb" %> + + +

Start Here

Umbraco

Thank you for choosing Umbraco!

-

- We think this could be the beginning of something beautiful. You have made a great - choice, to help you get started here are some links to addtional information: -

-

- Find out more:

- +

We think this could be the beginning of something beautiful. You have made a great choice, to help you get started here are some links to addtional information:

+

Find out more:

-

- New to Umbraco

+

New to Umbraco

-

- Go further

+

Go further

-

- Get support

+

Get support

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardKits.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardKits.ascx index be166e1d02..d7255afd4f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardKits.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardKits.ascx @@ -1,25 +1,25 @@ <%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - +<%@ Register Assembly="controls" Namespace="umbraco.uicontrols" TagPrefix="umb" %> +<%@ Register Assembly="ClientDependency.Core" Namespace="ClientDependency.Core.Controls" TagPrefix="umb" %> + + +

Make it look great

Umbraco Starter Kits Rock!

Install a Starter Site and Skin

-

- If you haven't already installed one of our Starter Kits, we think you should do that now. This is one of the best ways to start working with Umbraco. - After you install a Starter Kit, you can select a skin to make it look great and customize the kit to your liking. -

-

Starter Kits:

-
-
-
-
    +

    If you haven't already installed one of our Starter Kits, we think you should do that now. This is one of the best ways to start working with Umbraco. After you install a Starter Kit, you can select a skin to make it look great and customize the kit to your liking.

    +

    Starter Kits:

    +
    +
    +
    + -
    +
+
\ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardVideos.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardVideos.ascx index 6567a0fd6e..c139c0931c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardVideos.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/StartupDashboardVideos.ascx @@ -1,7 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - - +<%@ Register Assembly="controls" Namespace="umbraco.uicontrols" TagPrefix="umb" %> +<%@ Register Assembly="ClientDependency.Core" Namespace="ClientDependency.Core.Controls" TagPrefix="umb" %> + + + +

Watch and learn

Videos -

Hours of Umbraco training videos are only a click away

-

- Want to master Umbraco? Spend a couple of minutes learning some best practices - by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

-

To get you started:

-
- Loading... -
-
\ No newline at end of file +

Hours of Umbraco training videos are only a click away

+

Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

+

To get you started:

+
Loading...
+
\ No newline at end of file