You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/10/24 18:03:21 UTC
[07/15] git commit: ISIS-537 The theme chooser should show only the
Bootstrap default theme and Bootswatch ones (vegibit ones are not shown now)
ISIS-537 The theme chooser should show only the Bootstrap default theme and Bootswatch ones (vegibit ones are not shown now)
https://trello.com/c/gOpyWBeH/68-limit-the-amount-of-themes-to-the-ones-from-bootswatch-too-big-of-a-list-now-imho
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fb273a7c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fb273a7c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fb273a7c
Branch: refs/heads/master
Commit: fb273a7c721f0e97f997f136e9f71dd311cdb32a
Parents: 189c0ac
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 24 15:39:03 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Oct 24 15:39:59 2014 +0300
----------------------------------------------------------------------
.../ui/components/widgets/themepicker/ThemePicker.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fb273a7c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemePicker.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemePicker.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemePicker.java
index c5cf761..aeeb8b3 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemePicker.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemePicker.java
@@ -95,16 +95,18 @@ public class ThemePicker extends Panel {
private List<String> getThemeNames() {
final BootstrapThemeTheme bootstrapTheme = new BootstrapThemeTheme();
List<BootswatchTheme> bootswatchThemes = Arrays.asList(BootswatchTheme.values());
- List<VegibitTheme> vegibitThemes = Arrays.asList(VegibitTheme.values());
+// List<VegibitTheme> vegibitThemes = Arrays.asList(VegibitTheme.values());
List<String> allThemes = new ArrayList<>();
+ allThemes.add(bootstrapTheme.name());
+
for (ITheme theme : bootswatchThemes) {
allThemes.add(theme.name());
}
- for (ITheme theme : vegibitThemes) {
- allThemes.add(theme.name());
- }
- allThemes.add(bootstrapTheme.name());
+
+// for (ITheme theme : vegibitThemes) {
+// allThemes.add(theme.name());
+// }
return allThemes;