Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Add Icons to Menus #184

Closed
wants to merge 1 commit into
from

Conversation

Projects
None yet
3 participants
Contributor

srsgores commented Jan 6, 2013

  • Make forms use HTMl5 required and placeholder
  • Add icon property to any menu item. Icons reference the icomoon stylesheet, but this can be configured using the json file included
  • Fix toolbar elements not properly aligning
  • Add placeholder and required where I thought was necessary
  • Fix admin-menu.css import in html files. The file no longer exists.

Pics

calipsopic3
calipsopic3_2
calipsopic3_3
calipsopic3_4
calipsopic3_5
calipsopic3_6

@srsgores srsgores Add icons to menus.
Make forms use HTMl5 required and placeholder
6f14cf0
Collaborator

richtera commented Jan 6, 2013

Could you please pull upstream and rebase. I had fixed some stuff in terms of removing http: in front of the google font references and removing admin-menu.css.

Also by changing your branch configuration to do rebase it'll rebase automatically.
In each [branch] section in your .git/config file add "rebase=true"
This is how mine looks:

[branch "master"]
remote = origin
merge = refs/heads/master
rebase = true

Collaborator

richtera commented Jan 6, 2013

Also this commit changed the code style again. Please revert the code style changes.

Contributor

srsgores commented Jan 7, 2013

Ok, thanks for the heads up. My workflow for editing the JS files is to initially reformat them to my syntax settings (the way I find it easiest to read the code), then make changes. But what I don't understand is why you can't merge the conflicts and do a theirs resolution to the conflict. Or better yet, why not reformat the entire project to use tabs (in a separate, new commit)?

It is possible to put the else bracket on the same line. You just have to go to the bracket settings.

Really, I don't want you to have to hand-edit my changes. That's a waste of development time. How can we keep it so that I get to edit using my syntax settings, and you don't have to spend hours hand-editing them?

Let me know your thoughts.

Collaborator

richtera commented Jan 7, 2013

When working on projects together as a team, reformatting the code is a big
no-no. In fact any global changes are a bad idea because someone will need
to do a hand merge in the end. If a project has been around for a while it
already has a particular style and it's better to learn the style than to
reformat. The only way you could do this is to work off of a branch, make
all the style changes, commit. Then make your changes and cherry pick the
modifications after your style change commit to the original branch and fix
all the conflicts (which incidentally are all the same ones I have to fix.)
Code style changes just can't be imposted onto projects at a later time
unless everyone in the group wants to agree and reformat everything. I
already applied all your curly braces, extra comma and other fixes which
were part of your reformatting. If you use the code format xml file I sent
to you then your format should match the one in the code. I am not sure if
there is another solution because at any moment someone could come to the
project with yet another code preference and conflict with yours. Let me
know if you have another suggestion.
Thanks
Andy

Sent via the internets

On Jan 6, 2013, at 11:18 PM, Sean Goresht notifications@github.com wrote:

Ok, thanks for the heads up. My workflow for editing the JS files is to
initially reformat them to my syntax settings (the way I find it easiest to
read the code), then make changes. But what I don't understand is why you
can't merge the conflicts and do a theirs resolution to the conflict. Or
better yet, why not reformat the entire project to use tabs (in a separate,
new commit)?

It is possible to put the else bracket on the same line. You just have to
go to the bracket settings.

Really, I don't want you to have to hand-edit my changes. That's a waste of
development time. How can we keep it so that I get to edit using my syntax
settings, and you don't have to spend hours hand-editing them?

Let me know your thoughts.


Reply to this email directly or view it on
GitHubhttps://github.com/cliftonc/calipso/pull/184#issuecomment-11940454.

Is the "code format xml file" public?
Do you have a link to it?

Thanks,
Alin

Collaborator

richtera commented Jan 24, 2013

Awesome idea. I'll add it to the repo. The .idea folder was changing so
much that I deleted it.
Andy

Sent from my iPhone

On Jan 24, 2013, at 10:03 AM, doru notifications@github.com wrote:

Is the "code format xml file" public?
Do you have a link to it?

Thanks,
Alin


Reply to this email directly or view it on
GitHubhttps://github.com/cliftonc/calipso/pull/184#issuecomment-12654791.

Are you using webstorm? Is it the recomanded IDE for yhe project?
I am using it a lot and I like it a lot.

Alin
On Jan 24, 2013 10:42 AM, "Andreas Richter" notifications@github.com
wrote:

Awesome idea. I'll add it to the repo. The .idea folder was changing so
much that I deleted it.
Andy

Sent from my iPhone

On Jan 24, 2013, at 10:03 AM, doru notifications@github.com wrote:

Is the "code format xml file" public?
Do you have a link to it?

Thanks,
Alin


Reply to this email directly or view it on
GitHubhttps://github.com/cliftonc/calipso/pull/184#issuecomment-12654791.


Reply to this email directly or view it on GitHubhttps://github.com/cliftonc/calipso/pull/184#issuecomment-12656874.

Collaborator

richtera commented Jan 24, 2013

Yes webstorm
Andy

Sent from my iPhone

On Jan 24, 2013, at 10:48 AM, doru notifications@github.com wrote:

Are you using webstorm? Is it the recomanded IDE for yhe project?
I am using it a lot and I like it a lot.

Alin
On Jan 24, 2013 10:42 AM, "Andreas Richter" notifications@github.com
wrote:

Awesome idea. I'll add it to the repo. The .idea folder was changing so
much that I deleted it.
Andy

Sent from my iPhone

On Jan 24, 2013, at 10:03 AM, doru notifications@github.com wrote:

Is the "code format xml file" public?
Do you have a link to it?

Thanks,
Alin


Reply to this email directly or view it on
GitHubhttps://github.com/cliftonc/calipso/pull/184#issuecomment-12654791.


Reply to this email directly or view it on GitHub<
https://github.com/cliftonc/calipso/pull/184#issuecomment-12656874>.


Reply to this email directly or view it on
GitHubhttps://github.com/cliftonc/calipso/pull/184#issuecomment-12657170.

Contributor

srsgores commented Jan 27, 2013

Please explain how I should proceed with working on this repo. Do I just pull from devel, and then reformat, using the new settings before sending the pull request? Can you please specify a workflow for jetBrains editors like PHPStorm or Webstorm?

Thanks.

Collaborator

richtera commented Jan 27, 2013

You would need to pull master, make your changes and then undo all changes
which are not code changes. Unfortunately webstorm or phpstorm doesn't
support undo format changes. I added my version of the codestyle as an
export jar file to the repo. The only other way would be for me to do the
merge after you push a change and then you checkout after the merge but
that's a lot of work for me on each patch. I have not figured out an
automated way to do this but maybe it can be automated. Is it impossible
for you to leave the code formatted as is and modify it from there?
Thanks
Andy

Sent from my iPhone

On Jan 26, 2013, at 10:53 PM, Sean Goresht notifications@github.com wrote:

Please explain how I should proceed with working on this repo. Do I just
pull from devel, and then reformat, using the new settings before sending
the pull request? Can you please specify a workflow for jetBrains editors
like PHPStorm or Webstorm?

Thanks.


Reply to this email directly or view it on
GitHubhttps://github.com/cliftonc/calipso/pull/184#issuecomment-12747199.

Collaborator

richtera commented Apr 18, 2013

I did merge all these, forgot to close the pull request.

@richtera richtera closed this Apr 18, 2013

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