getting rid of some warnings in theme preview

git-svn-id: http://code.elgg.org/elgg/trunk@8218 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/developers/start.php b/mod/developers/start.php
index e8e2b850643cbd6110c5fa3904f4fd0709480e8b..99a0fec63f116b3851c6aff3017f88bd7a52f688 100644 (file)
--- a/mod/developers/start.php
+++ b/mod/developers/start.php
@@ -36,8 +36,8 @@ function developers_theme_preview_controller($page) {
 
        $pages = array('general', 'nav', 'forms', 'objects', 'grid', 'widgets', 'icons');
 
-       elgg_set_config('tp_ipsum', "Sed scelerisque sagittis lorem. Phasellus sodales.
-               Nulla urna justo, vehicula in, suscipit nec, molestie sed, tellus.");
+       elgg_set_config('tp_ipsum', 'Sed scelerisque sagittis lorem. Phasellus sodales.' .
+               ' Nulla urna justo, vehicula in, suscipit nec, molestie sed, tellus.');
 
        $title = elgg_echo("theme_preview:{$page[0]}");
        $page =  elgg_view("theme_preview/{$page[0]}", array(

diff --git a/mod/developers/views/default/theme_preview/forms.php b/mod/developers/views/default/theme_preview/forms.php
index 621f71b33ab3be5ddfcc853f0c07d7fd926c580c..5550e51d4c4dee82aeb872f1f029eb4e4ae25c41 100644 (file)
--- a/mod/developers/views/default/theme_preview/forms.php
+++ b/mod/developers/views/default/theme_preview/forms.php
@@ -14,7 +14,7 @@ $ipsum = elgg_get_config('tp_ipsum');
        <form action="#">
                <fieldset>
                        <legend>Form legend</legend>
-                       <p>
+                       <div>
                                <label for="f1">Text input:</label>
                                <?php echo elgg_view('input/text', array(
                                                'internalname' => 'f1',
@@ -22,8 +22,8 @@ $ipsum = elgg_get_config('tp_ipsum');
                                                'value' => 'input text',
                                                ));
                                ?>
-                       </p>
-                       <p>
+                       </div>
+                       <div>
                                <label for="f2">Password input:</label>
                                <?php echo elgg_view('input/password', array(
                                                'internalname' => 'f2',
@@ -31,26 +31,26 @@ $ipsum = elgg_get_config('tp_ipsum');
                                                'value' => 'password',
                                                ));
                                ?>
-                       </p>
-                       <p>
+                       </div>
+                       <div>
                                <label for="f3">Radio input:</label><br />
                                <?php echo elgg_view('input/radio', array(
                                                'internalname' => 'f3',
                                                'internalid' => 'f3',
-                                               'options' => array(1, 2),
+                                               'options' => array('a' => 1, 'b' => 2),
                                                ));
                                ?>
-                       </p>
-                       <p>
+                       </div>
+                       <div>
                                <label for="f4">Checkboxes input:</label><br />
                                <?php echo elgg_view('input/checkboxes', array(
                                                'internalname' => 'f4',
                                                'internalid' => 'f4',
-                                               'options' => array(1, 2),
+                                               'options' => array('a' => 1, 'b' => 2),
                                                ));
                                ?>
-                       </p>
-                       <p>
+                       </div>
+                       <div>
                                <label for="f5">Dropdown input:</label><br />
                                <?php echo elgg_view('input/dropdown', array(
                                                'internalname' => 'f5',
@@ -58,8 +58,8 @@ $ipsum = elgg_get_config('tp_ipsum');
                                                'options' => array('option 1', 'option 2'),
                                                ));
                                ?>
-                       </p>
-                       <p>
+                       </div>
+                       <div>
                                <label for="f6">Access input:</label>
                                <?php echo elgg_view('input/access', array(
                                                'internalname' => 'f6',
@@ -67,16 +67,16 @@ $ipsum = elgg_get_config('tp_ipsum');
                                                'value' => ACCESS_PUBLIC,
                                                ));
                                ?>
-                       </p>
-                       <p>
+                       </div>
+                       <div>
                                <label for="f7">File input:</label>
                                <?php echo elgg_view('input/file', array(
                                                'internalname' => 'f7',
                                                'internalid' => 'f7',
                                                ));
                                ?>
-                       </p>
-                       <p>
+                       </div>
+                       <div>
                                <label for="f8">URL input:</label>
                                <?php echo elgg_view('input/url', array(
                                                'internalname' => 'f8',
@@ -84,8 +84,8 @@ $ipsum = elgg_get_config('tp_ipsum');
                                                'value' => 'http://elgg.org/',
                                                ));
                                ?>
-                       </p>
-                       <p>
+                       </div>
+                       <div>
                                <label for="f9">Tags input:</label>
                                <?php echo elgg_view('input/tags', array(
                                                'internalname' => 'f9',
@@ -93,8 +93,8 @@ $ipsum = elgg_get_config('tp_ipsum');
                                                'value' => 'one, two, three',
                                                ));
                                ?>
-                       </p>
-                       <p>
+                       </div>
+                       <div>
                                <label for="f10">Email input:</label>
                                <?php echo elgg_view('input/email', array(
                                                'internalname' => 'f10',
@@ -102,8 +102,8 @@ $ipsum = elgg_get_config('tp_ipsum');
                                                'value' => 'noone@elgg.org',
                                                ));
                                ?>
-                       </p>
-                       <p>
+                       </div>
+                       <div>
                                <label for="f11">Autocomplete input:</label>
                                <?php echo elgg_view('input/autocomplete', array(
                                                'internalname' => 'f11',
@@ -111,24 +111,24 @@ $ipsum = elgg_get_config('tp_ipsum');
                                                'match_on' => 'users',
                                                ));
                                ?>
-                       </p>
-                       <p>
+                       </div>
+                       <div>
                                <label for="f12">Date picker input:</label>
                                <?php echo elgg_view('input/datepicker', array(
                                                'internalname' => 'f12',
                                                'internalid' => 'f12',
                                                ));
                                ?>
-                       </p>
-                       <p>
+                       </div>
+                       <div>
                                <label for="f13">User picker input:</label>
                                <?php echo elgg_view('input/userpicker', array(
                                                'internalname' => 'f13',
                                                'internalid' => 'f13',
                                                ));
                                ?>
-                       </p>
-                       <p>
+                       </div>
+                       <div>
                                <label for="f14">Long text input:</label>
                                <?php echo elgg_view('input/longtext', array(
                                                'internalname' => 'f14',
@@ -136,8 +136,8 @@ $ipsum = elgg_get_config('tp_ipsum');
                                                'value' => $ipsum,
                                                ));
                                ?>
-                       </p>
-                       <p>
+                       </div>
+                       <div>
                                <label for="f15">Plain text input:</label>
                                <?php echo elgg_view('input/plaintext', array(
                                                'internalname' => 'f15',
@@ -145,7 +145,7 @@ $ipsum = elgg_get_config('tp_ipsum');
                                                'value' => $ipsum,
                                                ));
                                ?>
-                       </p>
+                       </div>
                </fieldset>
        </form>
 

diff --git a/mod/developers/views/default/theme_preview/header.php b/mod/developers/views/default/theme_preview/header.php
index 0aa12347ace440f11f45f710330e7df71e508104..8a4a804492d010f7b71d3d3e1f37f588133c5745 100644 (file)
--- a/mod/developers/views/default/theme_preview/header.php
+++ b/mod/developers/views/default/theme_preview/header.php
@@ -14,7 +14,6 @@ $url = current_page_url();
 $title = elgg_echo("theme_preview:{$vars['page']}");
 
 $index = array_search($vars['page'], $vars['pages']);
-echo $index;
 
 $previous = '< previous';
 if ($index > 0) {

diff --git a/views/default/icon/default.php b/views/default/icon/default.php
index c033a256bfc20347db82a07e39ed459782a018a7..c5749ba0408ebe494220813882e5d340f8d26c39 100644 (file)
--- a/views/default/icon/default.php
+++ b/views/default/icon/default.php
@@ -29,7 +29,7 @@ if (isset($vars['href'])) {
        $url = $vars['href'];
 }
 
-$img_src = $entity->getIcon($vars['size']);
+$img_src = $entity->getIconURL($vars['size']);
 $img = "<img src=\"$img_src\" alt=\"$title\" />";
 
 if ($url) {