mirror of https://github.com/vector-im/riot-web
				
				
				
			Add default LoginHeader
							parent
							
								
									52f3d7f18b
								
							
						
					
					
						commit
						05a6121934
					
				|  | @ -151,7 +151,7 @@ module.exports = React.createClass({displayName: 'Login', | |||
|                 return ( | ||||
|                     <div> | ||||
|                     Sorry, this homeserver is using a login which is not | ||||
|                     recognised by Vector ({step}) | ||||
|                     recognised ({step}) | ||||
|                     </div> | ||||
|                 ); | ||||
|         } | ||||
|  | @ -159,15 +159,14 @@ module.exports = React.createClass({displayName: 'Login', | |||
| 
 | ||||
|     render: function() { | ||||
|         var Loader = sdk.getComponent("elements.Spinner"); | ||||
|         var LoginHeader = sdk.getComponent("login.LoginHeader"); | ||||
|         var LoginFooter = sdk.getComponent("login.LoginFooter"); | ||||
|         var loader = this.state.busy ? <div className="mx_Login_loader"><Loader /></div> : null; | ||||
| 
 | ||||
|         return ( | ||||
|             <div className="mx_Login"> | ||||
|                 <div className="mx_Login_box"> | ||||
|                     <div className="mx_Login_logo"> | ||||
|                         <img src="img/logo.png" width="249" height="78" alt="vector"/> | ||||
|                     </div> | ||||
|                     <LoginHeader /> | ||||
|                     <div> | ||||
|                         <h2>Sign in</h2> | ||||
|                         { this.componentForStep(this._getCurrentFlowStep()) } | ||||
|  |  | |||
|  | @ -0,0 +1,31 @@ | |||
| /* | ||||
| Copyright 2015 OpenMarket Ltd | ||||
| 
 | ||||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||||
| you may not use this file except in compliance with the License. | ||||
| You may obtain a copy of the License at | ||||
| 
 | ||||
|     http://www.apache.org/licenses/LICENSE-2.0
 | ||||
| 
 | ||||
| Unless required by applicable law or agreed to in writing, software | ||||
| distributed under the License is distributed on an "AS IS" BASIS, | ||||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
| See the License for the specific language governing permissions and | ||||
| limitations under the License. | ||||
| */ | ||||
| 
 | ||||
| 'use strict'; | ||||
| 
 | ||||
| var React = require('react'); | ||||
| 
 | ||||
| module.exports = React.createClass({ | ||||
|     displayName: 'LoginHeader', | ||||
| 
 | ||||
|     render: function() { | ||||
|         return ( | ||||
|             <div className="mx_Login_logo"> | ||||
|                 Matrix | ||||
|             </div> | ||||
|         ); | ||||
|     } | ||||
| }); | ||||
		Loading…
	
		Reference in New Issue
	
	 Kegan Dougal
						Kegan Dougal