Copy the System folder templates to Classy. Do not copy the following templates.

./core/modules/system/templates/admin-block-content.html.twig
./core/modules/system/templates/admin-block.html.twig
./core/modules/system/templates/admin-page.html.twig
./core/modules/system/templates/system-admin-index.html.twig
./core/modules/system/templates/system-config-form.html.twig
./core/modules/system/templates/system-themes-page.html.twig
./core/modules/system/templates/status-report.html.twig
./core/modules/system/templates/install-page.html.twig
./core/modules/system/templates/maintenance-task-list.html.twig

These templates will be copied without any edits to them. The editing of the templates will happen in child issues.

Files: 
CommentFileSizeAuthor
#66 reorgClassy-x.patch25.42 KBmortendk
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 86,220 pass(es). View
#64 2349759-reorgClassy-64.patch72.84 KBrteijeiro
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 86,228 pass(es). View
#63 2349759-reorgClassy-62.patch130.44 KBrteijeiro
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 86,221 pass(es). View
#61 2349759-reorgClassy-61.patch950 bytesrteijeiro
FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] Setup environment: Test cancelled by admin prior to completion. View
#54 reorgClassy-3.patch130.44 KBmortendk
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 86,197 pass(es). View
#52 interdiff-searchbox.txt475 bytesdavidhernandez
#52 reorgClassy-2.patch24.96 KBdavidhernandez
FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] Setup environment: Test cancelled by admin prior to completion. View
#48 reorgClassy-copysomesystem.patch24.49 KBdavidhernandez
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 86,199 pass(es). View

Comments

mortendk’s picture

Status: Active » Needs review
Issue tags: +cssbanana
FileSize
54.84 KB
FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] 78,534 pass(es), 315 fail(s), and 166 exception(s). View

this is gonna be a pita ...

Status: Needs review » Needs work

The last submitted patch, 1: copy_system_templates-2349759-1.patch, failed testing.

falkendk’s picture

Status: Needs work » Needs review
FileSize
79.29 KB
FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] Unable to apply patch copy_system_templates-2349759-3.patch. Unable to apply patch. See the log in the details link for more information. View

Copied files and removed classes

Status: Needs review » Needs work

The last submitted patch, 3: copy_system_templates-2349759-3.patch, failed testing.

mortendk’s picture

Issue tags: +drupalhagen
davidhernandez’s picture

Please double-check if any removed classes are being used in javascript. It is best to test the affected template using Stark to make sure nothing is broken.

Status: Needs work » Needs review

Status: Needs review » Needs work

The last submitted patch, 3: copy_system_templates-2349759-3.patch, failed testing.

Maninders’s picture

I worked on the time.html.twig and on vertical-tabs.html.twig file.

Manjit.Singh’s picture

Copied files and removed classes from these files select.html.twig, status-messages.html.twig, status-report.html.twig

Mukeysh’s picture

FileSize
14.49 KB
14.49 KB

patch added for
core/modules/system/templates/system-admin-index.html.twig
core/modules/system/templates/system-config-form.html.twig
core/modules/system/templates/system-themes-page.html.twig
core/modules/system/templates/table.html.twig
core/modules/system/templates/tablesort-indicator.html.twig
core/modules/system/templates/task-list.html.twig
core/modules/system/templates/textarea.html.twig

brahmjeet789’s picture

FileSize
12.77 KB

I added
core/theme/classy/templates/install-page.html.twig
core/theme/classy/templates/item-list.html.twig
core/theme/classy/templates/links.html.twig
core/theme/classy/templates/maintenance-page.html.twig
core/theme/classy/templates/mark.html.twig
core/theme/system/classy/menu-local-action.html.twig
and removed classes from the same files in the core/module/system/templates/..

nitishchopra’s picture

FileSize
14.49 KB
14.49 KB

patch

nitishchopra’s picture

patch added for

