From 1d9b1f79a11feb57043be1d9d656f4c1638d3357 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Mon, 15 Sep 2014 18:39:25 +0200 Subject: web: eventlog ui --- web/src/css/eventlog.less | 11 +++++++++++ web/src/css/header.less | 2 +- web/src/index.html | 8 ++++---- web/src/js/components/EventLog.react.js | 6 ++++++ web/src/js/components/Header.react.js | 9 ++++----- 5 files changed, 26 insertions(+), 10 deletions(-) (limited to 'web/src') diff --git a/web/src/css/eventlog.less b/web/src/css/eventlog.less index 0e97832b..8ad304aa 100644 --- a/web/src/css/eventlog.less +++ b/web/src/css/eventlog.less @@ -8,4 +8,15 @@ height: 200px; overflow: auto; } + + .close-button { + float: right; + margin: -9px; + padding: 4px; + cursor: pointer; + color: grey; + &:hover { + color: black; + } + } } \ No newline at end of file diff --git a/web/src/css/header.less b/web/src/css/header.less index 69a947c5..2a3c9765 100644 --- a/web/src/css/header.less +++ b/web/src/css/header.less @@ -45,7 +45,7 @@ header { } .menu { - height: 100px; + padding: 10px; border-bottom: solid @separator-color 1px; } } \ No newline at end of file diff --git a/web/src/index.html b/web/src/index.html index 6cef0d25..4db2ed51 100644 --- a/web/src/index.html +++ b/web/src/index.html @@ -4,10 +4,10 @@ mitmproxy - - - - + + + +
diff --git a/web/src/js/components/EventLog.react.js b/web/src/js/components/EventLog.react.js index e710d30c..0ecf40b1 100644 --- a/web/src/js/components/EventLog.react.js +++ b/web/src/js/components/EventLog.react.js @@ -1,10 +1,16 @@ /** @jsx React.DOM */ var EventLog = React.createClass({ + close(){ + SettingsActions.update({ + showEventLog: false + }); + }, render(){ return ( 
+            
             much log.
diff --git a/web/src/js/components/Header.react.js b/web/src/js/components/Header.react.js index dc304d81..d1f18a82 100644 --- a/web/src/js/components/Header.react.js +++ b/web/src/js/components/Header.react.js @@ -4,15 +4,14 @@ var MainMenu = React.createClass({ mixins: [SettingsMixin], handleSettingsChange() { SettingsActions.update({ - showEventLog: this.refs.showEventLogInput.getDOMNode().checked + showEventLog: !this.state.settings.showEventLog }); }, render(){ return
- +
; } }); -- cgit v1.2.3