Commit Graph

157 Commits

Author SHA1 Message Date
JC Brand
fcd488c452 Improved UI. The chat toolbar now gives better feedback. 2013-08-30 22:49:33 +02:00
JC Brand
e4cf875d24 Merge branch 'master' into otr
Conflicts:
	bower.json
	converse.css
	converse.js
	main.js
	tests_main.js
2013-08-30 20:26:48 +02:00
JC Brand
c61eef994c CSS tweaks from collective.xmpp.chat 2013-08-30 20:22:37 +02:00
JC Brand
c5e44a02fa Bugfix. The remove icon wasn't being shown for contacts. 2013-08-29 20:06:17 +02:00
JC Brand
f3c45e18af Give click/indent effect to config button as well. 2013-08-26 09:38:53 +02:00
JC Brand
c0a4e9577c IE8 fixes. 2013-08-26 09:33:11 +02:00
JC Brand
a0d5941fdb Another IE8 fix. 2013-08-26 09:30:00 +02:00
JC Brand
a607e09eef Better textarea styling. Ensure all boxes are same height.
Conflicts:
	converse.css
2013-08-26 09:29:14 +02:00
JC Brand
b2d4205baa IE8 CSS fix. 2013-08-26 09:13:12 +02:00
JC Brand
664e2090ba Add initial UI and handlers for starting OTR to converse.js 2013-08-25 22:10:32 +02:00
JC Brand
76da418380 Add a dropdown menu for OTR 2013-08-25 21:42:24 +02:00
JC Brand
40a3e013fd Style toolbar for OTR support 2013-08-25 14:30:59 +02:00
JC Brand
9c88aa1929 Better textarea styling. Ensure all boxes are same height. 2013-08-25 13:50:55 +02:00
JC Brand
dfe76e42f0 Merge branch 'master' into mockup
Conflicts:
	converse.css
	mockup.html
2013-08-25 13:03:56 +02:00
JC Brand
6aa1e97f21 Extend the mockup and fixed two CSS bugs.
Test for very long words in chat messages (must be wrapped) and very long names
in chatroom participants list.

Also show chat-info and chat-event messages (could probably be merged into one
class/style).
2013-08-25 12:49:21 +02:00
JC Brand
7fcec77651 Explicitly set chatbox width 2013-08-24 21:36:36 +02:00
JC Brand
4870389321 Fix width 2013-08-24 17:13:59 +02:00
JC Brand
6e93098442 Fix chatbox width bug. 2013-08-24 17:10:05 +02:00
JC Brand
0157b2379a Remove explicit borders around chatboxes.
Conflicts:
	converse.css
