Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
D
domotikad
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
domotika
domotikad
Commits
c5044b85
Commit
c5044b85
authored
Feb 28, 2014
by
nextime
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a regression in the gui about notifications
parent
03539fc0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
common.php
Web/htdocs/gui/includes/common.php
+1
-1
domotika.js
Web/htdocs/gui/js/domotika.js
+2
-0
footbar.php
Web/htdocs/gui/parts/footbar.php
+1
-4
No files found.
Web/htdocs/gui/includes/common.php
View file @
c5044b85
<?
$GUIDEBUG
=
FALSE
;
//
$GUIDEBUG=TRUE;
$GUIDEBUG
=
TRUE
;
function
getBaseGuiPath
()
...
...
Web/htdocs/gui/js/domotika.js
View file @
c5044b85
...
...
@@ -405,6 +405,8 @@
$
.
get
(
"/rest/v1.2/notifications/json"
,
function
(
r
){
for
(
i
=
0
;
i
<
r
.
data
.
length
;
i
++
)
{
console
.
debug
(
r
.
data
[
i
]);
console
.
debug
(
$
(
"#notifications"
));
$
(
"#notifications"
).
prepend
(
notifylistitem
(
r
.
data
[
i
].
message
,
r
.
data
[
i
].
source
,
r
.
data
[
i
].
id
,
r
.
data
[
i
].
added
));
}
});
...
...
Web/htdocs/gui/parts/footbar.php
View file @
c5044b85
...
...
@@ -27,10 +27,7 @@ if($_DOMOTIKA['gui_theme']=='dmblack')
<div
id=
"notifypanel"
class=
"panel panel-theme-
<?=
$_DOMOTIKA
[
'gui_theme'
]
?>
notifypanel text-on-white-theme-
<?=
$_DOMOTIKA
[
'gui_theme'
]
?>
"
>
<div
class=
"panel-heading panel-head-theme-
<?=
$_DOMOTIKA
[
'gui_theme'
]
?>
"
><h4>
Notifications
<i
class=
"glyphicon glyphicon-remove pull-right"
id=
"notify-removeall"
></i></h4></div>
<div
class=
"notifylist"
>
<div
class=
"list-group theme-
<?=
$_DOMOTIKA
[
'gui_theme'
]
?>
"
data-snap-ignore=
"true"
>
<div
class=
"list-group-item"
>
AAAA
</div>
<div
id=
"notifications"
class=
"list-group theme-
<?=
$_DOMOTIKA
[
'gui_theme'
]
?>
"
data-snap-ignore=
"true"
>
</div>
</div>
</div>
...
...
Write
Preview
Markdown
is supported
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