Changeset 28 for trunk/services

Timestamp:

Dec 7, 2005 8:51:24 AM (18 years ago)

Author:

scdev

Message:

 

Location:

trunk/services

Files:

• login.php (modified) (2 diffs)
• templates/lock.ihtml (modified) (1 diff)
• templates/log_list.ihtml (modified) (1 diff)
• templates/versions_diff.ihtml (modified) (1 diff)
• templates/versions_list.ihtml (modified) (2 diffs)
• templates/versions_view.ihtml (modified) (1 diff)

trunk/services/login.php

@@ -5 +5 @@
  */
 
+// We may want to use the add/edit interface from another script, so this
+// allows us to remember which page we came from so we can go back there.
 if (getFormData('boomerang', false) && isset($_SERVER['HTTP_REFERER'])) {
-    // We remember which page we came from so we can go back there.
-    App::setBoomerangURL($_SERVER['HTTP_REFERER']);
+    App::setBoomerangURL($_SERVER['HTTP_REFERER'], 'login');
 }
 App::sslOn();
@@ -19 +20 @@
     if ($auth->login($frm['username'], $frm['password'])) {
         App::raiseMsg(_("You are now logged in."), MSG_SUCCESS, __FILE__, __LINE__);
-        App::dieBoomerangURL();
+        App::dieBoomerangURL('login');
         App::logMsg(sprintf('%s %s successfully logged-in.', $auth->getVal('auth_name'), $frm['username']), LOG_INFO, __FILE__, __LINE__);
     } else {

trunk/services/templates/lock.ihtml

@@ -18 +18 @@
     <?php if ($lock->getSecondsElapsed() > $lock->timeout) { ?>
     <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>
-    <input type="submit" class="formsubmitbutton" name="unlock" value="<?php echo _("Unlock"); ?>" />
+    <input type="submit" name="unlock" value="<?php echo _("Unlock"); ?>" />
     <?php } ?>
 
-    <input type="submit" class="formsubmitbutton" name="cancel" value="<?php echo _("Cancel"); ?>" />
+    <input type="submit" name="cancel" value="<?php echo _("Cancel"); ?>" />
 </form>

trunk/services/templates/log_list.ihtml

@@ -32 +32 @@
     <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."); ?>" />
     <input type="checkbox" name="search_grep"<?php frmChecked(getFormData('search_grep')) ?> /><span class="commandtext"><?php echo _("Use Grep"); ?></span>
-    <input type="submit" name="list" value="<?php echo _("Search"); ?>" class="formsubmitbutton" />
+    <input type="submit" name="list" value="<?php echo _("Search"); ?>" />
 </div>
 

trunk/services/templates/versions_diff.ihtml

@@ -20 +20 @@
     ?>
     <tr>
-        <td class="padleft nowrap formlabel"<?php echo $style; ?>><?php echo $k; ?></td>
+        <td class="padleft nowrap"<?php echo $style; ?>><label><?php echo $k; ?></label></td>
         <td class="padleft"><?php echo $v_d; ?></td>
         <td class="padleft"><?php echo $v_c; ?></td>

trunk/services/templates/versions_list.ihtml

@@ -1 +1 @@
 <form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
 <?php App::printHiddenSession() ?>
-<input type="submit" class="formsubmitbutton" name="op" value="<?php echo _("Cancel"); ?>" />
+<input type="submit" name="op" value="<?php echo _("Cancel"); ?>" />
 <table class="list" border="0" cellspacing="0" cellpadding="4">
 <tr>
@@ -31 +31 @@
 </table>
 <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>
-<input type="submit" class="formsubmitbutton" name="op" value="<?php echo _("Cancel"); ?>" />
+<input type="submit" name="op" value="<?php echo _("Cancel"); ?>" />
 </form>

trunk/services/templates/versions_view.ihtml

@@ -13 +13 @@
     ?>
     <tr>
-        <td class="padleft nowrap formlabel"<?php echo $style; ?>><?php echo $k; ?></td>
+        <td class="padleft nowrap"<?php echo $style; ?>><label><?php echo $k; ?></label></td>
         <td class="padleft"><?php echo $v_d; ?></td>
     </tr>