...

aemadrid · Oct 6, 2011 · e2c8811 · e2c8811
1 parent c0acb4e
commit e2c8811
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 11 deletions.
diff --git a/lib/clarity/server/chunk_http.rb b/lib/clarity/server/chunk_http.rb
@@ -26,7 +26,7 @@ def respond_with(status, content, options = {})
     end    
 
     def render(view)
-      @toolbar = template("_toolbar.html.erb")
+      @toolbar = template("_toolbar2.html.erb")
       @content_for_header = template("_header.html.erb")
       template(view)
     end

diff --git a/public/stylesheets/app.css b/public/stylesheets/app.css
@@ -49,6 +49,10 @@ div#option-ctrl ul li {
 #results tr td.app {
 }
 
+#results tr td.line {
+  max-width: 1200px;
+}
+
 #results tr td.line div.line {
   line-height: 14px;
   font-size: 10px;

diff --git a/views/_toolbar2.html.erb b/views/_toolbar2.html.erb
@@ -0,0 +1,28 @@
+<form id='search' method='get' action='<%= relative_root %>/perform' class="pull-right">
+  <input type="hidden" name="tool" value="grep">
+  <select style="width:350px;" id='file-list' name='file'>
+    <% logfiles.map do |f| %><%= "<option value='#{f}'>#{f}</option>\n" %><% end %>
+  </select>
+  <input class="input-small" type="text" id="term1" name="term1" placeholder="Term #1">
+  <input class="input-small" type="text" id="term2" name="term2" placeholder="Term #2">
+  <input class="input-small" type="text" id="term3" name="term3" placeholder="Term #3">
+  <button type="submit" class="btn primary" onclick="Search.submit(); return false;">Search</button>
+  <button type="reset" class="btn" onclick='Search.clear(); return false;'>Reset</button>
+</form>
+
+<div id="option-ctrl">
+  <ul>
+    <li><input type='checkbox' name='enable_scrolling' id='auto-scroll'/><span> Auto scroll?</span></li>
+  </ul>
+</div>
+
+<script>
+  Search.url = "<%= relative_root %>" + Search.url;
+  Search.init(
+          {
+            'grep': <%= logfiles.map {|f| f }.to_json %>,
+            'tail': <%= logfiles.map {|f| f }.to_json %>
+          },
+          <%= params.empty? ? 'null' : params.to_json %>
+  );
+</script>
diff --git a/views/index.html.erb b/views/index.html.erb
@@ -7,19 +7,13 @@
   <body>
 
     <div class="topbar">
-      <div class="topbar-inner">
+      <div class="fill">
         <div class="container-fluid">
-          <a class="brand" href="#">Log Parser / Analyzer</a>
+          <a class="brand" href="/">Clarity</a>
+          <%= @toolbar %>
         </div>
       </div>
     </div>
 
     <div class="container-fluid">
-
-      <div class="sidebar">
-        <div class="well">
-          <%= @toolbar %>
-        </div>
-      </div>
-
-      <div class="content">
+      <div class="content" style="margin-left: 0;">