Skip to content

Feature/finalize admin view for dashboard#1263

Merged
brylie merged 15 commits intodevelopfrom
feature/finalize-admin-view-for-dashboard
Jul 6, 2016
Merged

Feature/finalize admin view for dashboard#1263
brylie merged 15 commits intodevelopfrom
feature/finalize-admin-view-for-dashboard

Conversation

@55
Copy link
Copy Markdown
Contributor

@55 55 commented Jul 4, 2016

Closes #1260
Closes #674

Proposed changes:

  • Moved dashboard folder to the root of the project
  • Added branding colors to the charts
  • Added help icons
  • Title
  • Final styling

@55 55 added the WIP label Jul 4, 2016
@55 55 added this to the Sprint 26 milestone Jul 4, 2016
@55 55 added the in progress label Jul 4, 2016
elnzv added 2 commits July 6, 2016 10:26
…dmin-view-for-dashboard

# Conflicts:
#	lib/i18n/en.i18n.json
@55 55 removed the WIP label Jul 6, 2016
@55
Copy link
Copy Markdown
Contributor Author

55 commented Jul 6, 2016

@apinf/developers, please review.

@brylie brylie self-assigned this Jul 6, 2016
{{ > requestsOverTimeChart }}
</div>
<div>
<div class="col-lg-12">
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is this Bootstrap class necessary when there are no other column sizes declared? E.g. does Bootstrap default to 12 columns?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes, it is. Bootstrap does default to 12 columns if we specify one of lg, md, sm, xs columns classes.

@@ -1,6 +1,16 @@
<template name="dataTable">
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

While we are here, lets give this template a more specific name. E.g.

dashboardDataTable

<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h1 class="dashboard-title">
{{_ "dashboard_MainTitle" }}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

First letter of camelCase should be lowercase:

"dashboard_mainTitle"

instead of

"dashboard_MainTitle"

@brylie
Copy link
Copy Markdown
Contributor

brylie commented Jul 6, 2016

The main feedback on this PR is that we need to be consistent with our i18n keys. The keys are not very consistent right now, so we should pick a convention and stick to it.

My suggestion is to go with camelCase, where the first letter is lowercase.

@brylie
Copy link
Copy Markdown
Contributor

brylie commented Jul 6, 2016

The only significant change I have recommended is to move markup and logic from the charts.html/.js/.less into dashboard.html/js/less. This is partially because the use of 'layout' is confusing, and also the extra charts.* files are somewhat unnecessary. See PR #1282 for discussion about this change, which can be made there instead.

Otherwise, this PR looks ready to merge.

@brylie brylie mentioned this pull request Jul 6, 2016
@frenchbread
Copy link
Copy Markdown
Contributor

I have done this change in #1282

The only significant change I have recommended is to move markup and logic from the charts.html/.js/.less into dashboard.html/js/less. This is partially because the use of 'layout' is confusing, and also the extra charts.* files are somewhat unnecessary.

@brylie
Copy link
Copy Markdown
Contributor

brylie commented Jul 6, 2016

Thanks @frenchbread 🎁

@55
Copy link
Copy Markdown
Contributor Author

55 commented Jul 6, 2016

@brylie, @frenchbread has now those structure changes in his PR. i18n keys updated.

@brylie brylie merged commit 550918a into develop Jul 6, 2016
@brylie brylie removed the in progress label Jul 6, 2016
@brylie brylie deleted the feature/finalize-admin-view-for-dashboard branch July 6, 2016 12:40
@brylie
Copy link
Copy Markdown
Contributor

brylie commented Jul 6, 2016

Merged. It looks like our i18n keys are about 50% camel case, 50% camel case with a capitalized first letter. We should consider whether/how to make these consistent.

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.

3 participants