Small ui fixes

This commit is contained in:
RainLoop Team 2013-12-25 19:53:47 +04:00
parent 639d8c58f6
commit e1adfdb504
38 changed files with 272 additions and 2171 deletions

View file

@ -931,8 +931,7 @@ class Actions
if ($oAccount instanceof \RainLoop\Account)
{
$oPab = $this->PersonalAddressBookProvider($oAccount);
$aResult['Auth'] = true;
$aResult['Email'] = $oAccount->Email();
$aResult['IncLogin'] = $oAccount->IncLogin();
@ -952,7 +951,15 @@ class Actions
{
$aResult['ContactsSyncServer'] = $this->Http()->GetHost(false, true, true);
$aResult['ContactsSyncUser'] = $oAccount->ParentEmailHelper();
$aResult['ContactsSyncPassword'] = $oPab->GetUserHashByEmail($aResult['ContactsSyncUser'], true);
try
{
$aResult['ContactsSyncPassword'] = $oPab->GetUserHashByEmail($aResult['ContactsSyncUser'], true);
}
catch (\Exception $oException)
{
$this->Logger()->WriteException($oException);
}
$sUrl = \rtrim(\trim($this->Http()->GetScheme().'://'.$this->Http()->GetHost(true, false).$this->Http()->GetPath()), '/\\');
$sUrl = \preg_replace('/index\.php(.*)$/i', '', $sUrl);

View file

@ -39,7 +39,14 @@
</script>
</head>
<body class="thm-body">
<div id="rl-loading" class="thm-loading">{{BaseAppLoadingDescription}}</div>
<div id="rl-loading" class="thm-loading">
{{BaseAppLoadingDescription}}
<div class="e-spinner">
<div class="e-bounce bounce1"></div>
<div class="e-bounce bounce2"></div>
<div class="e-bounce bounce3"></div>
</div>
</div>
<div id="rl-loading-error" class="thm-loading">
An Error occurred,<br />please refresh the page and try again.
</div>

View file

@ -46,6 +46,10 @@
.thm-loading {
color: @loading-color !important;
text-shadow: @loading-text-shadow !important;
.e-spinner .e-bounce {
background-color: @loading-color !important;
}
}
.thm-login {