Skip to content

Date time picker position fix & design fixes - #7477

Merged
MorrisJobke merged 4 commits into
masterfrom
date-time-picker-position-fix
Jan 5, 2018
Merged

Date time picker position fix & design fixes#7477
MorrisJobke merged 4 commits into
masterfrom
date-time-picker-position-fix

Conversation

@skjnldsv

Copy link
Copy Markdown
Member

Fix#7007

Position

BeforeAfter
kazam_screenshot_00009kazam_screenshot_00008

Design

BeforeAfter
kazam_screenshot_00003kazam_screenshot_00002
kazam_screenshot_00005kazam_screenshot_00007
kazam_screenshot_00004kazam_screenshot_00006

@skjnldsvskjnldsv added 3. to review Waiting for reviews bug design Design, UI, UX, etc. regression labels Dec 13, 2017
@skjnldsvskjnldsv added this to the Nextcloud 13 milestone Dec 13, 2017
@skjnldsvskjnldsv self-assigned this Dec 13, 2017
@MorrisJobke

MorrisJobke commented Dec 13, 2017

Copy link
Copy Markdown
Member
  • if the sidebar is scrolled (due to too small window) it adds the datepicker to the top:

bildschirmfoto 2017-12-13 um 12 26 23

@skjnldsv

Copy link
Copy Markdown
MemberAuthor

if the sidebar is scrolled (due to too small window) it adds the datepicker to the top:

Not sure this is fixable. The datepicker uses a fixed positioning and does not allow direction settings! 😕

@jancborchardt

Copy link
Copy Markdown
Member

Looks good! Can we also make sure that the triangle pointer of the popover is aligned to be centered below the input field? This looks especially off in the calendar timepicker, where the popover is off to the right. cc @georgehrke

(Of course we have to make sure this also works on mobile.)

@pixelipopixelipo left a comment

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.

Whitespace on the left when 24-hour scheme used:
image

@pixelipo

pixelipo commented Dec 15, 2017

Copy link
Copy Markdown
Contributor

@skjnldsv I've noticed the ⬆️ issue while testing a non-absolute solution for AM/PM - Maybe you want to try with that as well:

 /* AM/PM fix */