core/themes/classy/templates/form-element.html.twig
core/themes/classy/templates/form.html.twig
core/themes/classy/templates/html.html.twig
core/themes/classy/templates/image.html.twig
core/themes/classy/templates/indentation.html.twig
core/themes/classy/templates/input.html.twig

brahmjeet789’s picture

added new file

Sumit kumar’s picture

FileSize
51.9 KB
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 83,560 pass(es). View

patch added for
core/modules/system/templates/menu-local-task.html.twig
core/modules/system/templates/menu-local-tasks.html.twig
core/modules/system/templates/menu.html.twig
core/modules/system/templates/page.html.twig
core/modules/system/templates/pager.html.twig
core/modules/system/templates/progress-bar.html.twig

saki007ster’s picture

FileSize
7.16 KB
FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] 83,556 pass(es), 14 fail(s), and 0 exception(s). View

Patch added for
core/modules/system/templates/details.html.twig
core/modules/system/templates/dropbutton-wrapper.html.twig
core/modules/system/templates/feed-icon.html.twig
core/modules/system/templates/field-multiple-value-form.html.twig
core/modules/system/templates/field.html.twig
core/modules/system/templates/fieldset.html.twig
core/modules/system/templates/form-element-label.html.twig

lauriii’s picture

Issue tags: +dcdelhi
saki007ster’s picture

FileSize
7.16 KB
FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] 83,527 pass(es), 12 fail(s), and 0 exception(s). View

Updated the name of the patch file

Vidushi Mehta’s picture

FileSize
3.69 KB
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 83,565 pass(es). View

Remove and add classes from radios.html.twig, region.html.twig, system-admin-index.html.twig

jitendra verma’s picture

FileSize
10.96 KB
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 83,557 pass(es). View

File name :
core/modules/system/templates/admin-block-content.html.twig
core/modules/system/templates/admin-block.html.twig
core/modules/system/templates/admin-page.html.twig
core/modules/system/templates/block--system-branding-block.html.twig
core/modules/system/templates/block--system-menu-block.html.twig

Ashish sandil’s picture

FileSize
2 MB
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 83,563 pass(es). View

File name :
core/modules/system/templates/admin-block-content.html.twig

harish Patel’s picture

FileSize
26.9 KB
FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] 83,551 pass(es), 16 fail(s), and 0 exception(s). View

Files name :
core/modules/system/templates/breadcrumb.html.twig
core/modules/system/templates/checkboxes.html.twig
core/modules/system/templates/confirm-form.html.twig
core/modules/system/templates/container.html.twig
core/modules/system/templates/datetime-form.html.twig
core/modules/system/templates/datetime-wrapper.html.twig

lauriii’s picture

Status: Needs work » Needs review

The last submitted patch, 17: copy_system_pactches-2349759-saki007ster.patch, failed testing.

Status: Needs review » Needs work

The last submitted patch, 23: copy_system_template_2349759-23.patch, failed testing.

The last submitted patch, 19: copy_system_templates-2349759-saki007ster.patch, failed testing.

harish Patel’s picture

FileSize
1.36 MB
FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] Drupal installation failed. View

Recorrection of patch no 23.
Files:
core/modules/system/templates/breadcrumb.html.twig
core/modules/system/templates/checkboxes.html.twig
core/modules/system/templates/confirm-form.html.twig
core/modules/system/templates/container.html.twig
core/modules/system/templates/datetime-form.html.twig
core/modules/system/templates/datetime-wrapper.html.twig

Sivaji’s picture

Status: Needs work » Needs review

Status: Needs review » Needs work

The last submitted patch, 28: copy_system_templates_2349759-23.patch, failed testing.

Sivaji’s picture

Status: Needs work » Needs review

Retrying as test bot failed with message,

Detect a Drupal installation failure. 
Ensure that you can perform a fresh Drupal install.
davidhernandez’s picture

Lets go ahead and break up this issue. It is too many templates to deal with in one patch. Any ideas for a logical way to do it? If we did it alphabetically, it would be about 15 separate issues.

