roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r545990 [2/2] - in /roller/branches/roller_guice: ./ apps/weblogger/src/java/org/apache/roller/weblogger/business/ apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/ apps/weblogger/src/java/org/apache/roller/weblogger/bus...
Date Mon, 11 Jun 2007 02:27:57 GMT
Modified: roller/branches/roller_guice/apps/weblogger/web/themes/brushedmetal/theme.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/themes/brushedmetal/theme.xml?view=diff&rev=545990&r1=545989&r2=545990
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/themes/brushedmetal/theme.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/web/themes/brushedmetal/theme.xml Sun Jun
10 19:27:53 2007
@@ -8,8 +8,14 @@
     <!-- theme preview image -->
     <preview-image path="sm-theme-brushedmetal.png" />
     
-    <!-- custom stylesheet -->
-    <custom-stylesheet path="brushedmetal-custom.css" />
+    <!-- stylesheet -->
+    <stylesheet>
+        <name>brushedmetal-custom.css</name>
+        <description>Stylesheet for Brushed Metal theme</description>
+	<link>brushedmetal-custom.css</link>
+        <templateLanguage>velocity</templateLanguage>
+        <contentsFile>brushedmetal-custom.css</contentsFile>
+    </stylesheet>
     
     <!-- templates -->
     <template action="weblog">
@@ -32,17 +38,6 @@
         <templateLanguage>velocity</templateLanguage>
         <contentType>text/html</contentType>
         <contentsFile>_day.vm</contentsFile>
-    </template>
-    
-    <template action="custom">
-        <name>_css</name>
-        <description>_css</description>
-	<link></link>
-        <navbar>false</navbar>
-        <hidden>true</hidden>
-        <templateLanguage>velocity</templateLanguage>
-        <contentType>text/css</contentType>
-        <contentsFile>_css.vm</contentsFile>
     </template>
     
     <!-- resources -->

Modified: roller/branches/roller_guice/apps/weblogger/web/themes/sotto/Weblog.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/themes/sotto/Weblog.vm?view=diff&rev=545990&r1=545989&r2=545990
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/themes/sotto/Weblog.vm (original)
+++ roller/branches/roller_guice/apps/weblogger/web/themes/sotto/Weblog.vm Sun Jun 10 19:27:53
2007
@@ -2,15 +2,13 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
+<head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>$model.weblog.name : $model.weblogPage.name</title>
     #showAutodiscoveryLinks($model.weblog)
-    <style type="text/css">#includeTemplate($model.weblog "_css")</style>
-    <link rel="stylesheet" type="text/css" href='$url.resource("styles/default.css")'
/>
+    <link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
+</head>
 
-    <link rel="stylesheet" type="text/css" media="all" href="$model.weblog.customStylesheet">
-    </head>
 <body>
 
 <div id="mainContainer">

Modified: roller/branches/roller_guice/apps/weblogger/web/themes/sotto/theme.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/themes/sotto/theme.xml?view=diff&rev=545990&r1=545989&r2=545990
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/themes/sotto/theme.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/web/themes/sotto/theme.xml Sun Jun 10 19:27:53
2007
@@ -8,8 +8,14 @@
     <!-- theme preview image -->
     <preview-image path="sm-theme-sotto.png" />
     
-    <!-- custom stylesheet -->
-    <custom-stylesheet path="sotto-custom.css" />
+    <!-- stylesheet -->
+    <stylesheet>
+        <name>sotto-custom.css</name>
+        <description>Stylesheet for Sotto theme</description>
+	<link>sotto-custom.css</link>
+        <templateLanguage>velocity</templateLanguage>
+        <contentsFile>sotto-custom.css</contentsFile>
+    </stylesheet>
     
     <!-- templates -->
     <template action="weblog">
@@ -34,20 +40,7 @@
         <contentsFile>_day.vm</contentsFile>
     </template>
     
-    <template action="custom">
-        <name>_css</name>
-        <description>_css</description>
-	<link></link>
-        <navbar>false</navbar>
-        <hidden>true</hidden>
-        <templateLanguage>velocity</templateLanguage>
-        <contentType>text/css</contentType>
-        <contentsFile>_css.vm</contentsFile>
-    </template>
-    
     <!-- resources -->
-    <resource path="theme.css" />
-    <resource path="styles/default.css" />
     <resource path="images/bannerBackground.gif" />
     <resource path="images/buttonBackground.gif" />
     <resource path="images/clouds.jpg" />

Modified: roller/branches/roller_guice/merges.txt
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/merges.txt?view=diff&rev=545990&r1=545989&r2=545990
==============================================================================
--- roller/branches/roller_guice/merges.txt (original)
+++ roller/branches/roller_guice/merges.txt Sun Jun 10 19:27:53 2007
@@ -1,5 +1,11 @@
 
-June 6, 2007
+June 10, 2007
+svn merge -r 545649:545682 https://svn.apache.org/repos/asf/roller/trunk
+
+June 8, 2007
+svn merge -r 545377:545649 https://svn.apache.org/repos/asf/roller/trunk
+
+June 7, 2007
 svn merge -r 544948:545377 https://svn.apache.org/repos/asf/roller/trunk
 
 June 6, 2007



Mime
View raw message