You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/02/09 02:10:17 UTC
svn commit: r505111 - in /incubator/roller/trunk/apps/planet:
src/java/org/apache/roller/planet/ui/admin/struts2/ web/WEB-INF/classes/
web/WEB-INF/jsps/ web/WEB-INF/jsps/admin/ web/planet-ui/ web/planet-ui/css/
Author: agilliland
Date: Thu Feb 8 17:10:16 2007
New Revision: 505111
URL: http://svn.apache.org/viewvc?view=rev&rev=505111
Log:
cleaning up a few things and moving the last couple jsps under /WEB-INF/jsps
Added:
incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/login.jsp
- copied, changed from r505078, incubator/roller/trunk/apps/planet/web/planet-ui/login.jsp
incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/logout.jsp
- copied unchanged from r505078, incubator/roller/trunk/apps/planet/web/planet-ui/logout.jsp
incubator/roller/trunk/apps/planet/web/planet-ui/css/
incubator/roller/trunk/apps/planet/web/planet-ui/css/planet.css
- copied, changed from r505078, incubator/roller/trunk/apps/planet/web/planet-ui/planet.css
Removed:
incubator/roller/trunk/apps/planet/web/planet-ui/login.jsp
incubator/roller/trunk/apps/planet/web/planet-ui/logout.jsp
incubator/roller/trunk/apps/planet/web/planet-ui/planet.css
Modified:
incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java
incubator/roller/trunk/apps/planet/web/WEB-INF/classes/struts.xml
incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/MainMenu.jsp
incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/ConfigForm.jsp
incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp
incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp
incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp
incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetsList.jsp
Modified: incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java?view=diff&rev=505111&r1=505110&r2=505111
==============================================================================
--- incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java (original)
+++ incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java Thu Feb 8 17:10:16 2007
@@ -57,7 +57,7 @@
PlanetManager pMgr = PlanetFactory.getPlanet().getPlanetManager();
if(getGroupid() != null && !"".equals(getGroupid())) {
// load a planet group
- log.info("Loading Planet Group ...");
+ log.debug("Loading Planet Group ...");
group = pMgr.getGroupById(getGroupid());
} else {
Modified: incubator/roller/trunk/apps/planet/web/WEB-INF/classes/struts.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/classes/struts.xml?view=diff&rev=505111&r1=505110&r2=505111
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/classes/struts.xml (original)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/classes/struts.xml Thu Feb 8 17:10:16 2007
@@ -5,10 +5,10 @@
<!-- core package space -->
<package name="planet" namespace="/planet-ui" extends="struts-default">
<action name="Login" class="org.apache.roller.planet.ui.core.struts2.Login">
- <result>/planet-ui/login.jsp</result>
+ <result>/WEB-INF/jsps/login.jsp</result>
</action>
<action name="Logout" class="org.apache.roller.planet.ui.core.struts2.Logout">
- <result>/planet-ui/logout.jsp</result>
+ <result>/WEB-INF/jsps/logout.jsp</result>
</action>
<action name="MainMenu" class="org.apache.roller.planet.ui.core.struts2.MainMenu">
<result>/WEB-INF/jsps/MainMenu.jsp</result>
Modified: incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/MainMenu.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/MainMenu.jsp?view=diff&rev=505111&r1=505110&r2=505111
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/MainMenu.jsp (original)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/MainMenu.jsp Thu Feb 8 17:10:16 2007
@@ -21,7 +21,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title><s:text name="Menu.pageTitle" /></title>
- <link rel="stylesheet" type="text/css" href="<s:url value="/planet-ui/planet.css" />" />
+ <link rel="stylesheet" type="text/css" href="<s:url value="/planet-ui/css/planet.css" />" />
</head>
<body>
<div id="wrapper">
Modified: incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/ConfigForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/ConfigForm.jsp?view=diff&rev=505111&r1=505110&r2=505111
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/ConfigForm.jsp (original)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/ConfigForm.jsp Thu Feb 8 17:10:16 2007
@@ -29,7 +29,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title><s:text name="ConfigForm.pageTitle" /></title>
- <link rel="stylesheet" type="text/css" href="<s:url value="/planet-ui/planet.css" />" />
+ <link rel="stylesheet" type="text/css" href="<s:url value="/planet-ui/css/planet.css" />" />
</head>
<body>
<div id="wrapper">
Modified: incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp?view=diff&rev=505111&r1=505110&r2=505111
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp (original)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp Thu Feb 8 17:10:16 2007
@@ -21,7 +21,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title><s:text name="PlanetForm.pageTitle" /></title>
- <link rel="stylesheet" type="text/css" href="<s:url value="/planet-ui/planet.css" />" />
+ <link rel="stylesheet" type="text/css" href="<s:url value="/planet-ui/css/planet.css" />" />
<script type="text/javascript">
function confirmGroupDelete(groupid, handle) {
if (window.confirm('Are you sure you want to remove group: ' + handle)) {
Modified: incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp?view=diff&rev=505111&r1=505110&r2=505111
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp (original)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp Thu Feb 8 17:10:16 2007
@@ -21,7 +21,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title><s:text name="PlanetGroupForm.pageTitle" /></title>
- <link rel="stylesheet" type="text/css" href="<s:url value="/planet-ui/planet.css" />" />
+ <link rel="stylesheet" type="text/css" href="<s:url value="/planet-ui/css/planet.css" />" />
<script type="text/javascript">
function confirmSubDelete(subid, title) {
if (window.confirm('Are you sure you want to remove subscription: ' + title)) {
Modified: incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp?view=diff&rev=505111&r1=505110&r2=505111
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp (original)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp Thu Feb 8 17:10:16 2007
@@ -21,7 +21,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title><s:text name="PlanetSubscriptionForm.pageTitle" /></title>
- <link rel="stylesheet" type="text/css" href="<s:url value="/planet-ui/planet.css" />" />
+ <link rel="stylesheet" type="text/css" href="<s:url value="/planet-ui/css/planet.css" />" />
</head>
<body>
<div id="wrapper">
Modified: incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetsList.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetsList.jsp?view=diff&rev=505111&r1=505110&r2=505111
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetsList.jsp (original)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetsList.jsp Thu Feb 8 17:10:16 2007
@@ -21,7 +21,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title><s:text name="PlanetsList.pageTitle" /></title>
- <link rel="stylesheet" type="text/css" href="<s:url value="/planet-ui/planet.css" />" />
+ <link rel="stylesheet" type="text/css" href="<s:url value="/planet-ui/css/planet.css" />" />
<script type="text/javascript">
function confirmPlanetDelete(planetid, handle) {
if (window.confirm('Are you sure you want to remove planet: ' + handle)) {
Copied: incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/login.jsp (from r505078, incubator/roller/trunk/apps/planet/web/planet-ui/login.jsp)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/login.jsp?view=diff&rev=505111&p1=incubator/roller/trunk/apps/planet/web/planet-ui/login.jsp&r1=505078&p2=incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/login.jsp&r2=505111
==============================================================================
--- incubator/roller/trunk/apps/planet/web/planet-ui/login.jsp (original)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/login.jsp Thu Feb 8 17:10:16 2007
@@ -24,7 +24,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title><s:text name="Login.pageTitle" /></title>
- <link rel="stylesheet" type="text/css" href='<c:url value="/planet-ui/planet.css" />' />
+ <link rel="stylesheet" type="text/css" href='<c:url value="/planet-ui/css/planet.css" />' />
</head>
<body>
<div id="wrapper">
Copied: incubator/roller/trunk/apps/planet/web/planet-ui/css/planet.css (from r505078, incubator/roller/trunk/apps/planet/web/planet-ui/planet.css)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/planet-ui/css/planet.css?view=diff&rev=505111&p1=incubator/roller/trunk/apps/planet/web/planet-ui/planet.css&r1=505078&p2=incubator/roller/trunk/apps/planet/web/planet-ui/css/planet.css&r2=505111
==============================================================================
--- incubator/roller/trunk/apps/planet/web/planet-ui/planet.css (original)
+++ incubator/roller/trunk/apps/planet/web/planet-ui/css/planet.css Thu Feb 8 17:10:16 2007
@@ -8,7 +8,7 @@
body {
color: #666;
- background-image: url(images/body-bg-grey.png);
+ background-image: url(../images/body-bg-grey.png);
background-repeat: no-repeat;
background-position: top;
text-align: center;
@@ -97,7 +97,7 @@
background: #f5f5f5;
}
table.data th {
- background-image: url(images/th-bg-grey.png);
+ background-image: url(../images/th-bg-grey.png);
}