7:24 p.m.
Author: wesleyhales
Date: 2008-03-05 13:24:26 -0500 (Wed, 05 Mar 2008)
New Revision: 10214
Added:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/admin-header.jsp
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/admin.jsp
Modified:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/index.jsp
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/master.css
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/header.jsp
Log:
admin changes
Modified:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/index.jsp
===================================================================
---
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/index.jsp 2008-03-05
16:26:36 UTC (rev 10213)
+++
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/index.jsp 2008-03-05
18:24:26 UTC (rev 10214)
@@ -4,7 +4,7 @@
<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
<%@ page isELIgnored="false" %>
-<%@ include file="/layouts/header.jsp" %>
+<%@ include file="/layouts/admin-header.jsp" %>
<portal:page>
Modified:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/master.css
===================================================================
---
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/master.css 2008-03-05
16:26:36 UTC (rev 10213)
+++
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/master.css 2008-03-05
18:24:26 UTC (rev 10214)
@@ -155,6 +155,12 @@
text-align: right;
}
+div#container div.header div.secondary-nav {
+ font-size: 11px;
+ padding: 3px 5px 0 0;
+ text-align: right;
+}
+
div#container div.header div.pc20 img {
margin: 5px 10px 0 0;
}
Copied:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/admin-header.jsp
(from rev 10213,
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/header.jsp)
===================================================================
---
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/admin-header.jsp
(rev 0)
+++
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/admin-header.jsp 2008-03-05
18:24:26 UTC (rev 10214)
@@ -0,0 +1,34 @@
+<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
lang="en" id="testreplace">
+<head>
+ <title>Portlet Container 2.0</title>
+ <link rel="stylesheet"
href="${pageContext.request.contextPath}/css/master.css"
type="text/css"/>
+ <link rel="stylesheet" type="text/css"
href="${pageContext.request.contextPath}/css/shadowbox.css"/>
+ <script type="text/javascript"
src="${pageContext.request.contextPath}/js/prototype.js"></script>
+ <script type="text/javascript"
+
src="${pageContext.request.contextPath}/js/scriptaculous/scriptaculous.js?load=effects"></script>
+ <script type="text/javascript"
src="${pageContext.request.contextPath}/js/shadowbox-prototype.js"></script>
+ <script type="text/javascript"
src="${pageContext.request.contextPath}/js/shadowbox.js"></script>
+ <script type="text/javascript">
+ window.onload = function(){
+ Shadowbox.init();
+ };
+ </script>
+ <portal:headers/>
+</head>
+<body>
+
+<div id="container" class="full-width">
+ <div class="header full-width">
+ <div class="float-left three-quarter-width logo"></div>
+ <div class="float-right quarter-width pc20"><img
src="${pageContext.request.contextPath}/images/pc20.gif"
+ alt="Portlet Container
2.0"/></div>
+ <div class="float-right secondary-nav"><a
href="${pageContext.request.contextPath}/admin/index.jsp">Admin</a></div>
+ <br class="clear"/>
+ </div>
+ <%@ include file="nav/admin.jsp" %>
+ <div id="content">
\ No newline at end of file
Modified:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/header.jsp
===================================================================
---
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/header.jsp 2008-03-05
16:26:36 UTC (rev 10213)
+++
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/header.jsp 2008-03-05
18:24:26 UTC (rev 10214)
@@ -27,6 +27,7 @@
<div class="float-left three-quarter-width logo"></div>
<div class="float-right quarter-width pc20"><img
src="${pageContext.request.contextPath}/images/pc20.gif"
alt="Portlet Container
2.0"/></div>
+ <div class="float-right secondary-nav"><a
href="${pageContext.request.contextPath}/admin/index.jsp">Admin</a></div>
<br class="clear"/>
</div>
<%@ include file="nav/main.jsp" %>
Copied:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/admin.jsp
(from rev 10213,
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp)
===================================================================
---
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/admin.jsp
(rev 0)
+++
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/admin.jsp 2008-03-05
18:24:26 UTC (rev 10214)
@@ -0,0 +1,19 @@
+<%@ page contentType="text/html" %>
+<%@ page language="java" %>
+<%@ taglib prefix="jbp" tagdir="/WEB-INF/tags/portal" %>
+<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
+<%@ page isELIgnored="false" %>
+<%@ taglib prefix="fn"
uri="http://java.sun.com/jsp/jstl/functions" %>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+ <div class="nav full-width">
+ <ul>
+ <li>
+ <a href="${pageContext.request.contextPath}/admin/index.jsp"
class="${fn:substringAfter(pageContext.request.servletPath, 'admin/') ==
'index.jsp' ? 'selected' : ''}">Portlet Manager</a>
+ </li>
+ </ul>
+ <br class="clear"/>
+ </div>