/cuberite

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

Made WebAdmin more modern #1509

Merged
merged 5 commits into from Oct 6, 2014

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@WebFreak001 @madmaxoft @bearbin @AedDev @archshift
@WebFreak001
Contributor

WebFreak001 commented Oct 5, 2014

I've made the webadmin look more modern using the google designing standards.

  • Light/Bold text for captions and important stuff
  • .warn, .info, .err css class for error messages
  • a bit more margin and padding and increased font size for improved readability
  • made the website responsive until a width of about 650px
  • made it on larger screens wider for more informations. Long texts will be shorter in line height
  • made button and input styles to match everything
  • added page specific css for some core plugins
  • page specific css can be easily turned off
@archshift

archshift reviewed Oct 5, 2014
View changes

Show outdated Hide outdated MCServer/webadmin/files/style.css
@madmaxoft

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft Oct 5, 2014

Member

We don't put author names into files - it discourages further cooperation ("he's signed the file, I don't want him to feel offended / make my contribution under his name / ..."). Also the license is already in the LICENSE file and we don't put a copy in the sources; if you're alright with such changes.
Member

madmaxoft commented Oct 5, 2014

We don't put author names into files - it discourages further cooperation ("he's signed the file, I don't want him to feel offended / make my contribution under his name / ..."). Also the license is already in the LICENSE file and we don't put a copy in the sources; if you're alright with such changes.
@bearbin

This comment has been minimized.

Show comment
Hide comment
@bearbin

bearbin Oct 5, 2014

Member

Just put your name in the CONTRIBUTORS.md file in the main dir instead of in each file.
Member

bearbin commented Oct 5, 2014

Just put your name in the CONTRIBUTORS.md file in the main dir instead of in each file.
@WebFreak001

This comment has been minimized.

Show comment
Hide comment
@WebFreak001

WebFreak001 Oct 5, 2014

Contributor

then please dont tell me on the forums I need to add a license xD
Contributor

WebFreak001 commented Oct 5, 2014

then please dont tell me on the forums I need to add a license xD
@bearbin

This comment has been minimized.

Show comment
Hide comment
@bearbin

bearbin Oct 5, 2014

Member

Sorry, I just meant that you needed to be OK with it being under Apache 2.0, as if you're not OK then it can't go in the project.

Anyway, I like the new design, it's a great improvement.
Member

bearbin commented Oct 5, 2014

Sorry, I just meant that you needed to be OK with it being under Apache 2.0, as if you're not OK then it can't go in the project.

