Merge branch 'master' of /media/TBmyBook/marvin

abf8d8a5 · ands · 3c85d773 · de1ab541 · abf8d8a5 · abf8d8a5
Commit abf8d8a5 authored 14 years ago by ands
--- a/webroot/index.php
+++ b/webroot/index.php
 <head>
 	<link rel="stylesheet" type="text/css" href="css/widget.css" />
+	<script src="/js/jquery-1.4.4.js" type="text/javascript"></script>
 </head>
 <body>
 	<?php

--- a/webroot/js/jquery-1.4.4.js
+++ b/webroot/js/jquery-1.4.4.js
--- a/webroot/js/jquery-1.4.4.min.js
+++ b/webroot/js/jquery-1.4.4.min.js
--- a/webroot/widgets/ZoneOffen/ZoneOffen.js
+++ b/webroot/widgets/ZoneOffen/ZoneOffen.js
--- a/webroot/widgets/ZoneOffen/ZoneOffen.php
+++ b/webroot/widgets/ZoneOffen/ZoneOffen.php
 <?php

-require_once 'widgets/widgetInterface.php';
+require_once 'widgets/iWidget.php';

-class ZoneOffen implements widgetInterface 
+class ZoneOffen implements iWidget 
 {
+  public function __construct($width, $height)
+  {
+
+  }
+
+
  public function giveOutput() 
  {
-    $widgetOutput = "Test";
+    $widgetOutput = "Test\n";
+    $widgetOutput .= '<script src="/widgets/ZoneOffen/ZoneOffen.js" type="text/javascript"></script>'."\n";
+
    return $widgetOutput;
  }
 }

--- a/webroot/widgets/iWidget.php
+++ b/webroot/widgets/iWidget.php
+<?php
+
+interface iWidget 
+{
+  public function __construct($width, $height); 
+  public function giveOutput();
+}
+
+?>
--- a/webroot/widgets/widgetInterface.php
+++ b/webroot/widgets/widgetInterface.php
-<?php
-
-interface widget 
-{
-    public function giveOutput();
-}
-
-?>