Updated theme thumbnail files and removed old images. Commented out helper text on manage pages and manage blogs. Adjusted some margins in admin.

--HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045746
2025-11-28 17:32:44 +08:00 · 2010-01-20 20:52:00 +00:00
parent d0e00a91ed
commit 3291efeb71
17 changed files with 62 additions and 56 deletions
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -2,7 +2,7 @@
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
    <ProjectGuid>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</ProjectGuid>
    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
@@ -179,7 +179,7 @@
    <Content Include="Settings\Views\EditorTemplates\Items\Settings.Site.ascx" />
    <Content Include="Themes\Scripts\jquery-1.4.js" />
    <Content Include="Themes\Scripts\jquery-1.4.min.js" />
-    <Content Include="Themes\Theme.gif" />
+    <Content Include="Themes\Theme.png" />
    <Content Include="Themes\Theme.txt" />
    <Content Include="Themes\Styles\site.css" />
    <Content Include="Themes\Views\Admin\Install.aspx" />
@@ -232,8 +232,6 @@
          <IISUrl>
          </IISUrl>
          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>True</UseCustomServer>
-          <CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
        </WebProjectProperties>
      </FlavorProperties>
--- a/src/Orchard.Web/Core/Themes/Theme.gif
+++ b/src/Orchard.Web/Core/Themes/Theme.gif
--- a/src/Orchard.Web/Core/Themes/Theme.png
+++ b/src/Orchard.Web/Core/Themes/Theme.png
--- a/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx
@@ -3,14 +3,13 @@
 <%@ Import Namespace="Orchard.Extensions"%>
 <%@ Import Namespace="Orchard.Core.Themes.ViewModels"%>
 <h1><%=Html.TitleForPage(T("Manage Themes").ToString()) %></h1>
