Skip to content

Conversation

guoxiaolongzte
Copy link

What changes were proposed in this pull request?

Css style about paging function is error in the executor page. It is different of history server ui paging function css style.

But their style should be consistent. There are three reasons.

  1. The first reason: 'Previous', 'Next' and number should be the button format.

  2. The second reason: when you are on the first page, 'Previous' and '1' should be gray and can not be clicked.
    1

  3. The third reason: when you are on the last page, 'Previous' and 'Max number' should be gray and can not be clicked.
    2

before fix:
fix_before

after fix:
fix_after

The style of history server ui:
history

How was this patch tested?

manual tests

Please review http://spark.apache.org/contributing.html before opening a pull request.

郭小龙 10207633 added 30 commits March 31, 2017 21:57
@srowen
Copy link
Member

srowen commented Jun 12, 2017

I tend to take your word, but will CC @ajbozarth just in case.

(BTW why do your PRs have a huge number of merge commits? you generally branch off a clean fork of master. They get squashed anyway, just wondering)

@guoxiaolongzte
Copy link
Author

I know, is not it a bug or an improvement corresponding to a branch? This also makes it easy for you to merge to master.@srowen

@guoxiaolongzte
Copy link
Author

I'm sorry, I do not understand what you said, can you elaborate on it?

@srowen
Copy link
Member

srowen commented Jun 12, 2017

Look at all the "Merge branch 'master'..." messages above. I think you're somehow branching off a branch that you keep merging from upstream master. You just need to keep your master in sync with upstream with pull

@guoxiaolongzte
Copy link
Author

image
Should choose here. Please forgive me, I really did not pay attention before, thank you. The next time I write PR, I will pay attention.

@guoxiaolongzte
Copy link
Author

@ajbozarth
I am sorry and have trouble you. Help with code review.

@srowen
Copy link
Member

srowen commented Jun 12, 2017

No @guoxiaolongzte I think it's an issue with the branch you have set up to track upstream master. You seem to merge changes from master rather than pull/rebase. It doesn't actually cause a problem here, but isn't the right way to manage it. You probably want to delete your fork and master after you're done with PRs and then re-fork it, and never git merge your master, but git pull upstream master`

@SparkQA
Copy link

SparkQA commented Jun 12, 2017

Test build #3790 has finished for PR 18275 at commit b939e2e.

  • This patch fails Spark unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@SparkQA
Copy link

SparkQA commented Jun 12, 2017

Test build #3792 has finished for PR 18275 at commit b939e2e.

  • This patch fails Spark unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

Copy link
Member

@ajbozarth ajbozarth left a comment

Choose a reason for hiding this comment

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

LGTM

@guoxiaolongzte
Copy link
Author

@srowen
This patch fails Spark unit tests. This error is not due to my code.

@SparkQA
Copy link

SparkQA commented Jun 13, 2017

Test build #3794 has finished for PR 18275 at commit b939e2e.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@srowen
Copy link
Member

srowen commented Jun 13, 2017

Merged to master/2.2

@asfgit asfgit closed this in b7304f2 Jun 13, 2017
asfgit pushed a commit that referenced this pull request Jun 13, 2017
… executor page. Css style about paging function is error in the executor page. It is different of history server ui paging function css style.

## What changes were proposed in this pull request?

Css style about paging function is error in the executor page. It is different of history server ui paging function css style.

**But their style should be consistent**. There are three reasons.

1. The first reason: 'Previous', 'Next' and number should be the button format.

2. The second reason: when you are on the first page, 'Previous' and '1' should be gray and can not be clicked.
![1](https://user-images.githubusercontent.com/26266482/27026667-1fe745ee-4f91-11e7-8b34-150819d22bd3.png)

3. The third reason: when you are on the last page, 'Previous' and 'Max number' should be gray and can not be clicked.
![2](https://user-images.githubusercontent.com/26266482/27026811-9d8d6fa0-4f91-11e7-8b51-7816c3feb381.png)

before fix:
![fix_before](https://user-images.githubusercontent.com/26266482/27026428-47ec5c56-4f90-11e7-9dd5-d52c22d7bd36.png)

after fix:
![fix_after](https://user-images.githubusercontent.com/26266482/27026439-50d17072-4f90-11e7-8405-6f81da5ab32c.png)

The style of history server ui:
![history](https://user-images.githubusercontent.com/26266482/27026528-9c90f780-4f90-11e7-91e6-90d32651fe03.png)

## How was this patch tested?

manual tests

Please review http://spark.apache.org/contributing.html before opening a pull request.

Author: guoxiaolong <[email protected]>
Author: 郭小龙 10207633 <[email protected]>
Author: guoxiaolongzte <[email protected]>

Closes #18275 from guoxiaolongzte/SPARK-21060.

(cherry picked from commit b7304f2)
Signed-off-by: Sean Owen <[email protected]>
dataknocker pushed a commit to dataknocker/spark that referenced this pull request Jun 16, 2017
… executor page. Css style about paging function is error in the executor page. It is different of history server ui paging function css style.

## What changes were proposed in this pull request?

Css style about paging function is error in the executor page. It is different of history server ui paging function css style.

**But their style should be consistent**. There are three reasons.

1. The first reason: 'Previous', 'Next' and number should be the button format.

2. The second reason: when you are on the first page, 'Previous' and '1' should be gray and can not be clicked.
![1](https://user-images.githubusercontent.com/26266482/27026667-1fe745ee-4f91-11e7-8b34-150819d22bd3.png)

3. The third reason: when you are on the last page, 'Previous' and 'Max number' should be gray and can not be clicked.
![2](https://user-images.githubusercontent.com/26266482/27026811-9d8d6fa0-4f91-11e7-8b51-7816c3feb381.png)

before fix:
![fix_before](https://user-images.githubusercontent.com/26266482/27026428-47ec5c56-4f90-11e7-9dd5-d52c22d7bd36.png)

after fix:
![fix_after](https://user-images.githubusercontent.com/26266482/27026439-50d17072-4f90-11e7-8405-6f81da5ab32c.png)

The style of history server ui:
![history](https://user-images.githubusercontent.com/26266482/27026528-9c90f780-4f90-11e7-91e6-90d32651fe03.png)

## How was this patch tested?

manual tests

Please review http://spark.apache.org/contributing.html before opening a pull request.

Author: guoxiaolong <[email protected]>
Author: 郭小龙 10207633 <[email protected]>
Author: guoxiaolongzte <[email protected]>

Closes apache#18275 from guoxiaolongzte/SPARK-21060.
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.

4 participants