diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
index f2ffe2b3b..d819be54e 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
@@ -48,6 +48,7 @@ public class CreateWeblog extends UIAction {
private static final Log log = LogFactory.getLog(CreateWeblog.class);
private static final String DISABLED_RETURN_CODE = "disabled";
+ private static final String DEFAULT_THEME = "basic";
private CreateWeblogBean bean = new CreateWeblogBean();
@@ -97,6 +98,7 @@ public String execute() {
getBean().setLocale(user.getLocale());
getBean().setTimeZone(user.getTimeZone());
getBean().setEmailAddress(user.getEmailAddress());
+ getBean().setTheme(DEFAULT_THEME);
return INPUT;
}
diff --git a/app/src/main/webapp/themes/alpenglow/archives.vm b/app/src/main/webapp/themes/alpenglow/archives.vm
new file mode 100644
index 000000000..1d22bf492
--- /dev/null
+++ b/app/src/main/webapp/themes/alpenglow/archives.vm
@@ -0,0 +1,27 @@
+
+
+
+ #includeTemplate($model.weblog "standard_head")
+
+
+ #showWeblogEntryCalendarBig($model.weblog "nil")
+
+ Thirty recent stories
+ #set($recentEntries=$model.weblog.getRecentWeblogEntries("nil",30))
+
+ #foreach($recentEntry in $recentEntries)
+ - $recentEntry.title
+ #end
+
+
+
+ #includeTemplate($model.weblog "standard_footer")
+
+
diff --git a/app/src/main/webapp/themes/alpenglow/custom.css b/app/src/main/webapp/themes/alpenglow/custom.css
new file mode 100644
index 000000000..69ce9f218
--- /dev/null
+++ b/app/src/main/webapp/themes/alpenglow/custom.css
@@ -0,0 +1 @@
+/* Add weblog-specific Alpenglow overrides here. */
diff --git a/app/src/main/webapp/themes/alpenglow/day.vm b/app/src/main/webapp/themes/alpenglow/day.vm
new file mode 100644
index 000000000..dc4bf4d9d
--- /dev/null
+++ b/app/src/main/webapp/themes/alpenglow/day.vm
@@ -0,0 +1,28 @@
+#foreach($entry in $entries)
+
+ $velocityCount
+
+
+ #if($model.permalink)
+
$entry.title
+ #else
+
+ #end
+
+ #if($model.permalink)$entry.displayContent#else$entry.displayContent($url.entry($entry.anchor))#end
+
+
+
+
+#end
diff --git a/app/src/main/webapp/themes/alpenglow/entry.vm b/app/src/main/webapp/themes/alpenglow/entry.vm
new file mode 100644
index 000000000..ab33e9123
--- /dev/null
+++ b/app/src/main/webapp/themes/alpenglow/entry.vm
@@ -0,0 +1,18 @@
+
+
+
+ #includeTemplate($model.weblog "standard_head")
+
+
+ Search the trail
+ “$model.term”
+ $model.hits results
+
+
+ #if($model.hits>0)#set($pager=$model.getWeblogEntriesPager())#showWeblogEntriesPager($pager)
+
+ #else
+ No stories found. Try another trail.
+ #end
+
+ #includeTemplate($model.weblog "standard_footer")
+
+
diff --git a/app/src/main/webapp/themes/alpenglow/sidebar.vm b/app/src/main/webapp/themes/alpenglow/sidebar.vm
new file mode 100644
index 000000000..62afe5503
--- /dev/null
+++ b/app/src/main/webapp/themes/alpenglow/sidebar.vm
@@ -0,0 +1,23 @@
+
+
+
+
From Colorado to everywhere
+
+ Life is better
+
+ with a little
+
+ altitude.
+
+ #if($model.weblog.tagline)
+
$model.weblog.tagline
+ #end
+
+
+
+
+
+
+
+
+ #includeTemplate($model.weblog "sidebar")
+
+ #set($pager=$model.getWeblogEntriesPager())#showWeblogEntriesPager($pager)
+
+
+
+
+ #includeTemplate($model.weblog "standard_footer")
+
+
diff --git a/app/src/main/webapp/themes/dispatch/archives.vm b/app/src/main/webapp/themes/dispatch/archives.vm
new file mode 100644
index 000000000..a09c6b2d0
--- /dev/null
+++ b/app/src/main/webapp/themes/dispatch/archives.vm
@@ -0,0 +1,27 @@
+
+
+
+ #includeTemplate($model.weblog "standard_head")
+
+
+ DATABASE / ALL ENTRIES
+ Archive
+
+ #showWeblogEntryCalendarBig($model.weblog "nil")
+
+ LATEST_30
+ #set($recentEntries=$model.weblog.getRecentWeblogEntries("nil",30))
+
+ #foreach($recentEntry in $recentEntries)
+ - $recentEntry.title
+ #end
+
+
+
+ #includeTemplate($model.weblog "standard_footer")
+
+
diff --git a/app/src/main/webapp/themes/dispatch/custom.css b/app/src/main/webapp/themes/dispatch/custom.css
new file mode 100644
index 000000000..0e9a07b1d
--- /dev/null
+++ b/app/src/main/webapp/themes/dispatch/custom.css
@@ -0,0 +1 @@
+/* Add weblog-specific Dispatch overrides here. */
diff --git a/app/src/main/webapp/themes/dispatch/day.vm b/app/src/main/webapp/themes/dispatch/day.vm
new file mode 100644
index 000000000..7e36e259a
--- /dev/null
+++ b/app/src/main/webapp/themes/dispatch/day.vm
@@ -0,0 +1,30 @@
+#foreach($entry in $entries)
+
+
+ QUERY / $model.hits MATCHES
+ $model.term
+
+
+ #if($model.hits>0)#set($pager=$model.getWeblogEntriesPager())#showWeblogEntriesPager($pager)
+
+ #else
+ NO_MATCHES_FOUND
+ #end
+
+ #includeTemplate($model.weblog "standard_footer")
+
+
diff --git a/app/src/main/webapp/themes/dispatch/sidebar.vm b/app/src/main/webapp/themes/dispatch/sidebar.vm
new file mode 100644
index 000000000..5a33dd2a7
--- /dev/null
+++ b/app/src/main/webapp/themes/dispatch/sidebar.vm
@@ -0,0 +1,20 @@
+
+
+
+ #includeTemplate($model.weblog "sidebar")
+
+ #set($pager=$model.getWeblogEntriesPager())#showWeblogEntriesPager($pager)
+
+
+
+
+ #includeTemplate($model.weblog "standard_footer")
+
+
diff --git a/app/src/main/webapp/themes/horizon/archives.vm b/app/src/main/webapp/themes/horizon/archives.vm
new file mode 100644
index 000000000..dc37dea4c
--- /dev/null
+++ b/app/src/main/webapp/themes/horizon/archives.vm
@@ -0,0 +1,28 @@
+
+
+
+ #includeTemplate($model.weblog "standard_head")
+
+
+ Since the beginning
+ Archives
+ Browse the complete history of $model.weblog.name.
+
+ #showWeblogEntryCalendarBig($model.weblog "nil")
+
+ Recent posts
+ #set($recentEntries=$model.weblog.getRecentWeblogEntries("nil",30))
+
+ #foreach($recentEntry in $recentEntries)
+ - $recentEntry.title
+ #end
+
+
+
+ #includeTemplate($model.weblog "standard_footer")
+
+
diff --git a/app/src/main/webapp/themes/horizon/custom.css b/app/src/main/webapp/themes/horizon/custom.css
new file mode 100644
index 000000000..1a9e30736
--- /dev/null
+++ b/app/src/main/webapp/themes/horizon/custom.css
@@ -0,0 +1 @@
+/* Add weblog-specific Horizon overrides here. */
diff --git a/app/src/main/webapp/themes/horizon/day.vm b/app/src/main/webapp/themes/horizon/day.vm
new file mode 100644
index 000000000..70795e11c
--- /dev/null
+++ b/app/src/main/webapp/themes/horizon/day.vm
@@ -0,0 +1,34 @@
+#foreach($entry in $entries)
+
+
+
+ #if($model.permalink)
+ $entry.title
+ #else
+
+ #end
+
+ #if($model.permalink)$entry.displayContent#else$entry.displayContent($url.entry($entry.anchor))#end
+
+
+ #showTrackbackAutodiscovery($entry)
+
+#end
diff --git a/app/src/main/webapp/themes/horizon/entry.vm b/app/src/main/webapp/themes/horizon/entry.vm
new file mode 100644
index 000000000..a975d1c7f
--- /dev/null
+++ b/app/src/main/webapp/themes/horizon/entry.vm
@@ -0,0 +1,18 @@
+
+
+
+ #includeTemplate($model.weblog "standard_head")
+
+
+ Search
+ Results for “$model.term”
+ $model.hits matches
+
+
+ #if($model.hits>0)#set($pager=$model.getWeblogEntriesPager())#showWeblogEntriesPager($pager)
+
+ #else
+ No entries matched. Try a broader phrase.
+ #end
+
+ #includeTemplate($model.weblog "standard_footer")
+
+
diff --git a/app/src/main/webapp/themes/horizon/sidebar.vm b/app/src/main/webapp/themes/horizon/sidebar.vm
new file mode 100644
index 000000000..598b1cc37
--- /dev/null
+++ b/app/src/main/webapp/themes/horizon/sidebar.vm
@@ -0,0 +1,23 @@
+
diff --git a/app/src/main/webapp/themes/horizon/tags.vm b/app/src/main/webapp/themes/horizon/tags.vm
new file mode 100644
index 000000000..f63ff842d
--- /dev/null
+++ b/app/src/main/webapp/themes/horizon/tags.vm
@@ -0,0 +1,19 @@
+
+
+
+ #includeTemplate($model.weblog "standard_head")
+
+
+ Notes from the journey
+ $model.weblog.name
+ #if($model.weblog.tagline)
+ $model.weblog.tagline
+ #end
+
+
+
+ #set($pager=$model.getWeblogEntriesPager())#showWeblogEntriesPager($pager)
+
+
+ #includeTemplate($model.weblog "sidebar")
+
+
+ #includeTemplate($model.weblog "standard_footer")
+
+
diff --git a/app/src/test/java/org/apache/roller/weblogger/business/ThemeManagerTest.java b/app/src/test/java/org/apache/roller/weblogger/business/ThemeManagerTest.java
index b4584c44d..4269203ee 100644
--- a/app/src/test/java/org/apache/roller/weblogger/business/ThemeManagerTest.java
+++ b/app/src/test/java/org/apache/roller/weblogger/business/ThemeManagerTest.java
@@ -51,10 +51,15 @@ public void testThemeAssumptions() throws Exception {
assertNotNull( themeManager.getTheme("basic") );
assertNotNull( themeManager.getTheme("basic").getStylesheet() );
assertNull( themeManager.getTheme("frontpage").getStylesheet() );
+ assertNotNull( themeManager.getTheme("horizon") );
+ assertNotNull( themeManager.getTheme("horizon").getStylesheet() );
+ assertNotNull( themeManager.getTheme("alpenglow") );
+ assertNotNull( themeManager.getTheme("alpenglow").getStylesheet() );
+ assertNotNull( themeManager.getTheme("dispatch") );
+ assertNotNull( themeManager.getTheme("dispatch").getStylesheet() );
}
}
-