From 1d9b1f79a11feb57043be1d9d656f4c1638d3357 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Mon, 15 Sep 2014 18:39:25 +0200
Subject: web: eventlog ui

---
 libmproxy/web/static/css/app.css | 12 +++++++++++-
 libmproxy/web/static/js/app.js   | 13 +++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

(limited to 'libmproxy/web/static')

diff --git a/libmproxy/web/static/css/app.css b/libmproxy/web/static/css/app.css
index fe8fd79a..e5b9d134 100644
--- a/libmproxy/web/static/css/app.css
+++ b/libmproxy/web/static/css/app.css
@@ -64,7 +64,7 @@ header nav a.special:hover {
   background-color: #5386c6;
 }
 header .menu {
-  height: 100px;
+  padding: 10px;
   border-bottom: solid #a6a6a6 1px;
 }
 .eventlog {
@@ -76,6 +76,16 @@ header .menu {
   height: 200px;
   overflow: auto;
 }
+.eventlog .close-button {
+  float: right;
+  margin: -9px;
+  padding: 4px;
+  cursor: pointer;
+  color: grey;
+}
+.eventlog .close-button:hover {
+  color: black;
+}
 footer {
   box-shadow: 0 -1px 3px #d3d3d3;
   padding: 0px 10px 3px;
diff --git a/libmproxy/web/static/js/app.js b/libmproxy/web/static/js/app.js
index 7873046a..72bb5ff8 100644
--- a/libmproxy/web/static/js/app.js
+++ b/libmproxy/web/static/js/app.js
@@ -232,14 +232,13 @@ var MainMenu = React.createClass({displayName: 'MainMenu',
     mixins: [SettingsMixin],
     handleSettingsChange:function() {
         SettingsActions.update({
-            showEventLog: this.refs.showEventLogInput.getDOMNode().checked
+            showEventLog: !this.state.settings.showEventLog
         });
     },
     render:function(){
         return React.DOM.div(null, 
-            React.DOM.label(null, 
-                React.DOM.input({type: "checkbox", ref: "showEventLogInput", checked: this.state.settings.showEventLog, onChange: this.handleSettingsChange}), 
-                "Show Event Log"
+            React.DOM.button({className: "btn " + (this.state.settings.showEventLog ? "btn-primary" : "btn-default"), onClick: this.handleSettingsChange}, 
+                React.DOM.i({className: "fa fa-database"}), " Display Event Log"
             )
             );
     }
@@ -355,10 +354,16 @@ var TrafficTable = React.createClass({displayName: 'TrafficTable',
 /** @jsx React.DOM */
 
 var EventLog = React.createClass({displayName: 'EventLog',
+	close:function(){
+		SettingsActions.update({
+			showEventLog: false
+		});
+	},
     render:function(){
         return (
             React.DOM.div({className: "eventlog"}, 
             React.DOM.pre(null, 
+            React.DOM.i({className: "fa fa-close close-button", onClick: this.close}), 
             "much log."
             )
             )
-- 
cgit v1.2.3