-<h2><%=_Encoded("Current Theme")%></h2>
 <% if (Model.CurrentTheme == null) {
    %><p><%=_Encoded("There is no current theme in the application. The built-in theme will be used.")
             %><br /><%=Html.ActionLink(T("Install a new Theme").ToString(), "Install") %></p><%
   } else {
-    %><h3><%=Html.Encode(Model.CurrentTheme.DisplayName) %></h3>
+    %><h3><%=_Encoded("Current Theme")%> - <%=Html.Encode(Model.CurrentTheme.DisplayName) %></h3>
     <p>
-        <%=Html.Image(Html.ThemePath(Model.CurrentTheme, "/Theme.gif"), Html.Encode(Model.CurrentTheme.DisplayName), null)%><br />
+        <%=Html.Image(Html.ThemePath(Model.CurrentTheme, "/Theme.png"), Html.Encode(Model.CurrentTheme.DisplayName), null)%><br />
        <%=_Encoded("By") %> <%=Html.Encode(Model.CurrentTheme.Author) %><br />
        <%=Html.Encode(Model.CurrentTheme.Version) %><br />
        <%=Html.Encode(Model.CurrentTheme.Description) %><br />
@@ -25,7 +24,7 @@
        %>    <li>
        <h3><%=Html.Encode(theme.DisplayName) %></h3>
        <p>
-            <%=Html.Image(Html.ThemePath(theme, "/Theme.gif"), Html.Encode(theme.DisplayName), null)%><br />
+            <%=Html.Image(Html.ThemePath(theme, "/Theme.png"), Html.Encode(theme.DisplayName), null)%><br />
            <%=_Encoded("By") %> <%=Html.Encode(theme.Author) %><br />
            <%=Html.Encode(theme.Version) %><br />
            <%=Html.Encode(theme.Description) %><br />
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -148,7 +148,6 @@
  <ItemGroup>
    <Content Include="Config\Diagnostics.config" />
    <Content Include="Themes\Orange\Styles\site.css" />
-    <Content Include="Themes\Orange\Theme.gif" />
    <Content Include="Themes\Orange\Theme.txt" />
    <Content Include="Themes\Orange\Views\layout.ascx" />
    <Content Include="Themes\TheAdmin\Styles\images\background_header.jpg" />
@@ -174,7 +173,7 @@
    <Content Include="Themes\Classic\Content\Images\sidebarBackground.gif" />
    <Content Include="Themes\Classic\Styles\blog.css" />
    <Content Include="Themes\Classic\Styles\site.css" />
-    <Content Include="Themes\Classic\Theme.gif" />
+    <Content Include="Themes\Classic\Theme.png" />
    <Content Include="Themes\Classic\Theme.txt" />
    <Content Include="Themes\Classic\Views\DisplayTemplates\Items\Blogs.Blog.ascx" />
    <Content Include="Themes\Classic\Views\DisplayTemplates\Items\Blogs.Blog.Summary.ascx" />
@@ -186,6 +185,7 @@
    <Content Include="Themes\Classic\Views\menu.ascx" />
    <Content Include="Themes\Green\Content\Images\bodyBackground.gif" />
    <Content Include="Themes\Green\Content\Images\bodyBackground.png" />
+    <Content Include="Themes\Green\Content\Images\commentpointer.gif" />
    <Content Include="Themes\Green\Content\Images\logo.gif" />
    <Content Include="Themes\Green\Content\Images\logo.png" />
    <Content Include="Themes\Green\Content\Images\tabLeftOff.gif" />
@@ -195,17 +195,19 @@
    <Content Include="Themes\Green\Styles\blog.css" />
    <Content Include="Themes\Green\Styles\site.css" />
    <Content Include="Themes\Green\Styles\yui.css" />
-    <Content Include="Themes\Green\Theme.gif" />
+    <Content Include="Themes\Green\Theme.png" />
    <Content Include="Themes\Green\Theme.txt" />
    <Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.Blog.ascx" />
    <Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.Blog.Summary.ascx" />
    <Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.BlogPost.Summary.ascx" />
+    <Content Include="Themes\Green\Views\DisplayTemplates\Items\Pages.Page.ascx" />
    <Content Include="Themes\Green\Views\DisplayTemplates\Parts\Comments.HasComments.ascx" />
    <Content Include="Themes\Green\Views\footer.ascx" />
    <Content Include="Themes\Green\Views\layout.ascx" />
    <Content Include="Themes\Green\Views\ListOfComments.ascx" />
    <Content Include="Themes\Green\Views\menu.ascx" />
    <Content Include="Themes\Green\Views\user.ascx" />
+    <Content Include="Themes\Orange\Theme.png" />
    <Content Include="Themes\Orange\Views\Orchard.Blogs\BlogPost\Item.ascx" />
    <Content Include="Themes\Orchard\Content\Images\background_content.jpg" />
    <Content Include="Themes\Orchard\Content\Images\background_footer.jpg" />
@@ -214,7 +216,7 @@
    <Content Include="Themes\Orchard\Content\Images\background_pageTop.gif" />
    <Content Include="Themes\Orchard\Content\Images\orchardLogo.jpg" />
    <Content Include="Themes\Orchard\Styles\site.css" />
-    <Content Include="Themes\Orchard\Theme.gif" />
+    <Content Include="Themes\Orchard\Theme.png" />
    <Content Include="Themes\Orchard\Theme.txt" />
    <Content Include="Themes\Orchard\Views\footer.ascx" />
    <Content Include="Themes\Orchard\Views\layout.ascx" />
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/List.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/List.ascx
@@ -2,7 +2,7 @@
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
 <h1><%=Html.TitleForPage(T("Manage Blogs").ToString()) %></h1>
-<p><%=_Encoded("Possible text about setting up and managing a blog goes here.") %></p><%
+<%-- todo: Add helper text here when ready. <p><%=_Encoded("Possible text about setting up and managing a blog goes here.") %></p> --%><%
 if (Model.Blogs.Count() > 0) { %>
 <div class="actions"><a class="add button" href="<%=Url.BlogCreate() %>"><%=_Encoded("New Blog") %></a></div>
 <%=Html.UnorderedList(Model.Blogs, (b, i) => Html.DisplayForItem(b).ToHtmlString(), "blogs contentItems") %>
--- a/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/List.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/List.aspx
@@ -1,30 +1,31 @@
 <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<PagesViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Pages.ViewModels"%>
-<h1><%=Html.TitleForPage(T("Manage Pages").ToString()) %></h1>
-<p><%=_Encoded("Possible text about setting up a page goes here.")%></p>
-<% using (Html.BeginFormAntiForgeryPost()) { %>
-    <%=Html.ValidationSummary() %>
+<h1><%=Html.TitleForPage(T("Manage Pages").ToString())%></h1>
+<%-- todo: Add helper text here when ready. <p><%=_Encoded("Possible text about setting up a page goes here.")%></p>--%>
+<% using (Html.BeginFormAntiForgeryPost())
+   { %>
+    <%=Html.ValidationSummary()%>
    <fieldset class="actions bulk">
-        <label for="publishActions"><%=_Encoded("Actions:") %></label>
+        <label for="publishActions"><%=_Encoded("Actions:")%></label>
        <select id="publishActions" name="<%=Html.NameOf(m => m.Options.BulkAction) %>">
-            <%=Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.None, _Encoded("Choose action...").ToString()) %>
-            <%=Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.PublishNow, _Encoded("Publish Now").ToString()) %>
-            <%=Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.Unpublish, _Encoded("Unpublish").ToString()) %>
-            <%=Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.Delete, _Encoded("Delete").ToString()) %>
+            <%=Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.None, _Encoded("Choose action...").ToString())%>
+            <%=Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.PublishNow, _Encoded("Publish Now").ToString())%>
+            <%=Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.Unpublish, _Encoded("Unpublish").ToString())%>
+            <%=Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.Delete, _Encoded("Delete").ToString())%>
        </select>
        <input class="button" type="submit" name="submit.BulkEdit" value="<%=_Encoded("Apply") %>" />
    </fieldset>
    <fieldset class="actions bulk">
