Merge

--HG--
branch : dev

src/Orchard.Web/Core/Dashboard/Views/Admin/Index.ascx

@@ -1,4 +1,12 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<AdminViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<h1><%=Html.TitleForPage(T("Orchard Admin").ToString())%></h1>
-<p><%=T("Insert admin text here -> &middot;") %></p>
+<h1><%=Html.TitleForPage(T("Welcome to the Orchard administration dashboard").ToString())%></h1>
+
+<p>
+<%=_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”.") %></p>
+
+<p>
+<%=_Encoded("Have fun!") %><br />
+<%=_Encoded("The Orchard Team") %>
+</p>
+

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;