diff options
| author | Asaad Mahmood <asaad@spinpunch.com> | 2016-03-08 18:05:49 +0500 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2016-03-09 10:56:40 -0500 |
| commit | 29eb6a1d0147767d9aba980c14e7a3df9dd3d7c9 (patch) | |
| tree | 0b2cbfb4840b924b49f7569dc2dcc2b3355c2288 /web | |
| parent | d9eb8c0c5840b169da6e424ffa894dde4c632dd4 (diff) | |
| download | chat-29eb6a1d0147767d9aba980c14e7a3df9dd3d7c9.tar.gz chat-29eb6a1d0147767d9aba980c14e7a3df9dd3d7c9.tar.bz2 chat-29eb6a1d0147767d9aba980c14e7a3df9dd3d7c9.zip | |
Improvements to license page
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/admin_console/license_settings.jsx | 25 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_admin-console.scss | 19 |
2 files changed, 31 insertions, 13 deletions
diff --git a/web/react/components/admin_console/license_settings.jsx b/web/react/components/admin_console/license_settings.jsx index d4dfa13f2..632ef5ad4 100644 --- a/web/react/components/admin_console/license_settings.jsx +++ b/web/react/components/admin_console/license_settings.jsx @@ -174,15 +174,17 @@ class LicenseSettings extends React.Component { licenseKey = ( <div className='col-sm-8'> - <input - className='pull-left' - ref='fileInput' - type='file' - accept='.mattermost-license' - onChange={this.handleChange} - /> + <div className='file__upload'> + <button className='btn btn-primary'>{'Choose File'}</button> + <input + ref='fileInput' + type='file' + accept='.mattermost-license' + onChange={this.handleChange} + /> + </div> <button - className={btnClass + ' pull-left'} + className={btnClass} disabled={!this.state.fileSelected} onClick={this.handleSubmit} id='upload-button' @@ -193,11 +195,12 @@ class LicenseSettings extends React.Component { defaultMessage='Upload' /> </button> - <br/> - <br/> + <div className='help-text no-margin'> + {'No file uploaded'} + </div> <br/> {serverError} - <p className='help-text'> + <p className='help-text no-margin'> <FormattedHTMLMessage id='admin.license.uploadDesc' defaultMessage='Upload a license key for Mattermost Enterprise Edition to upgrade this server. <a href="http://mattermost.com" target="_blank">Visit us online</a> to learn more about the benefits of Enterprise Edition or to purchase a key.' diff --git a/web/sass-files/sass/partials/_admin-console.scss b/web/sass-files/sass/partials/_admin-console.scss index f782da36b..76081710f 100644 --- a/web/sass-files/sass/partials/_admin-console.scss +++ b/web/sass-files/sass/partials/_admin-console.scss @@ -145,12 +145,27 @@ .form-group { margin-bottom: 25px; } + .file__upload { + position: relative; + margin: 0 10px 10px 0; + display: inline-block; + input { + position: absolute; + @include opacity(0); + width: 100%; + height: 100%; + z-index: 5; + top: 0; + left: 0; + } + } .help-text { + &.no-margin { + margin: 0; + } ul, ol { padding-left: 23px; } - } - .help-text { margin: 10px 0 0 15px; color: #777; .help-link { |