-        <label for="filterResults"><%=_Encoded("Filter:") %></label>
+        <label for="filterResults"><%=_Encoded("Filter:")%></label>
        <select id="filterResults" name="<%=Html.NameOf(m => m.Options.Filter) %>">
-            <%=Html.SelectOption(Model.Options.Filter, PagesFilter.All, _Encoded("All Pages").ToString()) %>
-            <%=Html.SelectOption(Model.Options.Filter, PagesFilter.Published, _Encoded("Published Pages").ToString()) %>
-            <%=Html.SelectOption(Model.Options.Filter, PagesFilter.Offline, _Encoded("Offline Pages").ToString()) %>
+            <%=Html.SelectOption(Model.Options.Filter, PagesFilter.All, _Encoded("All Pages").ToString())%>
+            <%=Html.SelectOption(Model.Options.Filter, PagesFilter.Published, _Encoded("Published Pages").ToString())%>
+            <%=Html.SelectOption(Model.Options.Filter, PagesFilter.Offline, _Encoded("Offline Pages").ToString())%>
        </select>
        <input class="button" type="submit" name="submit.Filter" value="<%=_Encoded("Apply") %>"/>
    </fieldset>
-    <div class="manage"><%=Html.ActionLink(T("Add a page").ToString(), "Create", new {}, new { @class = "button" }) %></div>
+    <div class="manage"><%=Html.ActionLink(T("Add a page").ToString(), "Create", new { }, new { @class = "button" })%></div>
    <fieldset>
        <table class="items" summary="<%=_Encoded("This is a table of the PageEntries currently available for use in your application.") %>">
            <colgroup>
@@ -40,57 +41,66 @@
            <thead>
                <tr>
                    <th scope="col">&nbsp;&darr;<%-- todo: (heskew) something more appropriate for "this applies to the bulk actions --%></th>
-                    <th scope="col"><%=_Encoded("Status") %></th>
-                    <th scope="col"><%=_Encoded("Title") %></th>
-                    <th scope="col"><%=_Encoded("Slug") %></th>
-                    <th scope="col"><%=_Encoded("Author") %></th>
-                    <th scope="col"><%=_Encoded("Draft") %></th>
-                    <th scope="col"><%=_Encoded("Scheduled") %></th>
+                    <th scope="col"><%=_Encoded("Status")%></th>
+                    <th scope="col"><%=_Encoded("Title")%></th>
+                    <th scope="col"><%=_Encoded("Slug")%></th>
+                    <th scope="col"><%=_Encoded("Author")%></th>
+                    <th scope="col"><%=_Encoded("Draft")%></th>
+                    <th scope="col"><%=_Encoded("Scheduled")%></th>
                    <th scope="col"></th>
                </tr>
            </thead>
            <%
