diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-08-13 12:07:32 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-08-13 12:07:32 -0700 |
| commit | 912ca8e8dd2f69d8a15429f3ab4bbb7ac178ab8a (patch) | |
| tree | 0bf0eaa86f20b6a319fec890506808445160c1c6 | |
| parent | afe028ae3a63ff341cbaf89b7841e977fb0061fd (diff) | |
| download | chat-912ca8e8dd2f69d8a15429f3ab4bbb7ac178ab8a.tar.gz chat-912ca8e8dd2f69d8a15429f3ab4bbb7ac178ab8a.tar.bz2 chat-912ca8e8dd2f69d8a15429f3ab4bbb7ac178ab8a.zip | |
Changed location of file upload overlay
| -rw-r--r-- | web/react/components/file_upload_overlay.jsx | 16 | ||||
| -rw-r--r-- | web/react/components/post_list.jsx | 18 | ||||
| -rw-r--r-- | web/react/pages/channel.jsx | 6 | ||||
| -rw-r--r-- | web/templates/channel.html | 1 |
4 files changed, 28 insertions, 13 deletions
diff --git a/web/react/components/file_upload_overlay.jsx b/web/react/components/file_upload_overlay.jsx new file mode 100644 index 000000000..5f8ef0b0c --- /dev/null +++ b/web/react/components/file_upload_overlay.jsx @@ -0,0 +1,16 @@ +// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. +// See License.txt for license information. + +module.exports = React.createClass({ + displayName: 'FileUploadOverlay', + render: function() { + return ( + <div className='center-file-overlay invisible'> + <div> + <i className='fa fa-upload'></i> + <span>Drop a file to upload it.</span> + </div> + </div> + ); + } +}); diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index f45650279..83f806b79 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -463,19 +463,11 @@ module.exports = React.createClass({ } return ( - <div> - <div className='file-overlay center-file-overlay invisible'> - <div> - <i className="fa fa-upload"></i> - <span>Drop a file to upload it.</span> - </div> - </div> - <div ref="postlist" className="post-list-holder-by-time"> - <div className="post-list__table"> - <div className="post-list__content"> - { more_messages } - { postCtls } - </div> + <div ref="postlist" className="post-list-holder-by-time"> + <div className="post-list__table"> + <div className="post-list__content"> + { more_messages } + { postCtls } </div> </div> </div> diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx index 90d90b29f..922e61d1a 100644 --- a/web/react/pages/channel.jsx +++ b/web/react/pages/channel.jsx @@ -35,6 +35,7 @@ var ChannelInfoModal = require('../components/channel_info_modal.jsx'); var AccessHistoryModal = require('../components/access_history_modal.jsx'); var ActivityLogModal = require('../components/activity_log_modal.jsx'); var RemovedFromChannelModal = require('../components/removed_from_channel_modal.jsx') +var FileUploadOverlay = require('../components/file_upload_overlay.jsx'); var Constants = require('../utils/constants.jsx'); @@ -223,4 +224,9 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann document.getElementById('removed_from_channel_modal') ); + React.render( + <FileUploadOverlay />, + document.getElementById('file_upload_overlay') + ); + }; diff --git a/web/templates/channel.html b/web/templates/channel.html index da6fed97d..9bfd1fa35 100644 --- a/web/templates/channel.html +++ b/web/templates/channel.html @@ -14,6 +14,7 @@ <div id="navbar"></div> </div> <div class="row main"> + <div id="file_upload_overlay"></div> <div id="app-content" class="app__content"> <div id="channel-header"></div> <div id="post-list"></div> |