2013-08-20 22:36:44 +02:00
JC Brand
9ba32930c0 Remove explicit borders around chatboxes. 2013-08-20 22:33:51 +02:00
JC Brand
ed7905d10e Padding tweaks 2013-08-16 11:20:19 +02:00
JC Brand
fadae7a453 Restyle chat toolbar and add more icons 2013-08-15 22:50:13 +02:00
JC Brand
74cc8ceead Add two toolbar buttons for the send message textarea 2013-08-15 21:22:14 +02:00
JC Brand
1036fc12d9 Put icon inside link 2013-08-15 20:13:50 +02:00
JC Brand
c32f4bb171 Replace fonticons. Tweaked offline and busy fonts 2013-08-15 18:30:12 +02:00
JC Brand
b79c12e8a1 Mockup tweaks 2013-08-12 22:10:01 +02:00
JC Brand
84f4e47127 More tweaks and fixes 2013-08-12 21:32:00 +02:00
JC Brand
62534bf73d mockup: configure close and configure buttons 2013-08-12 21:07:35 +02:00
JC Brand
f23e480baf Remove more images with fonticons 2013-08-12 20:52:30 +02:00
JC Brand
4e606b3510 Mockup: add chatroom with error, fix box heights. 2013-08-12 20:10:12 +02:00
JC Brand
e2c11bf19f More mockup work.
- Added requesting contacts.
- Fix contact width on hover.
- Add tooltips for status icons
2013-08-12 19:22:43 +02:00
JC Brand
39665516a1 Darker font colors 2013-08-10 09:04:13 +02:00
JC Brand
e01dc0398d Give proper names and tweak font colors 2013-08-09 23:30:59 +02:00
JC Brand
cb5a75d310 Tweak contact status fonticon 2013-08-09 23:20:50 +02:00
JC Brand
396e54c0a7 fixed markup for 'add a contact' 2013-08-09 23:16:46 +02:00
JC Brand
861887fd77 Initial markup, testing out font icons 2013-08-09 20:25:21 +02:00
JC Brand
f8183c134e Add copyright header 2013-07-30 21:42:42 +02:00
JC Brand
527c96afd1 Make sure the info icon doesn't get cut off. 2013-07-27 01:07:26 +02:00
JC Brand
4c0d4f2ac5 bugfix. Fixes #26. Only the first minute digit was shown. 2013-07-24 22:58:53 +02:00
JC Brand
7a94f73d9f Fixed alignment of chat messages in Firefox 2013-05-31 16:53:43 +02:00
JC Brand
c845d11f26 Make sure chat-info msgs are not auto-removed 2013-05-31 09:58:12 +02:00
JC Brand
b0f0eb2bc8 .chat-body should have top rounded corners 2013-05-30 20:40:24 +02:00
JC Brand
b97e23ea0d CSS fixes for overflowing text. 2013-05-26 21:43:57 +02:00
JC Brand
e7debe0188 Fixed room join form styling.
- list of rooms dropped off the controlbox
2013-05-26 19:02:30 +02:00
JC Brand
5cb2a473f3 Fix spinner so that it also renders properly in Plone 2013-05-21 13:37:47 +02:00
JC Brand
feac7363ae Bugfix in room configuration code. 2013-05-20 22:16:35 +02:00
JC Brand
316d3f3396 Fixed an IE bug and fixed a bug in sendPresence. 2013-05-20 20:59:57 +02:00
JC Brand
0799d286fb CSS tweaks after testing standalone again 2013-05-20 20:08:47 +02:00
JC Brand
9aabe16155 CSS fixes for fancy dropdowns after some browser testing 2013-05-20 19:54:22 +02:00
JC Brand
feb3695ebe Tweak the error message styling 2013-05-14 22:13:05 +02:00
JC Brand
c1423928ab It's now possible to enter password protected chatrooms 2013-05-13 23:17:16 +02:00
JC Brand
01336fefd9 Defer rendering of the messages area and roster
until after we are sure that the user has actually entered the room
2013-05-13 09:10:47 +02:00
JC Brand
0e1386cb60 Room configuration settings can now be saved. 2013-05-12 13:53:37 +02:00
JC Brand
b470d2a571 More work towards making chatroom configurable
Added a form with inputs for the configuration options (not yet usable)
2013-05-11 18:14:06 +02:00
JC Brand
0914887b4f More work towards letting users configure chatrooms
Add a configure button on chatrooms when the user is the chatroom owner.
2013-05-11 16:58:08 +02:00
JC Brand
ef38fd0973 Add initial support for configuring chatrooms.
For now we just create an instant chatroom, but eventually we must provide a
way through the UI in which the user can request to configure the room.
2013-05-11 16:19:42 +02:00
JC Brand
fc06d46baa Give visual indication/tooltips about MUC user roles 2013-05-11 14:19:07 +02:00
JC Brand
c392a4e598 Show all available room features
when clicking the info icon next to a room's name
2013-05-11 08:50:01 +02:00
JC Brand
ee47b031ba Fixed width for inputs in chrome 2013-05-10 21:15:22 +02:00
JC Brand
7142dc58c7 Don't call disco#info for all chatrooms
It's way to inefficient when there are multiple chatrooms. Instead, I added an
info icon that can be clicked and which will fetch and display additional info
on the chatroom.
2013-05-10 21:05:58 +02:00
JC Brand
6db0a08f0a Don't show horizontal scrollbar 2013-05-10 11:50:19 +02:00
JC Brand
19cf4c753b Pad spinner which replaces login button 2013-05-09 22:38:17 +02:00
JC Brand
472280ae5d Add some padding around the login submit button 2013-05-09 19:01:34 +02:00
JC Brand
7bed939c43 css tweaks. Don't show scrollbar by default 2013-05-09 18:56:25 +02:00
JC Brand
686c94c13a Only show the delete icon when hovering 2013-05-09 18:50:18 +02:00
JC Brand
97c978bcfc Indicate when chatrooms are password protected 2013-05-09 18:34:15 +02:00
JC Brand
4050327061 Don't show scrollbar by default 2013-05-09 17:20:41 +02:00
JC Brand
b3ed43c450 Don't fetch rooms on roster or when leaving a room
Inefficient, causes way too much traffic and takes very long
2013-05-09 17:07:52 +02:00
JC Brand
5a3ed27fbb Add spinner class 2013-05-09 15:00:17 +02:00
JC Brand
07664ed350 Also inform if no rooms were found 2013-05-09 09:22:54 +02:00
JC Brand
5b2af5b03d Add a button to manually fetch rooms from server.
Also show a spinner when logging in (to disable resubmitting login form)
and when refreshing the available chatrooms.
2013-05-09 00:09:24 +02:00
JC Brand
54db82ff10 Fixed padding for chat status dropdown 2013-05-08 14:44:54 +02:00
JC Brand
308b4c6bd6 Show error messages in red 2013-05-08 14:25:21 +02:00
JC Brand
dd1d56b9d8 Enable users to specify the XMPP server for chatrooms 2013-04-30 07:36:16 +02:00
JC Brand
62a2e307a5 Add initial service discovery (XEP 30) support.
- Still needs caching and optimisation
2013-04-25 23:53:33 +02:00
JC Brand
d937d32d3b Fix quirks with the add-contact dropdown 2013-04-20 22:55:22 +02:00
JC Brand
6de997681b Fetch the user's vcard when you subscribe to them 2013-04-20 15:27:48 +02:00
JC Brand
1cae33b06b Globally rename xmppchat to converse 2013-04-20 10:41:10 +02:00
JC Brand
71f4cdb931 Initial work towards decoupling contact adding
New conf variable in converse.js to indicate how contacts are added (either via
XHR or directly).
2013-04-20 00:38:54 +02:00
JC Brand
399d029bd0 Fix css for xmpp status form 2013-04-19 20:23:45 +02:00
JC Brand
4faf7f2a02 Style tweaks
Truncate pending contacts with too long names
Position accept/decline buttons below pending contact's name
2013-04-17 22:43:17 +02:00
JC Brand
2f5c7014be Custom message was hidden with new css from gh-pages 2013-04-01 23:43:17 +02:00
JC Brand
09c614816c Make the user search form similar to the status dropdown 2013-04-01 20:50:25 +02:00
JC Brand
43497f7200 Style fancy dropdown li elements 2013-04-01 20:00:30 +02:00
JC Brand
78ec620eac Explicitly make background white 2013-04-01 19:47:52 +02:00
JC Brand
2161c02ffb Fix z-indexes 2013-04-01 19:10:09 +02:00
JC Brand
65c54d0ded CSS tweak after merging gh-pages 2013-04-01 18:52:52 +02:00
JC Brand
156b56602a Fix height for panels 2013-03-28 20:50:28 +02:00
JC Brand
b1a80ac5ea css tweaks and added background image 2013-03-28 11:46:43 +02:00
JC Brand
8863eb8a86 Bugfix, set width to max-width 2013-03-27 19:50:13 +02:00
JC Brand
07a65f5b6a Also show different days on chatrooms.
- Use a template to show the day's date.
- Use time element for the date and datetime attr
2013-03-27 17:07:24 +02:00
JC Brand
cfd60be3e3 CSS tweaks 2013-03-22 17:42:47 +02:00
JC Brand
b4aada0155 Don't wrap contact names 2013-03-22 13:22:27 +02:00
JC Brand
2ae4fabb4d Show ellipsis when contact name is too long 2013-03-21 12:29:15 +02:00
JC Brand
ee3da4e40e Show the controlbox toggle by default.
Also, make sure RosterItems localstorage is user specifici
2013-03-21 11:43:35 +02:00
JC Brand
df931af213 Re-implement the login dialog as part of the controlbox. 2013-03-21 10:54:41 +02:00
JC Brand
49fd8a7ecd Fix presence exchange.
- Added 'show' element
- 'busy' must be 'dnd'
2013-03-05 22:57:05 +02:00
JC Brand
e8e9718b01 Don't underline links 2013-03-04 23:05:23 +02:00
JC Brand
daa31794d7 Render the vCard profile picture 2013-03-03 20:14:11 +02:00
JC Brand
0c8c4bf2cd Add missing images 2013-03-03 17:27:14 +02:00