Review main Merged

10995[BUGFIX] Wrong margin calculation for Text/Image

Torben Hansen CR +2 V +2 Normal +39 −16 updated 06/03/13, 20:49

Commit message

This patch fixes a wrong calculation of margins for Text/Image
items with the properties "Beside text, left" and "Beside
text, right".

Review

  • Code review CR +2
    • Steffen Ritter +2
  • Verified V +2
    • Steffen Ritter +2

Files 1

Review log 20

  1. Gerrit wrote 06/24/12, 13:31

    Your change could not be merged due to a path conflict. Please merge (or rebase) the change locally and upload the resolution for review.
  2. Patrick Broens commented on patch set 2 06/24/12, 13:31

    I would prefer that you didn't submit this The uid of the cObj is used to make a class name, which produces a lot of temporary stylesheets, when this content object is used a lot. IMO it would be better to use the margin width in the class name instead of the uid, to prevent at least some double entries of the same margins. For instance, when the margin reaches the maxW, all classes using this margin will use the same class name and therefor the same temporary stylesheet. I'll post a new patch set on wednesday, if you're fine with that.
  3. Patrick Broens uploaded patch set 3 06/24/12, 13:31

  4. Patrick Broens uploaded patch set 4 06/24/12, 13:31

  5. Tolleiv Nietsch commented on patch set 2 06/24/12, 13:31

    Verified; Looks good to me, but someone else must approve The patch should also go into 6.0 ;) --- besides that the patch seems fine and worked properly for me. Thanks
  6. Tolleiv Nietsch uploaded patch set 2 06/24/12, 13:31

  7. Susi Moog commented on patch set 2 06/24/12, 13:31

    Patrick, can you have another look at this one?
  8. Steffen Ritter commented on patch set 2 06/24/12, 13:31

    Hi Patrick, could you do so? 4.7.1 will be next week, would like to see that in there!
  9. Steffen Ritter commented on patch set 4 V 0 06/24/12, 13:31

    by team member; Looks good to me, approved
  10. Steffen Ritter commented on patch set 4 06/24/12, 13:31

    Looks good to me, but someone else must approve Looks useful and makes sense... Anyhow there is a little white space issue in the stdwrap call of the newly inserted part. Any how if this remains the only concern, it should not block this patch
  11. Steffen Ritter voted on patch set 4 V 0 06/24/12, 13:31

  12. Steffen Ritter uploaded patch set 5 06/24/12, 13:31

  13. Tobias Wollender commented on patch set 4 06/24/12, 13:31

    Verified; Looks good to me, but someone else must approve
  14. Mr. Jenkins commented on patch set 1 06/24/12, 13:31

  15. Mr. Jenkins commented on patch set 2 06/24/12, 13:31

  16. Mr. Jenkins commented on patch set 3 06/24/12, 13:31

    Fails; I would prefer that you didn't submit this Build Failed https://ci.typo3.org/job/typo3-v4-core-gerrit/4533/ : FAILURE
  17. Mr. Jenkins commented on patch set 4 06/24/12, 13:31

  18. Mr. Jenkins commented on patch set 5 06/24/12, 13:31

  19. Steffen Ritter commented on patch set 5 V 0 06/24/12, 13:31

    by team member; Looks good to me, approved just merged to the cglified version
  20. Steffen Ritter merged patch set 5 06/24/12, 13:31