Unify dialog extra button handling

Another fix for #169
Merge branch 'master' of github.com:/rapila/cms-base