From 1741fc1e0c04a6876139f3e03773b151dd8cf421 Mon Sep 17 00:00:00 2001
From: jowall <jowall@microsoft.com>
Date: Thu, 4 Mar 2010 12:18:38 -0800
Subject: [PATCH] Updated the layout of the edit media page in the admin.

--HG--
branch : dev
---
 .../Orchard.Media/Views/Admin/EditMedia.aspx  | 30 ++++++++++++++-----
 .../Themes/Green/Views/Layout.HomePage.ascx   |  1 -
 .../Themes/TheAdmin/Styles/site.css           | 10 +++----
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx
index 53a003a97..c3727fbc7 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx
@@ -17,16 +17,32 @@
 	<%using (Html.BeginFormAntiForgeryPost()) { %>
         <%= Html.ValidationSummary() %>
         <div class="primary">
-		    <h2><%=_Encoded("About this media")%></h2>
-            <fieldset>
+		    <div>
+		    <img src="<%=ResolveUrl("~/Media/" + Html.Encode(Model.RelativePath + "/" + Model.Name))%>" class="previewImage" alt="<%=Html.Encode(Model.Caption) %>" />
+		    </div>
+		    <fieldset>
+		        <%-- todo: make these real (including markup) --%>
+			    <div>
+			    <label><%=T("Dimensions: <span>500 x 375 pixels</span>")%></label>
+			   
+			    <label><%=T("Size: <span>{0}</span>", Model.Size)%></label>
+			   
+			    <label><%=T("Added on: <span>{0} by Orchard User</span>", Model.LastUpdated)%></label>
+			    </div>
+			    <div>
+			        <label for="embedPath"><%=_Encoded("Embed:")%></label>
+			        <input id="embedPath" class="textMedium" name="embedPath" type="text" readonly="readonly" value="<%=_Encoded("<img src=\"{0}\" width=\"{1}\" height=\"{2}\" alt=\"{3}\" />", ResolveUrl("~/Media/" + Model.RelativePath + "/" + Model.Name), 500, 375, Model.Caption)%>" />
+			        <span class="hint"><%=_Encoded("Copy this html to add this image to your site.") %></span>
+			      </div>
+			  
                 <div>
                     <label for="Name"><%=_Encoded("Name")%></label>
 			        <input id="Name" name="Name" type="hidden" value="<%=Html.Encode(Model.Name) %>"/>
-			        <input id="NewName" class="text" name="NewName" type="text" value="<%=Html.Encode(Model.Name) %>"/>
+			        <input id="NewName" class="textMedium" name="NewName" type="text" value="<%=Html.Encode(Model.Name) %>"/>
 			    </div>
                 <div>
 			        <label for="Caption"><%=_Encoded("Caption")%></label>
-			        <input id="Caption" class="text" name="Caption" type="text" value="<%= Model.Caption %>"/>
+			        <input id="Caption" class="textMedium" name="Caption" type="text" value="<%= Model.Caption %>"/>
 			        <span class="hint"><%=_Encoded("This will be used for the image alt tag.")%></span>
 			        <input type="hidden" id="LastUpdated" name="LastUpdated" value="<%= Model.LastUpdated %>"/>
 			        <input type="hidden" id="Size" name="Size" value="<%= Model.Size %>"/>
@@ -39,11 +55,11 @@
 			    <%--<input type="submit" class="button" name="submit.Delete" value="<%=_Encoded("Delete") %>" />--%>
             </fieldset>
 	    </div>
-	    <div class="secondary">
+	    <%--<div class="secondary" style="border:1px solid #ff0000;">
 		    <h2><%=_Encoded("Preview")%></h2>
 		    <div><img src="<%=ResolveUrl("~/Media/" + Html.Encode(Model.RelativePath + "/" + Model.Name))%>" class="previewImage" alt="<%=Html.Encode(Model.Caption) %>" /></div>
 		    <ul>
-		        <%-- todo: make these real (including markup) --%>
+		        <%-- todo: make these real (including markup) 
 			    <li><label><%=T("Dimensions: <span>500 x 375 pixels</span>")%></label></li>
 			    <li><label><%=T("Size: <span>{0}</span>", Model.Size)%></label></li>
 			    <li><label><%=T("Added on: <span>{0} by Orchard User</span>", Model.LastUpdated)%></label></li>
@@ -53,6 +69,6 @@
 			        <span class="hint"><%=_Encoded("Copy this html to add this image to your site.") %></p>
 			    </li>
 		    </ul>
-	    </div>
+	    </div>--%>
 	<% } %>
 </div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx b/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx
index 0115d6f84..6015190d5 100644
--- a/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx
+++ b/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx
@@ -41,6 +41,5 @@
     </div>
   </div>
   <%-- End Content --%>
-  <%Html.Zone("footer");%>
   <% Html.Include("Footer"); %>
 </div>
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index 488e5e807..665774b69 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -357,12 +357,12 @@ fieldset.bulk.actions {
 }
 legend {
     font-size:1.6em;
-    font-weight:600;
     font-weight:bold;
 }
 label {
 	display: block;
-	color:#1d1b1b;
+	color:#4c4c4c;
+	font-weight:bold;
 }
 label.forcheckbox {
     display:inline;
@@ -425,7 +425,7 @@ fieldset {
     border-bottom:1px solid #eaeaea;
     padding:1em;
 }
-.settings fieldset div, .settings .button {
+.orchard-media fieldset div, .settings fieldset div, .orchard-media .button, .settings .button {
     margin:1em 0 .5em 1em;
 }
 .settings legend {
@@ -713,8 +713,8 @@ todo: (heskew) pull out into relevant modules where appropriate
 }
 .previewImage {
 	border:1px solid #525e50;
-	height:70%;
-	width:70%;
+	height:50%;
+	width:50%;
 }
 .themes #main h2 {
     margin:1em 0 0 0;