Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add TEMPLATE_SITETOOLS_DISPLAY and TEMPLATE_USERTOOLS_DISPLAY basing on ... #470

Merged
merged 1 commit into from Feb 19, 2015
Merged

Conversation

solewniczak
Copy link
Contributor

I've add TEMPLATE_SITETOOLS_DISPLAY and TEMPLATE_USERTOOLS_DISPLAY events do main dokuwiki template basing on code from Starter template. I think that it can be useful.

@solewniczak solewniczak mentioned this pull request Dec 10, 2013
'profile' => tpl_action('profile', 1, 'li', 1),
'register' => tpl_action('register', 1, 'li', 1),
'login' => tpl_action('login', 1, 'li', 1),
));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indention is wrong

@splitbrain
Copy link
Collaborator

Both events only really make sense in the dokuwiki template. Other templates may have structured actions differently. They might also use different markup (buttons vs. links, list items or not). The events get raw HTML passed here which isn't terrible useful.
OTOH we do have TEMPLATE_PAGETOOLS_DISPLAY in the template already, so this would fit in with that theme...
I'm torn here.

@Chris--S
Copy link
Collaborator

Chris--S commented Jan 5, 2014

I wonder if we need to allow templates to supply or override the wrapping markup for action links, buttons and toolbars.

@Klap-in
Copy link
Collaborator

Klap-in commented Jan 5, 2014

TEMPLATE_SITETOOLS_DISPLAY and TEMPLATE_USERTOOLS_DISPLAY are already in the starter template, so these events are triggered more often...

@solewniczak
Copy link
Contributor Author

So what is the status of my request. Do you want to have TEMPLATE_SITETOOLS_DISPLAY and TEMPLATE_USERTOOLS_DISPLAY in dokuwiki template? Maybe you have same proposals how to rebuild the patch to fit your needs?

@Chris--S
Copy link
Collaborator

Chris--S commented Feb 5, 2014

We didn't get to this PR during last Sunday's IRC meeting. Hopefully we'll get to it at the next one.

@splitbrain splitbrain merged commit 362a4f0 into dokuwiki:master Feb 19, 2015
@Klap-in
Copy link
Collaborator

Klap-in commented Jul 31, 2015

Why I cannot find this changes/commit in the master branch anymore? It seems to be merged looking in this thread, but in code it is invisible...

@Klap-in
Copy link
Collaborator

Klap-in commented Jul 31, 2015

Hmmm, I think I have spotted the issue. This was mixed with PR 1046, but is reverted.
Now it is reverted at all from master branch.

@selfthinker
Copy link
Collaborator

I think what happened is that @Hafron made the changes for this PR on his master branch (which is never a good idea, always use feature branches) and then created the html_showrev_output branch for #1046 from his master branch. Then he realised something was in there which shouldn't be (as this PR wasn't merged yet and his master branch wasn't up-to-date) and reverted it. But reverting in any branch which gets merged means reverting in master as well when this got merged.

splitbrain pushed a commit that referenced this pull request Apr 9, 2020
…ruct-column-in-bureaucracy-form

Fix FatalError on unknown struct column in bureaucracy forms
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants