Changeset 28


Ignore:
Timestamp:
Dec 7, 2005 8:51:24 AM (18 years ago)
Author:
scdev
Message:
 
Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/css/admin.inc.css

    r27 r28  
    5454    font-size: 70%;
    5555    max-width: 25em;
     56    font-weight: bold;
    5657    /* BEAU: I added class="right" to the <TD> to make them align right as they were before. Do you know a better way? */
    5758    /*float: right;*/

  • trunk/lib/Auth_SQL.inc.php

    r27 r28  
    550550                App::raiseMsg($msg, $type, $file, $line);
    551551            }
    552             App::setBoomerangURL(absoluteMe());
     552            // Login scripts must have the same 'login' tag for boomerangURL verification/manipulation.
     553            App::setBoomerangURL(absoluteMe(), 'login');
    553554            App::dieURL($this->_params['login_url']);
    554555        }

  • trunk/lib/PEdit.inc.php

    r27 r28  
    282282            ?>
    283283            <div class="pedit_buttons">
    284             <input class="formsubmitbutton" type="submit" name="op" value="<?php echo _("Save"); ?>" />
    285             <input class="formsubmitbutton" type="submit" name="op" value="<?php echo _("Cancel"); ?>" />
     284            <input type="submit" name="op" value="<?php echo _("Save"); ?>" />
     285            <input type="submit" name="op" value="<?php echo _("Cancel"); ?>" />
    286286            </div>
    287287            <?php
    … …  
    306306            ?>
    307307            <div class="pedit_buttons">
    308             <input class="formsubmitbutton" type="submit" name="op" value="<?php echo _("Save"); ?>" />
    309             <input class="formsubmitbutton" type="submit" name="op" value="<?php echo _("Cancel"); ?>" />
     308            <input type="submit" name="op" value="<?php echo _("Save"); ?>" />
     309            <input type="submit" name="op" value="<?php echo _("Cancel"); ?>" />
    310310            </div>
    311311            </form>
    … …  
    315315            ?>
    316316            <div class="pedit_buttons">
    317             <input class="formsubmitbutton" type="submit" name="op" value="<?php echo _("Cancel"); ?>" />
     317            <input type="submit" name="op" value="<?php echo _("Cancel"); ?>" />
    318318            </div>
    319319            </form>
    … …  
    323323            ?>
    324324            <div class="pedit_buttons">
    325             <input class="formsubmitbutton" type="submit" name="op" value="<?php echo _("Edit"); ?>" />
    326             <input class="formsubmitbutton" type="submit" name="op" value="<?php echo _("Versions"); ?>" />
     325            <input type="submit" name="op" value="<?php echo _("Edit"); ?>" />
     326            <input type="submit" name="op" value="<?php echo _("Versions"); ?>" />
    327327            </div>
    328328            </form>

  • trunk/lib/RecordLock.inc.php

    r27 r28  
    348348        <?php if ($this->getSecondsElapsed() > $this->getParam('timeout')) { ?>
    349349        <p><?php printf(_("You can forcibly unlock the record if you believe the editing session has expired. You might want to confirm with %s before doing this."), $this->getEditor()) ?></p>
    350         <input type="submit" class="formsubmitbutton" name="unlock" value="<?php echo _("Unlock"); ?>" />
     350        <input type="submit" name="unlock" value="<?php echo _("Unlock"); ?>" />
    351351        <?php } ?>
    352352       
    353         <input type="submit" class="formsubmitbutton" name="cancel" value="<?php echo _("Cancel"); ?>" />
     353        <input type="submit" name="cancel" value="<?php echo _("Cancel"); ?>" />
    354354        </form>
    355355        <?php

  • trunk/lib/TemplateGlue.inc.php

    r27 r28  
    173173        if ('allone' == $flag) {
    174174            // Print a cell with multidimentioal array checkboxes.
    175             ?><td><input type="checkbox" name="dbcol[<?php echo $db_col; ?>][<?php echo $item; ?>]"<?php echo $checked; ?> />&nbsp;<?php echo oTxt($item); ?>&nbsp;</td>
    176             <?php
    177          } else {
     175            $html_name = 'dbcol[' . $db_col . '][' . $item . ']';
     176        } else {
    178177            // Print a cell with basic named checkboxes.
    179             ?><td><input type="checkbox" name="<?php echo $db_col; ?>[<?php echo $item; ?>]"<?php echo $checked; ?> />&nbsp;<?php echo oTxt($item); ?>&nbsp;</td>
    180             <?php
    181         }
     178            $html_name = $db_col . '[' . $item . ']';
     179        }
     180        ?><td><input type="checkbox" name="<?php echo $html_name ?>" id="<?php echo $html_name ?>"<?php echo $checked; ?> /><label for="<?php echo $html_name ?>"><?php echo oTxt($item); ?></label></td>
     181        <?php
    182182    }
    183183    if ($col_cnt < $columns) {
    … …  
    250250        }
    251251        // Print a cell with basic named checkboxes.
    252         ?><td><input type="radio" name="<?php echo $db_col; ?>" value="<?php echo $item ?>"<?php echo $checked; ?> />&nbsp;<?php echo oTxt($item); ?>&nbsp;</td>
     252        ?><td><input type="radio" name="<?php echo $db_col; ?>" id="<?php echo $db_col; ?>" value="<?php echo $item ?>"<?php echo $checked; ?> /><label for="<?php echo $db_col ?>"><?php echo oTxt($item); ?></label></td>
    253253        <?php
    254254    }
    … …  
    366366    $col_cnt = 0;
    367367    ?>
    368     <table border="0" cellspacing="0" cellpadding="0" class="formcheckboxes">
     368    <table border="0" cellspacing="0" cellpadding="0">
    369369        <tr>
    370370    <?php
    … …  
    394394       
    395395        // Print a cell with basic named checkboxes.
    396         ?><td><input type="checkbox" name="<?php echo $val_column; ?>[<?php echo $box[$val_column]; ?>]"<?php echo $checked; ?> /></td><td><?php echo oTxt($box[$key_column]); ?></td>
    397         <?php
     396        $html_name = $val_column . '[' . $box[$val_column] . ']';
     397        ?>
     398        <td><input type="checkbox" name="<?php echo $html_name ?>" id="<?php echo $html_name ?>"<?php echo $checked; ?> /></td>
     399        <td><label for="<?php echo $html_name ?>" class="normal"><?php echo oTxt($box[$key_column]); ?></label></td>
     400        <?php /// FIXME: class=normal?
    398401    }
    399402   

  • trunk/services/login.php

    r27 r28  
    55 */
    66
     7// We may want to use the add/edit interface from another script, so this
     8// allows us to remember which page we came from so we can go back there.
    79if (getFormData('boomerang', false) && isset($_SERVER['HTTP_REFERER'])) {
    8     // We remember which page we came from so we can go back there.
    9     App::setBoomerangURL($_SERVER['HTTP_REFERER']);
     10    App::setBoomerangURL($_SERVER['HTTP_REFERER'], 'login');
    1011}
    1112App::sslOn();
    … …  
    1920    if ($auth->login($frm['username'], $frm['password'])) {
    2021        App::raiseMsg(_("You are now logged in."), MSG_SUCCESS, __FILE__, __LINE__);
    21         App::dieBoomerangURL();
     22        App::dieBoomerangURL('login');
    2223        App::logMsg(sprintf('%s %s successfully logged-in.', $auth->getVal('auth_name'), $frm['username']), LOG_INFO, __FILE__, __LINE__);
    2324    } else {

  • trunk/services/templates/lock.ihtml

    r27 r28  
    1818    <?php if ($lock->getSecondsElapsed() > $lock->timeout) { ?>
    1919    <p><?php printf(_("You can force unlock the record if you believe the editing session has expired. You might want to confirm with before doing this."), $lock->getEditor()) ?></p>
    20     <input type="submit" class="formsubmitbutton" name="unlock" value="<?php echo _("Unlock"); ?>" />
     20    <input type="submit" name="unlock" value="<?php echo _("Unlock"); ?>" />
    2121    <?php } ?>
    2222
    23     <input type="submit" class="formsubmitbutton" name="cancel" value="<?php echo _("Cancel"); ?>" />
     23    <input type="submit" name="cancel" value="<?php echo _("Cancel"); ?>" />
    2424</form>

  • trunk/services/templates/log_list.ihtml

    r27 r28  
    3232    <input type="text" class="small" size="20" name="search_query" value="<?php echo oTxt(getFormData('search_query')); ?>" title="<?php echo _("All lines in currently viewed log file are searched."); ?>" />
    3333    <input type="checkbox" name="search_grep"<?php frmChecked(getFormData('search_grep')) ?> /><span class="commandtext"><?php echo _("Use Grep"); ?></span>
    34     <input type="submit" name="list" value="<?php echo _("Search"); ?>" class="formsubmitbutton" />
     34    <input type="submit" name="list" value="<?php echo _("Search"); ?>" />
    3535</div>
    3636

  • trunk/services/templates/versions_diff.ihtml

    r27 r28  
    2020    ?>
    2121    <tr>
    22         <td class="padleft nowrap formlabel"<?php echo $style; ?>><?php echo $k; ?></td>
     22        <td class="padleft nowrap"<?php echo $style; ?>><label><?php echo $k; ?></label></td>
    2323        <td class="padleft"><?php echo $v_d; ?></td>
    2424        <td class="padleft"><?php echo $v_c; ?></td>

  • trunk/services/templates/versions_list.ihtml

    r27 r28  
    11<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
    22<?php App::printHiddenSession() ?>
    3 <input type="submit" class="formsubmitbutton" name="op" value="<?php echo _("Cancel"); ?>" />
     3<input type="submit" name="op" value="<?php echo _("Cancel"); ?>" />
    44<table class="list" border="0" cellspacing="0" cellpadding="4">
    55<tr>
    … …  
    3131</table>
    3232<div class="help"><?php printf(_("When there are more than %s versions, those over %s days old are deleted."), $version->record_version_min_qty, $version->record_version_min_days); ?></div>
    33 <input type="submit" class="formsubmitbutton" name="op" value="<?php echo _("Cancel"); ?>" />
     33<input type="submit" name="op" value="<?php echo _("Cancel"); ?>" />
    3434</form>

  • trunk/services/templates/versions_view.ihtml

    r27 r28  
    1313    ?>
    1414    <tr>
    15         <td class="padleft nowrap formlabel"<?php echo $style; ?>><?php echo $k; ?></td>
     15        <td class="padleft nowrap"<?php echo $style; ?>><label><?php echo $k; ?></label></td>
    1616        <td class="padleft"><?php echo $v_d; ?></td>
    1717    </tr>
Note: See TracChangeset for help on using the changeset viewer.