diff options
| -rw-r--r-- | data/templates/base.htm | 2 | ||||
| -rw-r--r-- | data/templates/search.htm | 24 | ||||
| -rw-r--r-- | data/templates/search/list.htm | 4 | ||||
| -rw-r--r-- | www/www-header.php | 1 |
4 files changed, 27 insertions, 4 deletions
diff --git a/data/templates/base.htm b/data/templates/base.htm index 72a34c1..f54cd0c 100644 --- a/data/templates/base.htm +++ b/data/templates/base.htm @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta charset="utf-8" /> - <title>{% block title %}{% endblock %} - {{title}}</title> + <title>{% block title %}{% endblock %}{{apptitle}}</title> <link rel="stylesheet" href="css/bootstrap.min.css"/> <link rel="stylesheet" href="css/font-awesome.css"/> <link rel="stylesheet" href="css/phinde.css"/> diff --git a/data/templates/search.htm b/data/templates/search.htm index d703784..c7b1bb7 100644 --- a/data/templates/search.htm +++ b/data/templates/search.htm @@ -1,6 +1,16 @@ {% extends "base.htm" %} -{%block title %}"{{query}}" search results{% endblock %} +{% block meta %} + {% if query %} + <meta name="robots" value="noindex,nofollow"/> + {% endif %} +{% endblock %} + +{%block title %} + {% if query %} + "{{query}}" search results - + {% endif %} +{% endblock %} {% block maincontent %} <div class="navbar navbar-inverse navbar-static-top"> @@ -24,12 +34,24 @@ </div> <div class="container"> <div class="row"> + {% if query %} <div class="span9"> {% include 'search/list.htm' %} </div> <div class="span3"> {% include 'search/sidebar.htm' %} </div> + {% else %} + <div class="span3"></div> + <div class="span6"> + <div class="hero-unit"> + <h2>Hi!</h2> + <p> + Type something in the text box above to search ⬆ + </p> + </div> + </div> + {% endif %} </div> </div> {% endblock %} diff --git a/data/templates/search/list.htm b/data/templates/search/list.htm index 069dcf3..c034dc2 100644 --- a/data/templates/search/list.htm +++ b/data/templates/search/list.htm @@ -1,5 +1,5 @@ {% if hitcount == 0 %} - <p> + <div style="text-align: center; margin-top: 5ex; margin-bottom: 5ex"> No results for "<strong><tt>{{cleanQuery}}</tt></strong>" {% if site %} @@ -7,7 +7,7 @@    |    <a href="{{urlNoSite}}">Show all results</a> {% endif %} - </p> + </div> {% else %} <p class="resultinfo"> {{hitcount}} diff --git a/www/www-header.php b/www/www-header.php index 2ec8c2f..da0d74c 100644 --- a/www/www-header.php +++ b/www/www-header.php @@ -27,6 +27,7 @@ function render($tplname, $vars = array(), $return = false) //$vars['htmlhelper'] = new HtmlHelper(); } $vars['apptitle'] = 'cweiske.de search'; + $vars['baseurl'] = '/'; $template = $GLOBALS['twig']->loadTemplate($tplname . '.htm'); if ($return) { |