Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New administrative interface #1306

Merged
merged 45 commits into from
Mar 14, 2014
Merged

New administrative interface #1306

merged 45 commits into from
Mar 14, 2014

Conversation

bcipolli
Copy link
Contributor

Addresses at least: #193 #364 #974 #689

Sending this PR now, even though it's not done, so others will be aware of where I'm at, and where I'm heading.

In building documentation for administration of KA Lite, I realized that our admin interface doesn't have overall coherence.

  • There are few entry points for some basic functions (e.g. creating facilities, groups, installing language packs)
  • Related functions have very different UI paths (e.g. adding users vs. editing/moving users across groups).
  • Terms can be relatively opaque and are not defined.
  • No place for access to help / documentation.

I'm redesigning the admin interface with 4 basic actions in mind:

  1. Overview: A high-level overview of both current status of user data, and current status of syncing
  2. Users: User management--teachers and students separately--adding, updating, moving, etc.
  3. Videos (in the future, Content): downloading or deleting content.
  4. Languages (in the future, Setup): updating the server setup / configuration, currently by installing language packs.

I believe from this interface, admins will have clear entry points into each function they will want to do, and the user's manual will be much more straightforward.

Here are a few screenshots of where I'm at so far!
screen shot 2013-12-18 at 10 27 44 pm
screen shot 2013-12-19 at 2 00 31 pm
screen shot 2013-12-19 at 1 57 23 pm
screen shot 2013-12-19 at 2 00 52 pm
screen shot 2013-12-19 at 2 01 01 pm
screen shot 2013-12-19 at 2 01 09 pm

All are welcomed to comment! @wangguan59 @rtibbles I know you've dealt with these things before, and hope you might have time for feedback in the next 16 hours--the timeline for rolling something out in Gitwe.

Ben Cipollini added 23 commits December 17, 2013 15:09
…view/url changes for facility user management page changes.
Conflicts:
	kalite/main/views.py
	kalite/templates/current_users.html
@rtibbles
Copy link
Member

As a first pass over the screenshots, the new navbar looks good. Does the landing page still need to be 'watch videos' or 'do exercises'? It seems like that would be better to redirect to something else, no?

'Help' seems like the wrong name for the tab that has additional functions over and above links to help documentation. Might be worth either splitting out the help docs from the rest of that admin panel, or changing the name.

@bcipolli
Copy link
Contributor Author

@rtibbles - thanks for the comments, appreciate it!

Does the landing page still need to be 'watch videos' or 'do exercises'? It seems like that would be better to redirect to something else, no?

Sorry, it redirects to the "overview" page--I just tend to screen-shot the homepage :)

'Help' seems like the wrong name for the tab that has additional functions over and above links to help documentation. Might be worth either splitting out the help docs from the rest of that admin panel, or changing the name.

Right, that's the plan (to migrate things out, and add a user's manual). I've already moved the clock set to the "overview" panel (and will add to the "device summary" page as well, and plan to finish that as I go.

@wangguan59
Copy link
Contributor

@bcipolli This is amazing, I have been thinking about combining these nav item, they are pretty much exactly what I was imagined. I don't have to test the actual code, because I gonna drive back home later in 10 min, will check around the code 10pm here. The only potential issue i see here is "video" might be understood as "watch video", but I think it's fine in admin page.

@bcipolli
Copy link
Contributor Author

@wangguan59 Thanks, I'm glad it's looking good! I agree that "Video" should be OK for administrators.

The code isn't quite ready for testing--I posted this to share the screen shots mostly, and get feedback on that. I will be working on this code tonight, and hope to have something for testing tomorrow morning (about 12 hours from now).

@bcipolli
Copy link
Contributor Author

@wangguan59 any time to move forward on this? The longer we wait, the more out of sync this gets.

@wangguan59
Copy link
Contributor

@bcipolli I will take a look, will respond you this afternoon

@bcipolli
Copy link
Contributor Author

So this has been severely broken by the latest refactor.

I suggest we look at whether this can be merged in some form or another, with the existing user management page being used under the "user" tab, and other functions labeled as "NYI"

Ben Cipollini added 11 commits February 15, 2014 12:41
…w_admin

Conflicts:
	kalite/control_panel/views.py
	kalite/facility/decorators.py
	kalite/facility/views.py
	kalite/main/api_views.py
	kalite/main/urls.py
	kalite/main/views.py
	kalite/templates/admin_distributed.html
	kalite/templates/facility/current_users.html
	kalite/templates/facility/facility_admin.html
	kalite/templates/updates/update_videos.html
	kalite/updates/views.py
…to new_admin

Conflicts:
	kalite/templates/base.html
	kalite/templates/control_panel/group_users_management.html
	kalite/templates/updates/update_videos.html
	kalite/updates/views.py
…w_admin

Conflicts:
	kalite/securesync/engine/models.py
	kalite/templates/base.html
	kalite/templates/updates/update_videos.html
	kalite/updates/views.py
@bcipolli bcipolli modified the milestones: KA Lite v0.12.1, KA Lite v0.12.2 Mar 1, 2014
@bcipolli
Copy link
Contributor Author

@aronasorman I believe merging this now may be the best way to go.

  • There are continually merge conflicts
  • The part that's broken (user management) has to be redone / solved for Nalanda RCT stage 1 anyway
  • Having more time to iterate on the current setup will help us push farther
  • This interacts with software updates, and the sooner it is in, the better off we will be for that.

So my suggestion is to merge to develop (which is a month away from release anyway), and iterate, rather than holding out, making no progress, and continually addressing merge conflicts.

What say you sir?

@aronasorman
Copy link
Collaborator

Sure, I have no problem merging as long as @wangguan59 is alright with the changes so far.

@bcipolli
Copy link
Contributor Author

Cool. @wangguan59 didn't like the current button setup, but otherwise was satisfied. Will merge, and those button things can be addressed in the code as well.

Will open up separate issues for them once this is merged.

…w_admin

Conflicts:
	kalite/facility/decorators.py
	kalite/i18n/custom_context_processors.py
	kalite/templates/base.html
bcipolli pushed a commit that referenced this pull request Mar 14, 2014
New administrative interface
@bcipolli bcipolli merged commit 6e1e7b6 into learningequality:develop Mar 14, 2014
@bcipolli bcipolli deleted the new_admin branch March 14, 2014 14:21
@bcipolli bcipolli modified the milestones: Nalanda RCT Stage 1, KA Lite v0.12.0 Mar 26, 2014
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.

None yet

4 participants