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

Merge branch '7.2.0' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.2.0

Browse Source 
Conflicts:
	src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
This commit is contained in:
Shannon
2014-08-25 16:57:10 +10:00
parent 4b8042ceb1 8609427d3c
commit 88da00cdd3
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx
View File

@@ -141,8 +141,10 @@
<cc2:PropertyPanel ID="pp_confirm" runat="server" Text="&nbsp;">
<p>
<asp:Button ID="bt_confirmUninstall" OnClick="confirmUnInstall" OnClientClick="$('#loadingbar').show()" Text="Confirm uninstall" CssClass="btn btn-primary" runat="server" />
<div style="display: none" id="loadingbar">
<cc2:ProgressBar ID="progbar" runat="server" Title="Please wait..." />
<div id="loadingbar" style="display: none">
<div style="overflow: hidden; margin-left: -100%; margin-right: -20px;">
<cc2:ProgressBar ID="progbar" runat="server" Title="Please wait..." />
</div>
</div>
</p>
</cc2:PropertyPanel>

9
src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
View File

@@ -252,10 +252,11 @@
<cc1:PropertyPanel runat="server" Text=" ">
<br />
<div id="installingMessage" style="display: none; overflow: hidden; margin-left: -100%; margin-right: -20px;">
<cc1:ProgressBar runat="server" ID="_progbar1" />
<br />
<em>&nbsp; &nbsp;Installing package, please wait...</em><br />
<div id="installingMessage" style="display: none;">
<div style="overflow: hidden; margin-left: -100%; margin-right: -20px;">
<cc1:ProgressBar runat="server" ID="_progbar1" />
</div>
<em>Installing package, please wait...</em><br /><br />
</div>
<asp:Button ID="ButtonInstall" runat="server" Text="Install Package" CssClass="btn btn-primary" Enabled="False"
OnClick="startInstall"></asp:Button>