logster 0.8.4.2.pre → 0.8.4.3.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ab4cc46fb6fc744870f4012f588acfd9fd463c4
-  data.tar.gz: 04597c1cf33e5b86537aa134d5dd964b1724c2fb
+  metadata.gz: e704a239b3cbe88f36a41e30888836d981451494
+  data.tar.gz: ea74d3dfb8a7f2ffe9371194a4ab233c13133e0c
 SHA512:
-  metadata.gz: deb16d38c75202e8658cae809d3be1694b940ef83a388473bb5f4cb7827f258f2ea8592397c2f438ce6251cdc2f50c937d75a7013126f83c431f45b608931fe6
-  data.tar.gz: 7260f410f3028d4b6178002e3e2f85a1213f81ffdf90c2133a6f55af5453b3181ad7207c8936ec51bbd6e14eb686c212f665672fdf54d05f72df9c76dfa5fbc0
+  metadata.gz: 45bbecf6dc989a24d796eb5059588dfee399bded667c775b3183d48d5158f782ef6aa796fd83df0faea0631b72a923b1a8e92e1aecce33f15affab8112d78bf5
+  data.tar.gz: 715218740ee56fe89bc9b46174722a95d3f49b2545b894a608e2f92e56cb034227a117f6ba9b55826ecbdcb7f3385ca481766828ff6015711b68c2121abaacc3

data/assets/javascript/app.js

@@ -166,11 +166,11 @@ App.Message = Ember.Object.extend({
       case 1:
         return "";
       case 2:
-        return "<i class='fa fa-exclamation-circle'></i>";
+        return "<i class='fa fa-exclamation-circle warning'></i>";
       case 3:
-        return "<i class='fa fa-times-circle'></i>";
+        return "<i class='fa fa-times-circle error'></i>";
       case 4:
-        return "<i class='fa fa-times-circle'></i>";
+        return "<i class='fa fa-times-circle fatal'></i>";
     }
   }.property("severity")
 });
