Эх сурвалжийг харах

Merge branch 'master' of git.raylu.net:otakuhub

Conflicts:
	views/layouts/default.html.php
Michael Francis 14 жил өмнө
parent
commit
9ce23b9795

+ 5 - 15
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&amp;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&amp;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(); ?>