Jeroen Hoffman pushed to branch master at cms-community / hippo-cms
Commits: 2db0e6aa by Bert Leunis at 2017-05-15T15:46:54+02:00 CMS-10420 use label instead of span - - - - - bad7d669 by Bert Leunis at 2017-05-15T16:02:06+02:00 CMS-10420 three more occurences of a checkbox with a clickable label - - - - - a9593ddb by Jeroen Hoffman at 2017-05-19T11:50:16+02:00 CMS-10420 Merge branch 'master' into feature/CMS-10420 - - - - - 623749cb by Jeroen Hoffman at 2017-05-19T11:51:43+02:00 CMS-10420 Reintegrate branch 'feature/CMS-10420' - - - - - 4 changed files: - console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.html - console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/content/ContentExportDialog.html - console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/delete/DeleteDialog.html - console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/recompute/RecomputeDialog.html Changes: ===================================== console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.html ===================================== --- a/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.html +++ b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.html @@ -1,5 +1,5 @@ <!-- - * Copyright 2007-2015 Hippo B.V. (http://www.onehippo.com) + * Copyright 2007-2017 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -82,7 +82,7 @@ <div wicket:id="mixintypes"> <ul style="list-style: none;"> <li class="mixin-type" wicket:id="type"> - <input type="checkbox" wicket:id="check"><span class="mixin-name" wicket:id="name">[mixin name]</span></input> + <input type="checkbox" wicket:id="check"><label class="mixin-name" wicket:id="name">[mixin name]</label></input> </li> </ul> </div> ===================================== console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/content/ContentExportDialog.html ===================================== --- a/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/content/ContentExportDialog.html +++ b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/content/ContentExportDialog.html @@ -1,5 +1,5 @@ <!-- - * Copyright 2007-2014 Hippo B.V. (http://www.onehippo.com) + * Copyright 2007-2017 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ <a wicket:id="view-link" style="color: #0000FF">Show export in this window</a> </li> <li style="padding: 1px"> - <input type="checkbox" wicket:id="skip-binaries"> Do not include binary properties in export (does not apply to 'download as zip')</input> + <label><input type="checkbox" wicket:id="skip-binaries"> Do not include binary properties in export (does not apply to 'download as zip')</input></label> </li> </ul> <div class="xml-dump"> ===================================== console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/delete/DeleteDialog.html ===================================== --- a/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/delete/DeleteDialog.html +++ b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/delete/DeleteDialog.html @@ -1,5 +1,5 @@ <!-- - * Copyright 2007-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2007-2017 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ </p> <p> </p> <p> - <wicket:message key="immediate.save"/>: <input type="checkbox" wicket:id="immediateSave"/> + <label><wicket:message key="immediate.save"/>: <input type="checkbox" wicket:id="immediateSave"/></label> </p> </wicket:extend> </html> ===================================== console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/recompute/RecomputeDialog.html ===================================== --- a/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/recompute/RecomputeDialog.html +++ b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/recompute/RecomputeDialog.html @@ -1,5 +1,5 @@ <!-- - * Copyright 2012-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2012-2017 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,6 @@ <wicket:extend> <p><span wicket:id="message"></span></p> <p> </p> - <p>Automatic batch save to reduce memory overhead: <input wicket:id="automatic-save" type="checkbox"/></p> + <p><label>Automatic batch save to reduce memory overhead: <input wicket:id="automatic-save" type="checkbox"/></label></p> </wicket:extend> </html> View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/compare/c0e3643b8c6de4050ca148ff172c9951ffbc95a9...623749cb48bb8dcc86f008ebfad0d4c4cb4f0ce6
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
