Author: taylor
Date: Thu Oct 29 23:39:19 2009
New Revision: 831154
URL: http://svn.apache.org/viewvc?rev=831154&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1057
prototype status area and search (search is disabled)
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/images/search.png
(with props)
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/css/styles.css
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/css/styles.css
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/css/styles.css
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/css/styles.css
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp?rev=831154&r1=831153&r2=831154&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
Thu Oct 29 23:39:19 2009
@@ -73,6 +73,10 @@
<div class="menu">
<span style='position: absolute; left: 0px' id='jstbLeftToggle'
class='jstbToggle1'></span><span id='jstbRightToggle' class='jstbToggle2'
style='position: absolute; right: 0px'></span>
</div>
+<%if (request.getUserPrincipal() != null) {%>
+<span class="layout-statusarea">David Sean Taylor | Profile | Tasks (5) |
Notifications (2) | <a href="<%=request.getContextPath()%>/login/logout">Log
out</a></span>
+<% } %>
+<!-- <span class="layout-search"><input type='text' size='14'/></span><span
class="layout-search2"><img height='18'
src="<%=request.getContextPath()%>/images/search.png"/></span> -->
</div> <!-- end header -->
<!-- main area -->
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/css/styles.css
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/css/styles.css?rev=831154&r1=831153&r2=831154&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/css/styles.css
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/css/styles.css
Thu Oct 29 23:39:19 2009
@@ -423,6 +423,34 @@
text-decoration:none;
}
+.layout-greenearth .layout-search {
+position: absolute;
+right: 22px; top: 18px;
+color: #000;
+padding:2px;
+text-decoration:none;
+}
+
+.layout-greenearth .layout-search2 {
+position: absolute;
+right: 3px; top: 21px;
+}
+
+.layout-greenearth .layout-statusarea {
+position: absolute;
+right: 2px; top: 0px;
+color: #fff;
+padding:2px;
+text-decoration:none;
+font-size:8pt;
+}
+.layyout-greenearth .layout-statusarea A:visited,
+.layout-greenearth .layout-statusarea A {
+color: #fff;
+font-size:8pt;
+}
+
+
.layout-greenearth .layout-greenearth-logout:hover{
text-decoration: underline;
}
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/css/styles.css
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/css/styles.css?rev=831154&r1=831153&r2=831154&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/css/styles.css
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/css/styles.css
Thu Oct 29 23:39:19 2009
@@ -421,8 +421,35 @@
color: #fff;
padding:2px;
text-decoration:none;
+font-size:8pt;
}
+.layout-jetspeed .layout-search {
+position: absolute;
+right: 22px; top: 18px;
+color: #000;
+padding:2px;
+text-decoration:none;
+}
+
+.layout-jetspeed .layout-search2 {
+position: absolute;
+right: 3px; top: 21px;
+}
+
+.layout-jetspeed .layout-statusarea {
+position: absolute;
+right: 2px; top: 0px;
+color: #fff;
+padding:2px;
+text-decoration:none;
+font-size:8pt;
+}
+.layyout-jetspeed .layout-statusarea A:visited,
+.layout-jetspeed .layout-statusarea A {
+color: #fff;
+}
+
.layout-jetspeed .layout-jetspeed-logout:hover{
text-decoration: underline;
}
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/css/styles.css
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/css/styles.css?rev=831154&r1=831153&r2=831154&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/css/styles.css
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/css/styles.css
Thu Oct 29 23:39:19 2009
@@ -423,6 +423,32 @@
text-decoration:none;
}
+.layout-purpleplanet .layout-search {
+position: absolute;
+right: 22px; top: 18px;
+color: #000;
+padding:2px;
+text-decoration:none;
+}
+
+.layout-purpleplanet .layout-search2 {
+position: absolute;
+right: 3px; top: 21px;
+}
+
+.layout-purpleplanet .layout-statusarea {
+position: absolute;
+right: 2px; top: 0px;
+color: #fff;
+padding:2px;
+text-decoration:none;
+font-size:8pt;
+}
+.layyout-purpleplanet .layout-statusarea A:visited,
+.layout-purpleplanet .layout-statusarea A {
+color: #fff;
+}
+
.layout-purpleplanet .layout-purpleplanet-logout:hover{
text-decoration: underline;
}
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/css/styles.css
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/css/styles.css?rev=831154&r1=831153&r2=831154&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/css/styles.css
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/css/styles.css
Thu Oct 29 23:39:19 2009
@@ -423,6 +423,33 @@
text-decoration:none;
}
+.layout-turbo .layout-search {
+position: absolute;
+right: 22px; top: 18px;
+color: #000;
+padding:2px;
+text-decoration:none;
+}
+
+.layout-turbo .layout-search2 {
+position: absolute;
+right: 3px; top: 21px;
+}
+
+.layout-turbo .layout-statusarea {
+position: absolute;
+right: 2px; top: 0px;
+color: #fff;
+padding:2px;
+text-decoration:none;
+font-size:8pt;
+}
+.layyout-turbo .layout-statusarea A:visited,
+.layout-turbo .layout-statusarea A {
+color: #fff;
+}
+
+
.layout-turbo .layout-turbo-logout:hover{
text-decoration: underline;
}
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/images/search.png
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/images/search.png?rev=831154&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/images/search.png
------------------------------------------------------------------------------
svn:mime-type = image/png
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