Status: Needs review » Needs work

The last submitted patch, 28: copy_system_templates_2349759-23.patch, failed testing.

Sivaji’s picture

+1 for breaking this issue. Doing the same alphabetically sounds okay to me. Let me know if I can create the meta issues.

davidhernandez’s picture

It is fine with me. Make them a child of the phase 2 meta (#2348543: [meta] Consensus Banana Phase 2, transition templates to the Classy theme) and add this issue as a related issue. Also, make their names consistent, with system in the title, so they are easier to keep track of. Something like "Copy system--A templates to Classy" or whatever.

davidhernandez’s picture

Also, if people have time to work on these issues, please try to work on the block and node ones instead. Those are more important. A list of priorities is in the summary of the phase 2 meta.

davidhernandez’s picture

Status: Needs work » Postponed

Thanks sivaji! I'm marking this one postponed just so people know not to work on it. When the child issues are closed we can close it.

Sumit kumar’s picture

Issue summary: View changes
Status: Postponed » Needs review
FileSize
4.72 KB
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 84,008 pass(es). View

patch for
core/modules/system/templates/breadcrumb.html.twig
core/modules/system/templates/checkboxes.html.twig
core/modules/system/templates/confirm-form.html.twig
core/modules/system/templates/container.html.twig
core/modules/system/templates/datetime-form.html.twig
core/modules/system/templates/datetime-wrapper.html.twig

davidhernandez’s picture

Status: Needs review » Postponed

These should be separate patches added to the child issues. You can see the child issues linked in the sidebar.

webchick’s picture

This issue could really do with a summary to explain the rationale for why we're doing this. Because at first glance, this seems to add a pretty big maintenance burden. Now, all routine bug fixes such as #2409817: CKEditor toolbar configuration UI missing ending UL need to be made in two places. Further, rather than the current state in e.g. Bartik where only the template files that themers are mostly likely to want to override being there for easy copy/paste/modify, we're copying *all* of the template files there, even relatively silly ones that only 0.000001% of people would ever override like, for example, the very ckeditor-settings-toolbar.html.twig from that issue, drowning out the "99% cases" (e.g. node.html.twig) in the process. And finally, the very nice-on-the-surface "Simply copy/paste/modify the template in Classy" breaks down as soon as you install a contributed module which of course naturally will not be able to put its stuff in themes/classy.

I raised these concerns with davidhernandez in IRC. He said that the rationale for this change is for usability, so themers don't need to learn weird things like that it's actually System module that provides field.html.twig, not Field module. Also, that if we don't copy all of them, we have to decide on a case-by-case which ones we're going to copy, and then also explain that to themer somehow. "In core vs. not in core" is much easier to document than "In core and arbitrarily decided upon by a committee to be important to themers." He also said this plan already has approval from Alex Pott, so I guess that's fair enough.

However, if that's the case, and we really do want to duplicate 100% of core's templates in Classy, then let's please do it as a single big patch and "rip off the band-aid" once (rather than 20 sub-issues), and from the time that's committed on, duplicate changes / add templates /etc. in both places (and publish a change record to this effect). As opposed to the current situation where it's very tricky to tell if a bug fix should be committed in two places or not without manual checking to see if it's one of the lucky templates that's been copied over yet.

alexpott’s picture

I feel that all the sub issues should be closed and that this issue should be about deciding what should be copied to classy from system. There are templates for the front- and back- end here. I think all the front-end templates should be copied and we should leave the back-end templates where they are. If we can't decide whether something is front or back then we should err on the side of copying. But, for example, I don't think we should be overwhelming front-end developers with things like system-admin-index.html.twig

mdrummond’s picture

My feeling for a while has been that classes that are relevant for system UI should stay within core. For example, the admin toolbar and contextual links should still work if you're using a theme based strictly on core and not on classy. I think that argument holds for template files that are geared towards creating back-end UI rather than user-facing templates.

The argument for moving over everything into Classy would probably be that it would make it easier to create an admin theme from scratch, but it's pretty rare that somebody needs to make an admin theme.

I think it's a solid point that putting a ton of templates that few people will likely change makes things more confusing.

I also agree that if there is any question on whether a template is something that is likely to be themed, it's probably better to err on the side of putting it in Classy.

That's my two cents.

mortendk’s picture

the only reason its rare to make admin themes in drupal is that its so %#€%" hard
pretty please lets not do the same mistakes again as we have done with drupal before and only make a bit of the templates visible for the themer.
its inconsistence and gonna bite us further down the road.

alexpott’s picture

re #44 - I think toolbar and contextual should stay classed in core - since there functionality depends on it. But there should be copies in classy. Because these templates affect the front end. Especially contextual - since content creation and editing is a common task for people that only see the front page. The toolbars templates I'm happy for a consensus to be build - not really fussed.

From a quick glance I would not copy views_ui, color, locale, language, simpletest, update, and the admin templates in system. The admin templates in system are (i think) admin-*, system-*, status-*, install-page and maintenance-task-list

alexpott’s picture

Oh and contextual does not have it's own templates so does not need to be part of the discussion afaics.

davidhernandez’s picture

Issue summary: View changes
Status: Postponed » Needs review
FileSize
24.49 KB
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 86,199 pass(es). View

Going with Alex's list from https://www.drupal.org/node/2348543#comment-9564823 we would not copy the following:

./core/modules/system/templates/admin-block-content.html.twig
./core/modules/system/templates/admin-block.html.twig
./core/modules/system/templates/admin-page.html.twig
./core/modules/system/templates/system-admin-index.html.twig
./core/modules/system/templates/system-config-form.html.twig
./core/modules/system/templates/system-themes-page.html.twig
./core/modules/system/templates/status-report.html.twig
./core/modules/system/templates/install-page.html.twig
./core/modules/system/templates/maintenance-task-list.html.twig

I'm uploading a patch copy the remaining system templates, and re-organize Classy into subdirectories. The patch should only have renames and copies. There shouldn't be any edits.

Make sure the directory names are correct, with no typos. And make sure the list of templates is correct.

Once this is in, we can still use the alpha list of child issues to de-classify the system templates that need it.

The only thing I am unsure of from the list is not copying status-report, but copying status-messages?

mortendk’s picture

Status: Needs review » Reviewed & tested by the community
Issue tags: -drupalhagen, -dcdelhi, -SprintWeekend2015 +classy

status messages is used on the normal frontend, so it should be there
- im gonna rant later on about the missing templates that are admin templates, but should not be treated differently.
Even the admin need's a little theme love ;)

not copied over:

admin-block-content.html.twig
admin-block.html.twig
admin-page.html.twig
install-page.html.twig
maintenance-task-list.html.twig
status-report.html.twig
system-admin-index.html.twig
system-config-form.html.twig
system-themes-page.html.twig

RTBC it, as its not the end of the world & a huge pita of a bikeshed if were gonna discuss this now, thats for a later issue :)

