diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-09-15 18:39:25 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-09-15 18:39:25 +0200 |
| commit | 1d9b1f79a11feb57043be1d9d656f4c1638d3357 (patch) | |
| tree | b1339c77d8761f7014424d7f73fb92c6fd600126 /web | |
| parent | cbf18320cdbd05197f232da69b3c9a5391735156 (diff) | |
| download | mitmproxy-1d9b1f79a11feb57043be1d9d656f4c1638d3357.tar.gz mitmproxy-1d9b1f79a11feb57043be1d9d656f4c1638d3357.tar.bz2 mitmproxy-1d9b1f79a11feb57043be1d9d656f4c1638d3357.zip | |
web: eventlog ui
Diffstat (limited to 'web')
| -rw-r--r-- | web/gulpfile.js | 2 | ||||
| -rw-r--r-- | web/src/css/eventlog.less | 11 | ||||
| -rw-r--r-- | web/src/css/header.less | 2 | ||||
| -rw-r--r-- | web/src/index.html | 8 | ||||
| -rw-r--r-- | web/src/js/components/EventLog.react.js | 6 | ||||
| -rw-r--r-- | web/src/js/components/Header.react.js | 9 |
6 files changed, 27 insertions, 11 deletions
diff --git a/web/gulpfile.js b/web/gulpfile.js index 68a5e479..939f4fcc 100644 --- a/web/gulpfile.js +++ b/web/gulpfile.js @@ -106,7 +106,7 @@ gulp.task("jshint", function () { gulp.task("html", function () { return gulp.src(path.html) - .pipe(gulp.dest(path.dist + "static")) + .pipe(gulp.dest(path.dist + "templates")) .pipe(livereload({ auto: false })); }); 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 @@ <meta charset="UTF-8"> <title>mitmproxy</title> <meta name="viewport" content="width=device-width, initial-scale=1"> - <link rel="stylesheet" href="css/vendor.css"/> - <link rel="stylesheet" href="css/app.css"/> - <script src="js/vendor.js"></script> - <script src="js/app.js"></script> + <link rel="stylesheet" href="/static/css/vendor.css"/> + <link rel="stylesheet" href="/static/css/app.css"/> + <script src="/static/js/vendor.js"></script> + <script src="/static/js/app.js"></script> </head> <body> <div id="mitmproxy"></div> 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 ( <div className="eventlog"> <pre> + <i className="fa fa-close close-button" onClick={this.close}></i> much log. </pre> </div> 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 <div> - <label> - <input type="checkbox" ref="showEventLogInput" checked={this.state.settings.showEventLog} onChange={this.handleSettingsChange}/> - Show Event Log - </label> + <button className={"btn " + (this.state.settings.showEventLog ? "btn-primary" : "btn-default")} onClick={this.handleSettingsChange}> + <i className="fa fa-database"></i> Display Event Log + </button> </div>; } }); |