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

Courses index view #68

Merged
merged 4 commits into from
Feb 1, 2017
Merged

Courses index view #68

merged 4 commits into from
Feb 1, 2017

Conversation

MatiasMercado
Copy link
Collaborator

Courses Index View

  • Nothing but the view for the courses =)

Trello Card

https://trello.com/c/timMxqFn/48-maquetar-vista-de-cursos

Copy link
Owner

@MatiasComercio MatiasComercio left a comment

Choose a reason for hiding this comment

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

You should be squashing your commits prior to the PR.
You should use the Squash and rebase button to squash all commits made after the PR has been requested.

In this case, for example, reviewers won't care if you have a commit changing branch. All you have to show is concisely what you have done.

I can notice you are learning a lot and I'm glad of that. Let's keep working this way! 😄

@@ -0,0 +1,69 @@
<div ng-controller='CoursesIndexCtrl as controller'>
<div class='courses-index-container'>
<!-- Page Heading -->
Copy link
Owner

Choose a reason for hiding this comment

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

Copy the student's index page heading style

<td>{{ course.credits }}</td>
<td>{{ course.semester }}</td>
<td class='actions-container'>
<a class='btn btn-default full-width-button' role='button'>
Copy link
Owner

Choose a reason for hiding this comment

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

Remove the full-width-button class. This is now accomplished through flexbox.

<th translate='i18nCourseName'></th>
<th translate='i18nCredits'></th>
<th translate='i18nSemester'></th>
<th translate='i18nActions'></th>
Copy link
Owner

Choose a reason for hiding this comment

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

This translation is not working OK. Check that the translation is' i18nActions' at the translations file

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thx, I may have missed this during the rebase

</thead>
<tbody>
<tr ng-hide='controller.courses.length > 0' class='bg-warning'>
<td colspan='4' class='text-danger text-center' translate='i18nNoCoursesFound'></td>
Copy link
Owner

Choose a reason for hiding this comment

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

Check how it is seen the message No se encontraron materias disponibles is seen. After that, update this to be colspan='5'. This is telling how many table columns the td element should be using.

@MatiasComercio
Copy link
Owner

Remove your assignment and assign me when finished with those fixes

Copy link
Owner

@MatiasComercio MatiasComercio left a comment

Choose a reason for hiding this comment

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

Good job! 🎉
Rebase and you are free to go! 😄

@MatiasMercado MatiasMercado merged commit 40d59e0 into development Feb 1, 2017
@MatiasMercado MatiasMercado deleted the courses_index_view branch February 1, 2017 18:56
MatiasComercio pushed a commit that referenced this pull request Feb 5, 2017
* Finished View
* Add test for Ctrl
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.

2 participants