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

Add Services and Privacy settings page to mobile #6086

Merged
merged 4 commits into from
Jun 18, 2015

Conversation

Flaburgan
Copy link
Member

No description provided.


.container-fluid
Copy link
Member Author

Choose a reason for hiding this comment

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

Git diff is not really powerful here, the only thing I did was to remove a .container-fluid and so moving everything two spaces to the left.

Copy link
Member

Choose a reason for hiding this comment

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

This adds some inconsistency for the desktop views. /user/edit has no surrounding .container-fluid anymore while all other settings pages still have one.

@Flaburgan
Copy link
Member Author

Wow, no hound remark at all? Wasn't expected.

@@ -2,13 +2,14 @@
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.

= render "shared/settings_nav"
.stream_element
Copy link
Member

Choose a reason for hiding this comment

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

That class doesn't look correct in this context. Maybe think of a new name and apply the same styles? (Or pick those that are necessary in this case)

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah I agree. I think that we should have two layouts in the mobile version, the pages which contain elements, like the stream, the profile, the notifications or the contacts pages, and the pages are more about text, like the settings pages, the admin panel, the getting started...

The pages of the first group should have the grey background and then a white bg around each elements, but the text pages should directly have a white background, to avoid losing width space and look overloaded.

What do you think about that? It's a bigger work than what I'm doing here, that's why I simply used .stream_element as a temporary solution, but I agree, temp can become long, so I can make this one cleaner.

Copy link
Member Author

Choose a reason for hiding this comment

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

Added a new class.

@Flaburgan
Copy link
Member Author

This closes #5312 btw

= block.person_name
\-
= link_to t('.stop_ignoring'), block_path(block),
method: :delete
Copy link

Choose a reason for hiding this comment

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

No way to render the desktop view instead ?

Copy link
Member Author

Choose a reason for hiding this comment

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

I could use a partial to do that yeah. What's your opinion everybody? Is this view good enough like this for mobile or should it be improved?

capture d ecran 2015-06-08 a 23 07 59

Copy link
Member Author

Choose a reason for hiding this comment

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

I extracted it in a partial.

@Flaburgan Flaburgan force-pushed the add-services-mobile branch 2 times, most recently from 07ea19d to eb2bb78 Compare June 12, 2015 11:07
@Flaburgan
Copy link
Member Author

Rebased, this is ready to review.

@svbergerem
Copy link
Member

I'll review this tonight. (Unless someone else is faster)

.clearfix= f.submit t('users.edit.close_account_text'), class: "btn btn-danger pull-right",
id: "close_account_confirm", data: { confirm: t("are_you_sure_delete_account") }

- if not mobile
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't this be just - else?

Copy link
Member Author

Choose a reason for hiding this comment

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

I didn't touch this code at all, I only reindented it that's why it is shown as modified.

Copy link
Member

Choose a reason for hiding this comment

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

I removed that in #6102 so don't worry about it anymore.

@Flaburgan
Copy link
Member Author

Hm, you removed the users/_edit.haml file in
4534ba5 yesterday and now use only one view for both mobile and desktop. Why did you do that?

@svbergerem
Copy link
Member

@Flaburgan Because there were no differences between the rendered files anymore.

@Flaburgan
Copy link
Member Author

Well, in develop, but not in this PR...

@svbergerem
Copy link
Member

If you need different views for desktop and mobile you can move app/views/users/edit.haml to app/views/users/edit.html.haml and save a copy to app/views/users/edit.mobile.haml.

@Flaburgan
Copy link
Member Author

The partial is fine, I'm going to redo it. I just wanted to check if you did that for a good reason or just as a refactor (it seemed weird because you reviewed this code just before). Anyway, back to work :)

@Flaburgan
Copy link
Member Author

I refactored the settings pages to correctly use the bootstrap grid. I'll have a final look at it soon and then it'll be ready.

@Flaburgan
Copy link
Member Author

This should be ready.

@@ -0,0 +1,2 @@
.container-fluid
= render "edit", mobile: false
Copy link
Member

Choose a reason for hiding this comment

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

the variable mobile is not used anywhere

@svbergerem
Copy link
Member

services before:

services_before

services after:

services_after

@Flaburgan
Copy link
Member Author

@svbergerem problems fixed.

Btw @goobertron is There are no services on this pod available. a nice sentence? I would have placed available just after services but eh, you're the native speaker so I ask ;)

@goobertron
Copy link

You are a native English speaker! Yes, 'There are no services available on this pod.' is far better - grammatically correct, and clearer in meaning.

I'm just going to have a think about whether there's a more 'positive'/friendly way we can say this. Probably not, and it's fine as is - just a good opportunity to see whether there's any improvement that can be made.

@KentShikama
Copy link
Contributor

Maybe 'There are no third party sharing services available on this pod.' is clearer? Just plain 'services' is a bit ambiguous in terms of what 'services' are if you didn't know what they could be in the first place. Without context, it might even make it sound like this pod can't do anything.

@goobertron
Copy link

There is context given by the notice to the right in the Services tab - see screenshots above. However it's not currently that informative.

I like your 'third-party sharing services', which I think makes it a bit clearer. I would add this to the notice on the right-hand side, so:

Connecting to third-party sharing services gives you the ability to publish your posts to them as you write them in diaspora*.

on the right, and stay with

There are no services available on this pod.

for the notice when there are none connected.

Fla, would you be happy to incorporate that extra change to the en locale in this PR?

@Flaburgan
Copy link
Member Author

@goobertron done.

@svbergerem svbergerem added this to the 0.6.0.0 milestone Jun 18, 2015
@svbergerem svbergerem merged commit a7d88ad into diaspora:develop Jun 18, 2015
svbergerem pushed a commit that referenced this pull request Jun 18, 2015
Add Services and Privacy settings page to mobile
@svbergerem
Copy link
Member

Thank you!

@Flaburgan
Copy link
Member Author

Nice :)

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