- table.ui-timepicker tr th {
- position: absolute;
- margin-left: -24px;
- top: calc(50% + 5px);
+ table.ui-timepicker tr .ui-timepicker-hour-cell:first-child {
+ margin-left: 30px;
}
.ui-timepicker-table {
th {
font-weight: normal;
color: nc-lighten($color-main-text, 33%);
opacity: .8;
+ &.periods {
+ padding: 0;
+ width: 30px;
+ line-height: 30px;
+ }
}
 &.ui-timepicker-hours {
border-right: 1px solid $color-border;
- /* AM/PM fix */
- .ui-timepicker tr {
- position: relative;
- margin-left: 25px;
- }
}

@codecov

codecovBot commented Dec 20, 2017

Copy link
Copy Markdown

Codecov Report

Merging #7477 into master will decrease coverage by 1.63%.
The diff coverage is 0%.

@@ Coverage Diff @@## master #7477 +/- ##
============================================
- Coverage 52.81% 51.18% -1.64% - Complexity 23581 24948 +1367 
============================================
Files 1445 1605 +160 Lines 80357 94923 +14566 Branches 0 1376 +1376 ============================================
+ Hits 42440 48584 +6144 - Misses 37917 46339 +8422
Impacted FilesCoverage ΔComplexity Δ
core/js/sharedialogshareelistview.js45.22% <0%> (ø)0 <0> (?)
.../tests/Unit/Collaboration/CommentersSorterTest.php25.55% <0%> (-66.45%)6% <0%> (ø)
apps/sharebymail/tests/SettingsTest.php52.17% <0%> (-47.83%)3% <0%> (ø)
lib/private/Security/RateLimiting/Limiter.php55.55% <0%> (-44.45%)5% <0%> (ø)
settings/Controller/EncryptionController.php54.71% <0%> (-38.84%)8% <0%> (ø)
settings/Controller/GroupsController.php64.61% <0%> (-35.39%)9% <0%> (ø)
...ps/comments/tests/Unit/AppInfo/ApplicationTest.php69.56% <0%> (-30.44%)4% <0%> (ø)
lib/private/AvatarManager.php71.42% <0%> (-28.58%)4% <0%> (ø)
apps/user_ldap/lib/Configuration.php42.02% <0%> (-27.86%)87% <0%> (ø)
apps/encryption/lib/Command/EnableMasterKey.php75% <0%> (-25%)5% <0%> (ø)
... and 403 more

@skjnldsv

Copy link
Copy Markdown
MemberAuthor

@pixelipo better?
How do you set 24h format btw?

@pixelipo

Copy link
Copy Markdown
Contributor

@skjnldsv change the NC language (for example, Italian, German)

@pixelipo

Copy link
Copy Markdown
Contributor

Still there, @skjnldsv :(
image

@skjnldsv
skjnldsvforce-pushed the date-time-picker-position-fix branch from 823f842 to c3d2e9bCompareDecember 20, 2017 10:32
@skjnldsvskjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Dec 21, 2017
pixelipo
pixelipo previously requested changes Dec 21, 2017

@pixelipopixelipo left a comment

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.

Two more things needed here:

  • Remove "Invalid date" text when no date is selected
  • Add a placeholder {{expirationDatePlaceholder}}

@skjnldsv

Copy link
Copy Markdown
MemberAuthor

@pixelipo if you want to add your fixes directly here, please do :)

@MorrisJobkeMorrisJobke mentioned this pull request Jan 2, 2018
30 tasks
@rullzer

Copy link
Copy Markdown
Member

@pixelipo@skjnldsv any chance to get this done? Beta4 is coming

@skjnldsv

Copy link
Copy Markdown
MemberAuthor

@rullzer yes, it's going in!

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv
skjnldsvforce-pushed the date-time-picker-position-fix branch from c3d2e9b to d190754CompareJanuary 3, 2018 13:02

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Tested and works 👍

@MorrisJobke

Copy link
Copy Markdown
Member

@pixelipo Could you again review this? Thanks

@skjnldsv

Copy link
Copy Markdown
MemberAuthor

Need the fixes that pixelipo requested. But the alignment can't be fixed properly.

@rullzerrullzer left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Let's do this 🐘

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv

skjnldsv commented Jan 5, 2018

Copy link
Copy Markdown
MemberAuthor

@pixelipo All clear! Default expiry date is set to NOW+1day (can't expire the same day)
And default placeholder fixed :)

There is still the AM/PM issue, I'm scratching my head over this! 🤔

@skjnldsv
skjnldsv dismissed pixelipo’s stale reviewJanuary 5, 2018 07:27

Please update review

@MorrisJobke

Copy link
Copy Markdown
Member

I would go with this for now in the beta 4. The original issue was much more obvious and killed the proper selection of the expiry date. It is fixed in this PR and we should fix the other little paper cut regressions in followup PRs that will not make it into beta 4 but that should be fine.

@MorrisJobke

Copy link
Copy Markdown
Member

I just tested again and it is fine as it is now.

@MorrisJobke
MorrisJobke merged commit 05bcdf9 into masterJan 5, 2018
@MorrisJobke
MorrisJobke deleted the date-time-picker-position-fix branch January 5, 2018 09:54
@pixelipo

Copy link
Copy Markdown
Contributor

Sorry I couldn't help you, guys - I'm sick and far away from my PC...

@MorrisJobke

Copy link
Copy Markdown
Member

Sorry I couldn't help you, guys - I'm sick and far away from my PC...

Don't worry :) Was just to get stuff fixed, that is actually broken and fix the small issues later on. :)

@MorrisJobke

Copy link
Copy Markdown
Member

And @pixelipo rest and get well soon :)

@skjnldsv

Copy link
Copy Markdown
MemberAuthor

@pixelipo never apologise for being sick! :)
Get well soon! 🎈

@jancborchardt

Copy link
Copy Markdown
Member

Just one thing, was the default expiry date now+1day? Seems a bit short, and now+1week seems better. Otherwise a lot of links will expire by default without opening.

@pixelipo get well soon! :)

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

Labels

2. developingWork in progressbugdesignDesign, UI, UX, etc.regression

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@skjnldsv@MorrisJobke@jancborchardt@pixelipo@rullzer