espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Installer: changed loading icon

Browse Source
This commit is contained in:
Taras Machyshyn
2018-01-30 17:26:03 +02:00
parent 994be85579
commit cf4247321c
9 changed files with 71 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install/core/tpl/errors.tpl
+5 -1
View File
@@ -1,6 +1,5 @@
<div class="panel-body body">
<div id="msg-box" class="alert alert-danger">{$errors}</div>
<div class="loading-icon hide"></div>
<form id="nav">
<div class="row">
<div class=" col-md-13">
@@ -10,6 +9,11 @@
</div>
</form>
</div>
<div class="loading-panel hide">
<div class="text-right">
<span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
</div>
</div>
<footer class="modal-footer">
<button class="btn btn-warning" type="button" id="re-check">{$langs['labels']['Re-check']}</button>
</footer>
install/core/tpl/setupConfirmation.tpl
+6 -5
View File
@@ -88,13 +88,14 @@
<div class="cell cell-website pull-right" align="right">
<a target="_blank" href="https://www.espocrm.com/documentation/administration/server-configuration/" style="font-weight:bold;">{$langs['labels']['Configuration Instructions']}</a>
</div>
<br>
<div class="loading-icon hide"></div>
</div>
</form>
<div class="space"></div>
</div>
<div class="loading-panel hide">
<div class="text-right">
<span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
</div>
</div>
<footer class="modal-footer">
<button class="btn btn-default" type="button" id="back">{$langs['labels']['Back']}</button>
install/core/tpl/step2.tpl
+14 -12
View File
@@ -35,9 +35,9 @@
<div class=" col-md-6">
<div class="row">
<div class="cell cell-website col-sm-12 form-group">
<div class="label-description">
{$langs['labels']['Database Settings Description']}
</div>
<div class="label-description">
{$langs['labels']['Database Settings Description']}
</div>
</div>
</div>
</div>
@@ -45,21 +45,23 @@
</form>
<div class="loading-icon hide"></div>
<div class="row">
<div class=" col-md-6">
<div class="row">
<div class="cell cell-website col-sm-12 form-group">
<div class="btn-panel">
<button class="btn btn-default" type="button" id="test-connection">{$langs['labels']['Test settings']}</button>
</div>
<div class=" col-md-6">
<div class="row">
<div class="cell cell-website col-sm-12 form-group">
<div class="btn-panel">
<button class="btn btn-default" type="button" id="test-connection">{$langs['labels']['Test settings']}</button>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="loading-panel hide">
<div class="text-right">
<span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
</div>
</div>
<footer class="modal-footer">
<button class="btn btn-default" type="button" id="back">{$langs['labels']['Back']}</button>
<button class="btn btn-primary" type="button" id="next">{$langs['labels']['Next']}</button>
install/core/tpl/step3.tpl
+5 -1
View File
@@ -1,6 +1,5 @@
<div class="panel-body body">
<div id="msg-box" class="alert hide"></div>
<div class="loading-icon hide"></div>
<form id="nav">
<div class="row">
@@ -36,6 +35,11 @@
</div>
</form>
</div>
<div class="loading-panel hide">
<div class="text-right">
<span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
</div>
</div>
<footer class="modal-footer">
<button class="btn btn-primary" type="button" id="next">{$langs['labels']['Next']}</button>
</footer>
install/core/tpl/step4.tpl
+5 -1
View File
@@ -1,6 +1,5 @@
<div class="panel-body body">
<div id="msg-box" class="alert hide"></div>
<div class="loading-icon hide"></div>
<form id="nav">
<div class="row">
<div class="col-md-8" style="width:100%" >
@@ -136,6 +135,11 @@
</div>
</form>
</div>
<div class="loading-panel hide">
<div class="text-right">
<span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
</div>
</div>
<footer class="modal-footer">
<button class="btn btn-default" type="button" id="back">{$langs['labels']['Back']}</button>
<button class="btn btn-primary" type="button" id="next">{$langs['labels']['Next']}</button>
install/core/tpl/step5.tpl
+5 -1
View File
@@ -1,6 +1,5 @@
<div class="panel-body body">
<div id="msg-box" class="alert hide"></div>
<div class="loading-icon hide"></div>
<form id="nav" autocomplete="off">
<div class="row">
<div class="col-md-8" style="width:100%" >
@@ -108,6 +107,11 @@
</div>
</form>
</div>
<div class="loading-panel hide">
<div class="text-right">
<span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
</div>
</div>
<footer class="modal-footer">
<button class="btn btn-default" type="button" id="back">{$langs['labels']['Back']}</button>
<button class="btn btn-primary" type="button" id="next">{$langs['labels']['Next']}</button>
install/css/install.css
+29 -11
View File
@@ -26,14 +26,6 @@ select[name="user-lang"] {
margin-left: 16.6667%;
}
.loading-icon {
background-image: url("../img/loading-icon.gif");
background-repeat: no-repeat;
height: 31px;
width: 31px;
float: right;
}
.devices {
width: 50%;
height: 50%;
@@ -68,7 +60,6 @@ select[name="user-lang"] {
text-align: center;
width: 4%;
float: left;
}
.semicolon-sign {
@@ -109,8 +100,13 @@ input[type=checkbox].btn-default {
margin-right: 10px;
}
.setup-confirmation .loading-icon {
margin-top: 10px;
.loading-panel {
padding: 0 14px 10px 0;
margin-top: -29px;
}
.space {
padding: 14px;
}
span.remark {
@@ -152,4 +148,26 @@ span.ok {
.main-header.panel-heading {
background-color: #546e7a !important;
padding: 0px 2px;
}
.glyphicon-refresh-animate {
-animation: front .5s infinite linear;
-ms-animation: front .5s infinite linear;
-webkit-animation: right .5s infinite linear;
-moz-animation: left .5s infinite linear;
}
@keyframes front {
from { transform: scale(1) rotate(0deg);}
to { transform: scale(1) rotate(360deg);}
}
@-webkit-keyframes right {
from { -webkit-transform: rotate(0deg);}
to { -webkit-transform: rotate(360deg);}
}
@-moz-keyframes left {
from { -moz-transform: rotate(0deg);}
to { -moz-transform: rotate(360deg);}
}
install/img/loading-icon.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

install/js/install.js
+2 -2
View File
@@ -566,11 +566,11 @@ InstallScript.prototype.hideMsg = function() {
}
InstallScript.prototype.showLoading = function() {
$('.loading-icon').removeClass('hide');
$('.loading-panel').removeClass('hide');
}
InstallScript.prototype.hideLoading = function() {
$('.loading-icon').addClass('hide');
$('.loading-panel').addClass('hide');
}
InstallScript.prototype.checkPass = function(opt) {