roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r412550 - in /incubator/roller/branches/roller_3.0/web: WEB-INF/classes/ WEB-INF/jsps/admin/ WEB-INF/jsps/authoring/ WEB-INF/jsps/tiles/ roller-ui/images/ roller-ui/scripts/ roller-ui/styles/ theme/ theme/images/ theme/scripts/
Date Wed, 07 Jun 2006 21:25:35 GMT
Author: agilliland
Date: Wed Jun  7 14:25:34 2006
New Revision: 412550

URL: http://svn.apache.org/viewvc?rev=412550&view=rev
Log:
moving the rest of the various UI files left under /theme/* to their new locations under /roller-ui/*


Added:
    incubator/roller/branches/roller_3.0/web/roller-ui/images/
    incubator/roller/branches/roller_3.0/web/roller-ui/images/dash.gif
      - copied unchanged from r412521, incubator/roller/branches/roller_3.0/web/theme/images/dash.gif
    incubator/roller/branches/roller_3.0/web/roller-ui/images/logo-shadow.png
      - copied unchanged from r412521, incubator/roller/branches/roller_3.0/web/theme/logo-shadow.png
    incubator/roller/branches/roller_3.0/web/roller-ui/images/menutab-tl.gif
      - copied unchanged from r412521, incubator/roller/branches/roller_3.0/web/theme/images/menutab-tl.gif
    incubator/roller/branches/roller_3.0/web/roller-ui/images/menutab-tr.gif
      - copied unchanged from r412521, incubator/roller/branches/roller_3.0/web/theme/images/menutab-tr.gif
    incubator/roller/branches/roller_3.0/web/roller-ui/images/spacer.png
      - copied unchanged from r412521, incubator/roller/branches/roller_3.0/web/theme/spacer.png
    incubator/roller/branches/roller_3.0/web/roller-ui/images/transparent-logo.png
      - copied unchanged from r412521, incubator/roller/branches/roller_3.0/web/theme/transparent-logo.png
    incubator/roller/branches/roller_3.0/web/roller-ui/scripts/ajax-user.js
      - copied unchanged from r412521, incubator/roller/branches/roller_3.0/web/theme/scripts/ajax-user.js
    incubator/roller/branches/roller_3.0/web/roller-ui/scripts/overlib.js
      - copied unchanged from r412521, incubator/roller/branches/roller_3.0/web/theme/scripts/overlib.js
    incubator/roller/branches/roller_3.0/web/roller-ui/styles/
    incubator/roller/branches/roller_3.0/web/roller-ui/styles/calendar.css
      - copied unchanged from r412511, incubator/roller/branches/roller_3.0/web/theme/calendar.css
    incubator/roller/branches/roller_3.0/web/roller-ui/styles/layout.css
      - copied unchanged from r412521, incubator/roller/branches/roller_3.0/web/theme/layout.css
    incubator/roller/branches/roller_3.0/web/roller-ui/styles/menu.css
      - copied, changed from r412521, incubator/roller/branches/roller_3.0/web/theme/menu.css
    incubator/roller/branches/roller_3.0/web/roller-ui/styles/roller.css
      - copied, changed from r412521, incubator/roller/branches/roller_3.0/web/theme/roller.css
Removed:
    incubator/roller/branches/roller_3.0/web/theme/calendar.css
    incubator/roller/branches/roller_3.0/web/theme/images/
    incubator/roller/branches/roller_3.0/web/theme/layout.css
    incubator/roller/branches/roller_3.0/web/theme/logo-shadow.png
    incubator/roller/branches/roller_3.0/web/theme/menu.css
    incubator/roller/branches/roller_3.0/web/theme/roller.css
    incubator/roller/branches/roller_3.0/web/theme/scripts/ajax-user.js
    incubator/roller/branches/roller_3.0/web/theme/scripts/overlib.js
    incubator/roller/branches/roller_3.0/web/theme/spacer.png
    incubator/roller/branches/roller_3.0/web/theme/transparent-logo.png
Modified:
    incubator/roller/branches/roller_3.0/web/WEB-INF/classes/popupcomments.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/UserAdmin.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/InviteMember.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/banner.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/head.jsp

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/classes/popupcomments.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/classes/popupcomments.vm?rev=412550&r1=412549&r2=412550&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/classes/popupcomments.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/classes/popupcomments.vm Wed Jun  7 14:25:34
2006
@@ -7,12 +7,6 @@
     <script type="text/javascript"
         src="$ctxPath/theme/scripts/roller.js"></script>
     <link rel="stylesheet" type="text/css" media="all"
-         href="$ctxPath/theme/layout.css" />
-    <link rel="stylesheet" type="text/css" media="all"
-         href="$ctxPath/theme/roller.css" />
-    <link rel="stylesheet" type="text/css" media="all"
-         href="$ctxPath/theme/menu.css" />
-    <link rel="stylesheet" type="text/css" media="all"
          href="$ctxPath/themes/base.css" />
     <style type="text/css">
     body {

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/UserAdmin.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/UserAdmin.jsp?rev=412550&r1=412549&r2=412550&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/UserAdmin.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/UserAdmin.jsp Wed Jun  7 14:25:34
2006
@@ -15,224 +15,224 @@
   copyright in this work, please see the NOTICE file in the top level
   directory of this distribution.
 -->
-<%@ include file="/taglibs.jsp" %>
-<script type="text/javascript">
-// <!--
-function cancel() {
-    document.userAdminForm.method.value="cancel"; 
-    document.userAdminForm.submit();
-}
-<%@ include file="/theme/scripts/ajax-user.js" %>
-// -->
-</script> 
-
-<%-- If user name is not specified, then allow user to choose a user to be loaded --%>
-<c:if test="${empty userAdminForm.userName && userAdminForm.newUser == false}">
-
-    <p class="subtitle"><fmt:message key="userAdmin.subtitle.searchUser" /></p>
-    <p><fmt:message key="userAdmin.prompt.searchUser" /></p>
-
-    <html:form action="/admin/user" method="post" focus="userName">
-        <input name="method" type="hidden" value="edit" />    
-        
-        <span style="margin:4px"><fmt:message key="inviteMember.userName" /></span>
-        <input name="userName" id="userName" size="30" maxlength="30" 
-            onfocus="onUserNameFocus(null)" onkeyup="onUserNameChange(null)" 
-            style="margin:4px" />
-        <input type="submit" value='<fmt:message key="userAdmin.edit" />' 
-            style="margin:4px" />
-        <br />
-        <select id="userList" size="10" onchange="onUserSelected()" 
-            style="width:300px; margin:4px" ></select>
-                        
-    </html:form>
-
-    <p class="subtitle"><fmt:message key="userAdmin.subtitle.userCreation" /></p>
-    <fmt:message key="userAdmin.prompt.orYouCan" />
-    <c:url value="/admin/user.do" var="newUser">
-        <c:param name="method" value="newUser" />
-    </c:url>
-    <a href='<c:out value="${newUser}" />'>
-        <fmt:message key="userAdmin.prompt.createANewUser" />
-    </a>
-
-</c:if>
-
-<%-- If a user name is specified, then show the admin user form --%>
-<c:if test="${!(empty userAdminForm.userName && userAdminForm.newUser == false)}">
-
-    <c:choose>
-        <c:when test="${userAdminForm.newUser == false}">		
-            <p class="subtitle"><fmt:message key="userAdmin.subtitle.editUser" /></p>
-            <p><fmt:message key="userAdmin.prompt.editUser" /></p>
-        </c:when>
-        <c:otherwise>
-            <h1>
-                <fmt:message key="userAdmin.title.createNewUser" />
-            </h1>			
-            <p class="subtitle"><fmt:message key="userAdmin.subtitle.createNewUser"
/></p>
-        </c:otherwise>
-    </c:choose>
-    
-    <html:form action="/admin/user" method="post">
-        <html:hidden property="method" value="update"/></input>        
-        <html:hidden property="id"/></input>
-        <html:hidden property="adminCreated" /></input>
-        <html:hidden property="newUser" /></input>
-        
-    <table class="formtable">
-    <tr>
-        <td class="label"><label for="fullName" /><fmt:message key="userSettings.fullname"
/></label></td>
-        <td class="field"><html:text property="fullName" size="30" maxlength="30"
/></td>
-        <td class="description"><fmt:message key="userAdmin.tip.fullName" /></td>
-    </tr>
-
-    <tr>
-        <td class="label"><label for="userName" /><fmt:message key="userSettings.username"
/></label></td>
-        <td class="field">
-            <c:choose>
-                <c:when test="${userAdminForm.newUser == true}">
-                    <html:text property="userName" size="30" maxlength="30" />
-                </c:when>
-                <c:otherwise>
-                    <html:text readonly="true" style="background: #e5e5e5" 
-                        property="userName" size="30" maxlength="30" />
-                </c:otherwise>
-            </c:choose>
-        </td>
-        <td class="description"><fmt:message key="userAdmin.tip.userName" /></td>
-    </tr>
-
-    <tr>
-        <td class="label"><label for="passwordText" /><fmt:message key="userSettings.password"
/></label></td>
-        <td class="field">
-           <html:password property="passwordText" size="20" maxlength="20" />
-           <html:hidden property="password" />
-       </td>
-        <td class="description"><fmt:message key="userAdmin.tip.password" /></td>
-    </tr>
-
-    <tr>
-        <td class="label"><label for="passwordConfirm" /><fmt:message key="userSettings.passwordConfirm"
/></label></td>
-        <td class="field"><html:password property="passwordConfirm" size="20" maxlength="20"
/></td>
-        <td class="description"><fmt:message key="userAdmin.tip.passwordConfirm"
/></td>
-    </tr>
-
-    <tr>
-        <td class="label"><label for="emailAddress" /><fmt:message key="userSettings.email"
/></label></td>
-        <td class="field"><html:text property="emailAddress" size="40" maxlength="40"
/></td>
-        <td class="description"><fmt:message key="userAdmin.tip.email" /></td>
-    </tr>
-
-    <tr>
-        <td class="label"><label for="locale" /><fmt:message key="userSettings.locale"
/></label></td>
-        <td class="field">
-           <html:select property="locale" size="1" >
-              <html:options collection="locales" property="value" labelProperty="label"/>
-           </html:select>
-        </td>
-        <td class="description"><fmt:message key="userAdmin.tip.locale" /></td>
-    </tr>
-
-    <tr>
-        <td class="label"><label for="timeZone" /><fmt:message key="userSettings.timeZone"
/></label></td>
-        <td class="field">
-           <html:select property="timeZone" size="1" >
-               <html:options collection="timeZones" property="value" labelProperty="label"/>
-           </html:select>
-        </td>
-        <td class="description"><fmt:message key="userAdmin.tip.timeZone" /></td>
-    </tr>
-
-    <tr>
-        <td class="label"><label for="userEnabled" /><fmt:message key="userAdmin.enabled"
/></label></td>
-        <td class="field">
-           <html:checkbox property="enabled" value="true" />
-        </td>
-        <td class="description"><fmt:message key="userAdmin.tip.enabled" /></td>
-    </tr>
-    
-    <tr>
-        <td class="label"><label for="userAdmin" /><fmt:message key="userAdmin.userAdmin"
/></label></td>
-        <td class="field">
-           <html:checkbox property="userAdmin" value="true" />
-        </td>
-        <td class="description"><fmt:message key="userAdmin.tip.userAdmin" /></td>
-    </tr>
-
-    </table>
-    
-    <html:hidden property="delete" />
-    <br />
-    
-    
-    <c:if test="${userAdminForm.newUser == false}">
-        <p class="subtitle"><fmt:message key="userAdmin.userWeblogs" /></p>
-
-        <c:choose>
-            <c:when test="${!empty model.permissions}"> 
-
-                <p><fmt:message key="userAdmin.userMemberOf" /></p>  
-                <table class="rollertable" style="width: 80%">
-                <c:forEach var="perms" items="${model.permissions}">
-                   <tr>
-                       <td width="%30">
-                           <a href='<c:out value="${model.baseURL}" />/page/<c:out
value="${perms.website.handle}" />'>
-                               <c:out value="${perms.website.name}" /> [<c:out value="${perms.website.handle}"
/>] 
-                           </a>
-                       </td>
-                       <td width="%15">
-                           <c:url value="/editor/weblog.do" var="newEntry">
-                               <c:param name="method" value="create" />
-                               <c:param name="weblog" value="${perms.website.handle}"
/>
-                           </c:url>
-                           <img src='<c:url value="/images/page_white_edit.gif"/>'
/>
-                           <a href='<c:out value="${newEntry}" />'>
-                               <fmt:message key="userAdmin.newEntry" /></a>
-                       </td>
-                       <td width="%15">
-                           <c:url value="/editor/weblogEntryManagement.do" var="editEntries">
-                               <c:param name="method" value="query" />
-                               <c:param name="weblog" value="${perms.website.handle}"
/>
-                           </c:url>
-                           <img src='<c:url value="/images/page_white_edit.png"/>'
/>
-                           <a href='<c:out value="${editEntries}" />'>
-                               <fmt:message key="userAdmin.editEntries" /></a>

-                       </td>
-                       <td width="%15">
-                           <c:url value="/editor/website.do" var="manageWeblog">
-                               <c:param name="method" value="edit" />
-                               <c:param name="weblog" value="${perms.website.handle}"
/>
-                           </c:url>
-                           <img src='<c:url value="/images/page_white_edit.png"/>'
/>
-                           <a href='<c:out value="${manageWeblog}" />'>
-                               <fmt:message key="userAdmin.manage" /></a>
-                       </td>
-                   </tr>
-                </c:forEach>    
-                </table>
-
-            </c:when>
-
-            <c:otherwise>
-                <fmt:message key="userAdmin.userHasNoWeblogs" />
-            </c:otherwise>
-
-        </c:choose>
-    </c:if>
-    
-    <br />
-    <br />
-
-    <div class="control">
-       <input type="submit" value='<fmt:message key="userAdmin.save" />'/></input>
-       <input type="button" value='<fmt:message key="application.cancel" />' onclick="cancel()"></input>
-    </div>
-        
-    </html:form>
-    
-</c:if>
-
-
-
-
+<%@ include file="/taglibs.jsp" %>
+<script type="text/javascript">
+// <!--
+function cancel() {
+    document.userAdminForm.method.value="cancel"; 
+    document.userAdminForm.submit();
+}
+<%@ include file="/roller-ui/scripts/ajax-user.js" %>
+// -->
+</script> 
+
+<%-- If user name is not specified, then allow user to choose a user to be loaded --%>
+<c:if test="${empty userAdminForm.userName && userAdminForm.newUser == false}">
+
+    <p class="subtitle"><fmt:message key="userAdmin.subtitle.searchUser" /></p>
+    <p><fmt:message key="userAdmin.prompt.searchUser" /></p>
+
+    <html:form action="/admin/user" method="post" focus="userName">
+        <input name="method" type="hidden" value="edit" />    
+        
+        <span style="margin:4px"><fmt:message key="inviteMember.userName" /></span>
+        <input name="userName" id="userName" size="30" maxlength="30" 
+            onfocus="onUserNameFocus(null)" onkeyup="onUserNameChange(null)" 
+            style="margin:4px" />
+        <input type="submit" value='<fmt:message key="userAdmin.edit" />' 
+            style="margin:4px" />
+        <br />
+        <select id="userList" size="10" onchange="onUserSelected()" 
+            style="width:300px; margin:4px" ></select>
+                        
+    </html:form>
+
+    <p class="subtitle"><fmt:message key="userAdmin.subtitle.userCreation" /></p>
+    <fmt:message key="userAdmin.prompt.orYouCan" />
+    <c:url value="/admin/user.do" var="newUser">
+        <c:param name="method" value="newUser" />
+    </c:url>
+    <a href='<c:out value="${newUser}" />'>
+        <fmt:message key="userAdmin.prompt.createANewUser" />
+    </a>
+
+</c:if>
+
+<%-- If a user name is specified, then show the admin user form --%>
+<c:if test="${!(empty userAdminForm.userName && userAdminForm.newUser == false)}">
+
+    <c:choose>
+        <c:when test="${userAdminForm.newUser == false}">		
+            <p class="subtitle"><fmt:message key="userAdmin.subtitle.editUser" /></p>
+            <p><fmt:message key="userAdmin.prompt.editUser" /></p>
+        </c:when>
+        <c:otherwise>
+            <h1>
+                <fmt:message key="userAdmin.title.createNewUser" />
+            </h1>			
+            <p class="subtitle"><fmt:message key="userAdmin.subtitle.createNewUser"
/></p>
+        </c:otherwise>
+    </c:choose>
+    
+    <html:form action="/admin/user" method="post">
+        <html:hidden property="method" value="update"/></input>        
+        <html:hidden property="id"/></input>
+        <html:hidden property="adminCreated" /></input>
+        <html:hidden property="newUser" /></input>
+        
+    <table class="formtable">
+    <tr>
+        <td class="label"><label for="fullName" /><fmt:message key="userSettings.fullname"
/></label></td>
+        <td class="field"><html:text property="fullName" size="30" maxlength="30"
/></td>
+        <td class="description"><fmt:message key="userAdmin.tip.fullName" /></td>
+    </tr>
+
+    <tr>
+        <td class="label"><label for="userName" /><fmt:message key="userSettings.username"
/></label></td>
+        <td class="field">
+            <c:choose>
+                <c:when test="${userAdminForm.newUser == true}">
+                    <html:text property="userName" size="30" maxlength="30" />
+                </c:when>
+                <c:otherwise>
+                    <html:text readonly="true" style="background: #e5e5e5" 
+                        property="userName" size="30" maxlength="30" />
+                </c:otherwise>
+            </c:choose>
+        </td>
+        <td class="description"><fmt:message key="userAdmin.tip.userName" /></td>
+    </tr>
+
+    <tr>
+        <td class="label"><label for="passwordText" /><fmt:message key="userSettings.password"
/></label></td>
+        <td class="field">
+           <html:password property="passwordText" size="20" maxlength="20" />
+           <html:hidden property="password" />
+       </td>
+        <td class="description"><fmt:message key="userAdmin.tip.password" /></td>
+    </tr>
+
+    <tr>
+        <td class="label"><label for="passwordConfirm" /><fmt:message key="userSettings.passwordConfirm"
/></label></td>
+        <td class="field"><html:password property="passwordConfirm" size="20" maxlength="20"
/></td>
+        <td class="description"><fmt:message key="userAdmin.tip.passwordConfirm"
/></td>
+    </tr>
+
+    <tr>
+        <td class="label"><label for="emailAddress" /><fmt:message key="userSettings.email"
/></label></td>
+        <td class="field"><html:text property="emailAddress" size="40" maxlength="40"
/></td>
+        <td class="description"><fmt:message key="userAdmin.tip.email" /></td>
+    </tr>
+
+    <tr>
+        <td class="label"><label for="locale" /><fmt:message key="userSettings.locale"
/></label></td>
+        <td class="field">
+           <html:select property="locale" size="1" >
+              <html:options collection="locales" property="value" labelProperty="label"/>
+           </html:select>
+        </td>
+        <td class="description"><fmt:message key="userAdmin.tip.locale" /></td>
+    </tr>
+
+    <tr>
+        <td class="label"><label for="timeZone" /><fmt:message key="userSettings.timeZone"
/></label></td>
+        <td class="field">
+           <html:select property="timeZone" size="1" >
+               <html:options collection="timeZones" property="value" labelProperty="label"/>
+           </html:select>
+        </td>
+        <td class="description"><fmt:message key="userAdmin.tip.timeZone" /></td>
+    </tr>
+
+    <tr>
+        <td class="label"><label for="userEnabled" /><fmt:message key="userAdmin.enabled"
/></label></td>
+        <td class="field">
+           <html:checkbox property="enabled" value="true" />
+        </td>
+        <td class="description"><fmt:message key="userAdmin.tip.enabled" /></td>
+    </tr>
+    
+    <tr>
+        <td class="label"><label for="userAdmin" /><fmt:message key="userAdmin.userAdmin"
/></label></td>
+        <td class="field">
+           <html:checkbox property="userAdmin" value="true" />
+        </td>
+        <td class="description"><fmt:message key="userAdmin.tip.userAdmin" /></td>
+    </tr>
+
+    </table>
+    
+    <html:hidden property="delete" />
+    <br />
+    
+    
+    <c:if test="${userAdminForm.newUser == false}">
+        <p class="subtitle"><fmt:message key="userAdmin.userWeblogs" /></p>
+
+        <c:choose>
+            <c:when test="${!empty model.permissions}"> 
+
+                <p><fmt:message key="userAdmin.userMemberOf" /></p>  
+                <table class="rollertable" style="width: 80%">
+                <c:forEach var="perms" items="${model.permissions}">
+                   <tr>
+                       <td width="%30">
+                           <a href='<c:out value="${model.baseURL}" />/page/<c:out
value="${perms.website.handle}" />'>
+                               <c:out value="${perms.website.name}" /> [<c:out value="${perms.website.handle}"
/>] 
+                           </a>
+                       </td>
+                       <td width="%15">
+                           <c:url value="/editor/weblog.do" var="newEntry">
+                               <c:param name="method" value="create" />
+                               <c:param name="weblog" value="${perms.website.handle}"
/>
+                           </c:url>
+                           <img src='<c:url value="/images/page_white_edit.gif"/>'
/>
+                           <a href='<c:out value="${newEntry}" />'>
+                               <fmt:message key="userAdmin.newEntry" /></a>
+                       </td>
+                       <td width="%15">
+                           <c:url value="/editor/weblogEntryManagement.do" var="editEntries">
+                               <c:param name="method" value="query" />
+                               <c:param name="weblog" value="${perms.website.handle}"
/>
+                           </c:url>
+                           <img src='<c:url value="/images/page_white_edit.png"/>'
/>
+                           <a href='<c:out value="${editEntries}" />'>
+                               <fmt:message key="userAdmin.editEntries" /></a>

+                       </td>
+                       <td width="%15">
+                           <c:url value="/editor/website.do" var="manageWeblog">
+                               <c:param name="method" value="edit" />
+                               <c:param name="weblog" value="${perms.website.handle}"
/>
+                           </c:url>
+                           <img src='<c:url value="/images/page_white_edit.png"/>'
/>
+                           <a href='<c:out value="${manageWeblog}" />'>
+                               <fmt:message key="userAdmin.manage" /></a>
+                       </td>
+                   </tr>
+                </c:forEach>    
+                </table>
+
+            </c:when>
+
+            <c:otherwise>
+                <fmt:message key="userAdmin.userHasNoWeblogs" />
+            </c:otherwise>
+
+        </c:choose>
+    </c:if>
+    
+    <br />
+    <br />
+
+    <div class="control">
+       <input type="submit" value='<fmt:message key="userAdmin.save" />'/></input>
+       <input type="button" value='<fmt:message key="application.cancel" />' onclick="cancel()"></input>
+    </div>
+        
+    </html:form>
+    
+</c:if>
+
+
+
+

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/InviteMember.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/InviteMember.jsp?rev=412550&r1=412549&r2=412550&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/InviteMember.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/InviteMember.jsp Wed Jun
 7 14:25:34 2006
@@ -23,7 +23,7 @@
     document.inviteMemberForm.method.value="cancel"; 
     document.inviteMemberForm.submit();
 }
-<%@ include file="/theme/scripts/ajax-user.js" %>
+<%@ include file="/roller-ui/scripts/ajax-user.js" %>
 // -->
 </script> 
 

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/banner.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/banner.jsp?rev=412550&r1=412549&r2=412550&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/banner.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/banner.jsp Wed Jun  7 14:25:34
2006
@@ -37,10 +37,10 @@
 <div id="logo">
     <!-- Transparent PNG fix for IE, thanks to Kenneth M. Kolano -->
     <div id="logoshadow" 
-        style="_background-image:none; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<c:out
value='${model.baseURL}' />/theme/logo-shadow.png',sizingMethod='crop');">
+        style="_background-image:none; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<c:out
value='${model.baseURL}' />/roller-ui/images/logo-shadow.png',sizingMethod='crop');">
         <div id="logobackground">
             <a href='<c:out value="${model.baseURL}" />/main.do' id="logoimage"

-                style="_background-image:none; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<c:out
value='${model.baseURL}' />/theme/transparent-logo.png', sizingMethod='crop');">
+                style="_background-image:none; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<c:out
value='${model.baseURL}' />/roller-ui/images/transparent-logo.png', sizingMethod='crop');">
             </a>
         </div>
     </div>

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/head.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/head.jsp?rev=412550&r1=412549&r2=412550&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/head.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/head.jsp Wed Jun  7 14:25:34
2006
@@ -5,13 +5,13 @@
 <%@ include file="/taglibs.jsp" %>
 
 <link rel="stylesheet" type="text/css" media="all" 
-    href="<%= request.getContextPath() %>/theme/layout.css" />
+    href='<c:url value="/roller-ui/styles/layout.css"/>'>
 <link rel="stylesheet" type="text/css" media="all" 
-    href="<%= request.getContextPath() %>/theme/roller.css" />   
+    href='<c:url value="/roller-ui/styles/roller.css"/>'>   
 <link rel="stylesheet" type="text/css" media="all" 
-    href="<%= request.getContextPath() %>/theme/menu.css" />
+    href='<c:url value="/roller-ui/styles/menu.css"/>'>
 <link rel="stylesheet" type="text/css" media="all" 
-    href="<%= request.getContextPath() %>/theme/calendar.css" />
+    href='<c:url value="/roller-ui/styles/calendar.css"/>'>
       
 <%
 //String theme = theme = RollerConfig.getProperty("editor.theme");
@@ -32,9 +32,9 @@
 <script type="text/javascript" 
     src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script>
  
 <script type="text/javascript" 
-    src="<%= request.getContextPath() %>/roller-ui/scripts/calendar.js"></script>
+    src='<c:url value="/roller-ui/scripts/calendar.js"/>'></script>
 <script type="text/javascript" 
-    src="<%= request.getContextPath() %>/theme/scripts/overlib.js">
+    src='<c:url value="/roller-ui/scripts/overlib.js"/>'>
     <!-- overLIB (c) Erik Bosrup -->
 </script>  
 

Copied: incubator/roller/branches/roller_3.0/web/roller-ui/styles/menu.css (from r412521,
incubator/roller/branches/roller_3.0/web/theme/menu.css)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/roller-ui/styles/menu.css?p2=incubator/roller/branches/roller_3.0/web/roller-ui/styles/menu.css&p1=incubator/roller/branches/roller_3.0/web/theme/menu.css&r1=412521&r2=412550&rev=412550&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/theme/menu.css (original)
+++ incubator/roller/branches/roller_3.0/web/roller-ui/styles/menu.css Wed Jun  7 14:25:34
2006
@@ -32,7 +32,7 @@
     padding: 0px; 
     height: 100%;
     width: 100%;
-    background: url("images/menutab-tl.gif") no-repeat top left;   
+    background: url("../images/menutab-tl.gif") no-repeat top left;   
     background-repeat: no-repeat;
     vertical-align: middle;
     display: table;
@@ -42,7 +42,7 @@
     padding: 0px; 
     height: 100%;
     width: 100%;
-    background: url("images/menutab-tr.gif") no-repeat top right;    
+    background: url("../images/menutab-tr.gif") no-repeat top right;    
     background-repeat: no-repeat;
 }
 

Copied: incubator/roller/branches/roller_3.0/web/roller-ui/styles/roller.css (from r412521,
incubator/roller/branches/roller_3.0/web/theme/roller.css)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/roller-ui/styles/roller.css?p2=incubator/roller/branches/roller_3.0/web/roller-ui/styles/roller.css&p1=incubator/roller/branches/roller_3.0/web/theme/roller.css&r1=412521&r2=412550&rev=412550&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/theme/roller.css (original)
+++ incubator/roller/branches/roller_3.0/web/roller-ui/styles/roller.css Wed Jun  7 14:25:34
2006
@@ -114,7 +114,7 @@
 }
 .sidebarBody li {
    list-style-position: inside;
-   list-style-image: url(images/dash.gif);
+   list-style-image: url(../images/dash.gif);
    margin-left: 0em;
    padding-left: 0.5em;  
    padding-top: 3px;
@@ -610,7 +610,7 @@
     width: 165px;
     height: 50px;
     _background: transparent !important;
-    background-image: url(logo-shadow.png); 
+    background-image: url(../images/logo-shadow.png); 
 }
 #logobackground {
     width: 159px;
@@ -621,7 +621,7 @@
     height: 44px;
     display: block;
     cursor: pointer; /* Make IE show correct cursor for link */
-    background-image: url(transparent-logo.png);
+    background-image: url(../images/transparent-logo.png);
 }
 
 /* main menu page */



Mime
View raw message