diff options
| author | Michael Francis <edude03@gmail.com> | 2011-07-06 18:17:31 -0400 |
|---|---|---|
| committer | Michael Francis <edude03@gmail.com> | 2011-07-06 18:17:31 -0400 |
| commit | 9ce23b97954ffd22b4f9831ae3a795f01b347d0b (patch) | |
| tree | 84857fb0eeb6a68d03d4375d364f5731c2923387 /views | |
| parent | 570ddaca48eedce6e3f0b2753a9b092c34efab5a (diff) | |
| parent | 599aaa9f1eb6fad11b0305b91ad057b0bcdfaa29 (diff) | |
| download | otakuhub-9ce23b97954ffd22b4f9831ae3a795f01b347d0b.tar.xz | |
Merge branch 'master' of git.raylu.net:otakuhub
Conflicts:
views/layouts/default.html.php
Diffstat (limited to 'views')
| -rw-r--r-- | views/layouts/default.html.php | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/views/layouts/default.html.php b/views/layouts/default.html.php index 904c99d..a81dbe8 100644 --- a/views/layouts/default.html.php +++ b/views/layouts/default.html.php @@ -6,21 +6,11 @@ use \lithium\security\Auth; <head> <?= $this->html->charset(); ?> <title>OtakuHub<?php $title = $this->title(); if ($title) echo " > $title" ?></title> - <?= $this->html->style(array('style', 'base')); ?> - <?= $this->html->style('themes/light'); ?> - <?= $this->html->style('prettyPhoto'); ?> + <?= $this->html->style(array('style', 'base')) ?> + <?= $this->html->style('themes/light') ?> + <?= $this->html->style('prettyPhoto') ?> + <?= $this->html->style('http://fonts.googleapis.com/css?family=Cantarell:regular,bold&v1') ?> <?= $this->styles(); ?> - - <script type="text/javascript" > - function clearDefault(el) { - if (el.defaultValue == el.value) - el.value = "" - } - function resetValue(el) { - el.value = "Search..." - } - </script> - <link href='http://fonts.googleapis.com/css?family=Cantarell:regular,bold&v1' rel='stylesheet' type='text/css'> </head> <header> <?php @@ -69,7 +59,7 @@ use \lithium\security\Auth; ?> <?= $this->form->create(null, array('url' => '/search/index/anime', 'class' => 'search', 'method' => 'get')); ?> - <?= $this->form->text('search', array('value' => 'Search...', 'onFocus' => 'clearDefault(this)', 'style' => 'width: 200px')); ?> + <?= $this->form->text('search', array('placeholder' => 'Search...')); ?> <input type="submit" value="Go"> <?= $this->form->end(); ?> |