yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0

Browse Source
This commit is contained in:
perploug
2013-11-05 12:01:00 +01:00
parent d9e18859e9 1c4129fd64
commit bcf20f9f3f
3 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/less/buttons.less
View File

@@ -7,7 +7,7 @@
// --------------------------------------------------
// Core
.btn, input[type=submit] {
.btn {
display: inline-block;
.ie7-inline-block();
padding: 4px 12px;

53
src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKits.ascx
View File

@@ -24,32 +24,41 @@
})(jQuery);
</script>
<% } %>
<div id="starter-kit-progress" style="display: none;">
<h2>Installation in progress...</h2>
<div class="loader">
<div class="hold">
<div class="progress-bar">
</div>
<span class="progress-bar-value">0%</span>
</div>
<strong></strong>
</div>
</div>
<asp:Repeater ID="rep_starterKits" runat="server">
<HeaderTemplate>
<ul class="thumbnails">
</HeaderTemplate>
<ItemTemplate>
<li class="add-<%# ((Package)Container.DataItem).Text.Replace(" ","").ToLower() %>">
<div class="image">
<a href="#" class="single-tab selectStarterKit" title="Install <%# ((Package)Container.DataItem).Text %>" data-repoId="<%# ((Package)Container.DataItem).RepoGuid %>">
<div class="overlay">Install <%# ((Package)Container.DataItem).Text %></div>
<img src="http://our.umbraco.org<%# ((Package)Container.DataItem).Thumbnail %>" alt="<%# ((Package)Container.DataItem).Text %>">
</a>
<a class="zoom-in" title="Enlarge <%# ((Package)Container.DataItem).Text %>" href="#<%# ((Package)Container.DataItem).Text %>">Open</a>
</div>
</li>
<div id="<%# ((Package)Container.DataItem).Text %>" class="lb"><a href="#top"><img src="http://our.umbraco.org<%# ((Package)Container.DataItem).Thumbnail %>" alt="oh man" /></a></div>
<headertemplate>
<ul class="thumbnails">
</headertemplate>
<itemtemplate>
<li class="add-<%# ((Package)Container.DataItem).Text.Replace(" ","").ToLower() %>">
<div class="image">
</ItemTemplate>
<FooterTemplate>
<div class="overlay"><a href="#" class="single-tab selectStarterKit" data-name="<%# ((Package)Container.DataItem).Text %>" title="Install <%# ((Package)Container.DataItem).Text %>" data-repoid="<%# ((Package)Container.DataItem).RepoGuid %>">Install <%# ((Package)Container.DataItem).Text %></a></div>
<img src="http://our.umbraco.org<%# ((Package)Container.DataItem).Thumbnail %>" alt="<%# ((Package)Container.DataItem).Text %>">
<a class="zoom-in" title="Enlarge <%# ((Package)Container.DataItem).Text %>" href="#<%# ((Package)Container.DataItem).Text %>">Open</a>
</div>
</li>
<div id="<%# ((Package)Container.DataItem).Text %>" class="lb"><a href="#top"><img src="http://our.umbraco.org<%# ((Package)Container.DataItem).Thumbnail %>" alt="oh man" /></a></div>
</itemtemplate>
<footertemplate>
</ul>
<asp:LinkButton runat="server" ID="declineStarterKits" CssClass="declineKit" OnClientClick="return confirm('Are you sure you do not want to install a starter kit?');" OnClick="NextStep">
<asp:LinkButton runat="server" ID="declineStarterKits" CssClass="declineKit" OnClientClick="return confirm('Are you sure you do not want to install a starter kit?');" OnClick="NextStep">
No thanks, do not install a starterkit!
</asp:LinkButton>
</FooterTemplate>
</asp:LinkButton>
</footertemplate>
</asp:Repeater>
</asp:PlaceHolder>

8
src/Umbraco.Web.UI/umbraco_client/Installer/js/PackageInstaller.js
View File

@@ -72,6 +72,14 @@
//bind to the click handler for each of the install starter kit buttons
this._opts.starterKits.click(function () {
// show status screen
$(".thumbnails").fadeOut();
$(".declineKit").fadeOut();
$("#starter-kit-progress").fadeIn();
// set progress
self._setProgress("5", "Downloading " + $(this).attr("data-name"));
//set the package id to install
self._packageId = $(this).attr("data-repoId");
self.downloadPackageFiles();