roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r541384 - in /roller/branches/roller_4.0_newbackend: tests/org/apache/roller/ui/ tests/org/apache/roller/ui/authoring/ tests/org/apache/roller/ui/rendering/plugins/ web/WEB-INF/jsps/admin/struts2/ web/WEB-INF/jsps/authoring/ web/WEB-INF/jsp...
Date Thu, 24 May 2007 18:51:01 GMT
Author: snoopdave
Date: Thu May 24 11:50:56 2007
New Revision: 541384

URL: http://svn.apache.org/viewvc?view=rev&rev=541384
Log:
merging latest from trunk

Added:
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/CreateWeblog.jsp
      - copied unchanged from r541345, roller/trunk/web/WEB-INF/jsps/core/CreateWeblog.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/Login.jsp
      - copied unchanged from r541345, roller/trunk/web/WEB-INF/jsps/core/Login.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/MainMenu.jsp
      - copied unchanged from r541345, roller/trunk/web/WEB-INF/jsps/core/MainMenu.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/MainMenuSidebar.jsp
      - copied unchanged from r541345, roller/trunk/web/WEB-INF/jsps/core/MainMenuSidebar.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/Profile.jsp
      - copied unchanged from r541345, roller/trunk/web/WEB-INF/jsps/core/Profile.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/Register.jsp
      - copied unchanged from r541345, roller/trunk/web/WEB-INF/jsps/core/Register.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/Setup.jsp
      - copied unchanged from r541345, roller/trunk/web/WEB-INF/jsps/core/Setup.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/Welcome.jsp
      - copied unchanged from r541345, roller/trunk/web/WEB-INF/jsps/core/Welcome.jsp
Removed:
    roller/branches/roller_4.0_newbackend/tests/org/apache/roller/ui/ServletTestBase.java
    roller/branches/roller_4.0_newbackend/tests/org/apache/roller/ui/StrutsActionTestBase.java
    roller/branches/roller_4.0_newbackend/tests/org/apache/roller/ui/UITestSuite.java
    roller/branches/roller_4.0_newbackend/tests/org/apache/roller/ui/authoring/
    roller/branches/roller_4.0_newbackend/tests/org/apache/roller/ui/rendering/plugins/
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/struts2/
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/BookmarkForm.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/BookmarksForm.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/BookmarksSidebar.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/CategoriesForm.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/CategoriesSidebar.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/CategoryDeleteOK.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/CategoryForm.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/CommentManagement.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/CustomPingTargetDeleteOK.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/CustomPingTargetEdit.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/CustomPingTargets.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/FolderForm.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/Invitations.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/InviteMember.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/Maintenance.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/MemberPermissions.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/MemberPermissionsSidebar.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/PingResult.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/Pings.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/UploadFile.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/WeblogEdit.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/WeblogEditSidebar.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/WeblogEntryManagementSidebar.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/WeblogEntryRemove.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/WebsiteRemove.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/bake-weblog.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/edit-page.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/edit-pages-sidebar.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/edit-pages.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/edit-website.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/export-entries.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/import-entries.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/import.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/referers.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/remove-page.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/spellcheck-entry.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/theme-editor.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/CreateWebsite.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/UserNew.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/YourProfile.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/YourWebsites.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/YourWebsitesSidebar.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/login.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/planet.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/welcome.jsp
Modified:
    roller/branches/roller_4.0_newbackend/web/themes/basic/Weblog.vm
    roller/branches/roller_4.0_newbackend/web/themes/basic/theme.xml
    roller/branches/roller_4.0_newbackend/web/themes/frontpage/_footer.vm
    roller/branches/roller_4.0_newbackend/web/themes/frontpage/_header.vm

Modified: roller/branches/roller_4.0_newbackend/web/themes/basic/Weblog.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/themes/basic/Weblog.vm?view=diff&rev=541384&r1=541383&r2=541384
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/themes/basic/Weblog.vm (original)
+++ roller/branches/roller_4.0_newbackend/web/themes/basic/Weblog.vm Thu May 24 11:50:56 2007
@@ -5,6 +5,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" media="all" href="$model.weblog.customStylesheet">
 </head>
 <body>
 

Modified: roller/branches/roller_4.0_newbackend/web/themes/basic/theme.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/themes/basic/theme.xml?view=diff&rev=541384&r1=541383&r2=541384
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/themes/basic/theme.xml (original)
+++ roller/branches/roller_4.0_newbackend/web/themes/basic/theme.xml Thu May 24 11:50:56 2007
@@ -8,6 +8,9 @@
     <!-- theme preview image -->
     <preview-image path="sm-theme-basic.jpg" />
     
+    <!-- custom stylesheet -->
+    <custom-stylesheet path="basic-custom.css" />
+    
     <!-- templates -->
     <template action="weblog">
         <name>Weblog</name>

Modified: roller/branches/roller_4.0_newbackend/web/themes/frontpage/_footer.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/themes/frontpage/_footer.vm?view=diff&rev=541384&r1=541383&r2=541384
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/themes/frontpage/_footer.vm (original)
+++ roller/branches/roller_4.0_newbackend/web/themes/frontpage/_footer.vm Thu May 24 11:50:56
2007
@@ -1,12 +1,10 @@
 <div id="footer">
-Powered by <a href="http://www.rollerweblogger.org">Roller Weblogger</a> $config.rollerVersion
|
+Powered by <a href="http://roller.apache.org">Apache Roller</a> $config.rollerVersion
|
 <a href="http://opensource2.atlassian.com/projects/roller/">
 Report an Issue</a> | 
-<a href="http://rollerweblogger.org/wiki/Wiki.jsp?page=UserGuide">
+<a href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+User+Documentation">
     User Guide</a> | 
-<a href="http://www.rollerweblogger.org/velocidoc/">
-    Macros</a> | 
-<a href="http://rollerweblogger.org/wiki/Wiki.jsp?page=RollerMailingLists">
+<a href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists">
     Mailing Lists</a>
 </div>
        

Modified: roller/branches/roller_4.0_newbackend/web/themes/frontpage/_header.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/themes/frontpage/_header.vm?view=diff&rev=541384&r1=541383&r2=541384
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/themes/frontpage/_header.vm (original)
+++ roller/branches/roller_4.0_newbackend/web/themes/frontpage/_header.vm Thu May 24 11:50:56
2007
@@ -23,7 +23,7 @@
                 <td class="bannerLeft"></td>
                 <td class="bannerRight">
                    <a href="$url.absoluteSite">$config.siteName</a> |
-                   <a href="$url.absoluteSite/roller-ui/yourWebsites.do">Main Menu</a>
|
+                   <a href="$url.absoluteSite/roller-ui/menu.rol">Main Menu</a>
|
                    <a href="$url.login">Login</a>
                 </td>
             </tr>



Mime
View raw message