davidhernandez’s picture

Status: Reviewed & tested by the community » Needs work

We have to fix Bartik's search form block.

{% extends "@classy/block--search-form-block.html.twig" %}

Does the template extension not find things in subdirectories?

Manuel Garcia’s picture

The system folder seems a bit crowded.. could we organize it a bit ? Grouping these two into their own directories would make it easier for people to find them... sorry if this has already been discussed though! ;)

system/form:

  • form-element.html.twig
  • form-element-label.html.twig
  • form.html.twig
  • confirm-form.html.twig
  • field-multiple-value-form.html.twig
  • input.html.twig
  • radios.html.twig
  • select.html.twig
  • textarea.html.twig
  • datetime-form.html.twig

system/menu:

  • block--system-menu-block.html.twig
  • menu.html.twig
  • menu-local-action.html.twig
  • menu-local-task.html.twig
  • menu-local-tasks.html.twig
davidhernandez’s picture

Status: Needs work » Needs review
FileSize
24.96 KB
FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] Setup environment: Test cancelled by admin prior to completion. View
475 bytes

@Manuel, we're going to leave it be for now. The simplest thing is to just mimic the module directories already have it. We may be able to revisit it later.

Uploading a new patch. So you have to specify the template subdirectory. I thought we weren't going to need to do that with the inheritance changes? It seems I also can't remove the @classy. I thought we fixed that too?

