Commit Graph

451 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
0d00fb786b Prevented a whiteboard from unnecessary redrawing and improved scaling 2015-08-28 20:12:44 -07:00
Oleksandr Zhurbenko
621ebc169d Prevented whiteboard's redrawing when one of the shapes is redrawn 2015-08-27 17:55:28 -07:00
Oleksandr Zhurbenko
ea8fe5d146 Fixed a bug with an endless array which became bigger while cursors' moving and slowed down a whiteboard 2015-08-26 16:12:20 -07:00
Oleksandr Zhurbenko
30a1d0d880 Fixed a bug with publishing a custom poll containing just one answer 2015-08-24 15:59:45 -07:00
Oleksandr Zhurbenko
8b6ebe63b6 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui 2015-08-24 15:31:50 -07:00
Oleksandr Zhurbenko
e77c6377be Removed 40px restriction for the width and increased a default font-size for calculations 2015-08-24 15:22:59 -07:00
Oleksandr Zhurbenko
953a98b038 Added scaling and truncating to the bar with poll buttons with answers 2015-08-21 10:14:56 -07:00
Oleksandr Zhurbenko
39e51604a0 Made a raise hand button transparent 2015-08-20 12:21:48 -07:00
Richard Alam
dbe2e1c389 Merge pull request #2730 from OZhurbenko/meteor-ui
Polling, Sorting and URL Validation
2015-08-19 21:06:45 -04:00
Oleksandr Zhurbenko
5f6bd654d4 Changed the whole way of how we calculate height and width of text elements, as the previous one didn't work in Firefox. Also, if the number of the votes doesn't fit the box then it's displayed in black on the right. Changed the colors to dark grey 2015-08-19 17:42:38 -07:00
Maxim Khlobystov
e676b2b1c4 Set the client to store the slide URI in a more general way to be able to handle old PNG links. 2015-08-17 16:55:28 -04:00
Oleksandr Zhurbenko
cd9625dd84 Putting everything in order 2015-08-16 15:19:43 -07:00
Oleksandr Zhurbenko
5eb6166db3 Added a 'number of votes' text column to the center of the each black bar 2015-08-14 17:12:25 -07:00
Oleksandr Zhurbenko
d8af3bedba Line bars change according to a number of people voted for that particular answer 2015-08-14 17:10:51 -07:00
Oleksandr Zhurbenko
6c1e2ca385 Fixed a bug with the poll shape not being removed properly 2015-08-13 22:28:30 -07:00
Oleksandr Zhurbenko
c9f802ce68 Calculations and positioning for the 'percentages' column 2015-08-13 16:31:48 -07:00
Oleksandr Zhurbenko
58018da679 Calculations and positioning for the 'key' column 2015-08-13 14:06:28 -07:00
Oleksandr Zhurbenko
1f8d41595f Added all the needed calculations for the sizes and positioning of the line bars 2015-08-13 12:50:25 -07:00
Oleksandr Zhurbenko
967fef5191 Added a function which calculates the font-size of the text fields and checks if the text fields meet all the requirements and fit the box. Also, it calculates the maximum width for the first and last column. 2015-08-12 19:19:05 -07:00
Oleksandr Zhurbenko
3f7f37c862 Initialized the box for the poll shape, and left and right text columns 2015-08-12 19:11:00 -07:00
Oleksandr Zhurbenko
9a016011ad Initialized and filled a 2D array with all the text objects I need to draw later 2015-08-12 19:07:15 -07:00
Oleksandr Zhurbenko
cc8a2ffee5 Cleanup 2015-08-11 19:00:55 -07:00
Oleksandr Zhurbenko
585af9b974 WhiteboardPollModel class initial commit 2015-08-10 17:31:52 -07:00
Oleksandr Zhurbenko
8402efc07e Added WhiteboardShapeModel's calls 2015-08-07 18:24:37 -07:00
Richard Alam
839e7ebf58 Merge branch 'svg-conversion' of https://github.com/gthacoder/bigbluebutton into gthacoder-svg-conversion 2015-08-07 18:28:16 +00:00
Richard Alam
839473395a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-leonardo-api-changes
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
2015-08-07 15:06:40 +00:00
Oleksandr Zhurbenko
d3b59103b4 Added Poll properties to the object 2015-08-06 16:32:41 -07:00
Maxim Khlobystov
5c0cb9c3d8 Merge branch 'meteor-client-pdf-conversion' of https://github.com/gthacoder/bigbluebutton into development
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PresentationEventRedisRecorder.scala
2015-08-06 16:21:31 -04:00
Oleksandr Zhurbenko
400a0db0f4 Parsing the message and sending shape information further 2015-08-05 16:54:44 -07:00
Oleksandr Zhurbenko
3afad5db50 Fixed an issue with the 'get_users_reply' message and sorting 2015-08-04 14:12:28 -07:00
Oleksandr Zhurbenko
d3e318f6f2 Fixed a mistake with phone_user's priorities 2015-08-04 09:51:02 -07:00
Oleksandr Zhurbenko
2ebf44a3b7 Added Sorting to the userlist 2015-08-03 17:23:57 -07:00
Oleksandr Zhurbenko
0b3606350f Handling for 'poll_show_result_message' 2015-08-02 15:57:54 -07:00
Maxim Khlobystov
16658f1c0f Fixed the issue with wrong file references in Chrome/Firefox CSS inspector. 2015-08-01 15:28:19 -04:00
Oleksandr Zhurbenko
84840f1830 Added handling for 'user_voted_poll_message' 2015-08-01 12:27:01 -07:00
Oleksandr Zhurbenko
147e1942fb Removing the userIds of the users who already voted from the collection, added null pointer validation 2015-07-31 11:07:27 -07:00
Oleksandr Zhurbenko
bae52f4f4b Added the ability to send responses to polls back to the server 2015-07-30 17:08:12 -07:00
Maxim Khlobystov
eb6062a0e7 Minor style fix for the hamburger buttons: eliminated the light-colored bottom border on a dark background. 2015-07-30 16:48:36 -04:00
Maxim Khlobystov
e0417ff4c8 Added a tooltip to the hamburger button that toggles the right-hand menu. 2015-07-30 16:34:44 -04:00
Maxim Khlobystov
52425394b7 Fixed the issue with the navbar's audio icon disappearing on hovering and made all the navbar buttons behave consistently on hovering or focusing. 2015-07-30 16:26:44 -04:00
Oleksandr Zhurbenko
3bbca33fca Keeping colors consistent 2015-07-29 15:37:41 -07:00
Maxim Khlobystov
5b16f3b0c1 Fixed the positioning of the navbar's audio button and made the presentation title's width flexible. 2015-07-29 16:19:59 -04:00
Oleksandr Zhurbenko
69c4405cdb Added the UI for sending back answers 2015-07-29 11:09:37 -07:00
Oleksandr Zhurbenko
aee51542a3 A polling element appears when the poll is published for a current user 2015-07-28 13:25:04 -07:00
Oleksandr Zhurbenko
b07e49b6e2 When there is a poll waiting for a current user, a whiteboard shrinks 2015-07-28 13:21:56 -07:00
Oleksandr Zhurbenko
83ec5b8892 Added Polling related functions to the bbb_api_brigde 2015-07-28 13:14:03 -07:00
Richard Alam
2aaf36a0df Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into development 2015-07-28 18:52:07 +00:00
Maxim Khlobystov
9a7e52274e Made the vertical centering of the navbar title work in Firefox. 2015-07-28 14:15:43 -04:00
Oleksandr Zhurbenko
a813298e56 Small corrections 2015-07-27 16:35:27 -07:00
Oleksandr Zhurbenko
10be3d03e0 Added permissions for viewers and a presenter. Viewers can't retreive the total number of votes. Also, viewers can't retreive any data if they have voted already 2015-07-27 15:55:29 -07:00