lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Suha Can
2010-03-04 12:20:10 -08:00
parent 99ec679363 1741fc1e0c
commit 7217a5f6f8
3 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx
View File

@@ -17,16 +17,32 @@
<%using (Html.BeginFormAntiForgeryPost()) { %> <%using (Html.BeginFormAntiForgeryPost()) { %>
<%= Html.ValidationSummary() %> <%= Html.ValidationSummary() %>
<div class="primary"> <div class="primary">
<h2><%=_Encoded("About this media")%></h2> <div>
<fieldset> <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> <div>
<label for="Name"><%=_Encoded("Name")%></label> <label for="Name"><%=_Encoded("Name")%></label>
<input id="Name" name="Name" type="hidden" value="<%=Html.Encode(Model.Name) %>"/> <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>
<div> <div>
<label for="Caption"><%=_Encoded("Caption")%></label> <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> <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="LastUpdated" name="LastUpdated" value="<%= Model.LastUpdated %>"/>
<input type="hidden" id="Size" name="Size" value="<%= Model.Size %>"/> <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") %>" />--%> <%--<input type="submit" class="button" name="submit.Delete" value="<%=_Encoded("Delete") %>" />--%>
</fieldset> </fieldset>
</div> </div>
<div class="secondary"> <%--<div class="secondary" style="border:1px solid #ff0000;">
<h2><%=_Encoded("Preview")%></h2> <h2><%=_Encoded("Preview")%></h2>
<div><img src="<%=ResolveUrl("~/Media/" + Html.Encode(Model.RelativePath + "/" + Model.Name))%>" class="previewImage" alt="<%=Html.Encode(Model.Caption) %>" /></div> <div><img src="<%=ResolveUrl("~/Media/" + Html.Encode(Model.RelativePath + "/" + Model.Name))%>" class="previewImage" alt="<%=Html.Encode(Model.Caption) %>" /></div>
<ul> <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("Dimensions: <span>500 x 375 pixels</span>")%></label></li>
<li><label><%=T("Size: <span>{0}</span>", Model.Size)%></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> <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> <span class="hint"><%=_Encoded("Copy this html to add this image to your site.") %></p>
</li> </li>
</ul> </ul>
</div> </div>--%>
<% } %> <% } %>
</div> </div>

1
src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx
View File

@@ -41,6 +41,5 @@
</div> </div>
</div> </div>
<%-- End Content --%> <%-- End Content --%>
<%Html.Zone("footer");%>
<% Html.Include("Footer"); %> <% Html.Include("Footer"); %>
</div> </div>

10
src/Orchard.Web/Themes/TheAdmin/Styles/site.css
View File

@@ -357,12 +357,12 @@ fieldset.bulk.actions {
} }
legend { legend {
font-size:1.6em; font-size:1.6em;
font-weight:600;
font-weight:bold; font-weight:bold;
} }
label { label {
display: block; display: block;
color:#1d1b1b; color:#4c4c4c;
font-weight:bold;
} }
label.forcheckbox { label.forcheckbox {
display:inline; display:inline;
@@ -425,7 +425,7 @@ fieldset {
border-bottom:1px solid #eaeaea; border-bottom:1px solid #eaeaea;
padding:1em; padding:1em;
} }
.settings fieldset div, .settings .button { .orchard-media fieldset div, .settings fieldset div, .orchard-media .button, .settings .button {
margin:1em 0 .5em 1em; margin:1em 0 .5em 1em;
} }
.settings legend { .settings legend {
@@ -713,8 +713,8 @@ todo: (heskew) pull out into relevant modules where appropriate
} }
.previewImage { .previewImage {
border:1px solid #525e50; border:1px solid #525e50;
height:70%; height:50%;
width:70%; width:50%;
} }
.themes #main h2 { .themes #main h2 {
margin:1em 0 0 0; margin:1em 0 0 0;