Author: thomas.heute(a)jboss.com
Date: 2008-04-02 07:41:30 -0400 (Wed, 02 Apr 2008)
New Revision: 10478
Added:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal_body.jsp
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal_head.jsp
Removed:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal.jsp
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/cms/admin/tiny_mce/themes/default/editor_ui.css
branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/cms/admin/tiny_mce/themes/simple/editor_ui.css
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/jsp/view.jsp
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/index.jsp
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/index.jsp
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/maximized.jsp
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/login/error.jsp
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/login/index.jsp
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/industrial/portal_style.css
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/maple/portal_style.css
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/mission-critical/portal_style.css
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/phalanx/portal_style.css
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp
branches/JBoss_Portal_Branch_2_6/jems/.classpath
branches/JBoss_Portal_Branch_2_6/registration/.classpath
branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java
Log:
JBPORTAL-1874: Default installation of JBoss Portal 2.6.3 does not validate as correct
XHTML and CSS
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp 2008-04-02
10:23:40 UTC (rev 10477)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp 2008-04-02
11:41:30 UTC (rev 10478)
@@ -12,11 +12,12 @@
<p:theme themeName="renaissance"/>
<!-- insert header content that was possibly set by portlets on the page -->
<p:headerContent/>
+ <%@include file="/layouts/common/modal_head.jsp"%>
</head>
<body id="body">
<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
-<%@include file="/layouts/common/modal.jsp"%>
+<%@include file="/layouts/common/modal_body.jsp"%>
<div id="portal-container">
<div id="sizer">
<div id="expander">
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/index.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/index.jsp 2008-04-02
10:23:40 UTC (rev 10477)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/index.jsp 2008-04-02
11:41:30 UTC (rev 10478)
@@ -12,11 +12,12 @@
<p:theme themeName="renaissance"/>
<!-- insert header content that was possibly set by portlets on the page -->
<p:headerContent/>
+ <%@include file="/layouts/common/modal_head.jsp"%>
</head>
<body id="body">
<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
-<%@include file="/layouts/common/modal.jsp"%>
+<%@include file="/layouts/common/modal_body.jsp"%>
<div id="portal-container">
<div id="sizer">
<div id="expander">
Deleted:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal.jsp 2008-04-02
10:23:40 UTC (rev 10477)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal.jsp 2008-04-02
11:41:30 UTC (rev 10478)
@@ -1,7 +0,0 @@
-<script src="<%=request.getContextPath()%>/js/modal.js"
type="text/javascript"></script>
-<link rel="stylesheet"
href="<%=request.getContextPath()%>/css/modal.css"
type="text/css" />
- <div id="login-modal" style="display:none">
- <div id="login-modal-msg"
style="display:none;width:257px;height:157px">
- <iframe src="" frameborder="0" width="257"
height="157" scrolling="no" marginheight="0"
marginwidth="0" name="login-content" class="login-content"
id="loginIframe"></iframe>
- </div>
- </div>
\ No newline at end of file
Added:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal_body.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal_body.jsp
(rev 0)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal_body.jsp 2008-04-02
11:41:30 UTC (rev 10478)
@@ -0,0 +1,5 @@
+ <div id="login-modal" style="display:none">
+ <div id="login-modal-msg"
style="display:none;width:257px;height:157px">
+ <iframe src="" frameborder="0" width="257"
height="157" scrolling="no" marginheight="0"
marginwidth="0" name="login-content" class="login-content"
id="loginIframe"></iframe>
+ </div>
+ </div>
\ No newline at end of file
Added:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal_head.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal_head.jsp
(rev 0)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal_head.jsp 2008-04-02
11:41:30 UTC (rev 10478)
@@ -0,0 +1,2 @@
+<script src="<%=request.getContextPath()%>/js/modal.js"
type="text/javascript"></script>
+<link rel="stylesheet"
href="<%=request.getContextPath()%>/css/modal.css"
type="text/css" />
\ No newline at end of file
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/index.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/index.jsp 2008-04-02
10:23:40 UTC (rev 10477)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/index.jsp 2008-04-02
11:41:30 UTC (rev 10478)
@@ -12,11 +12,12 @@
<p:theme themeName="renaissance"/>
<!-- insert header content that was possibly set by portlets on the page -->
<p:headerContent/>
+ <%@include file="/layouts/common/modal_head.jsp"%>
</head>
<body id="body">
<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
-<%@include file="/layouts/common/modal.jsp"%>
+<%@include file="/layouts/common/modal_body.jsp"%>
<div id="portal-container">
<div id="sizer">
<div id="expander">
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/maximized.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/maximized.jsp 2008-04-02
10:23:40 UTC (rev 10477)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/maximized.jsp 2008-04-02
11:41:30 UTC (rev 10478)
@@ -12,11 +12,12 @@
<p:theme themeName="renaissance"/>
<!-- inject header content that was generated by the portlets on the requested
page -->
<p:headerContent/>
+ <%@include file="/layouts/common/modal_head.jsp"%>
</head>
<body id="body">
<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
-<%@include file="/layouts/common/modal.jsp"%>
+<%@include file="/layouts/common/modal_body.jsp"%>
<div id="portal-container">
<div id="sizer">
<div id="expander">
Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/login/error.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/login/error.jsp 2008-04-02
10:23:40 UTC (rev 10477)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/login/error.jsp 2008-04-02
11:41:30 UTC (rev 10478)
@@ -1,5 +1,5 @@
<html>
-<head/>
+<head></head>
<body>
bad login
</body>
Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/login/index.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/login/index.jsp 2008-04-02
10:23:40 UTC (rev 10477)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/login/index.jsp 2008-04-02
11:41:30 UTC (rev 10478)
@@ -1,5 +1,5 @@
<%@ page import="org.jboss.portal.common.util.Tools"%><html>
-<head/>
+<head></head>
<body>
<form method="POST" action="j_security_check">
<%--
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/industrial/portal_style.css
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/industrial/portal_style.css 2008-04-02
10:23:40 UTC (rev 10477)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/industrial/portal_style.css 2008-04-02
11:41:30 UTC (rev 10478)
@@ -307,7 +307,7 @@
}
UL#tabsHeader ul a {
- font: 11px;
+ font-size: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
color: #5078aa;
@@ -315,14 +315,14 @@
}
UL#tabsHeader ul a:hover {
- font: 11px;
+ font-size: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
color: #5078aa;
}
UL#tabsHeader #current ul a {
- font: 11px;
+ font-size: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
color: #5078aa;
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/maple/portal_style.css
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/maple/portal_style.css 2008-04-02
10:23:40 UTC (rev 10477)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/maple/portal_style.css 2008-04-02
11:41:30 UTC (rev 10478)
@@ -323,7 +323,7 @@
}
UL#tabsHeader ul a {
- font: 11px;
+ font-size: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
color: #5078aa;
@@ -331,14 +331,14 @@
}
UL#tabsHeader ul a:hover {
- font: 11px;
+ font-size: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
color: #5078aa;
}
UL#tabsHeader #current ul a {
- font: 11px;
+ font-size: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
color: #5078aa;
@@ -688,7 +688,7 @@
#foldheader {
list-style-image: url( images/bullet.gif ) ! Important;
vertical-align: middle;
- cursor: hand !important;
+ cursor: pointer !important;
margin-left: -10px;
}
@@ -696,13 +696,13 @@
margin-left: 10px;
list-style-image: url( images/bullet.gif ) ! Important;
list-style-position: outside;
- cursor: hand !important;
+ cursor: pointer !important;
margin-left: -10px;
}
#pagenosub {
list-style-image: url( images/bullet.gif ) ! Important;
- cursor: hand !important;
+ cursor: pointer !important;
margin-left: -10px;
vertical-align: middle;
}
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/mission-critical/portal_style.css
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/mission-critical/portal_style.css 2008-04-02
10:23:40 UTC (rev 10477)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/mission-critical/portal_style.css 2008-04-02
11:41:30 UTC (rev 10478)
@@ -303,7 +303,7 @@
}
UL#tabsHeader ul a {
- font: 11px;
+ font-size: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
color: #5078aa;
@@ -311,14 +311,14 @@
}
UL#tabsHeader ul a:hover {
- font: 11px;
+ font-size: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
color: #5078aa;
}
UL#tabsHeader #current ul a {
- font: 11px;
+ font-size: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
color: #5078aa;
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/phalanx/portal_style.css
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/phalanx/portal_style.css 2008-04-02
10:23:40 UTC (rev 10477)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/phalanx/portal_style.css 2008-04-02
11:41:30 UTC (rev 10478)
@@ -341,7 +341,7 @@
}
UL#tabsHeader ul a {
- font: 11px;
+ font-size: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
color: #5078aa;
@@ -349,14 +349,14 @@
}
UL#tabsHeader ul a:hover {
- font: 11px;
+ font-size: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
color: #5078aa;
}
UL#tabsHeader #current ul a {
- font: 11px;
+ font-size: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
color: #5078aa;
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2008-04-02
10:23:40 UTC (rev 10477)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2008-04-02
11:41:30 UTC (rev 10478)
@@ -321,21 +321,21 @@
ul#tabsHeader ul a {
text-decoration: none;
- font: 11px;
+ font-size: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
color: #5078aa;
}
ul#tabsHeader ul a:hover {
- font: 11px;
+ font-size: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
color: #5078aa;
}
ul#tabsHeader #current ul a {
- font: 11px;
+ font-size: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
color: #5078aa;
@@ -393,14 +393,15 @@
ul#tabsHeader #addpage {
display: inline;
- background-color: none;
- background-image: none;
+ background-color: transparent;
margin-bottom: -3px;
padding-top: 1px;
}
ul#tabsHeader #addpage a, #addpage a:hover {
- font: 11px / normal Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 11px;
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-variant: normal;
font-weight: bold;
color: white;
line-height: 22px;
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2008-04-02
10:23:40 UTC (rev 10477)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2008-04-02
11:41:30 UTC (rev 10478)
@@ -19,6 +19,7 @@
<%if(request.getAttribute("ssoEnabled") == null){%>
<script type="text/javascript">
+ /* <![CDATA[ */
if (typeof isModalLoaded != 'undefined'){
document.write('<a href=\"#\"
onclick=\"alertModal(\'login-modal\',\'login-modal-msg\');return
false;\">Login</a>');
}else{
@@ -27,6 +28,7 @@
//set the iframe src for login modal to requested URL
var iframeSrc = '<%= loginURL %>' + '?loginheight=0';
document.getElementById('loginIframe').src = iframeSrc;
+ /* ]]> */
</script>
<noscript>
@@ -43,8 +45,10 @@
{
%>
<script type="text/javascript">
+ /* <![CDATA[ */
//we don't need the iframe/modal if logged in
document.getElementById('loginIframe').src = '';
+ /* ]]> */
</script>
Logged in as: <%= user.getUserName() %><br/><br/>
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp 2008-04-02
10:23:40 UTC (rev 10477)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp 2008-04-02
11:41:30 UTC (rev 10478)
@@ -20,22 +20,25 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
~ 02110-1301 USA, or see the FSF site:
http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
+<%@ page pageEncoding="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">
<head>
+ <title>Login</title>
<style type="text/css">
+ /* <![CDATA[ */
body {
margin: 0;
padding: 0;
border: 0;
padding-top: <%=(request.getParameter("loginheight") != null ?
request.getParameter("loginheight") : "300px")%>;
}
-
+ /* ]]> */
</style>
<link rel="stylesheet" href="/portal-core/css/login.css"
type="text/css" />
</head>
-<body OnLoad="document.loginform.j_username.focus();">
+<body onload="document.loginform.j_username.focus();">
<div class="login-container">
@@ -44,19 +47,20 @@
</div>
<div class="login-content">
<div class="error-message"
-
style="display:<%=(request.getAttribute("org.jboss.portal.loginError")
!= null ? "" :
"none")%>;"><%=request.getAttribute("org.jboss.portal.loginError")
%>
+
style="<%=(request.getAttribute("org.jboss.portal.loginError") != null ?
"" : "display:none")%>;"><%=
+ (request.getAttribute("org.jboss.portal.loginError") == null ?
"" : request.getAttribute("org.jboss.portal.loginError"))%>
</div>
- <form method="POST" action="<%=
response.encodeURL("j_security_check") %>" name="loginform"
id="loginForm"
+ <form method="post" action="<%=
response.encodeURL("j_security_check") %>" name="loginform"
id="loginForm"
target="_parent">
- <label for="j_username">
- <div class="form-field">Username:
- <input type="text" name="j_username"
id="j_username" value=""/></div>
- </label>
- <label for="j_password">
- <div class="form-field bottom-field">Password:
- <input type="password" name="j_password"
id="j_password" value=""/></div>
- </label>
- <input
style="display:<%=(request.getParameter("loginheight") != null ?
"" : "none")%>;" type="button"
name="cancel" value="Cancel" class="cancel-button"
onclick="window.parent.hideContentModal('login-modal');"/>
+ <div class="form-field">
+ <label for="j_username">Username:</label>
+ <input type="text" name="j_username"
id="j_username" value=""/>
+ </div>
+ <div class="form-field bottom-field">
+ <label for="j_password">Password:</label>
+ <input type="password" name="j_password"
id="j_password" value=""/>
+ </div>
+ <input style="<%=(request.getParameter("loginheight") !=
null ? "" : "display:none")%>;" type="button"
name="cancel" value="Cancel" class="cancel-button"
onclick="window.parent.hideContentModal('login-modal');"/>
<input style="<%=(request.getParameter("loginheight") !=
null ? "" : "right:10px")%>;" type="submit"
name="login" value="Login" class="login-button"/>
</form>
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/cms/admin/tiny_mce/themes/default/editor_ui.css
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/cms/admin/tiny_mce/themes/default/editor_ui.css 2008-04-02
10:23:40 UTC (rev 10477)
+++
branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/cms/admin/tiny_mce/themes/default/editor_ui.css 2008-04-02
11:41:30 UTC (rev 10478)
@@ -9,7 +9,7 @@
border-bottom: 1px solid;
border-right: 1px solid;
border-color: #F0F0EE;
- cursor: hand
+ cursor: pointer;
}
.mceButtonOver {
@@ -17,7 +17,7 @@
border-left: 1px solid buttonhighlight;
border-bottom: 1px solid buttonshadow;
border-right: 1px solid buttonshadow;
- cursor: hand
+ cursor: pointer;
}
.mceButtonDown {
@@ -25,7 +25,7 @@
border-right: 1px solid buttonhighlight;
border-top: 1px solid buttonshadow;
border-left: 1px solid buttonshadow;
- cursor: hand
+ cursor: pointer;
}
.mceButtonSelected {
@@ -34,17 +34,17 @@
border-top: 1px solid;
border-left: 1px solid;
border-color: #C0C0BB;
- cursor: hand
+ cursor: pointer;
}
.mceButtonDisabled {
- filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);
border-top: 1px solid;
border-left: 1px solid;
border-bottom: 1px solid;
border-right: 1px solid;
border-color: #F0F0EE;
- cursor: text
+ cursor: text;
+ filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);
}
.mceSeparator {
@@ -69,14 +69,14 @@
}
.mceSelectList {
- font-family: "MS Sans Serif";
+ font-family: "MS Sans Serif",sans-serif;;
font-size: 7pt;
font-weight: normal;
margin-top: 2px;
}
.mceLabel, .mceLabelDisabled {
- font-family: "MS Sans Serif";
+ font-family: "MS Sans Serif",sans-serif;;
font-size: 9pt;
}
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/cms/admin/tiny_mce/themes/simple/editor_ui.css
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/cms/admin/tiny_mce/themes/simple/editor_ui.css 2008-04-02
10:23:40 UTC (rev 10477)
+++
branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/cms/admin/tiny_mce/themes/simple/editor_ui.css 2008-04-02
11:41:30 UTC (rev 10478)
@@ -9,7 +9,7 @@
border-bottom: 1px solid;
border-right: 1px solid;
border-color: #F0F0EE;
- cursor: hand
+ cursor: pointer;
}
.mceButtonOver {
@@ -17,7 +17,7 @@
border-left: 1px solid buttonhighlight;
border-bottom: 1px solid buttonshadow;
border-right: 1px solid buttonshadow;
- cursor: hand
+ cursor: pointer;
}
.mceButtonDown {
@@ -25,7 +25,7 @@
border-right: 1px solid buttonhighlight;
border-top: 1px solid buttonshadow;
border-left: 1px solid buttonshadow;
- cursor: hand
+ cursor: pointer;
}
.mceButtonSelected {
@@ -34,17 +34,17 @@
border-top: 1px solid;
border-left: 1px solid;
border-color: #C0C0BB;
- cursor: hand
+ cursor: pointer;
}
.mceButtonDisabled {
- filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);
border-top: 1px solid;
border-left: 1px solid;
border-bottom: 1px solid;
border-right: 1px solid;
border-color: #F0F0EE;
- cursor: text
+ cursor: text;
+ filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);
}
.mceSeparator {
@@ -69,14 +69,14 @@
}
.mceSelectList {
- font-family: "MS Sans Serif";
+ font-family: "MS Sans Serif",sans-serif;
font-size: 7pt;
font-weight: normal;
margin-top: 2px;
}
.mceLabel, .mceLabelDisabled {
- font-family: "MS Sans Serif";
+ font-family: "MS Sans Serif",sans-serif;
font-size: 9pt;
}
@@ -95,7 +95,7 @@
}
.mceEditorArea {
- font-family: "MS Sans Serif";
+ font-family: "MS Sans Serif",sans-serif;
background: #FFFFFF;
}
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/jsp/view.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/jsp/view.jsp 2008-04-02
10:23:40 UTC (rev 10477)
+++
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/jsp/view.jsp 2008-04-02
11:41:30 UTC (rev 10478)
@@ -31,13 +31,13 @@
<tr>
<td align="center"><a
href="http://portal.demo.jboss.com" target="_blank"><img
src="<%= renderRequest.getContextPath() %>/images/dodemo.gif"
border="0"
- alt="Try the latest release of JBoss Portal, live and
online."></a>
+ alt="Try the latest release of JBoss Portal, live and online."
/></a>
<a
href="http://labs.jboss.com/portal/jbossportal/download/index.html&q...
target="_blank"><img
src="<%= renderRequest.getContextPath()
%>/images/getcode.gif" border="0"
- alt="Download JBoss Portal and have it up and running in
minutes."></a>
+ alt="Download JBoss Portal and have it up and running in minutes."
/></a>
<a href="http://www.portletswap.com"
target="_blank"><img
src="<%= renderRequest.getContextPath()
%>/images/accessorize.gif" border="0"
- alt="Download portlets and layouts for your new JBoss Portal
installation."></a></td>
+ alt="Download portlets and layouts for your new JBoss Portal
installation." /></a></td>
</tr>
<tr>
<td></td>
Modified: branches/JBoss_Portal_Branch_2_6/jems/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/jems/.classpath 2008-04-02 10:23:40 UTC (rev 10477)
+++ branches/JBoss_Portal_Branch_2_6/jems/.classpath 2008-04-02 11:41:30 UTC (rev 10478)
@@ -23,7 +23,6 @@
<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"
sourcepath="/JBoss_AS_4.0.5/jmx/src/main"/>
<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jmx-invoker-adaptor-client.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/apache-xerces/lib/xml-apis.jar"/>
<classpathentry kind="lib"
path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_6/registration/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/registration/.classpath 2008-04-02 10:23:40 UTC (rev
10477)
+++ branches/JBoss_Portal_Branch_2_6/registration/.classpath 2008-04-02 11:41:30 UTC (rev
10478)
@@ -8,7 +8,6 @@
<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/>
<classpathentry kind="lib"
path="/thirdparty/junit/lib/junit.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/apache-xerces/lib/xml-apis.jar"/>
<classpathentry kind="lib"
path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified:
branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2008-04-02
10:23:40 UTC (rev 10477)
+++
branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2008-04-02
11:41:30 UTC (rev 10478)
@@ -58,11 +58,6 @@
//
renderTitle(rendererContext, drc);
- //End the dyna-handle early so it doesn't encompass
- //the mode container -
- markup.print("</div>");
- markup.print("</div>");
-
markup.print("<div class=\"portlet-mode-container\">");
renderTriggerableActions(rendererContext, drc, ActionRendererContext.MODES_KEY);
renderTriggerableActions(rendererContext, drc,
ActionRendererContext.WINDOWSTATES_KEY);