Added installed image to Gallery.

--HG--
branch : 1.x
This commit is contained in:
jowall
2011-04-05 17:40:44 -07:00
parent e10a7d4cca
commit 84f606bfd7
6 changed files with 25 additions and 15 deletions

View File

@@ -26,7 +26,7 @@
</div> </div>
</section> </section>
<h2>@T("Advisory from <a href=\"{0}\">{0}</a>", "http://www.orchardproject.net/advisory")</h2> <h2 class="advisory">@T("Advisory from <a href=\"{0}\">{0}</a>", "http://www.orchardproject.net/advisory")</h2>
<iframe id="advisory" src="http://www.orchardproject.net/advisory" frameborder="0" height="64" width="100%" > <iframe id="advisory" src="http://www.orchardproject.net/advisory" frameborder="0" height="40" width="100%" scrolling="no">
<p>@T("Your browser does not support iframes. You can't see advisory messages.")</p> <p>@T("Your browser does not support iframes. You can't see advisory messages.")</p>
</iframe> </iframe>

View File

@@ -112,6 +112,7 @@
<Generator>DataServiceClientGenerator</Generator> <Generator>DataServiceClientGenerator</Generator>
<LastGenOutput>Reference.cs</LastGenOutput> <LastGenOutput>Reference.cs</LastGenOutput>
</Content> </Content>
<Content Include="Styles\images\installed.gif" />
<Content Include="Styles\orchard-packaging-admin.css" /> <Content Include="Styles\orchard-packaging-admin.css" />
<Content Include="Views\Gallery\AddSource.cshtml" /> <Content Include="Views\Gallery\AddSource.cshtml" />
<Content Include="Views\Gallery\Modules.cshtml" /> <Content Include="Views\Gallery\Modules.cshtml" />

Binary file not shown.

After

Width:  |  Height:  |  Size: 239 B

View File

@@ -10,8 +10,12 @@
.extensionName { .extensionName {
float:left; float:left;
} }
.extensionName.installed {
background: url("images/installed.gif") no-repeat 0px 8px #fff;
padding:0 0 0 60px;
}
.contentItems .related { .contentItems .related {
padding: 1.2em 0.4em 0.5em padding:6px 0 0 0;
} }
.contentItems .properties { .contentItems .properties {
float: left; float: left;
@@ -33,7 +37,6 @@
} }
.extensionThumbnail { .extensionThumbnail {
margin-left: -100%; margin-left: -100%;
padding-top: 20px;
} }
.iconThumbnail .extensionThumbnail { .iconThumbnail .extensionThumbnail {
width: 70px; width: 70px;
@@ -77,6 +80,5 @@
float: right; float: right;
display: inline; display: inline;
height: auto; height: auto;
margin: 0 1.4em 0 0;
padding-top: 0; padding-top: 0;
} }

View File

@@ -47,9 +47,18 @@
} }
} }
<div class="summary">
@if (item.Notifications != null && item.Notifications.Count > 0) {
<div class="notifications">
@foreach (string notification in item.Notifications) {
<h5>@notification</h5>
}
</div>
}
</div>
<div class="iconThumbnail"> <div class="iconThumbnail">
<div class="extensionDetails column"> <div class="extensionDetails column">
<div class="extensionName"> <div class="extensionName @if (item.Installed) {<text>installed</text>}">
@if (!string.IsNullOrWhiteSpace(item.GalleryDetailsUrl)) { @if (!string.IsNullOrWhiteSpace(item.GalleryDetailsUrl)) {
<a href="@item.GalleryDetailsUrl"> <a href="@item.GalleryDetailsUrl">
<h2>@item.Title<span> - @T("Version: {0}", item.Version)</span></h2> <h2>@item.Title<span> - @T("Version: {0}", item.Version)</span></h2>
@@ -59,19 +68,13 @@
} }
</div> </div>
<div class="related"> <div class="related">
@Html.ActionLink(T("Install").ToString(), "InstallGallery", "PackagingServices", new RouteValueDictionary { { "packageId", item.PackageId }, { "version", item.Version }, { "sourceId", item.Source.Id }, { "redirectUrl", HttpContext.Current.Request.RawUrl } }, null)@T(" | ") @Html.ActionLink(T("Install").ToString(), "InstallGallery", "PackagingServices", new RouteValueDictionary { { "packageId", item.PackageId }, { "version", item.Version }, { "sourceId", item.Source.Id }, { "redirectUrl", HttpContext.Current.Request.RawUrl } }, null)@T(" | ")
<a href="@item.PackageStreamUri">@T("Download")</a> <a href="@item.PackageStreamUri">@T("Download")</a>
</div> </div>
<div class="properties"> <div class="properties">
@if (item.Notifications != null && item.Notifications.Count > 0) {
<div class="notifications">
@foreach (string notification in item.Notifications) {
<h5>@notification</h5>
}
</div>
}
<p>@(item.Description == null ? T("(No description").Text : item.Description)</p> <p>@(item.Description == null ? T("(No description").Text : item.Description)</p>
<ul class="pageStatus group"> <ul class="pageStatus group">
<li>@T("Last Updated: {0}", item.LastUpdated)</li> <li>@T("Last Updated: {0}", item.LastUpdated)</li>

View File

@@ -490,6 +490,7 @@ ul.menuItems {margin:6px 0 0 0;}
.message, .validation-summary-errors { .message, .validation-summary-errors {
margin:10px 0 4px 0; margin:10px 0 4px 0;
padding:4px; padding:4px;
clear:both;
} }
messages div.message { messages div.message {
clear:both; clear:both;
@@ -1069,7 +1070,7 @@ fieldset.delete-button {
.dashboard .help-item .dashboard .help-item
{ {
width: 245px; width: 245px;
min-height: 170px; min-height: 180px;
float: left; float: left;
margin: 0 55px 55px 0; margin: 0 55px 55px 0;
} }
@@ -1090,7 +1091,10 @@ fieldset.delete-button {
padding: 6px; padding: 6px;
font-size: 16px; font-size: 16px;
} }
.dashboard h2.advisory
{
font-size: 16px;
}
.dashboard .help-item h2.gallery .dashboard .help-item h2.gallery
{ {
background: #f1f1f2 url('images/icon-gallery.png') no-repeat 5px 50%; background: #f1f1f2 url('images/icon-gallery.png') no-repeat 5px 50%;