-                int pageIndex = 0;
-                foreach (var pageEntry in Model.PageEntries) {
-                    var pi = pageIndex; %>
+int pageIndex = 0;
+foreach (var pageEntry in Model.PageEntries)
+{
+    var pi = pageIndex; %>
            <tr>
                <td>
                    <input type="hidden" value="<%=Model.PageEntries[pageIndex].PageId %>" name="<%=Html.NameOf(m => m.PageEntries[pi].PageId) %>"/>
                    <input type="checkbox" value="true" name="<%=Html.NameOf(m => m.PageEntries[pi].IsChecked) %>"/>
                </td>
                <td>
-                  <% if (pageEntry.Page.HasPublished) { %>
+                  <% if (pageEntry.Page.HasPublished)
+                     { %>
                  <img src="<%=ResolveUrl("~/Packages/Orchard.Pages/Content/Admin/images/online.gif") %>" alt="<%=_Encoded("Online") %>" title="<%=_Encoded("The page is currently online") %>" />
-                  <% } else { %>
+                  <% }
+                     else
+                     { %>
                  <img src="<%=ResolveUrl("~/Packages/Orchard.Pages/Content/Admin/images/offline.gif") %>" alt="<%=_Encoded("Offline") %>" title="<%=_Encoded("The page is currently offline") %>" />
                  <% } %>
                </td>
-                <td><%=Html.Encode(pageEntry.Page.Title ?? T("(no title)").ToString()) %></td>
-                <td><% if (pageEntry.Page.HasPublished) { %>
-                        <%=Html.ActionLink(pageEntry.Page.Slug ?? T("(no slug)").ToString(), "Item", new {controller = "Page", slug = pageEntry.Page.PublishedSlug}) %>
-                    <% } else {%>
-                        <%=Html.Encode(pageEntry.Page.Slug ?? T("(no slug)").ToString()) %>
+                <td><%=Html.Encode(pageEntry.Page.Title ?? T("(no title)").ToString())%></td>
+                <td><% if (pageEntry.Page.HasPublished)
+                       { %>
+                        <%=Html.ActionLink(pageEntry.Page.Slug ?? T("(no slug)").ToString(), "Item", new { controller = "Page", slug = pageEntry.Page.PublishedSlug })%>
+                    <% }
+                       else
+                       {%>
+                        <%=Html.Encode(pageEntry.Page.Slug ?? T("(no slug)").ToString())%>
                    <% } %>   
                 </td>
-                <td><%=_Encoded("By {0}", pageEntry.Page.Creator.UserName) %></td>
+                <td><%=_Encoded("By {0}", pageEntry.Page.Creator.UserName)%></td>
                <td>
-                    <% if (pageEntry.Page.HasDraft) { %>
+                    <% if (pageEntry.Page.HasDraft)
+                       { %>
                    <img src="<%=ResolveUrl("~/Packages/Orchard.Pages/Content/Admin/images/draft.gif") %>" alt="<%=_Encoded("Draft") %>" title="<%=_Encoded("The page has a draft") %>" />
                    <% } %>
                </td>
                <td>
-                    <% if (!pageEntry.Page.IsPublished) { %>
+                    <% if (!pageEntry.Page.IsPublished)
+                       { %>
                        <%=pageEntry.Page.Published != null
                          ? string.Format("{0:d}<br />{0:t}", pageEntry.Page.Published.Value)
-                          : "" %>
+                          : ""%>
                    <% } %>    
                </td>
-                <td><%=Html.ActionLink(T("Edit").ToString(), "Edit", new { id = pageEntry.PageId }) %></td>
+                <td><%=Html.ActionLink(T("Edit").ToString(), "Edit", new { id = pageEntry.PageId })%></td>
            </tr>
            <%
-                pageIndex++; 
-            } %>
+pageIndex++;
+} %>
        </table>
    </fieldset>
-    <div class="manage"><%=Html.ActionLink(T("Add a page").ToString(), "Create", new {}, new { @class = "button"}) %></div>
+    <div class="manage"><%=Html.ActionLink(T("Add a page").ToString(), "Create", new { }, new { @class = "button" })%></div>
 <% } %>
--- a/src/Orchard.Web/Themes/Classic/Theme.gif
+++ b/src/Orchard.Web/Themes/Classic/Theme.gif
--- a/src/Orchard.Web/Themes/Classic/Theme.png
+++ b/src/Orchard.Web/Themes/Classic/Theme.png
--- a/src/Orchard.Web/Themes/Green/Styles/site.css
+++ b/src/Orchard.Web/Themes/Green/Styles/site.css
@@ -75,8 +75,6 @@ fieldset div {margin:12px 0 0 0}
    
 legend {
 	font-size:123.1%;
-	margin:-10px 0 0 10px;
-	padding:0 6px;
 }

 label {
--- a/src/Orchard.Web/Themes/Green/Theme.gif
+++ b/src/Orchard.Web/Themes/Green/Theme.gif
--- a/src/Orchard.Web/Themes/Green/Theme.png
+++ b/src/Orchard.Web/Themes/Green/Theme.png
--- a/src/Orchard.Web/Themes/Orange/Theme.gif
+++ b/src/Orchard.Web/Themes/Orange/Theme.gif
--- a/src/Orchard.Web/Themes/Orange/Theme.png
+++ b/src/Orchard.Web/Themes/Orange/Theme.png
--- a/src/Orchard.Web/Themes/Orchard/Theme.gif
+++ b/src/Orchard.Web/Themes/Orchard/Theme.gif
--- a/src/Orchard.Web/Themes/Orchard/Theme.png
+++ b/src/Orchard.Web/Themes/Orchard/Theme.png
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -278,7 +278,7 @@ a:hover, a:active, a:focus {
 /* Content
 ----------------------------------------------------------*/
 #main h1 {
-    margin:.23em 0 1em;
+    margin:0 0 1em;
 }
 #main h2, #main h3 {
    margin:.5em 0;
@@ -682,9 +682,8 @@ todo: (heskew) pull out into relevant modules where appropriate
 }
 .templates p img {
    float:left;
-    height:144px;
+    height:200px;
    margin:.27em .93em .93em .54em;
-    width:124px;
 }
 .previewImage {
 	border:1px solid #525e50;