RDF UI's css was left in the main module directory.

CommentFileSizeAuthor
#6 rdfui_css_location-1160116.patch2.15 KBbarbi

Comments

scor’s picture

Issue tags: +Novice

Actually, css/rdfui.css is a duplicate of modules/rdfui/rdfui.css, which itself should live in modules/rdfui/css.

todo:
- remove css/rdfui.css
- move modules/rdfui/rdfui.css into its own css folder
- update rdfui.module to account for the new path.

That's not too difficult to fix, so tagging novice. Make sure to use -C -M when rolling your patch to support the magic git file move/copy and lower the patch size.

scor’s picture

Title: Move css/rdfui.css into modules/rdfui/css » Fix RDF UI css file location
barbi’s picture

subscribing

barbi’s picture

Assigned: Unassigned » barbi

When removing css/rdfui.css, I assume I have to remove the empty CSS fodler too.
I have made the other changes and need help with using -C and -M tags. I am asking this question in IRC.

scor’s picture

no need to remove the empty folder, git will take care of that. just remove the file.

barbi’s picture

Status: Active » Needs review
StatusFileSize
new2.15 KB

Got help from IRC [Thanks tr] in using the -C and -M tags
This is how I made the patch. Just to ensure the process is right and also might help someone in search.

509 git clone --branch 7.x-2.x http://git.drupal.org/project/rdfx.git
510 cd rdfx/
511 git branch -a
512 git checkout -b cssfix
513 ls
514 git rm css/rdfui.css
515 mkdir modules/rdfui/css
516 git mv modules/rdfui/rdfui.css modules/rdfui/css/rdfui.css
517 mate .
518 git status
519 git add modules/rdfui/rdfui.module
520 git status
521 git commit -m 'remove css file from rdfx/css and move css in rdfui'
522 git log --pretty=oneline
523 git format-patch 7.x-2.x --stdout > sample.patch
524 rm sample.patch
525 git format-patch -C -M 7.x-2.x --stdout > sample.patch

scor’s picture

hey Barbi, nice thorough work again here :) It would be awesome if you could summarize the approach you used and what was discussed in #1116900: git format-patch displays file moves as whole verbose diffs in the documentation for creating patches: Advanced patch contributor guide. you should be able to edit that page and add in the information creating patches using the git file copy and rename magic.

scor’s picture

Status: Needs review » Fixed

Thanks barbi, patch committed and pushed. Try to use regular syntax when you make commits, e.g. #1160116 by barbi | scor: Changed Fix RDF UI css file location.. I amended you commit message in this case, so no problem :) Thanks again for your contribution, it's great work!

Automatically closed -- issue fixed for 2 weeks with no activity.