Changeset 2122

Show
Ignore:
Timestamp:
04/09/09 15:07:52
Author:
johnsa
Message:

access control widget: fixed for ie8 dom issues
minor cosmetic work

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/resources/javascript/bedework/bedeworkAccess.js

    r2079 r2122  
    655655    try { 
    656656 
     657      // get the aclWidget and throw out the existing contents 
    657658      var aclWidget = document.getElementById(id); 
    658       aclWidget.innerHTML = ""; 
     659      aclWidget.removeChild(aclWidget.firstChild); 
    659660 
    660661      var bwCurrentAccess = document.createElement("table"); 
    …… 
    663664      bwCurrentAccess.createTHead(); 
    664665      bwCurrAccessHead = bwCurrentAccess.tHead.insertRow(0); 
    665       bwCurrAccessHead.innerHTML = '<th>' + bwAclWidgetEntryStr + '</th>' +  '<th>' + bwAclWidgetAccessStr + '</th>' + '<th>' + bwAclWidgetInheritedStr + '</th><th></th>'; 
     666      // build the th row using the DOM to avoid IE8 issues (i.e. avoid innerHTML) 
     667      var th1 = document.createElement("th"); 
     668      var txt1 = document.createTextNode(bwAclWidgetEntryStr); 
     669      var th2 = document.createElement("th"); 
     670      var txt2 = document.createTextNode(bwAclWidgetAccessStr); 
     671      var th2 = document.createElement("th"); 
     672      var txt3 = document.createTextNode(bwAclWidgetInheritedStr); 
     673      var th3 = document.createElement("th"); 
     674      var th4 = document.createElement("th"); 
     675      th1.appendChild(txt1); 
     676      th2.appendChild(txt2); 
     677      th3.appendChild(txt3); 
     678      bwCurrAccessHead.appendChild(th1); 
     679      bwCurrAccessHead.appendChild(th2); 
     680      bwCurrAccessHead.appendChild(th3); 
     681      bwCurrAccessHead.appendChild(th4); 
     682 
    666683      var bwCurrAccessTBody = document.createElement("tbody"); 
    667684      bwCurrentAccess.appendChild(bwCurrAccessTBody); 

  • trunk/deployment/resources/javascript/jquery/bedeworkJqueryThemes.css

    r1967 r2122  
    214214    height: 200px; /*must have*/ 
    215215} 
    216  
    217  
     216/* UI DIALOG */ 
     217 
     218/* Dialog 
     219----------------------------------*/ 
     220.ui-dialog { position: relative; padding: .2em; width: 300px; } 
     221.ui-dialog .ui-dialog-titlebar { padding: .5em .3em .3em 1em; position: relative;  } 
     222.ui-dialog .ui-dialog-title { float: left; margin: .1em 0 .2em; } 
     223.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; } 
     224.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; } 
     225.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; } 
     226.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; } 
     227.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } 
     228.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; } 
     229.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } 
     230.ui-draggable .ui-dialog-titlebar { cursor: move; } 

  • trunk/deployment/resources/login/login.html

    r2071 r2122  
    3535        padding-right: 0.5em; 
    3636      } 
     37      #loginBox input { 
     38        width: 10em; 
     39      } 
     40      #loginBox input.submit { 
     41        width: 6em; 
     42      } 
    3743      form { 
    3844        margin: 1em 0; 
    …… 
    6369          <td> 
    6470            <input type="password" name="j_password" size="20"/> 
    65             <input type="submit" name="j_security_check" value="login"/> 
     71            <input type="submit" class="submit" name="j_security_check" value="login"/> 
    6672          </td> 
    6773        </tr> 

  • trunk/deployment/webadmin/webapp/resources/default/default/default.css

    r2105 r2122  
    484484  background-color: transparent; 
    485485} 
     486table.common2 { 
     487  border-top: 1px solid #ddd; 
     488  border-left: 1px solid #ddd; 
     489} 
     490table.common2 th, 
     491table.common2 td { 
     492  padding: 0.5em; 
     493  border-bottom: 1px solid #ddd; 
     494  border-right: 1px solid #ddd; 
     495  text-align: left; 
     496  vertical-align: top; 
     497  font-weight: normal; 
     498} 
     499table.common2 th { 
     500  color: black; 
     501  background-color: #eee; 
     502} 
    486503#confirmButtons { 
    487504  margin: 1em 0 !important; 

  • trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

    r2109 r2122  
    20812081          </td> 
    20822082          <td> 
    2083             <xsl:copy-of select="form/desc/*"/> 
     2083            <textarea name="description" cols="55" rows="8"> 
     2084              <xsl:copy-of select="form/desc/textarea/*"/> 
     2085              <xsl:if test="form/desc/textarea = ''"><xsl:text> </xsl:text></xsl:if> 
     2086            </textarea> 
    20842087            <div class="fieldInfo"> 
    20852088              Enter all pertinent information, including the academic titles of 
    …… 
    47144717    <form name="eventForm" method="post" action="{$event-upload}" id="standardForm" enctype="multipart/form-data"> 
    47154718      <h2>Upload iCAL File</h2> 
    4716       <table class="common" cellspacing="0"> 
    4717         <tr> 
    4718           <td class="fieldname"> 
     4719      <table class="common2" cellspacing="0"> 
     4720        <tr> 
     4721          <th> 
    47194722            Filename: 
    4720           </td> 
     4723          </th> 
    47214724          <td align="left"> 
    47224725            <input type="file" name="uploadFile" size="60" /> 
    …… 
    47244727        </tr> 
    47254728        <tr> 
    4726           <td class="fieldname padMeTop"> 
     4729          <th> 
    47274730            Into calendar: 
    4728           </td> 
     4731          </th> 
    47294732          <td align="left" class="padMeTop"> 
    47304733            <input type="hidden" name="newCalPath" value=""/> 
    …… 
    47374740        </tr> 
    47384741        <tr> 
    4739           <td class="fieldname padMeTop"> 
     4742          <th > 
    47404743            Effects free/busy: 
    4741           </td> 
     4744          </th> 
    47424745          <td align="left" class="padMeTop"> 
    47434746            <input type="radio" value="" name="transparency" checked="checked"/> accept event's settings<br/> 
    …… 
    47474750        </tr> 
    47484751        <tr> 
    4749           <td class="fieldname padMeTop"> 
     4752          <th> 
    47504753            Status: 
    4751           </td> 
     4754          </th> 
    47524755          <td align="left" class="padMeTop"> 
    47534756            <input type="radio" value="" name="status" checked="checked"/> accept event's status<br/> 
    …… 
    59195922          </th> 
    59205923          <td> 
    5921             <textarea name="def" rows="30" cols="80"></textarea> 
     5924            <textarea name="def" rows="30" cols="80"> 
     5925              <xsl:text> </xsl:text> 
     5926            </textarea> 
    59225927          </td> 
    59235928        </tr> 

  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r2121 r2122  
    402402         losing the script closing tags (which avoids browser problems) --> 
    403403    <script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js">&#160;</script> 
    404     <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.3.2.min.js">&#160;</script> 
    405     <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.7.1.custom.min.js">&#160;</script> 
    406     <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/jquery-ui-1.7.1.custom.css"/> 
     404    <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js">&#160;</script> 
     405    <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js">&#160;</script> 
     406    <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/> 
    407407 
    408408    <xsl:if test="/bedework/page='modSchedulingPrefs' or 
    …… 
    411411      <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkPrefs.js">&#160;</script> 
    412412    </xsl:if> 
     413 
    413414    <xsl:if test="/bedework/page='modCalendar' or 
    414415                  /bedework/page='modSchedulingPrefs'"> 
    …… 
    422423      </xsl:if> 
    423424    </xsl:if> 
     425 
    424426    <xsl:if test="/bedework/page='attendees'"> 
    425427      <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js">&#160;</script> 
    …… 
    429431      <link rel="stylesheet" type="text/css" href="/bedework-common/javascript/jquery/autocomplete/jquery.autocomplete.css" /> 
    430432    </xsl:if> 
     433 
    431434    <xsl:if test="/bedework/page='addEvent' or 
    432435                  /bedework/page='editEvent' or 
    …… 
    489492      </script> 
    490493    </xsl:if> 
     494 
    491495    <script type="text/javascript"> 
    492496      <xsl:comment> 
    …… 
    723727      </ul> 
    724728    </div> 
    725     <!-- table cellspacing="0" id="tabsTable"> 
    726       <tr> 
    727         <td> 
    728           <xsl:choose> 
    729             <xsl:when test="/bedework/periodname='Day'"> 
    730               <a href="{$navAction}&amp;viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-day-on.gif" width="90" height="20" border="0" alt="DAY"/></a> 
    731             </xsl:when> 
    732             <xsl:otherwise> 
    733               <a href="{$navAction}&amp;viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-day-off.gif" width="90" height="20" border="0" alt="DAY"/></a> 
    734             </xsl:otherwise> 
    735           </xsl:choose> 
    736         </td> 
    737         <td> 
    738           <xsl:choose> 
    739             <xsl:when test="/bedework/periodname='Week' or /bedework/periodname=''"> 
    740               <a href="{$navAction}&amp;viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-week-on.gif" width="92" height="20" border="0" alt="WEEK"/></a> 
    741              </xsl:when> 
    742             <xsl:otherwise> 
    743               <a href="{$navAction}&amp;viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a> 
    744              </xsl:otherwise> 
    745           </xsl:choose> 
    746         </td> 
    747         <td> 
    748           <xsl:choose> 
    749             <xsl:when test="/bedework/periodname='Month'"> 
    750               <a href="{$navAction}&amp;viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-month-on.gif" width="90" height="20" border="0" alt="MONTH"/></a> 
    751             </xsl:when> 
    752             <xsl:otherwise> 
    753               <a href="{$navAction}&amp;viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a> 
    754             </xsl:otherwise> 
    755           </xsl:choose> 
    756         </td> 
    757         <td> 
    758           <xsl:choose> 
    759             < ! - - don't allow switching to year for free busy view, so only use setViewPeriod action - - > 
    760             <xsl:when test="/bedework/periodname='Year'"> 
    761               <a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-year-on.gif" width="92" height="20" border="0" alt="YEAR"/></a> 
    762             </xsl:when> 
    763             <xsl:otherwise> 
    764               <xsl:choose> 
    765                 <xsl:when test="/bedework/page='attendees' or /bedework/page='freeBusy'"> 
    766                   <img src="{$resourcesRoot}/resources/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/> 
    767                 </xsl:when> 
    768                 <xsl:otherwise> 
    769                   <a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a> 
    770                 </xsl:otherwise> 
    771               </xsl:choose> 
    772             </xsl:otherwise> 
    773           </xsl:choose> 
    774         </td> 
    775         <td class="rightCell"> 
    776           logged in as 
    777           <xsl:text> </xsl:text> 
    778           <strong><xsl:value-of select="/bedework/userid"/></strong> 
    779           <xsl:text> </xsl:text> 
    780           <span class="logout"><a href="{$setup}&amp;logout=true">logout</a></span> 
    781         </td> 
    782       </tr> 
    783     </table--> 
    784729  </xsl:template> 
    785730 
    …… 
    26092554                  </xsl:when> 
    26102555                  <xsl:otherwise> 
    2611                     <!-- span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetStartDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
    2612                       <xsl:attribute name="value"><xsl:value-of select="form/start/rfc3339DateTime"/></xsl:attribute> 
    2613                       <xsl:text> </xsl:text> 
    2614                     </span --> 
    26152556                    <input type="text" name="bwEventWidgetStartDate" id="bwEventWidgetStartDate" size="10"/> 
    26162557                    <script type="text/javascript"> 
    …… 
    26202561                      }).attr("readonly", "readonly"); 
    26212562                      $("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(form/start/rfc3339DateTime,'T')"/>'); 
    2622                       //alert($("#bwEventWidgetStartDate").datepicker("getDate")); 
    26232563                      </xsl:comment> 
    26242564                    </script> 
    …… 
    37123652          </xsl:apply-templates> 
    37133653        </xsl:if> 
    3714         <p class="editAttendees"> 
     3654        <div class="editAttendees"> 
    37153655          <xsl:choose> 
    37163656            <xsl:when test="form/scheduleMethod = '2'"> 
    …… 
    37283668            </xsl:otherwise> 
    37293669          </xsl:choose> 
    3730         </p> 
     3670        </div> 
    37313671      </div> 
    37323672    </div>