diff options
author | Corey Hulen <corey@hulen.com> | 2015-09-16 09:44:52 -0700 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-09-16 09:44:52 -0700 |
commit | 9828d84f01147ffb87b372d20681f91325ecfcf0 (patch) | |
tree | dc6ebe8374320ae53d199a87a9fcd51f103f8905 /web/react | |
parent | 1220a0985876a63f59f2e469d03910cf0e609226 (diff) | |
parent | 28b61e6437a75be4e181188fcbbf9919239daf72 (diff) | |
download | chat-9828d84f01147ffb87b372d20681f91325ecfcf0.tar.gz chat-9828d84f01147ffb87b372d20681f91325ecfcf0.tar.bz2 chat-9828d84f01147ffb87b372d20681f91325ecfcf0.zip |
Merge pull request #691 from asaadmahmoodspin/ui-changes
UI Updates for multiple tickets
Diffstat (limited to 'web/react')
-rw-r--r-- | web/react/components/admin_console/email_settings.jsx | 2 | ||||
-rw-r--r-- | web/react/components/admin_console/jobs_settings.jsx | 2 | ||||
-rw-r--r-- | web/react/components/change_url_modal.jsx | 2 | ||||
-rw-r--r-- | web/react/components/search_bar.jsx | 4 | ||||
-rw-r--r-- | web/react/components/setting_item_max.jsx | 2 | ||||
-rw-r--r-- | web/react/components/sidebar.jsx | 7 |
6 files changed, 14 insertions, 5 deletions
diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx index 3c53a8ee1..e8fb25858 100644 --- a/web/react/components/admin_console/email_settings.jsx +++ b/web/react/components/admin_console/email_settings.jsx @@ -300,7 +300,7 @@ export default class EmailSettings extends React.Component { type='submit' className='btn btn-primary' > - {'Submit'} + {'Save'} </button> </div> </div> diff --git a/web/react/components/admin_console/jobs_settings.jsx b/web/react/components/admin_console/jobs_settings.jsx index 34ec9693d..0b4fc4185 100644 --- a/web/react/components/admin_console/jobs_settings.jsx +++ b/web/react/components/admin_console/jobs_settings.jsx @@ -172,7 +172,7 @@ export default class Jobs extends React.Component { type='submit' className='btn btn-primary' > - {'Submit'} + {'Save'} </button> </div> </div> diff --git a/web/react/components/change_url_modal.jsx b/web/react/components/change_url_modal.jsx index 28fa70c1f..3553e1107 100644 --- a/web/react/components/change_url_modal.jsx +++ b/web/react/components/change_url_modal.jsx @@ -159,7 +159,7 @@ ChangeUrlModal.defaultProps = { title: 'Change URL', desciption: '', urlLabel: 'URL', - submitButtonText: 'Submit', + submitButtonText: 'Save', currentURL: '', serverError: '' }; diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx index 006d15459..77166fef9 100644 --- a/web/react/components/search_bar.jsx +++ b/web/react/components/search_bar.jsx @@ -75,6 +75,9 @@ export default class SearchBar extends React.Component { PostStore.emitSearchTermChange(false); this.setState({searchTerm: term}); } + handleMouseInput(e) { + e.preventDefault(); + } handleUserFocus(e) { e.target.select(); $('.search-bar__container').addClass('focused'); @@ -140,6 +143,7 @@ export default class SearchBar extends React.Component { value={this.state.searchTerm} onFocus={this.handleUserFocus} onChange={this.handleUserInput} + onMouseUp={this.handleMouseInput} /> {isSearching} </form> diff --git a/web/react/components/setting_item_max.jsx b/web/react/components/setting_item_max.jsx index b1bab1d48..1bffa7c79 100644 --- a/web/react/components/setting_item_max.jsx +++ b/web/react/components/setting_item_max.jsx @@ -26,7 +26,7 @@ export default class SettingItemMax extends React.Component { href='#' onClick={this.props.submit} > - Submit + Save </a> ); } diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index 977fecb5c..697fc09c9 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -348,6 +348,11 @@ export default class Sidebar extends React.Component { ); } + var badgeClass; + if (msgCount > 0) { + badgeClass = 'has-badge'; + } + // set up status icon for direct message channels var status = null; if (channel.type === 'D') { @@ -408,7 +413,7 @@ export default class Sidebar extends React.Component { className={linkClass} > <a - className={'sidebar-channel ' + titleClass} + className={'sidebar-channel ' + titleClass + ' ' + badgeClass} href={href} onClick={handleClick} > |