Come together with the global Drupal community in Rotterdam, 28 Sept – 1 Oct 2026. Sessions, contribution, connection, and Early Bird savings until 8 June.After today's push of me to merge the branches/5 and branches/groups theme, there is not much left in terms of difference between the two themes.
1. There is a site_variable.patch a page.patch and a bb_regions_and_custom_css.patch which all seem to be superseded by current theme code (eg. bb-regions contains a bb_header region which is now called $top in the theme; page.patch contains code which is now much better generalized, etc).
2. There is this remaining patch. Done from branches/5 to branches/groups, so it shows as if we are moving from 5 to groups (which we don't do, but groups has changes, so it was best to show that this way). We are merging the other way around!
- node.tpl.php: has organic groups specific theming for terms, previews, etc. This could use a detailed look and code style (brr, tabs) fixing.
- template.php: looks like harmless changes in hook_variables(); debug code in hook_links() (?)
- style.css: this could use good testing and reviews. Margins, paddings, backgrounds, etc are modified on groups. Complete sections are removed. The bulk of the changes seem to concern "a.download-link" and project issue stuff which drupal.org should have right, so should be fine to merge into groups instead.
After this patch is reviewed and committed, the groups theme should be identical to branches/5. This is number 1 goal at http://groups.drupal.org/node/16183 Yay!
| Comment | File | Size | Author |
|---|---|---|---|
| #5 | Picture 1.png | 56.87 KB | greggles |
| #3 | template-php-variables.patch | 4.87 KB | gábor hojtsy |
| #2 | node-tpl-php.diff | 7.97 KB | gábor hojtsy |
| #1 | style-sync.patch | 8.01 KB | gábor hojtsy |
| remaining_diffs.patch | 13.56 KB | gábor hojtsy |
Comments
Comment #1
gábor hojtsyDiscussed this patch with Moshe, and will commit in smaller chunks. Implemented and reviewed the style.css changes. Committed this patch in rev 32. Still two more files to sync based on the original patch.
Comment #2
gábor hojtsyCommitted this in rev 33 to merge the node.tpl.php differences. Needed to introduce an _is_groups_site() function so that we can identify the groups site. The groups node.tpl.php included problematic whitespace but I did keep it (and even carried over to bluebeach node.tpl.php) so that what changed is more visible in the diff). I did make a few whitespace changes still.
Comment #3
gábor hojtsyThe rest was this merge of the variables code in template.php. Committed in rev 34. Now the groups and branch 5 theme should be the same.
Comment #5
gregglesThere was a problem and a fix when the new subscribe button was added to g.d.o.
The bug has re-appeared which I imagine occurred with the unforking of the themes.
The problem is occurring again - http://groups.drupal.org/node/17934#new (screenshotted b/c the problem goes away after the second comment.
Comment #6
drummLooks like that button is gone, and the old theme is on its way out anyway.