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.

Sign up for GitHub

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

Jump to bottom

Feature/#1164 sitelabel #1617

Merged
merged 2 commits into from
Jul 4, 2017
Merged

Feature/#1164 sitelabel #1617

merged 2 commits into from
Jul 4, 2017

Conversation

clash99
Copy link
Contributor

@clash99 clash99 commented Jun 28, 2017 •
edited by seav
Loading

Proposed changes in this pull request

When should this PR be merged

  • When convenient

Risks

  • Low

Follow-up actions

  • None

Checklist (for reviewing)

General

  • Is this PR explained thoroughly? All code changes must be accounted for in the PR description.
  • Is the PR labeled correctly? It should have the migration label if a new migration is added.
  • Is the risk level assessment sufficient? The risks section should contain all risks that might be introduced with the PR and which actions we need to take to mitigate these risks. Possible risks are database migrations, new libraries that need to be installed or changes to deployment scripts.

Functionality

  • Are all requirements met? Compare implemented functionality with the requirements specification.
  • Does the UI work as expected? There should be no Javascript errors in the console; all resources should load. There should be no unexpected errors. Deliberately try to break the feature to find out if there are corner cases that are not handled.

Code

  • Do you fully understand the introduced changes to the code? If not ask for clarification, it might uncover ways to solve a problem in a more elegant and efficient way.
  • Does the PR introduce any inefficient database requests? Use the debug server to check for duplicate requests.
  • Are all necessary strings marked for translation? All strings that are exposed to users via the UI must be marked for translation.

Tests

  • Are there sufficient test cases? Ensure that all components are tested individually; models, forms, and serializers should be tested in isolation even if a test for a view covers these components.
  • If this is a bug fix, are tests for the issue in place? There must be a test case for the bug to ensure the issue won’t regress. Make sure that the tests break without the new code to fix the issue.
  • If this is a new feature or a significant change to an existing feature? has the manual testing spreadsheet been updated with instructions for manual testing?

Security

  • Confirm this PR doesn't commit any keys, passwords, tokens, usernames, or other secrets.
  • Are all UI and API inputs run through forms or serializers?
  • Are all external inputs validated and sanitized appropriately?
  • Does all branching logic have a default case?
  • Does this solution handle outliers and edge cases gracefully?
  • Are all external communications secured and restricted to SSL?

Documentation

  • Are changes to the UI documented in the platform docs? If this PR introduces new platform site functionality or changes existing ones, the changes must be documented in the Cadasta Platform Documentation.
  • Are changes to the API documented in the API docs? If this PR introduces new API functionality or changes existing ones, the changes must be documented in the API docs.
  • Are reusable components documented? If this PR introduces components that are relevant to other developers (for instance a mixin for a view or a generic form) they should be documented in the Wiki.

@clash99 clash99 force-pushed the feature/#1164-sitelabel branch from 5b055e3 to 0afce12 Compare June 28, 2017 22:11
@amplifi amplifi requested review from seav and amplifi July 4, 2017 14:01
amplifi
amplifi previously approved these changes Jul 4, 2017
View reviewed changes
@seav
Copy link
Contributor

seav commented Jul 4, 2017

@clash99: Is this PR also intended to merge the project dashboard changes as well? If not, I would prefer that we separate the site label changes from the project dashboard as a completely independent commit instead of branching it off from the feature/project-dashboard branch. Otherwise, I think it would be better to approve and then merge PR #1537 first before merging this PR.

@amplifi
Copy link
Contributor

amplifi commented Jul 4, 2017

@seav PR #1537 has been merged

@seav
Copy link
Contributor

seav commented Jul 4, 2017

Some further comments. The site label can't be localized so it will always be in English. I think this should be okay, but just letting everyone know.

Also, should this site label be mentioned somehow, somewhere in our documentation (paging @bethschechter and @dpalomino)? If so, then we should create a GitHub issue at the cadasta-docs repo to track this.

@amplifi amplifi mentioned this pull request Jul 4, 2017
Open
@amplifi
Copy link
Contributor

amplifi commented Jul 4, 2017

Added Cadasta/cadasta-docs#60 to reflect site label in documentation.

bohare and others added 2 commits July 4, 2017 19:23
@amplifi
WIP: refactoring layout
b0bb3f1 
WIP: fixing dashboard view test

WIP: starting map overlay

WIP: Add members panel

WIP: fixing tests

Adding data collection section

WIP: more fixes

Making header fluid

HTML updates

Overview and linting

More dashboard changes

Dashboard and CSS

Css changes

Swap button and alert

Fixed broken test

Reworked view for non-project members

This is to fill space in right column until request form gets developed

Hide project exports button if no content

Added hover to cog

disable map click for non-project users

Remove map overlay when project has locations

Map fixes:

* Fix map height on location detail page
* Fix click handling on location pages for non-project users

Adding org admins to members list

Updates to overview and dashboards

Small tweak and responsive fixes

Fixing db queries

Removing redundant test code

Breaking into subtemplates

Changed private icon to label

Removed member admin options, updated new user language, private label

About projects and about org area and client-side required for description fields

Moving comments inside logic

Updating schema messaging

Minor fix

Removing font awesome

Adjusted table panel and check color

Restructuring welcome text for buttons to align

Added "no questionnaire" option

CSS for alert

Broke org into member and nonmember parts. Improved empty and starter text areas.

Eliminate extra space before period

Order project members by username

Fixed broken tag

Changed view for contacts and url, removed plus from button

Hid starter text to add team members
@amplifi
Adding site label placeholder and css
847c6b8 
Dynamic platform env identifier to base html template

CSS adjustments
@amplifi amplifi force-pushed the feature/#1164-sitelabel branch from 0afce12 to 847c6b8 Compare July 4, 2017 17:23
seav
seav approved these changes Jul 4, 2017
View reviewed changes
Copy link
Contributor

@seav seav left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! 👍

@amplifi amplifi merged commit c4aa5fe into master Jul 4, 2017
@amplifi amplifi deleted the feature/#1164-sitelabel branch July 4, 2017 17:40
@seav seav mentioned this pull request Jul 4, 2017
Merged
46 tasks
@dpalomino
Copy link

Some further comments. The site label can't be localized so it will always be in English. I think this should be okay, but just letting everyone know.

Thanks @seav for the heads-up. Yes, I agree, I think this is okay.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amplifi amplifi amplifi approved these changes

@seav seav seav approved these changes

Assignees
No one assigned
Labels
PR: approved ui/ux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Include a "Demo" label to make users more clear that they are in demo site
4 participants
@clash99 @seav @amplifi @dpalomino