Changeset 690
- Timestamp:
- 07/04/06 01:14:54
- Files:
-
- trunk/calendar3/deployment/freebusyAggregator/webapp/resources/demoskins/MainCampus/default/default/default.css (modified) (1 diff)
- trunk/calendar3/deployment/freebusyAggregator/webapp/resources/demoskins/MainCampus/default/default/default.xsl (modified) (5 diffs)
- trunk/calendar3/deployment/freebusyAggregator/webapp/resources/demoskins/MainCampus/resources/dynCalendarWidget.css (modified) (1 diff)
- trunk/calendar3/deployment/freebusyAggregator/webapp/resources/demoskins/MainCampus/resources/includes.js (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/calendar3/deployment/freebusyAggregator/webapp/resources/demoskins/MainCampus/default/default/default.css
r689 r690 46 46 } 47 47 #bodyBlock td#fbForm { 48 padding: 1em 0.5em 1em 1em;48 padding: 0; 49 49 border-right: 1px solid #ccc; 50 50 vertical-align: top; 51 51 white-space: nowrap; 52 52 } 53 #bodyBlock td#fbForm form { 54 margin: 1em 0.5em 1em 1em; 55 } 56 #bodyBlock td#fbForm form input { 57 margin: 2px 0; 58 padding: 0; 59 } 60 #bodyBlock td#fbForm h4 { 61 background: #eee; 62 color: black; 63 font-size: 1em; 64 padding: 2px 0; 65 text-align: center; 66 margin: 0 0 1em 0; 67 } 53 68 #bodyBlock td#fbForm p { 54 69 margin: 0 0 0.5em 0; 55 70 padding: 0; 56 71 } 57 #bodyBlock td#fbForm p. submit{72 #bodyBlock td#fbForm p.padTop { 58 73 margin: 1em 0 0 0; 74 padding: 0; 75 } 76 #bodyBlock td#fbForm #users { 77 margin: 0 auto; 78 padding: 0; 59 79 } 60 80 #bodyBlock td#bodyContent { trunk/calendar3/deployment/freebusyAggregator/webapp/resources/demoskins/MainCampus/default/default/default.xsl
r689 r690 151 151 152 152 <xsl:template name="fbForm"> 153 <h4>aggregation</h4> 153 154 <form 154 155 name="freebusyForm" … … 157 158 enctype="multipart/form-data" 158 159 id="freebusyForm"> 159 160 <input type="hidden" name="all" value="true"/> 160 161 <p> 161 162 Start date:<br/> 162 163 <input 163 164 type="text" 164 name="start Date"165 name="startdt" 165 166 size="8" 166 167 value="" /> … … 175 176 <input 176 177 type="text" 177 name="end Date"178 name="enddt" 178 179 size="8" 179 180 value="" /> … … 182 183 endDateDynCalWidget = new dynCalendar('endDateDynCalWidget', 'endDateCalWidgetCallback','<xsl:value-of select="$resourcesRoot"/>/resources/'); 183 184 </script> 184 </span> 185 </span><!--<br /> 186 <em>yyyymmdd</em>--> 185 187 </p> 186 <p >188 <p class="padTop"> 187 189 Add user/group:<br/> 188 190 <input … … 190 192 name="user" 191 193 size="12" 192 value="" /> 194 value="" /><br/> 195 <input type="radio" value="user" name="kind" checked="checked"/>user 196 <input type="radio" value="group" name="kind"/>group 193 197 </p> 194 <p class=" submit">198 <p class="padTop center"> 195 199 <input type="submit" value="aggregate"/> 196 200 </p> 197 201 <!--<input type="reset" value="reset"/>--> 198 202 </form> 203 204 <h4>users</h4> 205 <table id="users"> 206 <tr> 207 <td> 208 <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/> 209 </td> 210 <td> 211 douglm 212 </td> 213 <td> 214 <xsl:variable name="acct" select="account"/> 215 <!--<a href="{$admingroup-updateMembers}&removeGroupMember={$acct}&kind=user" title="remove">--> 216 <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="remove"/> 217 <!--</a>--> 218 </td> 219 </tr> 220 <tr> 221 <td> 222 <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/> 223 </td> 224 <td> 225 johnsa 226 </td> 227 <td> 228 <xsl:variable name="acct" select="account"/> 229 <!--<a href="{$admingroup-updateMembers}&removeGroupMember={$acct}&kind=user" title="remove">--> 230 <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="remove"/> 231 <!--</a>--> 232 </td> 233 </tr> 234 <!--<xsl:for-each select="/bedeworkadmin/adminGroup/members/member"> 235 <xsl:choose> 236 <xsl:when test="kind='0'">--><!-- kind = user --> 237 <!--<tr> 238 <td> 239 <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/> 240 </td> 241 <td> 242 <xsl:value-of select="account"/> 243 </td> 244 <td> 245 <xsl:variable name="acct" select="account"/> 246 <a href="{$admingroup-updateMembers}&removeGroupMember={$acct}&kind=user" title="remove"> 247 <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="remove"/> 248 </a> 249 </td> 250 </tr> 251 </xsl:when> 252 <xsl:otherwise>--><!-- kind = group --> 253 <!--<tr> 254 <td> 255 <img src="{$resourcesRoot}/resources/groupIcon.gif" width="13" height="13" border="0" alt="group"/> 256 </td> 257 <td> 258 <strong><xsl:value-of select="account"/></strong> 259 </td> 260 <td> 261 <xsl:variable name="acct" select="account"/> 262 <a href="{$admingroup-updateMembers}&removeGroupMember={$acct}&kind=group" title="remove"> 263 <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="remove"/> 264 </a> 265 </td> 266 </tr> 267 </xsl:otherwise> 268 </xsl:choose> 269 </xsl:for-each> --> 270 </table> 199 271 </xsl:template> 200 272 trunk/calendar3/deployment/freebusyAggregator/webapp/resources/demoskins/MainCampus/resources/dynCalendarWidget.css
r688 r690 1 1 .calWidget { 2 2 position: relative; 3 margin-left: 2px; 3 margin: 0 0 0 2px; 4 padding: 0; 4 5 } 5 6 .dynCalendar { trunk/calendar3/deployment/freebusyAggregator/webapp/resources/demoskins/MainCampus/resources/includes.js
r688 r690 7 7 } 8 8 today = new Date(); 9 document.freebusyForm['start Date'].value = month + "/" + date + "/" + year;9 document.freebusyForm['startdt'].value = year + month + date; 10 10 } 11 11 function endDateCalWidgetCallback(date, month, year) { … … 17 17 } 18 18 today = new Date(); 19 document.freebusyForm['end Date'].value = month + "/" + date + "/" + year;19 document.freebusyForm['enddt'].value = year + month + date; 20 20 }
