images/search.png views/search.erb @@ -5,11 +5,12 @@ = CHACON IDEAS * inter-branch links - * remotes (add / fetch) * tagging + * file attachments * merge conflict resolution * cherry-picked branches (read-tree/write-tree) * git-less version (read-only) + * track which branched from which * push? * users (email/name/ip - use for commits) TODO @@ -37,6 +37,7 @@ get('/') { redirect '/' + HOMEPAGE } get('/_style.css') { header 'Content-Type' => 'text/css'; File.read(File.join(File.dirname(__FILE__), 'css', 'style.css')) } get('/_code.css') { header 'Content-Type' => 'text/css'; File.read(File.join(File.dirname(__FILE__), 'css', "#{UV_THEME}.css")) } get('/_app.js') { header 'Content-Type' => 'application/x-javascript'; File.read(File.join(File.dirname(__FILE__), 'javascripts', "application.js")) } +get('/_search.png') { header 'Content-Type' => 'image/png'; File.read(File.join(File.dirname(__FILE__), 'images', "search.png")) } get '/_list' do @pages = $repo.log.first.gtree.children.map { |name, blob| Page.new(name) } rescue [] @@ -154,4 +155,10 @@ post '/a/new_remote' do $repo.add_remote(params[:branch_name], params[:branch_url]) $repo.fetch(params[:branch_name]) redirect '/a/branches' +end + +get '/a/search' do + @search = params[:search] + @grep = $repo.grep(@search) + show :search, 'Search Results' end \ No newline at end of file git-wiki.rb @@ -4,7 +4,7 @@ <% @history.each do |commit| %> <tr> <td><code><%= commit.sha[0, 8] %></code></td> - <td><%= commit.date %></td> + <td><small><%= commit.date %></small></td> <td><%= commit.message %></td> <td><%= commit.name %></td> <% if commit != @history.first %> views/branch_history.erb @@ -8,6 +8,7 @@ </head> <body> <div id="container"> + <form method="get" action="/a/search"> <ul class="nav_list" id="top_nav"> <li><strong><%= $repo.current_branch %></strong></li> <li><a href="/" class="nav_link">home</a></li> @@ -15,7 +16,9 @@ <li><a href="/a/history" class="nav_link">history</a></li> <li><a href="/_list" class="nav_link">pages</a></li> <li><a href="/a/tarball" class="nav_link">tarball</a></li> + <li><input name="search" size="15"> <input type="image" src="/_search.png"></li> </ul> + </form> <%= yield %> <div id="footer"> powered by <a href="http://github.com/sr/git-wiki/network">git-wiki</a> views/layout.erb e7718c564e758a37489123ba3a097261e73b0369 Scott Chacon schacon@gmail.com http://github.com/edavis10/git-wiki/commit/3fe21594034d22381cc5dbbfef0181b3949e2893 3fe21594034d22381cc5dbbfef0181b3949e2893

2008-03-08T12:27:38-08:00

added search through git-grep ab87643e09b020797f15477bc5d84965511b5697 Scott Chacon schacon@gmail.com