Jasper Floor pushed to branch master at cms-community / hippo-cms
Commits: d0bc1653 by Bert Leunis at 2016-08-26T10:26:06+02:00 CMS-10405 added several new icons - - - - - a798743f by Jasper Floor at 2016-10-12T11:43:02+02:00 CMS-10405 Merge master changes in feature/CMS-10405 - - - - - 30cddf9c by Jasper Floor at 2016-10-12T11:57:36+02:00 CMS-10405 Reintegrate feature/CMS-10405 - - - - - 2 changed files: - console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/icons/FontAwesomeIcon.java - console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/icons/JcrNodeIcon.java Changes: ===================================== console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/icons/FontAwesomeIcon.java ===================================== --- a/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/icons/FontAwesomeIcon.java +++ b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/icons/FontAwesomeIcon.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 Hippo B.V. (http://www.onehippo.com) + * Copyright 2015-2016 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. @@ -133,6 +133,7 @@ public enum FontAwesomeIcon { COMMENTS("fa-comments"), COMMENTS_O("fa-comments-o"), COMPASS("fa-compass"), + COMPASS_ROTATE_90("fa-compass fa-rotate-90"), COMPRESS("fa-compress"), COPY("fa-copy"), CREDIT_CARD("fa-credit-card"), @@ -286,6 +287,7 @@ public enum FontAwesomeIcon { PHONE("fa-phone"), PHONE_SQUARE("fa-phone-square"), PICTURE_O("fa-picture-o"), + PIECHART("fa-pie-chart"), PINTEREST("fa-pinterest"), PINTEREST_SQUARE("fa-pinterest-square"), PLANE("fa-plane"), @@ -328,6 +330,8 @@ public enum FontAwesomeIcon { SHARE_SQUARE("fa-share-square"), SHARE_SQUARE_O("fa-share-square-o"), SHIELD("fa-shield"), + SHIELD_FLIP_HORIZONTAL("fa-shield fa-flip-horizontal"), + SHIELD_ROTATE_270("fa-shield fa-rotate-270"), SHIRTSINBULK(" fa-shirtsinbulk"), SHOPPING_CART("fa-shopping-cart"), SIGN_IN("fa-sign-in"), @@ -407,6 +411,7 @@ public enum FontAwesomeIcon { UPLOAD("fa-upload"), USD("fa-usd"), USER("fa-user"), + USER_PLUS("fa-user-plus"), USER_MD("fa-user-md"), USER_SECRET("fa-user-secret"), USERS("fa-users"), ===================================== console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/icons/JcrNodeIcon.java ===================================== --- a/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/icons/JcrNodeIcon.java +++ b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/icons/JcrNodeIcon.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 Hippo B.V. (http://www.onehippo.com) + * Copyright 2015-2016 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. @@ -59,6 +59,8 @@ public class JcrNodeIcon { // hst config primaryTypeNameIcons.put("hst:hst", FontAwesomeIcon.CLOUD); primaryTypeNameIcons.put("hst:sitemapitem", FontAwesomeIcon.SITEMAP); + primaryTypeNameIcons.put("hst:sitemapitemhandlers", FontAwesomeIcon.COMPASS); + primaryTypeNameIcons.put("hst:sitemapitemhandler", FontAwesomeIcon.COMPASS_ROTATE_90); primaryTypeNameIcons.put("hst:sitemap", FontAwesomeIcon.SITEMAP); primaryTypeNameIcons.put("hst:template", FontAwesomeIcon.FILE_TEXT_O); primaryTypeNameIcons.put("hst:templates", FontAwesomeIcon.FILE_O); @@ -131,6 +133,13 @@ public class JcrNodeIcon { primaryTypeNameIcons.put("hipposys:queryfolder", FontAwesomeIcon.QUESTION_CIRCLE); primaryTypeNameIcons.put("hipposys:queryfolder", FontAwesomeIcon.QUESTION_CIRCLE); primaryTypeNameIcons.put("hippostd:templatequery", FontAwesomeIcon.QUESTION); + primaryTypeNameIcons.put("hipposys:resourcebundles", FontAwesomeIcon.BOOKMARK_O); + primaryTypeNameIcons.put("hipposys:resourcebundle", FontAwesomeIcon.BOOKMARK); + primaryTypeNameIcons.put("hipposys:domainfolder", FontAwesomeIcon.SHIELD); + primaryTypeNameIcons.put("hipposys:domain", FontAwesomeIcon.SHIELD_ROTATE_270); + primaryTypeNameIcons.put("hipposys:domainrule", FontAwesomeIcon.SHIELD_ROTATE_270); + primaryTypeNameIcons.put("hipposys:facetrule", FontAwesomeIcon.PIECHART); + primaryTypeNameIcons.put("hipposys:authrole", FontAwesomeIcon.USER_PLUS); // targeting primaryTypeNameIcons.put("targeting:experiments", FontAwesomeIcon.FLASK); @@ -163,6 +172,8 @@ public class JcrNodeIcon { primaryTypeNameIcons.put("targeting:expression", FontAwesomeIcon.ANGLE_DOUBLE_RIGHT); primaryTypeNameIcons.put("targeting:negate", FontAwesomeIcon.ANGLE_DOUBLE_RIGHT); primaryTypeNameIcons.put("targeting:abstractandexpression", FontAwesomeIcon.ANGLE_DOUBLE_RIGHT); + primaryTypeNameIcons.put("targeting:services", FontAwesomeIcon.SUN_O); + primaryTypeNameIcons.put("targeting:service", FontAwesomeIcon.CERTIFICATE); pathCssClass.put("/hst:hst", "hst"); pathCssClass.put("/" + CONFIGURATION_PATH, "conf"); View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/compare/0f0e46b0476ba5199391621f929e93127eb0156c...30cddf9c03f89d942dd98f1c93902e485d7c6866
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