@@ -435,6 +435,7 @@ App.PanelResizerComponent = Em.Component.extend({
       return;
     }
 
+
     this.topPanel.css("bottom", fromBottom + 5);
     this.bottomPanel.css("height", fromBottom - 15);
     this.divider.css("bottom", fromBottom - 5);
@@ -535,24 +536,24 @@ App.UpdateTimeComponent = Em.Component.extend({
   didInsertElement: function(){
     var updateTimes = function(){
       $('.auto-update-time').each(function(){
-        var newTime = moment(
-            parseInt(this.getAttribute('data-timestamp'),10)
-          ).fromNow(),
-            elem = this;
+        var timestamp = parseInt(this.getAttribute('data-timestamp'),10);
+        var elem = this;
+
+        var text = App.formatTime(timestamp);
 
-        if(newTime != elem.innerText) {
-          elem.innerText = newTime;
+        if(text !== elem.innerText) {
+          elem.innerText = text;
         }
 
       });
-      Em.run.later(updateTimes, 10000);
+      Em.run.later(updateTimes, 60000);
     };
 
-    Em.run.later(updateTimes, 10000);
+    Em.run.later(updateTimes, 60000);
   }
 });
 
-App.TimeAgoComponent = Ember.Component.extend({
+App.TimeFormatterComponent = Ember.Component.extend({
   tagName: 'span',
   classNames: 'auto-update-time',
   attributeBindings: ['data-timestamp', 'title'],
@@ -569,18 +570,32 @@ App.TimeAgoComponent = Ember.Component.extend({
     return moment(this.get("timestamp"));
   }.property(),
 
-  fromNow: function(){
-    return this.get("moment").fromNow();
-  }.property().volatile()
+  render: function(buffer){
+    buffer.push(App.formatTime(this.get('timestamp')));
+  },
 });
 
-// Em.HTMLBars._registerHelper('timeAgo', function(prop, options){
-//   var timestamp = Ember.Handlebars.get(this, prop, options);
-//   var parsed = moment(timestamp);
-//   var formatted = "<span data-timestamp='" + timestamp + "' class='auto-update-time' title='" + parsed.format() +  "'>" + parsed.fromNow() + "</span>";
-//
-//   return new Handlebars.SafeString(formatted);
-// });
+App.formatTime = function(timestamp){
+  var formatted;
+  var time = moment(timestamp);
+  var now = moment();
+
+  if (time.diff(now.startOf('day')) > 0) {
+    formatted = time.format('h:mm a');
+  } else {
+    if (time.diff(now.startOf('week')) > 0) {
+      formatted = time.format('dd h:mm a');
+    } else {
+      if (time.diff(now.startOf('year')) > 0) {
+        formatted = time.format('D MMM h:mm a');
+      } else {
+        formatted = time.format('D MMM YY');
+      }
+    }
+  }
+
+  return formatted;
+};
 
 App.TabbedSectionComponent = Ember.Component.extend({
   tabs: Em.A(),
@@ -627,6 +642,9 @@ App.TabContentsComponent = Ember.Component.extend({
 
   didInsertElement: function() {
     this.invokeParent("addTab");
+    if (this.get("defaultTab")) {
+      this.invokeParent("selectTab");
+    }
   },
   willDestroyElement: function() {
     this.invokeParent("removeTab");

data/assets/javascript/components/message-info.hbs

@@ -10,7 +10,7 @@
       {{/if}}
       <pre>{{currentMessage.message}}</pre>
     {{/tab-contents}}
-    {{#tab-contents name="backtrace" hint="show backtrace" currentMessage=currentMessage}}
+    {{#tab-contents name="backtrace" defaultTab="true" hint="show backtrace" currentMessage=currentMessage}}
       {{#if showTitle}}
       <h3>Backtrace</h3>
       {{/if}}

data/assets/javascript/components/message-row.hbs

@@ -7,11 +7,11 @@
 <td class="message-body">
   <div class="message">
     {{model.displayMessage}}
-    {{#if model.protected}}
-    <span class='protected'>
-      <i class='fa fa-lock'></i>
-    </span>
-    {{/if}}
   </div>
 </td>
-<td class="time">{{time-ago timestamp=model.timestamp}}</td>
+<td class='protected'>
+  {{#if model.protected}}
+    <i title="message is protected, clearing will not remove it" class='fa fa-lock'></i>
+  {{/if}}
+</td>
+<td class="time">{{time-formatter timestamp=model.timestamp}}</td>

data/assets/javascript/templates/index.hbs

@@ -5,13 +5,14 @@
         <th class="count"></th>
         <th class="severity"></th>
         <th class="info">Info</th>
+        <th class="protected"></th>
         <th class="time">Time</th>
       </tr>
     </thead>
     <tbody>
     {{#if model.moreBefore}}
       <tr {{action "showMoreBefore"}} class="show-more">
-        <td colspan=4>{{model.totalBefore}} more</td>
+        <td colspan=5>{{model.totalBefore}} more</td>
       </tr>
     {{/if}}
     {{#each model.messages as |message|}}
@@ -35,14 +36,17 @@
     </label>
     <label class="warn">
       {{input type="checkbox" checked=showWarn}}
+      <i class='fa fa-exclamation-circle warning'></i>
       Warning
     </label>
     <label class="error">
       {{input type="checkbox" checked=showErr}}
+      <i class='fa fa-times-circle error'></i>
       Error
     </label>
     <label class="fatal">
       {{input type="checkbox" checked=showFatal}}
+      <i class='fa fa-times-circle fatal'></i>
       Fatal
     </label>
     <label class="search">

data/assets/stylesheets/app.css

@@ -1,8 +1,12 @@
 body {
-  font-family: Arial, 'Liberation Sans', 'DejaVu Sans', sans-serif;
+  font-family: 'Roboto', Arial, 'Liberation Sans', 'DejaVu Sans', sans-serif;
   font-size: 12px;
 }
 
+pre {
+   font-family: 'Roboto Mono', Consolas, Monaco, Ubuntu Mono, monospace;
+}
+
 
 tbody tr {
   width: 98%;
@@ -36,7 +40,6 @@ td.time {
   vertical-align: top;
 }
 .message {
-  font-family: Consolas, Monaco, Ubuntu Mono, monospace;
   font-size: 13px;
   overflow: hidden;
   white-space: nowrap;
@@ -54,25 +57,31 @@ th.severity{
 
 th.time{
   width: 90px;
+  text-align: right;
+  padding-right: 20px;
+}
+
+td.time{
+  text-align: right;
+  padding-right: 8px;
 }
 
-.fatal .severity .fa{
+th.protected {
+  width: 10px;
+}
+
+i.fatal {
   color: #900;
 }
 
-.error .severity .fa {
+i.error {
   color: #E00;
 }
 
-.warn .severity .fa {
+i.warning {
   color: #FEB800;
 }
 
-.message .protected {
-  float: right;
-  margin-top: 7px;
-}
-
 .debug {
   color: #777;
 }
@@ -138,10 +147,15 @@ tr.show-more {
 
 .message-actions {
     position: fixed;
-    bottom: 70px;
+    bottom: 45px;
     right: 10px;
 }
 
+.message-actions a {
+  z-index: 10000;
+  padding-right: 7px;
+}
+
 .divider {
   position: fixed;
   bottom: 310px;
@@ -246,10 +260,10 @@ tr.show-more {
 
 .message-info .content {
   position: absolute;
-  top: 5;
-  bottom: 40;
-  left: 5;
-  right: 5;
+  top: 5px;
+  bottom: 35px;
+  left: 5px;
+  right: 5px;
   overflow: auto;
   display: none;
 }
@@ -261,7 +275,7 @@ tr.show-more {
 
 .tabs {
   position: absolute;
-  bottom: 10;
+  bottom: 10px;
   left: 0;
   right: 0;
   list-style-type: none;

data/lib/logster/middleware/viewer.rb

@@ -173,8 +173,11 @@ JS
 
       def body(preload)
 <<HTML
+<!doctype html>
 <html>
 <head>
+  <link href='http://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
+  <link href='http://fonts.googleapis.com/css?family=Roboto+Mono' rel='stylesheet' type='text/css'>
   #{css("app.css")}
   #{css("font-awesome.min.css")}
   #{script("external/moment.min.js")}
@@ -183,7 +186,6 @@ JS
   #{script("external/ember-template-compiler.js")}
   #{script("external/ember.min.js", "external/ember.js")}
   #{template("application")}
-  #{component("time-ago")}
   #{component("message-row")}
   #{component("message-info")}
   #{component("tabbed-section")}

data/lib/logster/version.rb

@@ -1,3 +1,3 @@
 module Logster
-  VERSION = "0.8.4.2.pre"
+  VERSION = "0.8.4.3.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logster
 version: !ruby/object:Gem::Version
-  version: 0.8.4.2.pre
+  version: 0.8.4.3.pre
 platform: ruby
 authors:
 - UI for viewing logs in Rack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,7 +120,6 @@ files:
 - assets/javascript/components/tab-contents.hbs
 - assets/javascript/components/tab-link.hbs
 - assets/javascript/components/tabbed-section.hbs
-- assets/javascript/components/time-ago.hbs
 - assets/javascript/external/ember-template-compiler.js
 - assets/javascript/external/ember.js
 - assets/javascript/external/ember.min.js

data/assets/javascript/components/time-ago.hbs

@@ -1 +0,0 @@
-{{unbound fromNow}}