mortendk’s picture

@manual nope were gonna do that in seperate issues, this needs to be as small as possible

mortendk’s picture

FileSize
130.44 KB
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 86,197 pass(es). View

fixed the issue as well with block--system-menu-block.html.twig that should be extending on classy not system.

we need an issue on this behaviour, as its strange but works.
{% extends "@classy/system/block--system-menu-block.html.twig" %}

The last submitted patch, 52: reorgClassy-2.patch, failed testing.

rteijeiro’s picture

Status: Needs review » Reviewed & tested by the community

Looks good! Reviewed admin pages and everything seems to be working well.

Jeff Burnz’s picture

Status: Reviewed & tested by the community » Needs work
+{% extends "@classy/search/block--search-form-block.html.twig" %}

Shouldn't this work: {% extends "block--search-form-block.html.twig" %} assuming block--search-form-block.html.twig is in Classy I would have thought Bartik will just pick it up and use it, since we have the registry discovery system now for templates?

Correct me if I am wrong, I just assumed that would work, I'm doing something similar now but a bit different, sorry no time to test as its 11:40pm and I must be shoving off for the day :/

Cottser’s picture

Status: Needs work » Reviewed & tested by the community

#57 shouldn't remove RTBC, please see #2387069: {% extends "foo.html.twig" %} in Twig templates does not respect theme inheritance. Removing the namespace results in an infinite loop.

alexpott’s picture

Status: Reviewed & tested by the community » Needs work

The patch just adds new files - so everything is duplicated. The patch should be really small - it should tell us that a load of files are moving and that there are some minor edits.

Jeff Burnz’s picture

#58 ok, we probably need to document some details around that - so a recursion only occurs if you try to extend the current template? Thanks for pointing this out, cheers!

rteijeiro’s picture

Status: Needs work » Needs review
FileSize
950 bytes
FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] Setup environment: Test cancelled by admin prior to completion. View

I think it's fixed now.

mortendk’s picture

Status: Needs review » Needs work

@ruben no files are moved over ?

rteijeiro’s picture

FileSize
130.44 KB
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 86,221 pass(es). View

Ops, wrong diff!

rteijeiro’s picture

FileSize
72.84 KB
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 86,228 pass(es). View

Aaaarghh! What about now?

The last submitted patch, 61: 2349759-reorgClassy-61.patch, failed testing.

mortendk’s picture

Status: Needs work » Needs review
FileSize
25.42 KB
PASSED: [[SimpleTest]]: [PHP 5.4 MySQL] 86,220 pass(es). View

fix git issues locally & rerolled -3

lauriii’s picture

mortendk’s picture

@laurii are you about to scope creep on this ;) ?

Cottser’s picture

@lauriii - check #57/#58, because it's calling its parent template in the registry that is not possible, at least not currently.

rteijeiro’s picture

Status: Needs review » Reviewed & tested by the community

Back to RTBC. Let's merge this!

alexpott’s picture

Status: Reviewed & tested by the community » Fixed
Issue tags: -Needs issue summary update

Templates are not frozen in beta. Committed b76f263 and pushed to 8.0.x. Thanks!

I also added crowdcg, sivaji@knackforge.com, dernetzjaeger from the postponed sub issues to the commit credit.

  • alexpott committed b76f263 on 8.0.x
    Issue #2349759 by davidhernandez, mortendk, rteijeiro, harish86, Sumit...

Status: Fixed » Closed (fixed)

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

brahmjeet789’s picture

Sumit kumar’s picture