Permalink
Browse files

Search widget update

  • Loading branch information...
1 parent b12dc0b commit 95b12d31251b210ee97dc370dc956b098226e1cc @priithaamer priithaamer committed Jan 24, 2012
Showing with 19 additions and 16 deletions.
  1. +8 −6 components/js.tpl
  2. +2 −2 components/search.tpl
  3. +2 −5 components/siteheader.tpl
  4. +1 −0 layouts/blog___news.tpl
  5. +6 −3 stylesheets/style.css
View
@@ -1,8 +1,10 @@
{% if site.search.enabled %}
- <script type="text/javascript" src="http://www.google.com/jsapi"></script>
- <script type="text/javascript" src="http://static.edicy.com/assets/site_search/2.0/site_search.js"></script>
- <script type="text/javascript" charset="utf-8">
- var search_translations = {"search": "{{ "search"|lc }}", "close": "{{ "search_close"|lc }}", "noresults": "{{ "search_noresults"|lc }}"};
- </script>
+ <script type="text/javascript" src="http://static.edicy.com/assets/site_search/3.0/site_search.js?1"></script>
+ <script type="text/javascript">
+ var edys_site_search_options = {
+ texts: { noresults: "{{ "search_noresults"|lc }}" },
+ default_stylesheet_enabled: false,
+}
+</script>
{% endif %}
-{% unless editmode %}{{site.analytics}}{% endunless %}
+{% unless editmode %}{{site.analytics}}{% endunless %}
View
@@ -1,6 +1,6 @@
{% if site.search.enabled %}
-<form action="#" method="post" id="search" class="clear">
- <p class="left"><input type="text" name="" id="onpage_search" /></p>
+<form action="#" method="post" id="search" class="clear edys-search">
+ <p class="left"><input type="text" name="" id="onpage_search" class="edys-search-input" placeholder="{{ "search"|lc }}" /></p>
<p id="search-btn"><input type="submit" name="" value="Search" class="search-submit" /></p>
</form>
{% endif %}
@@ -3,7 +3,7 @@
<meta name="copyright" content="{{ site.copyright }}" />
<meta name="author" content="{{ site.author }}" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
+ {% if site.search.enabled %}{% stylesheet_link "assets/site_search/3.0/style.css?1" static_host="true" %}{% endif %}
{% stylesheet_link "reset.css?1" %}
{% stylesheet_link "fonts.css?1" %}
{% stylesheet_link "style.css?1" %}
@@ -12,9 +12,6 @@
<link rel="icon" href="/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="/favicon.ico" type="image/ico" />
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
- {% if site.search.enabled %}
- {% stylesheet_link "assets/site_search/2.0/site_search.css?1" static_host="true" %}
- {% endif %}
<meta name="viewport" content="initial-scale=1" />
<!--[if IE]><link rel="stylesheet" href="http://static.edicy.com/assets/ie.css" type="text/css" /><![endif]-->
- <title>{% if article %}{{ article.title }} | {{site.name}}{% else %}{{site.name}} | {{ page.title }}{% endif %}</title>
+ <title>{% if article %}{{ article.title }} | {{page.site_title}}{% else %}{{page.site_title}} | {{ page.title }}{% endif %}</title>
View
@@ -22,6 +22,7 @@
<div id="sidebar"> {% include "Submenu" %} </div>
<!-- //sidebar -->
<div id="content">
+ {% if editmode %}<p>{% addbutton class="add-article" %}</p>{% endif %}
<ul id="blog-list">
{% for article in articles %}
<li> <span class="date">{{article.created_at | format_date:"%d.%m"}}</span>
View
@@ -63,7 +63,7 @@ img {
.header-wrap {
max-width: 940px;
margin: 0 auto;
- background: url('../images/lilled.png?1') no-repeat center left;
+ background: url('../images/flowers.png?1') no-repeat center left;
padding: 0 19px
}
#page-top {
@@ -508,6 +508,9 @@ h2 .date {
#mobile-submenu, #mobile-thirdmenu {
display: none
}
+.placeholder { color: #bdddf0 !important }
+::-webkit-input-placeholder { color: #bdddf0 !important }
+:-moz-placeholder { color: #bdddf0 !important }
@media only screen and (max-width: 650px) {
#header, #nav-wrap #nav {
padding-bottom: 20px
@@ -582,11 +585,11 @@ color: #222
}
#nav .active a {
color: #fff;
- padding: 0
+ padding: 3px 0
}
#nav a {
color: #333;
- padding: 0
+ padding: 3px 0
}
#nav a:hover {
border-bottom: none;

0 comments on commit 95b12d3

Please sign in to comment.