summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-11-23 10:42:14 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-11-23 10:42:14 +0100
commitbf672d7e51bd3411130a3c3a41a931fb3d23ff68 (patch)
tree41185570e7a50290dee0fc5fb359e20e098769e4 /settings
parent43391f8f47d82eca4605ed9255d551ca3a9cbf33 (diff)
parenta63a1043b6a40193a44d2fb1b702a775bb761c8d (diff)
downloadnextcloud-server-bf672d7e51bd3411130a3c3a41a931fb3d23ff68.tar.gz
nextcloud-server-bf672d7e51bd3411130a3c3a41a931fb3d23ff68.zip
Merge pull request #20222 from owncloud/federated_sharing_auto_complete
federated sharing auto-complete, first step
Diffstat (limited to 'settings')
-rw-r--r--settings/css/settings.css4
-rw-r--r--settings/templates/admin.php6
2 files changed, 5 insertions, 5 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 60ba805d3ca..5a1d864734b 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -412,13 +412,13 @@ table.grid td.date{
.cronlog {
margin-left: 10px;
}
-.cronstatus {
+.status {
display: inline-block;
height: 16px;
width: 16px;
vertical-align: text-bottom;
}
-.cronstatus.success {
+.status.success {
border-radius: 50%;
}
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 24af4964248..0721c0e0afb 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -290,18 +290,18 @@ if ($_['cronErrors']) {
$relative_time = relative_modified_date($_['lastcron']);
$absolute_time = OC_Util::formatDate($_['lastcron']);
if (time() - $_['lastcron'] <= 3600): ?>
- <span class="cronstatus success"></span>
+ <span class="status success"></span>
<span class="crondate" original-title="<?php p($absolute_time);?>">
<?php p($l->t("Last cron job execution: %s.", [$relative_time]));?>
</span>
<?php else: ?>
- <span class="cronstatus error"></span>
+ <span class="status error"></span>
<span class="crondate" original-title="<?php p($absolute_time);?>">
<?php p($l->t("Last cron job execution: %s. Something seems wrong.", [$relative_time]));?>
</span>
<?php endif;
else: ?>
- <span class="cronstatus error"></span>
+ <span class="status error"></span>
<?php p($l->t("Cron was not executed yet!"));
endif; ?>
</p>