diff options
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | libmproxy/web/static/js/app.js | 9 | ||||
| -rw-r--r-- | web/src/js/components/Footer.react.js | 3 | ||||
| -rw-r--r-- | web/src/js/components/ProxyApp.react.js | 3 | ||||
| -rw-r--r-- | web/src/js/stores/SettingsStore.es6.js | 3 |
5 files changed, 11 insertions, 8 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..569c2741 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +libmproxy/web/static/**/* -diff
\ No newline at end of file diff --git a/libmproxy/web/static/js/app.js b/libmproxy/web/static/js/app.js index 8c898673..dbaa5cb4 100644 --- a/libmproxy/web/static/js/app.js +++ b/libmproxy/web/static/js/app.js @@ -83,7 +83,8 @@ for(var EventEmitter____Key in EventEmitter){if(EventEmitter.hasOwnProperty(Even //FIXME: What do we do if we haven't requested anything from the server yet? this.settings = { version: "0.12", - showEventLog: true + showEventLog: true, + mode: "transparent", }; } _SettingsStore.prototype.getAll=function() {"use strict"; @@ -385,9 +386,10 @@ var EventLog = React.createClass({displayName: 'EventLog', var Footer = React.createClass({displayName: 'Footer', render:function(){ + var mode = this.props.settings.mode; return ( React.DOM.footer(null, - React.DOM.span({className: "label label-success"}, "transparent mode") + mode != "regular" ? React.DOM.span({className: "label label-success"}, mode, " mode") : null ) ); } @@ -402,7 +404,6 @@ var Reports = React.createClass({displayName: 'Reports', }); - var ProxyAppMain = React.createClass({displayName: 'ProxyAppMain', getInitialState:function(){ return { settings: SettingsStore.getAll() }; @@ -423,7 +424,7 @@ var ProxyAppMain = React.createClass({displayName: 'ProxyAppMain', Header({settings: this.state.settings}), React.DOM.div({id: "main"}, this.props.activeRouteHandler(null)), this.state.settings.showEventLog ? EventLog(null) : null, - Footer(null) + Footer({settings: this.state.settings}) ) ); } diff --git a/web/src/js/components/Footer.react.js b/web/src/js/components/Footer.react.js index ae0ccbe5..20a4abfb 100644 --- a/web/src/js/components/Footer.react.js +++ b/web/src/js/components/Footer.react.js @@ -2,9 +2,10 @@ var Footer = React.createClass({ render(){ + var mode = this.props.settings.mode; return ( <footer> - <span className="label label-success">transparent mode</span> + {mode != "regular" ? <span className="label label-success">{mode} mode</span> : null} </footer> ); } diff --git a/web/src/js/components/ProxyApp.react.js b/web/src/js/components/ProxyApp.react.js index 01adb089..07d66440 100644 --- a/web/src/js/components/ProxyApp.react.js +++ b/web/src/js/components/ProxyApp.react.js @@ -8,7 +8,6 @@ var Reports = React.createClass({ }); - var ProxyAppMain = React.createClass({ getInitialState(){ return { settings: SettingsStore.getAll() }; @@ -29,7 +28,7 @@ var ProxyAppMain = React.createClass({ <Header settings={this.state.settings}/> <div id="main"><this.props.activeRouteHandler/></div> {this.state.settings.showEventLog ? <EventLog/> : null} - <Footer/> + <Footer settings={this.state.settings}/> </div> ); } diff --git a/web/src/js/stores/SettingsStore.es6.js b/web/src/js/stores/SettingsStore.es6.js index 2743161e..29971fa7 100644 --- a/web/src/js/stores/SettingsStore.es6.js +++ b/web/src/js/stores/SettingsStore.es6.js @@ -5,7 +5,8 @@ class _SettingsStore extends EventEmitter { //FIXME: What do we do if we haven't requested anything from the server yet? this.settings = { version: "0.12", - showEventLog: true + showEventLog: true, + mode: "transparent", }; } getAll() { |