Maybe I'm missing something obvious, but I've checked the box "Show diffs inline for this content type" and I can't see any change in the diff output/behaviour (still 2-column side-by-side).
Any ideas??
TIA
| Comment | File | Size | Author |
|---|---|---|---|
| #12 | diff-448898.patch | 4.51 KB | realityloop |
Comments
Comment #1
gpk commentedChanging status.
I've double checked my content type settings. and from scanning this http://cvs.drupal.org/viewvc.py/drupal/contributions/modules/diff/diff.m... it seems I should be seeing additional options (inline diff form) when viewing a page? But there seems to be nothing there..!
Maybe I've overlooked something, but part of the problem is I don't know where to look to find the inline diff stuff.
Comment #2
gpk commentedUpdating title.
Comment #3
itaine commentedYeah there is no documentation of the new features, so initially it throws you for a loop. The new inline functionality can be harnessed via a button entitled "Highlight changes" under the view tab of the node. After punching it you get a drop down selection to checkout inline diffs; different from what I expected. Nevertheless very welcomed features!
Comment #4
gpk commentedThanks, where is this button? Have tried changing the site theme to Garland but still no sign of it when viewing a node!
I wonder if OG or another module is interfering somehow..
Comment #5
gpk commentedHad an idea ... I can see the button if I log in as user 1.
What seems to be happening is that Highlight changes specifically requires "view revisions" permission, whereas viewing revisions can be done via administer nodes permission.
This turns out to be useful since the diff-inline-form somewhat breaks my page layout..! So I'm glad to be able to hide the resulting mess from other content admins!
Comment #6
elijah lynnI just updated to latest dev and it worked for me. I saw it on OpenAtrium's home and really liked it!
Comment #7
my-family commentedI see the "highlight changes" button, but not the results. I see only legend with coloured background, but no changes (differences in background colour) in the text. Neither the changed parts of text have any additional class related to diff module. It is the same for the last stable and last -dev version. Thank you in advance for help.
Comment #8
Anonymous (not verified) commentedSame for me.
"Hightlight changes"-Button appears, coloured legend is shown, nodes without revisions do not have that stuff.
But there is no effect for the display, neither for user 1 nor other users.
Has to happen some css-tweaking or other kinds of stuff to get it working?
Would really love to have that nice feature for my wiki pages.
Is there some documentation about this?
Comment #9
sphopkins commentedI am not seeing the highlighted text as well.
Comment #10
realityloop commentedI'm seeing the link to show inline diffs but when I click it differences aren't highlighted, if I use Show Diffs from the Revisions tab the differences are displayed correctly.
I tested this with alpha 3 and dev releases
Comment #11
realityloop commentedI've found what I believe to be the cause of this issue but I'm not entirely sure how to fix it.
For starters will need to change
to
So that cck fields will be available to the preg_split code.
But I have no idea how to refactor the preg_split code to also act against cck fields and then reassemble for $output...
diff.pages.inc line 388
Comment #12
realityloop commentedPatch attached
Comment #13
Sera commentedThis patch doesnt help.
But I already have applied
http://drupal.org/node/639320 Patch #24
and http://drupal.org/node/372957 Patch #8
With the help of these I was able to see the "Highlight changes" button (sometimes). Sometimes the changes were already colored, but I dont see the button. Sometimes I see the button, but no colors. Nevertheless the above mentioned patches do fix the problem "partially".
Patch #11 doesnt improve this. :( [Without the patches mentioned above I cant get diff running with php5.3 :/ ]
Comment #14
realityloop commentedI found yesterday my patch at #12 only works if your template renders the node->content , using a custom tpl or contemplate will likely stop it from displaying correctly.
I'm not using php 5.3 here so am unable to test my changes to see if 5.3 causes additional issues
Comment #15
yhahn commentedThanks, committed: http://drupal.org/cvs?commit=405702
Comment #16
sphopkins commentedThis patch seems to almost perfectly work for me. I have php 5.2x installed. The only issue I note is that on nodes that have fieldsets collapsed, the collapsed fieldsets do not render the inline diff. If I open the fieldsets, the diff works perfectly...
Comment #18
marcoBauli commentedstill seeing revisions in side by side columns and no "Highlight changes" button on latest dev version even on default Garland theme..
running PHP 5.2
Comment #19
chinita7 commentedI also don't see "Highlight changes" anywhere. I tried 6.x-2.3 and the latest dev version. running on php5.3
Comment #20
alan d. commentedRegarding #18 / #19
This is only present in the block "Inline differences", so enable that and you should see the button.
Comment #21
matt.rad commentedRe: #20 -- This button is now hidden by default, right? It should load automatically?