Anyway, I like the new design, it's a great improvement.
MCServer/webadmin/template.lua
Output([[
<!DOCTYPE html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="icon" href="/favicon.ico">
<title>]] .. Title .. [[</title>
<link rel="stylesheet" type="text/css" media="screen" href="/style.css">
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,600,300' rel='stylesheet' type='text/css'>

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft Oct 5, 2014

Member

Uhhh... can't we do without reliance on Google? I don't like them sniffing around each and every page I visit.
Copy link
@madmaxoft

madmaxoft Oct 5, 2014

Member

Uhhh... can't we do without reliance on Google? I don't like them sniffing around each and every page I visit.

This comment has been minimized.

Show comment
Hide comment
@archshift

archshift Oct 5, 2014

Contributor

Come on, this is literally downloading a font. They can't snoop you through a font.
Copy link
@archshift

archshift Oct 5, 2014

Contributor

Come on, this is literally downloading a font. They can't snoop you through a font.

This comment has been minimized.

Show comment
Hide comment
@bearbin

bearbin Oct 5, 2014

Member

Relying on Google here is actually very beneficial - it serves the correct type of font for whatever platform the user is on, and very quickly as well (because in most cases, it's cached).

And they say they don't track you via the CDN I think.
Copy link
@bearbin

bearbin Oct 5, 2014

Member

Relying on Google here is actually very beneficial - it serves the correct type of font for whatever platform the user is on, and very quickly as well (because in most cases, it's cached).

And they say they don't track you via the CDN I think.

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft Oct 5, 2014

Member

Oh yes they can - they receive a Referer header pointing to my server's URL. And they get all the stupid cookies that their spy ads program uses.
Copy link
@madmaxoft

madmaxoft Oct 5, 2014

Member

Oh yes they can - they receive a Referer header pointing to my server's URL. And they get all the stupid cookies that their spy ads program uses.

This comment has been minimized.

Show comment
Hide comment
@archshift

archshift Oct 5, 2014

Contributor

My only issue here is that I doubt whether it will display correctly when the user is not connected to the internet, which is an entirely plausible situation.
Copy link
@archshift

archshift Oct 5, 2014

Contributor

My only issue here is that I doubt whether it will display correctly when the user is not connected to the internet, which is an entirely plausible situation.

This comment has been minimized.

Show comment
Hide comment
@bearbin

bearbin Oct 5, 2014

Member

@archshift: Made a comment regarding that above.
Copy link
@bearbin

bearbin Oct 5, 2014

Member

@archshift: Made a comment regarding that above.

This comment has been minimized.

Show comment
Hide comment
@bearbin

bearbin Oct 5, 2014

Member

Stackoverflow says it's quite easy to convert google fonts to offline fonts: http://stackoverflow.com/a/15930264/1542540

(I'm not sure about copyright though, make sure it's right first.)
Copy link
@bearbin

bearbin Oct 5, 2014

Member

Stackoverflow says it's quite easy to convert google fonts to offline fonts: http://stackoverflow.com/a/15930264/1542540

(I'm not sure about copyright though, make sure it's right first.)

This comment has been minimized.

Show comment
Hide comment
@archshift

archshift Oct 5, 2014

Contributor

Wikipedia says it's under the Apache License 2.0.
Copy link
@archshift

archshift Oct 5, 2014

Contributor

Wikipedia says it's under the Apache License 2.0.

This comment has been minimized.

Show comment
Hide comment
@bearbin

bearbin Oct 5, 2014

Member

That should be fine then :)
Copy link
@bearbin

bearbin Oct 5, 2014

Member

That should be fine then :)
@bearbin

bearbin reviewed Oct 5, 2014
View changes

Show outdated Hide outdated MCServer/webadmin/files/style.css
@madmaxoft

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft Oct 5, 2014

Member

Pity that the font looks really terrible when the OS doesn't anti-alias:
webadmin_roboto
Member

madmaxoft commented Oct 5, 2014

Pity that the font looks really terrible when the OS doesn't anti-alias:
webadmin_roboto
@madmaxoft

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft Oct 6, 2014

Member

Alright, anyone opposed to merging?
Member

madmaxoft commented Oct 6, 2014

Alright, anyone opposed to merging?
@bearbin

This comment has been minimized.

Show comment
Hide comment
@bearbin

bearbin Oct 6, 2014

Member

Nope. Merge it! @tigerw also wants it merged.
On Oct 6, 2014 8:25 AM, "Mattes D" notifications@github.com wrote:

Alright, anyone opposed to merging?

—
Reply to this email directly or view it on GitHub
#1509 (comment).
Member

bearbin commented Oct 6, 2014

Nope. Merge it! @tigerw also wants it merged.
On Oct 6, 2014 8:25 AM, "Mattes D" notifications@github.com wrote:

Alright, anyone opposed to merging?

—
Reply to this email directly or view it on GitHub
#1509 (comment).
@AedDev

This comment has been minimized.

Show comment
Hide comment
@AedDev

AedDev Oct 6, 2014

Great stuff, bro! But why not using Bootstrap?

AedDev commented Oct 6, 2014

Great stuff, bro! But why not using Bootstrap?
@WebFreak001

This comment has been minimized.

Show comment
Hide comment
@WebFreak001

WebFreak001 Oct 6, 2014

Contributor

@morphesus I don't like bootstrap for so easy things. Also it would be hard to make the plugins compatible with it^^
Contributor

WebFreak001 commented Oct 6, 2014

@morphesus I don't like bootstrap for so easy things. Also it would be hard to make the plugins compatible with it^^
@AedDev

This comment has been minimized.

Show comment
Hide comment
@AedDev

AedDev Oct 6, 2014

@WebFreak001 Ok, thats an Argument. I'll test the new layout later ;) Looks really good!

AedDev commented Oct 6, 2014

@WebFreak001 Ok, thats an Argument. I'll test the new layout later ;) Looks really good!

madmaxoft added a commit that referenced this pull request Oct 6, 2014

@madmaxoft
Merge pull request #1509 from WebFreak001/master 
Made WebAdmin more modern
75003e1

@madmaxoft madmaxoft merged commit 75003e1 into cuberite:master Oct 6, 2014
1 check passed

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment