Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
97c60fd2
Commit
97c60fd2
authored
Nov 18, 2015
by
Björn Schießle
Browse files
change 'cronstatus' to 'status' so that it can be used in other apps too
parent
c5e41450
Changes
2
Hide whitespace changes
Inline
Side-by-side
settings/css/settings.css
View file @
97c60fd2
...
...
@@ -412,13 +412,13 @@ table.grid td.date{
.cronlog
{
margin-left
:
10px
;
}
.
cron
status
{
.status
{
display
:
inline-block
;
height
:
16px
;
width
:
16px
;
vertical-align
:
text-bottom
;
}
.
cron
status.success
{
.status.success
{
border-radius
:
50%
;
}
...
...
settings/templates/admin.php
View file @
97c60fd2
...
...
@@ -290,18 +290,18 @@ if ($_['cronErrors']) {
$relative_time
=
relative_modified_date
(
$_
[
'lastcron'
]);
$absolute_time
=
OC_Util
::
formatDate
(
$_
[
'lastcron'
]);
if
(
time
()
-
$_
[
'lastcron'
]
<=
3600
)
:
?>
<span
class=
"
cron
status 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=
"
cron
status 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=
"
cron
status error"
></span>
<span
class=
"status error"
></span>
<?php
p
(
$l
->
t
(
"Cron was not executed yet!"
));
endif
;
?>
</p>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment