Changeset 5902 for trunk/www/logout.jsp


Ignore:
Timestamp:
Dec 8, 2011, 3:01:38 PM (10 years ago)
Author:
Nicklas Nordborg
Message:

References #1655: GUI improvements

  • Make sure content on dialog can be placed so that it fills the free space between the title and buttons.


  • The 'Logout' dialog is easy and provides the simple case where everything is centered in the remaining space. Should also work when resizing the dialog.


  • The 'Reset filters' and 'Broadcast message' dialogs need a bit more work. The look ok now, but there are some minor things to fix yet.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/www/logout.jsp

    r5900 r5902  
    7272  {
    7373    Main.hide('confirm');
     74    Main.hide('dialogbuttons');
    7475    Main.show('logout');
    7576    setTimeout("document.forms['logout'].submit()", 800);
    … …  
    7879</base:head>
    7980<base:body>
    80   <br>
    81   <form action="logout.jsp" method="post" name="logout" onsubmit="return false;">
     81  <h1><%=title%></h1>
     82  <div class="content">
     83  <table class="fullcc"><tr><td>
     84    <form action="logout.jsp" method="post" name="logout" onsubmit="return false;">
    8285    <input type="hidden" name="ID" value="<%=ID%>">
    8386    <input type="hidden" name="noconfirm" value="1">
    84  
    85   <div id="confirm">
    86     <base:note type="question" title="<%=title%>">
    87       Are you sure you want to logout? All unsaved data will be lost!
    88       <br>
    89     </base:note>
    90     <p>
    91     <table align="center">
    92     <tr>
    93       <td>
    94       <%
    95       if (sc.isImpersonated())
    96       {
    97         User originalUser = (User)sc.getSessionSetting("impersonate.originalUser");
    98         if (originalUser != null)
     87      <div id="confirm">
     88        <b>Are you sure you want to logout? </b>
     89        <br>
     90        All unsaved data will be lost!
     91        <%
     92        if (sc.isImpersonated())
    9993        {
    100           %>
    101           <input type="checkbox" name="revert" id="revert" value="1" checked><label for="revert">Revert to
    102           <%=HTML.encodeTags(originalUser.getName())%></label>
    103           <%
     94          User originalUser = (User)sc.getSessionSetting("impersonate.originalUser");
     95          if (originalUser != null)
     96          {
     97            %>
     98            <p>
     99            <input type="checkbox" name="revert" id="revert" value="1" checked><label for="revert">Revert to
     100            <%=HTML.encodeTags(originalUser.getName())%></label>
     101            <%
     102          }
    104103        }
    105       }
    106       %>
    107       </td>
    108     </tr>
    109     </table>
    110    
    111     <base:buttongroup subclass="dialogbuttons">
    112       <base:button onclick="beginLogout()" title="Yes" />
    113       <base:button onclick="window.close()" title="No" />
    114     </base:buttongroup>
    115    
     104        %>
     105      </div>
     106      <div id="logout" style="display: none;">
     107        <b>Logging out...</b>
     108      </div>
     109    </form>
     110  </td></tr></table>
    116111  </div>
    117  
    118   <div id="logout" style="display: none;">
    119     <base:note type="info" title="Logging out...">
    120     Logging out...
    121     </base:note>
    122   </div>
    123  
    124   </form>
    125 
     112  <base:buttongroup subclass="dialogbuttons" id="dialogbuttons">
     113    <base:button onclick="beginLogout()" title="Yes" />
     114    <base:button onclick="window.close()" title="No" />
     115  </base:buttongroup>
    126116</base:body>
    127117</base:page>
Note: See TracChangeset for help on using the changeset viewer.