mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-09-22 20:13:50 +08:00
Started adding primary button to admin. Fixed some layout issues in manage media.
--HG-- branch : dev
This commit is contained in:
@@ -4,5 +4,5 @@
|
|||||||
<% using (Html.BeginFormAntiForgeryPost()) { %>
|
<% using (Html.BeginFormAntiForgeryPost()) { %>
|
||||||
<%=Html.ValidationSummary() %>
|
<%=Html.ValidationSummary() %>
|
||||||
<%=Html.EditorForItem(vm => vm.Blog) %>
|
<%=Html.EditorForItem(vm => vm.Blog) %>
|
||||||
<fieldset><input class="button" type="submit" value="<%=_Encoded("Create") %>" /></fieldset><%
|
<fieldset><input class="button primaryAction" type="submit" value="<%=_Encoded("Create") %>" /></fieldset><%
|
||||||
} %>
|
} %>
|
@@ -6,5 +6,5 @@
|
|||||||
<%=Html.EditorForItem(m => m.Blog) %>
|
<%=Html.EditorForItem(m => m.Blog) %>
|
||||||
<%=Html.EditorFor(m => m.PromoteToHomePage) %>
|
<%=Html.EditorFor(m => m.PromoteToHomePage) %>
|
||||||
<label for="PromoteToHomePage" class="forcheckbox"><%=_Encoded("Set as home page") %></label>
|
<label for="PromoteToHomePage" class="forcheckbox"><%=_Encoded("Set as home page") %></label>
|
||||||
<fieldset><input class="button" type="submit" value="<%=_Encoded("Save") %>" /></fieldset><%
|
<fieldset><input class="button primaryAction" type="submit" value="<%=_Encoded("Save") %>" /></fieldset><%
|
||||||
} %>
|
} %>
|
@@ -72,7 +72,7 @@
|
|||||||
<td>
|
<td>
|
||||||
<ul class="actions">
|
<ul class="actions">
|
||||||
<li class="construct">
|
<li class="construct">
|
||||||
<a href="<%=Url.Action("Edit", new {commentEntry.Comment.Id}) %>" class="ibutton edit" title="<%=_Encoded("Edit Comment")%>"><%=_Encoded("Edit Comment")%></a>
|
<a href="<%=Url.Action("Edit", new {commentEntry.Comment.Id}) %>" title="<%=_Encoded("Edit")%>"><%=_Encoded("Edit")%></a>
|
||||||
</li>
|
</li>
|
||||||
<li class="destruct">
|
<li class="destruct">
|
||||||
<%-- a form in a form doesn't quite work <% using (Html.BeginFormAntiForgeryPost(Url.Action("Delete", new {id = commentEntry.Comment.Id, redirectToAction = "Details"}), FormMethod.Post, new { @class = "inline" })) { %>
|
<%-- a form in a form doesn't quite work <% using (Html.BeginFormAntiForgeryPost(Url.Action("Delete", new {id = commentEntry.Comment.Id, redirectToAction = "Details"}), FormMethod.Post, new { @class = "inline" })) { %>
|
||||||
|
@@ -3,6 +3,7 @@
|
|||||||
<%@ Import Namespace="Orchard.Media.Models"%>
|
<%@ Import Namespace="Orchard.Media.Models"%>
|
||||||
<%@ Import Namespace="Orchard.Media.ViewModels"%>
|
<%@ Import Namespace="Orchard.Media.ViewModels"%>
|
||||||
<h1><%=Html.TitleForPage(T("Add Media").ToString()) %></h1>
|
<h1><%=Html.TitleForPage(T("Add Media").ToString()) %></h1>
|
||||||
|
<div class="breadCrumbs">
|
||||||
<p><%=Html.ActionLink(T("Media Folders").ToString(), "Index") %> >
|
<p><%=Html.ActionLink(T("Media Folders").ToString(), "Index") %> >
|
||||||
<%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) { %>
|
<%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) { %>
|
||||||
<%=Html.ActionLink(navigation.FolderName, "Edit",
|
<%=Html.ActionLink(navigation.FolderName, "Edit",
|
||||||
@@ -10,6 +11,8 @@
|
|||||||
|
|
||||||
<% } %>
|
<% } %>
|
||||||
<%=_Encoded("Add Media") %></p>
|
<%=_Encoded("Add Media") %></p>
|
||||||
|
</div>
|
||||||
|
|
||||||
<% using (Html.BeginForm("Add", "Admin", FormMethod.Post, new { enctype = "multipart/form-data" })) { %>
|
<% using (Html.BeginForm("Add", "Admin", FormMethod.Post, new { enctype = "multipart/form-data" })) { %>
|
||||||
<%= Html.ValidationSummary() %>
|
<%= Html.ValidationSummary() %>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
@@ -20,7 +23,7 @@
|
|||||||
<input type="hidden" id="MediaPath" name="MediaPath" value="<%=Html.Encode(Model.MediaPath) %>" />
|
<input type="hidden" id="MediaPath" name="MediaPath" value="<%=Html.Encode(Model.MediaPath) %>" />
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<input type="submit" class="button" value="<%=_Encoded("Upload") %>" />
|
<input type="submit" class="button primaryAction" value="<%=_Encoded("Upload") %>" />
|
||||||
<%=Html.AntiForgeryTokenOrchard() %>
|
<%=Html.AntiForgeryTokenOrchard() %>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<% } %>
|
<% } %>
|
@@ -3,18 +3,23 @@
|
|||||||
<%@ Import Namespace="Orchard.Media.Models"%>
|
<%@ Import Namespace="Orchard.Media.Models"%>
|
||||||
<%@ Import Namespace="Orchard.Media.ViewModels"%>
|
<%@ Import Namespace="Orchard.Media.ViewModels"%>
|
||||||
<h1><%=Html.TitleForPage(T("Add a Folder").ToString()) %></h1>
|
<h1><%=Html.TitleForPage(T("Add a Folder").ToString()) %></h1>
|
||||||
|
<div class="breadCrumbs">
|
||||||
<p><%=Html.ActionLink(T("Media Folders").ToString(), "Index") %> >
|
<p><%=Html.ActionLink(T("Media Folders").ToString(), "Index") %> >
|
||||||
<%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) { %>
|
<%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) { %>
|
||||||
<%=Html.ActionLink(navigation.FolderName, "Edit",
|
<%=Html.ActionLink(navigation.FolderName, "Edit",
|
||||||
new {name = navigation.FolderName, mediaPath = navigation.FolderPath}) %> >
|
new {name = navigation.FolderName, mediaPath = navigation.FolderPath}) %> >
|
||||||
<% } %>
|
<% } %>
|
||||||
<%=_Encoded("Add a Folder") %></p>
|
<%=_Encoded("Add a Folder") %></p>
|
||||||
|
</div>
|
||||||
|
|
||||||
<%using (Html.BeginFormAntiForgeryPost()) { %>
|
<%using (Html.BeginFormAntiForgeryPost()) { %>
|
||||||
<%= Html.ValidationSummary() %>
|
<%= Html.ValidationSummary() %>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<label for="Name"><%=_Encoded("Folder Name") %></label>
|
<label for="Name"><%=_Encoded("Folder Name") %></label>
|
||||||
<input id="Name" class="text" name="Name" type="text" />
|
<input id="Name" class="textMedium" name="Name" type="text" />
|
||||||
<input type="hidden" id="MediaPath" name="MediaPath" value="<%=Html.Encode(Model.MediaPath) %>" />
|
<input type="hidden" id="MediaPath" name="MediaPath" value="<%=Html.Encode(Model.MediaPath) %>" />
|
||||||
<input type="submit" class="button" value="<%=_Encoded("Save") %>" />
|
</fieldset>
|
||||||
|
<fieldset>
|
||||||
|
<input type="submit" class="button primaryAction" value="<%=_Encoded("Save") %>" />
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<% } %>
|
<% } %>
|
@@ -3,7 +3,11 @@
|
|||||||
<%@ Import Namespace="Orchard.Media.Helpers"%>
|
<%@ Import Namespace="Orchard.Media.Helpers"%>
|
||||||
<%@ Import Namespace="Orchard.Media.ViewModels"%>
|
<%@ Import Namespace="Orchard.Media.ViewModels"%>
|
||||||
<h1><%=Html.TitleForPage(T("Manage Folder").ToString())%></h1>
|
<h1><%=Html.TitleForPage(T("Manage Folder").ToString())%></h1>
|
||||||
<div class="manage"><%=Html.ActionLink(T("Folder Properties").ToString(), "EditProperties", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button"})%></div>
|
|
||||||
|
|
||||||
|
<%--<div class="manage"><%=Html.ActionLink(T("Folder Properties").ToString(), "EditProperties", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button"})%></div>--%>
|
||||||
|
|
||||||
|
<div class="breadCrumbs">
|
||||||
<p><%=Html.ActionLink(T("Media Folders").ToString(), "Index")%> >
|
<p><%=Html.ActionLink(T("Media Folders").ToString(), "Index")%> >
|
||||||
<%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%>
|
<%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%>
|
||||||
<%=Html.ActionLink(navigation.FolderName, "Edit",
|
<%=Html.ActionLink(navigation.FolderName, "Edit",
|
||||||
@@ -11,16 +15,23 @@
|
|||||||
|
|
||||||
<% } %>
|
<% } %>
|
||||||
<%=_Encoded("Manage Folder")%></p>
|
<%=_Encoded("Manage Folder")%></p>
|
||||||
|
</div>
|
||||||
|
<div class="folderProperties">
|
||||||
|
<p><%=Html.ActionLink(T("Folder Properties").ToString(), "EditProperties", new { folderName = Model.FolderName, mediaPath = Model.MediaPath })%></p>
|
||||||
|
</div>
|
||||||
|
<div class="clearBoth"></div>
|
||||||
|
|
||||||
|
|
||||||
<% using(Html.BeginFormAntiForgeryPost()) { %>
|
<% using(Html.BeginFormAntiForgeryPost()) { %>
|
||||||
<fieldset class="actions bulk">
|
<fieldset class="actions bulk">
|
||||||
<label for="publishActions"><%=_Encoded("Actions:")%></label>
|
<label for="publishActions"><%=_Encoded("Actions:")%></label>
|
||||||
<select id="Select1" name="publishActions">
|
<select id="Select1" name="publishActions">
|
||||||
<option value="1"><%=_Encoded("Delete")%></option>
|
<option value="1"><%=_Encoded("Delete")%></option>
|
||||||
</select>
|
</select>
|
||||||
<input class="button roundCorners" type="submit" value="<%=_Encoded("Apply") %>" />
|
<input class="button" type="submit" value="<%=_Encoded("Apply") %>" />
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<div class="manage">
|
<div class="manage">
|
||||||
<%=Html.ActionLink(T("Add media").ToString(), "Add", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button" })%>
|
<%=Html.ActionLink(T("Add media").ToString(), "Add", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button primaryAction" })%>
|
||||||
<%=Html.ActionLink(T("Add a folder").ToString(), "Create", new { Model.MediaPath }, new { @class = "button" })%>
|
<%=Html.ActionLink(T("Add a folder").ToString(), "Create", new { Model.MediaPath }, new { @class = "button" })%>
|
||||||
</div>
|
</div>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
@@ -83,7 +94,7 @@
|
|||||||
</table>
|
</table>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<div class="manage">
|
<div class="manage">
|
||||||
<%=Html.ActionLink(T("Add media").ToString(), "Add", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button" })%>
|
<%=Html.ActionLink(T("Add media").ToString(), "Add", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button primaryAction" })%>
|
||||||
<%=Html.ActionLink(T("Add a folder").ToString(), "Create", new { Model.MediaPath }, new { @class = "button" })%>
|
<%=Html.ActionLink(T("Add a folder").ToString(), "Create", new { Model.MediaPath }, new { @class = "button" })%>
|
||||||
</div>
|
</div>
|
||||||
<% } %>
|
<% } %>
|
@@ -3,13 +3,17 @@
|
|||||||
<%@ Import Namespace="Orchard.Media.Helpers"%>
|
<%@ Import Namespace="Orchard.Media.Helpers"%>
|
||||||
<%@ Import Namespace="Orchard.Media.ViewModels"%>
|
<%@ Import Namespace="Orchard.Media.ViewModels"%>
|
||||||
<h1><%=Html.TitleForPage(T("Edit Media - {0}", Model.Name).ToString())%></h1>
|
<h1><%=Html.TitleForPage(T("Edit Media - {0}", Model.Name).ToString())%></h1>
|
||||||
|
|
||||||
|
<div class="breadCrumbs">
|
||||||
<p><%=Html.ActionLink(T("Media Folders").ToString(), "Index")%> >
|
<p><%=Html.ActionLink(T("Media Folders").ToString(), "Index")%> >
|
||||||
<%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%>
|
<%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%>
|
||||||
<%=Html.ActionLink(navigation.FolderName, "Edit",
|
<%=Html.ActionLink(navigation.FolderName, "Edit",
|
||||||
new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> >
|
new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> >
|
||||||
<% } %>
|
<% } %>
|
||||||
<%=_Encoded("Edit Media")%></p>
|
<%=_Encoded("Edit Media")%></p>
|
||||||
<div class="sections">
|
</div>
|
||||||
|
|
||||||
|
<div class="sections clearBoth">
|
||||||
<%using (Html.BeginFormAntiForgeryPost()) { %>
|
<%using (Html.BeginFormAntiForgeryPost()) { %>
|
||||||
<%= Html.ValidationSummary() %>
|
<%= Html.ValidationSummary() %>
|
||||||
<div class="primary">
|
<div class="primary">
|
||||||
@@ -31,7 +35,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<input type="submit" class="button" name="submit.Save" value="<%=_Encoded("Save") %>" />
|
<input type="submit" class="button primaryAction" name="submit.Save" value="<%=_Encoded("Save") %>" />
|
||||||
<%--<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>
|
||||||
|
@@ -3,6 +3,7 @@
|
|||||||
<%@ Import Namespace="Orchard.Media.Models"%>
|
<%@ Import Namespace="Orchard.Media.Models"%>
|
||||||
<%@ Import Namespace="Orchard.Media.ViewModels"%>
|
<%@ Import Namespace="Orchard.Media.ViewModels"%>
|
||||||
<h1><%=Html.TitleForPage(T("Folder Properties").ToString())%></h1>
|
<h1><%=Html.TitleForPage(T("Folder Properties").ToString())%></h1>
|
||||||
|
<div class="breadCrumbs">
|
||||||
<p><%=Html.ActionLink(T("Media Folders").ToString(), "Index")%> >
|
<p><%=Html.ActionLink(T("Media Folders").ToString(), "Index")%> >
|
||||||
<%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%>
|
<%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%>
|
||||||
<%=Html.ActionLink(navigation.FolderName, "Edit",
|
<%=Html.ActionLink(navigation.FolderName, "Edit",
|
||||||
@@ -10,13 +11,17 @@
|
|||||||
|
|
||||||
<% } %>
|
<% } %>
|
||||||
<%=_Encoded("Folder Properties")%></p>
|
<%=_Encoded("Folder Properties")%></p>
|
||||||
|
</div>
|
||||||
|
|
||||||
<% using (Html.BeginFormAntiForgeryPost()) { %>
|
<% using (Html.BeginFormAntiForgeryPost()) { %>
|
||||||
<%=Html.ValidationSummary() %>
|
<%=Html.ValidationSummary() %>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<label for="Name"><%=_Encoded("Folder Name:") %></label>
|
<label for="Name"><%=_Encoded("Folder Name:") %></label>
|
||||||
<input id="MediaPath" name="MediaPath" type="hidden" value="<%=Html.Encode(Model.MediaPath) %>" />
|
<input id="MediaPath" name="MediaPath" type="hidden" value="<%=Html.Encode(Model.MediaPath) %>" />
|
||||||
<input id="Name" class="text" name="Name" type="text" value="<%=Html.Encode(Model.Name) %>" />
|
<input id="Name" class="textMedium" name="Name" type="text" value="<%=Html.Encode(Model.Name) %>" />
|
||||||
<input type="submit" class="button" name="submit.Save" value="<%=_Encoded("Save") %>" />
|
</fieldset>
|
||||||
|
<fieldset>
|
||||||
|
<input type="submit" class="button primaryAction" name="submit.Save" value="<%=_Encoded("Save") %>" />
|
||||||
<%--<input type="submit" class="button buttonFocus roundCorners" name="submit.Delete" value="<%=_Encoded("Delete") %>" />--%>
|
<%--<input type="submit" class="button buttonFocus roundCorners" name="submit.Delete" value="<%=_Encoded("Delete") %>" />--%>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<% } %>
|
<% } %>
|
@@ -10,7 +10,7 @@
|
|||||||
</select>
|
</select>
|
||||||
<input class="button roundCorners" type="submit" value="<%=_Encoded("Apply") %>" />
|
<input class="button roundCorners" type="submit" value="<%=_Encoded("Apply") %>" />
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<div class="manage"><%=Html.ActionLink(T("Add a folder").ToString(), "Create", new {}, new { @class = "button"}) %></div>
|
<div class="manage"><%=Html.ActionLink(T("Add a folder").ToString(), "Create", new { }, new { @class = "button primaryAction" })%></div>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<table class="items" summary="<%=_Encoded("This is a table of the media folders currently available for use in your application.") %>">
|
<table class="items" summary="<%=_Encoded("This is a table of the media folders currently available for use in your application.") %>">
|
||||||
<colgroup>
|
<colgroup>
|
||||||
@@ -48,5 +48,5 @@
|
|||||||
<%}%>
|
<%}%>
|
||||||
</table>
|
</table>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<div class="manage"><%=Html.ActionLink(T("Add a folder").ToString(), "Create", new {}, new { @class = "button"}) %></div>
|
<div class="manage"><%=Html.ActionLink(T("Add a folder").ToString(), "Create", new { }, new { @class = "button primaryAction" })%></div>
|
||||||
<% } %>
|
<% } %>
|
@@ -11,7 +11,7 @@
|
|||||||
</select>
|
</select>
|
||||||
<input class="button" type="submit" name="submit.BulkEdit" value="<%=_Encoded("Apply") %>" />
|
<input class="button" type="submit" name="submit.BulkEdit" value="<%=_Encoded("Apply") %>" />
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<div class="manage"><%=Html.ActionLink(T("Add a tag").ToString(), "Create", new { }, new { @class = "button" })%></div>
|
<div class="manage"><%=Html.ActionLink(T("Add a tag").ToString(), "Create", new { }, new { @class = "button primaryAction" })%></div>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<table class="items" summary="<%=_Encoded("This is a table of the tags in your application") %>">
|
<table class="items" summary="<%=_Encoded("This is a table of the tags in your application") %>">
|
||||||
<colgroup>
|
<colgroup>
|
||||||
@@ -46,5 +46,5 @@
|
|||||||
<% tagIndex++; } %>
|
<% tagIndex++; } %>
|
||||||
</table>
|
</table>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<div class="manage"><%=Html.ActionLink(T("Add a tag").ToString(), "Create", new { }, new { @class = "button" })%></div>
|
<div class="manage"><%=Html.ActionLink(T("Add a tag").ToString(), "Create", new { }, new { @class = "button primaryAction" })%></div>
|
||||||
<% } %>
|
<% } %>
|
@@ -817,3 +817,18 @@ table.items, textarea, input.text, input.text-box,
|
|||||||
.properties h3 {
|
.properties h3 {
|
||||||
display:inline;
|
display:inline;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Added classes for media
|
||||||
|
---------------------------------------------------------- */
|
||||||
|
.breadCrumbs, .folderProperties {
|
||||||
|
float:left;
|
||||||
|
margin:-2em 0 0 0;
|
||||||
|
}
|
||||||
|
.folderProperties {
|
||||||
|
float:right;
|
||||||
|
}
|
||||||
|
/* ---------- Generic ---------- */
|
||||||
|
|
||||||
|
.clearBoth {
|
||||||
|
clear:both;
|
||||||
|
}
|
Reference in New Issue
Block a user