Skip to content

Numpad release#2279

Merged
aronasorman merged 23 commits intolearningequality:release-0.12.0from
rtibbles:numpad-release
Jul 30, 2014
Merged

Numpad release#2279
aronasorman merged 23 commits intolearningequality:release-0.12.0from
rtibbles:numpad-release

Conversation

@rtibbles
Copy link
Member

As requested by @mikewray - PR for the numpad code to be included in 0.12.3.

This code has already been reviewed, submitting PR to make sure it doesn't break tests. Manually tested, seems to be working - had to add additional styling to make the keyboard render properly without bootstrap.

jamalex and others added 22 commits July 21, 2013 01:00
Conflicts:
	kalite/distributed/templates/distributed/exercise.html
	kalite/static/js/khan-exercises/khan-exercise.js
	kalite/static/js/khan-exercises/utils/answer-types.js
Conflicts:
	kalite/distributed/static/css/distributed/khan-lite.css
Allows toggling of keypad, with auto-toggled off if modernizr.touch is false.

Conflicts:
	kalite/distributed/static/css/distributed/khan-lite.css
TODO-BLOCKER (rtibbles): Undo these commits before 0.13.
@aronasorman
Copy link
Collaborator

Well... tests pass!

@aronasorman
Copy link
Collaborator

Will take a look in a bit.

@aronasorman
Copy link
Collaborator

Is the keypad really like this?

screenshot from 2014-07-29 09 56 11

@aronasorman
Copy link
Collaborator

Firefox 31, Ubuntu 14.04

@aronasorman
Copy link
Collaborator

Fixed in the latest chromium browser.

@rtibbles
Copy link
Member Author

Hopefully fixed in Firefox. We should really test in Android browsers as the main target.

@aronasorman
Copy link
Collaborator

Can confirm that it's working properly on desktop firefox and the android browser for the ubislate. Merging!

aronasorman added a commit that referenced this pull request Jul 30, 2014
@aronasorman aronasorman merged commit c4ca138 into learningequality:release-0.12.0 Jul 30, 2014
@mjptak
Copy link

mjptak commented Jul 30, 2014

awesome!

@mikewray
Copy link

mikewray commented Aug 1, 2014

Hi there - how can I test? Is there a new version available?

@aronasorman
Copy link
Collaborator

Hi @mikewray -- I'll handle a release tomorrow, and will send you the link once I build the new version.

@mikewray
Copy link

mikewray commented Aug 1, 2014

Tx - can I test on Rpi as well? If so please advise. Is it along these lines:

To check if your RPi is in the latest version -> "git remote update" then type in "git status"
If output says you behind "origin/release-0.12.3", then you don't have the latest version of that branch. To update, just do a "git merge origin/release-0.12.3" then you're good"

@mikewray
Copy link

mikewray commented Aug 4, 2014

Hi - just checked on 0.12.3 (windows) and numpad seems to be working well. Like how it gives you the numpad on tablet and you need to ask for it on desktop. The only thing I might change is putting the 'check answer' by or just below the question. As it is you have to scroll down to check the answer then go back up to the top to put in the answer for the next.

@aronasorman
Copy link
Collaborator

Hi @mikewray,

You can definitely try with the RPi right now. Here are the exact steps:

  1. "git remote update"
  2. "git checkout master"
  3. "git merge origin master"

That's it! You should be in v0.12.3 now.

@mikewray
Copy link

mikewray commented Aug 5, 2014

Thanks - it seemed to work and numpad working off Rpi but got a strange message when running 'git checkout master' - something about files getting over written then it 'Aborting' at the end. I put output on gist, could you confirm errors are ok -> https://gist.github.com/mikewray/184c647ea569d5836cb4

@aronasorman
Copy link
Collaborator

It didn't go exactly as planned, but since it's a fast-forward then you should be good.

@mikewray
Copy link

mikewray commented Aug 5, 2014

Is there a clean way to do it, this is going to be an image for a few deployments so would rather get it right? I'm upgrading from 0.12.0. Tx!

@jamalex
Copy link
Member

jamalex commented Aug 5, 2014

Just a note that you'll need to make sure to stop the server and delete the database before cloning the image, as otherwise they will contain the same Device ID, which will be very bad for syncing.

@mikewray
Copy link

mikewray commented Aug 6, 2014

Yes am aware, tx @jamalex - only caveat with your solution is that you cannot name the device which would be nice to have, it seems randomly assigned unless there is a command to do this. My master plan was to do a fresh install of KA Lite on the clone and in so doing create the device name and start with a new database. If this is a better plan, what is the command I should use?

When I upgraded to 0.12.3 there was some weirdness (see above) - is there any way I can do a definitely clean install or is it certain the errors I got ok. I can go back to earlier image if required.

@jamalex
Copy link
Member

jamalex commented Aug 6, 2014

You can rename the device after it's been initialized, so that might be the best approach: let it autogenerate everything (starting clean with no database), and then rename it after logging in. If this image will be kept private, there is a setting for having it auto-create a standard admin account so you won't need to do that from the command line (put this in local_settings.py):

INSTALL_ADMIN_USERNAME = "admin"
INSTALL_ADMIN_PASSWORD = "whateverpassword"

Eventually, we want to move all this config into the browser, so after a clean start, it will allow you to name the device and create an admin account the first time you load the KA Lite web interface.

@mikewray
Copy link

mikewray commented Aug 6, 2014

Thanks - makes great sense. How do you rename the device after its been initialized, I can't see how...or is there a command?

@jamalex
Copy link
Member

jamalex commented Aug 7, 2014

Ah. Yes. Looks like there's no good way in the web interface. You can use the following command (all one line):
python manage.py runcode "from securesync.models import Device; d = Device.get_own_device(); d.name = 'Some new name'; d.save()"

@mikewray
Copy link

mikewray commented Aug 8, 2014

Tested all above it works - thanks! I see on initiation two devices are made, the renamed one is edulution. Just curious, what is the other one? Can I delete it somehow?

device name

@rtibbles rtibbles deleted the numpad-release branch October 24, 2014 18:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants