Commit Graph

473 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
cfccc3aae2 Added outer whitespace to the poll shape, as in the Flash client 2015-09-11 13:07:50 -07:00
Oleksandr Zhurbenko
41c453c470 cleanup 2015-09-10 15:09:55 -07:00
Oleksandr Zhurbenko
d208da2c31 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
2015-09-10 15:01:09 -07:00
Oleksandr Zhurbenko
2feabdc65b Fixed a bug with whiteboard's width in case when poll controllers appeared 2015-09-10 14:50:38 -07:00
Oleksandr Zhurbenko
f9b2cdb01c Removed unnecessary Tracker.autorun and cleaned up things 2015-09-09 10:24:57 -07:00
Oleksandr Zhurbenko
db3b95e990 Added proper scaling for the whiteboard when a polling or bottom presenter buttons templates are rendered or destroyed 2015-09-08 16:57:39 -07:00
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
Maxim Khlobystov
89b4bac21a Made the userlist hidden by default on phones. 2015-08-27 17:47:40 -04:00
Maxim Khlobystov
4ecf1ea16a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-mobile-view
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
2015-08-27 17:19:43 -04:00
Maxim Khlobystov
5be21ee80a Made sure the width and position of the Settings window are set appropriately on any device. 2015-08-27 17:11:59 -04: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
Maxim Khlobystov
ec33e1404b Made the notifications look appropriately sized regardless of the device type or screen orientation. 2015-08-26 17:37:27 -04:00
Maxim Khlobystov
b362cb95f3 Polished up the sizing of Settings window. 2015-08-25 14:49:04 -04: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
Maxim Khlobystov
092274e8ef Continued transitioning the mobile views to CSS pixels, corrected the sizes of Settings window's fonts/elements. 2015-08-24 17:20:14 -04:00
Oleksandr Zhurbenko
953a98b038 Added scaling and truncating to the bar with poll buttons with answers 2015-08-21 10:14:56 -07:00
Maxim Khlobystov
21f1bd6a60 Polishing up the font and element sizes for phones and tablets. 2015-08-21 10:59:09 -04:00
Maxim Khlobystov
81a2ce5827 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-mobile-view
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/chat.less
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
2015-08-21 09:55:23 -04:00
Maxim Khlobystov
88fb41263e Modified the UI styling to start using CSS pixels + separated phone, tablet and desktop views. 2015-08-20 15:45:26 -04: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
8b06d43aec Fixed the mechanism of toggling the chat bar and made sure user is unable to resize the whiteboard when the chat is closed. 2015-08-19 12:47:00 -04:00
Maxim Khlobystov
f5fe166b50 Styling for the side menus. 2015-08-18 20:02:00 -04:00
Maxim Khlobystov
9fb02eae05 Made sure all the side menu elements are clickable. 2015-08-18 19:35:14 -04:00
Maxim Khlobystov
e98c96bd8b Fixed the issue of not being able to toggle userlist in landscape mode on mobile devices. 2015-08-18 18:09:24 -04:00
Maxim Khlobystov
3b73497bea Added phone/tablet detection, made the navbars look bigger on a mobile phone in landscape orientation. 2015-08-18 15:01:49 -04:00
Maxim Khlobystov
6d0808c93b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-mobile-view 2015-08-17 17:25:20 -04: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