[Bedework-commit] r339 - in trunk/calendar3:
deployment/webuser/webapp/resources/demoskins/default/default
deployment/webuser/webapp/resources/demoskins/resources
webadmin/war/WEB-INF webadmin/war/docs
svnadmin at bedework.org
svnadmin at bedework.org
Thu Apr 6 14:41:43 EDT 2006
Author: johnsa
Date: 2006-04-06 14:41:36 -0400 (Thu, 06 Apr 2006)
New Revision: 339
Modified:
trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css
trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
trunk/calendar3/deployment/webuser/webapp/resources/demoskins/resources/std-print-icon.gif
trunk/calendar3/webadmin/war/WEB-INF/web.xml
trunk/calendar3/webadmin/war/docs/header.jsp
Log:
make user information appear for non-superusers in admin client
updates to personal client styles
Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css 2006-04-06 17:09:01 UTC (rev 338)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css 2006-04-06 18:41:36 UTC (rev 339)
@@ -71,36 +71,39 @@
color: #333;
text-decoration: none;
}
-/*#titleBar {
- display: none;
-}*/
-#curDateRange {
+#curDateRangeTable {
+ width: 100%;
background-color: #663;
color : #eee;
- padding-top: 2px;
+ padding-top: 3px;
padding-bottom: 1px;
padding-left: 0.5em;
padding-right: 0.5em;
margin: 0em;
+ line-height: 1.5em;
font-weight : bold;
text-align : center;
+ vertical-align: middle;
white-space: nowrap;
}
-.rssPrint {
- margin: 0;
- padding-right: 1em;
+#curDateRangeTable td.date {
+ width: 100%;
font-weight : bold;
+ text-align : center;
+ white-space: nowrap;
+}
+#curDateRangeTable td.rssPrint {
+ font-weight : bold;
text-align : right;
white-space: nowrap;
}
-.rssPrint img {
- display: inline;
+#curDateRangeTable td.rssPrint img {
position: relative;
top: 3px;
}
-.rssPrint a:link,
-.rssPrint a:active,
-.rssPrint a:visited {
+#curDateRangeTable td.rssPrint a:link,
+#curDateRangeTable td.rssPrint a:active,
+#curDateRangeTable td.rssPrint a:visited {
font-size: 10px;
color: #eee;
background-color: transparent;
@@ -111,13 +114,13 @@
position: relative;
top: -3px;
}
-.rssPrint a:hover {
+#curDateRangeTable td.rssPrint a:hover {
color: #663;
background-color: #fff;
}
-.rssPrint a.rss:link,
-.rssPrint a.rss:active,
-.rssPrint a.rss:visited {
+#curDateRangeTable td.rssPrint a.rss:link,
+#curDateRangeTable td.rssPrint a.rss:active,
+#curDateRangeTable td.rssPrint a.rss:visited {
font-size: 10px;
font-weight: bold;
color: #444;
@@ -131,7 +134,7 @@
top: -3px;
border: solid 1px #666;
}
-.rssPrint a.rss:hover {
+#curDateRangeTable td.rssPrint a.rss:hover {
color: #900;
background-color: #fff;
}
@@ -163,9 +166,12 @@
background-color: #ddd;
}
#sideBarOpenCloseIcon {
- position: absolute;
+ float: left;
+ margin: 3px 0;
+ vertical-align: middle;
+ /*position: absolute;
left: 32px;
- padding-top: 3px;
+ padding-top: 3px;*/
}/*
#bodyBlock td#sideBar #sideBarTabs {
width: 200px;
@@ -205,39 +211,39 @@
vertical-align: top;
padding: 0;
}
-#userBarTable {
+#utilBarTable {
margin: 0;
padding: 0;
background-color : #eee;
color: black;
font-size: 0.9em;
}
-#userBarTable .leftCell {
+#utilBarTable .leftCell {
margin: 0;
padding: 0;
padding: 0.2em 0 0.2em 1em;
white-space: nowrap;
}
-#userBarTable .leftCell .link {
+#utilBarTable .leftCell .link {
font-size: 0.8em;
padding-left: 1em;
color: #999;
background-color: transparent;
}
-#userBarTable .leftCell a {
+#utilBarTable .leftCell a {
color: #999;
background-color: transparent;
}
-#userBarTable .logout {
+#utilBarTable .logout {
font-size: 0.8em;
}
-#userBarTable .rightCell {
+#utilBarTable .rightCell {
margin: 0;
padding: 0.1em 0.2em 0 0;
text-align: right;
white-space: nowrap;
}
-#userBarTable form {
+#utilBarTable form {
margin: 0px 0px 1px 0px;
padding: 0em;
}
@@ -248,21 +254,24 @@
vertical-align: bottom;
background-color: #333;
color: #eee;
+ font-size: 0.8em;
}
+#tabsTable td {
+ white-space: nowrap;
+}
#tabsTable .centerCell {
text-align: left;
background : url(../../resources/std-tab-space.gif);
- font-size: 0.8em;
- white-space: nowrap;
width: 100%;
padding-left: 0.5em;
}
-#tabsTable .centerCell a {
+#tabsTable a {
+ background-color: inherit;
color: #ccc;
}
#tabsTable .rightCell {
background : url(../../resources/std-tab-space.gif);
- padding-right: 0.5em;
+ padding: 0 0.5em;
}
#navigationBarTable {
font-size: 0.8em;
Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2006-04-06 17:09:01 UTC (rev 338)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2006-04-06 18:41:36 UTC (rev 339)
@@ -147,7 +147,7 @@
<xsl:otherwise>
<!-- otherwise, show the eventsCalendar -->
<xsl:call-template name="navigation"/>
- <xsl:call-template name="userBar"/>
+ <xsl:call-template name="utilBar"/>
<!-- main eventCalendar content -->
<xsl:choose>
<xsl:when test="/bedework/periodname='Day'">
@@ -230,8 +230,8 @@
<td width="50%"><img alt="" src="{$resourcesRoot}/resources/metacal-topBorder.gif" width="100%" height="23" border="0"/></td>
</tr>
</table>
- <div id="curDateRange">
- <div id="sideBarOpenCloseIcon">
+ <table id="curDateRangeTable" cellspacing="0">
+ <td>
<xsl:choose>
<xsl:when test="/bedework/appvar[key='sidebar']/value='closed'">
<a href="?setappvar=sidebar(opened)">
@@ -244,13 +244,21 @@
</a>
</xsl:otherwise>
</xsl:choose>
- </div>
- <xsl:value-of select="/bedework/firstday/longdate"/>
- <xsl:if test="/bedework/periodname!='Day'">
- -
- <xsl:value-of select="/bedework/lastday/longdate"/>
- </xsl:if>
- </div>
+ </td>
+ <td class="date">
+ <xsl:value-of select="/bedework/firstday/longdate"/>
+ <xsl:if test="/bedework/periodname!='Day'">
+ -
+ <xsl:value-of select="/bedework/lastday/longdate"/>
+ </xsl:if>
+ </td>
+ <td class="rssPrint">
+ <a href="javascript:window.print()" title="print this view">
+ <img alt="print this view" src="{$resourcesRoot}/resources/std-print-icon.gif" width="20" height="14" border="0"/> print
+ </a>
+ <a class="rss" href="{$setSelection}?calId=&setappvar=summaryMode(details)&skinName=rss" title="RSS feed">RSS</a>
+ </td>
+ </table>
</xsl:template>
<xsl:template name="sideBar">
@@ -311,15 +319,12 @@
<td class="centerCell">
 
</td>
- <td class="rssPrint">
- <a href="javascript:window.print()" title="print this view">
- <img alt="print this view" src="{$resourcesRoot}/resources/std-print-icon.gif" width="20" height="14" border="0"/> print
- </a>
- <a class="rss" href="{$setSelection}?calId=&setappvar=summaryMode(details)&skinName=rss" title="RSS feed">RSS</a>
- </td>
-
<td class="rightCell">
-  
+ Welcome
+ <xsl:text> </xsl:text>
+ <strong><xsl:value-of select="/bedework/userid"/></strong>
+ <xsl:text> </xsl:text>
+ <span class="logout"><a href="{$setup}?logout=true">logout</a></span>
</td>
</tr>
</table>
@@ -343,7 +348,11 @@
 <!--<a href="http://www.rpi.edu/dept/cct/apps/pubeventsxml/calendarfeatures.html">login</a>-->
</td>
<td class="rightCell">
-  
+ Welcome
+ <xsl:text> </xsl:text>
+ <strong><xsl:value-of select="/bedework/userid"/></strong>
+ <xsl:text> </xsl:text>
+ <span class="logout"><a href="{$setup}?logout=true">logout</a></span>
</td>
</tr>
</table>
@@ -460,15 +469,10 @@
</table>
</xsl:template>
- <xsl:template name="userBar">
- <table width="100%" border="0" cellpadding="0" cellspacing="0" id="userBarTable">
+ <xsl:template name="utilBar">
+ <table width="100%" border="0" cellpadding="0" cellspacing="0" id="utilBarTable">
<tr>
<td class="leftCell">
- Logged in as:
- <xsl:text> </xsl:text>
- <strong><xsl:value-of select="/bedework/userid"/></strong>
- <xsl:text> </xsl:text>
- <span class="logout"><a href="{$setup}?logout=true">logout</a></span>
<!--<xsl:choose>
<xsl:when test="/bedework/title!=''">
Calendar: <xsl:value-of select="/bedework/title"/>
Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/resources/std-print-icon.gif
===================================================================
(Binary files differ)
Modified: trunk/calendar3/webadmin/war/WEB-INF/web.xml
===================================================================
--- trunk/calendar3/webadmin/war/WEB-INF/web.xml 2006-04-06 17:09:01 UTC (rev 338)
+++ trunk/calendar3/webadmin/war/WEB-INF/web.xml 2006-04-06 18:41:36 UTC (rev 339)
@@ -175,6 +175,11 @@
<taglib-uri>struts-template</taglib-uri>
<taglib-location>/WEB-INF/tlds/struts-template.tld</taglib-location>
</taglib>
+
+ <taglib>
+ <taglib-uri>bedework</taglib-uri>
+ <taglib-location>/WEB-INF/tlds/bedework.tld</taglib-location>
+ </taglib>
</jsp-config>
<!-- JDBC DataSources (java:comp/env/jdbc) -->
Modified: trunk/calendar3/webadmin/war/docs/header.jsp
===================================================================
--- trunk/calendar3/webadmin/war/docs/header.jsp 2006-04-06 17:09:01 UTC (rev 338)
+++ trunk/calendar3/webadmin/war/docs/header.jsp 2006-04-06 18:41:36 UTC (rev 339)
@@ -3,6 +3,7 @@
<%@ taglib uri='struts-logic' prefix='logic' %>
<%@ taglib uri='struts-html' prefix='html' %>
<%@ taglib uri='struts-genurl' prefix='genurl' %>
+<%@ taglib uri='bedework' prefix='bw' %>
<html:xhtml/>
<%
try {
@@ -191,13 +192,8 @@
</logic:notEqual>
<!-- user and group -->
- <logic:equal name="peForm" property="userAuth.contentAdminUser" value="true" >
- <user><bean:write name="peForm" property="adminUserId" /></user>
- <logic:present name="peForm" property="adminGroup" >
- <group><bean:write name="peForm" property="adminGroup.account" /></group>
- </logic:present>
- </logic:equal>
-
+ <bw:emitText name="peForm" property="adminUserId" tagName="user"/>
+ <bw:emitText name="peForm" property="adminGroup.account" tagName="group"/>
</userInfo>
<logic:iterate id="appvar" name="peForm" property="appVars">
More information about the Bedework-commit
mailing list