@@ -6,7 +6,7 @@ require 'page'
require_gem_with_feedback gem
end
-GIT_REPO = ARGV[0] || ENV['HOME'] + '/wiki'
+GIT_REPO = ENV['HOME'] + '/wiki'
HOMEPAGE = 'home'
unless File.exists?(GIT_REPO) && File.directory?(GIT_REPO)
environment.rb
@@ -11,7 +11,6 @@ get '/a/list' do
end
get '/:page' do
- @page_url = page_url
@page = Page.new(params[:page])
@page.tracked? ? show(:show, @page.name) : redirect('/e/' + @page.name)
end
@@ -137,8 +136,8 @@ get '/a/search' do
show :search, 'Search Results'
end
-def page_url
- "#{request.env["rack.url_scheme"]}://#{request.env["HTTP_HOST"]}#{request.env["REQUEST_PATH"]}"
+def page_url(page)
+ "#{request.env["rack.url_scheme"]}://#{request.env["HTTP_HOST"]}/#{page}"
end
private
git-wiki.rb
@@ -25,5 +25,5 @@ function distance_of_time_in_words(to, from) {
}
function clearField(field_id) {
- document.getElementById(field_id).value = "";
+ document.getElementById(field_id).value = "";
}
\ No newline at end of file
public/app.js
@@ -63,7 +63,6 @@ ul {
.content {
margin-left: 35%;
- margin-top: -.55em;
padding: 0 10px 2px 10px;
}
@@ -106,6 +105,15 @@ ul {
.right { text-align: right; }
+.search_result {
+ margin-bottom: 15px;
+}
+
+.search_result .match {
+ line-height: 1em;
+ margin-bottom: 15px;
+}
+
.submit {
font-size: large;
font-weight: bold;
public/style.css
@@ -9,7 +9,8 @@
<li>
<strong><a href="/<%= page.name %>"><%= page.name %></a></strong> —
<a href="/e/<%= page.name %>">edit</a> •
- <a href="/h/<%= page.name %>">history</a>
+ <a href="/h/<%= page.name %>">history</a> •
+ <a href="javascript:var q; if (window.getSelection) q=window.getSelection(); else if (document.selection) q=document.selection.createRange().text; if (q != '') location.href='<%= page_url(page.name) %>/append?text='+encodeURIComponent(q+' (from "'+document.title+'":'+location.href+')'); else location.href='<%= page_url(page.name) %>/append?text='+encodeURIComponent('"'+document.title+'":'+location.href);">bookmarklet</a>
</li>
<% end %>
</ul>
views/list.erb
@@ -1,32 +1,29 @@
<% if @grep.empty? %>
<h1>No pages match</h1>
<% else %>
- <h1>All matches for '<%= @search %>'</h1>
+ <h1>Results for '<%= @search %>'</h1>
<% end %>
<div class="sub_nav">
- Details go here.
+ <div class="details">
+ <%= @grep.size %> pages contain match<br />
+ <%= @grep.map { |g| g[1].size }.inject { |acc, n| acc + n } %> results
+ </div>
</div>
<div class="content">
- <br/>
- <table width="100%">
<% @grep.each do |sha, arr_match| %>
- <% (sha, file) = sha.split(':') %>
- <tr>
- <td valign="top"><%= $repo.object(sha).name %></td>
- <td valign="top"><a href="/<%= file %>"><%= file %></a></td>
- <td><table>
- <% arr_match.each do |line, match| %>
- <tr>
- <td>line <%= line %></td>
- <td><%= match %></td>
- </tr>
- <% end %>
- </table></td>
- </tr>
+ <div class="search_result">
+ <% (sha, file) = sha.split(':') %>
+ <% arr_match.each do |line, match| %>
+ <div class="match">
+ <tt><%= match %></tt>
+ <br />
+ — <a href="/<%= file %>"><%= file %></a>, line <%= line %> (<%= $repo.object(sha).name %>)
+ </div>
+ <% end %>
+ </div>
<% end %>
- </table>
</div>
views/search.erb
@@ -40,9 +40,7 @@
document.write(time_ago_in_words(<%= @page.updated_at.for_time_ago_in_words %>) + ' ago');
</script>
<br />
- <%= $repo.current_branch %> branch
- <br />
- <a href="javascript:var q; if (window.getSelection) q=window.getSelection(); else if (document.selection) q=document.selection.createRange().text; if (q != '') location.href='<%= @page_url %>/append?text='+encodeURIComponent(q+' (from "'+document.title+'":'+location.href+')'); else location.href='<%= @page_url %>/append?text='+encodeURIComponent('"'+document.title+'":'+location.href);">append bookmarklet</a>
+ <%= $repo.current_branch %> branch
</div>
</div>
views/show.erb
14d211cfcdcf1c171e2bd7b469c0649bcb68acec
Alex Payne
al3x@al3x.net
http://github.com/al3x/git-wiki/commit/952375327cd420439ce22c44f688a6fbd0526116
952375327cd420439ce22c44f688a6fbd0526116
2008-03-15T01:02:34-07:00
2008-03-15T01:02:34-07:00
prettier search results page
0a692a9f6d14a0c1b0a1d4ca2b66311c8ae3fcd1
Alex Payne
al3x@al3x.net