Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
marvin
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
legacy-projekte
marvin
Commits
b354edbb
Commit
b354edbb
authored
14 years ago
by
ands
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of /media/TBmyBook/marvin
Conflicts: webroot/index.php
parents
4cc75a2b
4d9bf750
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
webroot/index.php
+1
-1
1 addition, 1 deletion
webroot/index.php
webroot/widgets/ZoneOffen/ZoneOffen.js
+26
-0
26 additions, 0 deletions
webroot/widgets/ZoneOffen/ZoneOffen.js
webroot/widgets/ZoneOffen/ZoneOffen.php
+4
-2
4 additions, 2 deletions
webroot/widgets/ZoneOffen/ZoneOffen.php
with
31 additions
and
3 deletions
webroot/index.php
+
1
−
1
View file @
b354edbb
<head>
<head>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"css/widget.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"css/widget.css"
/>
<script
src=
"/js/jquery-1.4.4.js"
type=
"text/javascript"
></script>
<title>
Warpzone's Marvin
</title>
<title>
Warpzone's Marvin
</title>
<script
src=
"js/jquery-1.4.4.js"
type=
"text/javascript"
></script>
</head>
</head>
<body>
<body>
<img
src=
"img/warpzone.png"
>
<img
src=
"img/warpzone.png"
>
...
...
This diff is collapsed.
Click to expand it.
webroot/widgets/ZoneOffen/ZoneOffen.js
+
26
−
0
View file @
b354edbb
function
fillContent
(
response
)
{
if
(
response
[
"
TuerOffen
"
]
==
false
){
$
(
"
#ZoneOffen_open
"
).
html
(
"
<font color='red'>geschlossen!</font>
"
);
}
else
{
$
(
"
#ZoneOffen_open
"
).
html
(
"
<font color='green'>geöffnet!</font>
"
);
}
$
(
"
#ZoneOffen_templounge
"
).
html
(
response
[
"
tempLounge
"
]);
$
(
"
#ZoneOffen_tempwerkstatt
"
).
html
(
response
[
"
tempWerkstatt
"
]);
}
function
updateZoneOffen
()
{
$
.
getJson
(
"
widgets/ZoneOffen/ajax.php
"
,
function
(
response
)
{
fillContent
(
response
);
},
"
json
"
);
}
$
(
document
).
ready
(
function
()
{
//Zuerst einmal nur einmal laden
updateZoneOffen
();
}
);
This diff is collapsed.
Click to expand it.
webroot/widgets/ZoneOffen/ZoneOffen.php
+
4
−
2
View file @
b354edbb
...
@@ -12,8 +12,10 @@ class ZoneOffen implements iWidget
...
@@ -12,8 +12,10 @@ class ZoneOffen implements iWidget
public
function
giveOutput
()
public
function
giveOutput
()
{
{
$widgetOutput
=
"Test
\n
"
;
$widgetOutput
=
'<script src="widgets/ZoneOffen/ZoneOffen.js" type="text/javascript"></script>'
.
"
\n
"
;
$widgetOutput
.
=
'<script src="/widgets/ZoneOffen/ZoneOffen.js" type="text/javascript"></script>'
.
"
\n
"
;
$widgetOutput
.
=
'<div>Die Zone ist <span id="ZoneOffen_open"></span></div>'
.
"
\n
"
;
$widgetOutput
.
=
'<div>Lounge <span id="ZoneOffen_templounge"></span></div>'
.
"
\n
"
;
$widgetOutput
.
=
'<div>Werkstatt <span id="ZoneOffen_tempwerkstatt"></span></div>'
.
"
\n
"
;
return
$widgetOutput
;
return
$widgetOutput
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment