From 30091bac36741ade91f71e2e29324abcc10eb273 Mon Sep 17 00:00:00 2001 From: jowall Date: Mon, 1 Mar 2010 17:36:51 -0800 Subject: [PATCH] Added Dashboard text. --HG-- branch : dev --- .../Core/Dashboard/Views/Admin/Index.ascx | 12 ++++++++++-- src/Orchard.Web/Themes/TheAdmin/Styles/site.css | 7 +++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/Orchard.Web/Core/Dashboard/Views/Admin/Index.ascx b/src/Orchard.Web/Core/Dashboard/Views/Admin/Index.ascx index 4500ada19..d830f958b 100644 --- a/src/Orchard.Web/Core/Dashboard/Views/Admin/Index.ascx +++ b/src/Orchard.Web/Core/Dashboard/Views/Admin/Index.ascx @@ -1,4 +1,12 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> -

<%=Html.TitleForPage(T("Orchard Admin").ToString())%>

-

<%=T("Insert admin text here -> ·") %>

\ No newline at end of file +

<%=Html.TitleForPage(T("Welcome to the Orchard administration dashboard").ToString())%>

+ +

+<%=_Encoded("This is the place where you can manage your web site, its appearance and its contents. Please take a moment to explore the different menu items on the left of the screen to familiarize yourself with the features of the application. For example, try to change the theme through the “Manage Themes” menu entry. You can also create new pages and manage existing ones through the “Manage Pages” menu entry or create blogs through “Manage Blogs”.") %>

+ +

+<%=_Encoded("Have fun!") %>
+<%=_Encoded("The Orchard Team") %> +

+ diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index 430742ce4..df6e7f2c5 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -274,9 +274,9 @@ a:hover, a:active, a:focus { #main h2, #main h3 { margin:.5em 0; } -/*#main p { +#main p { margin:0 0 1.5em; -}*/ +} #main .main.actions { margin:0 0 1.4em; } @@ -754,6 +754,9 @@ table.items, textarea, input.text, input.text-box, .properties { float:left; } +.orchard-blogs #main p { + margin:0; +} #main .contentItems .properties h3 { border-bottom:none; margin:0;