Changeset 502 for trunk/services

Timestamp:

Dec 30, 2014 10:24:51 PM (9 years ago)

Author:

anonymous

Message:

Many minor fixes during pulso development

Location:

trunk/services

Files:

• templates/versions_diff.ihtml (modified) (1 diff)
• templates/versions_list.ihtml (modified) (1 diff)
• templates/versions_view.ihtml (modified) (1 diff)
• versions.php (modified) (1 diff)

trunk/services/templates/versions_diff.ihtml

@@ -45 +45 @@
             $action_links = array();
             if (!getFormData('current', false)) {
-                $action_links[] = array('href' => $app->oHREF($_SERVER['PHP_SELF'] . '?op=restore', array('version_id', 'version_title')), 'value' => _("Restore this saved version"), 'class' => 'small button alert', 'accesskey' => 'r');
+                $action_links[] = array('href' => $app->oHREF('?op=restore', array('version_id', 'version_title')), 'value' => _("Restore this saved version"), 'class' => 'small button alert', 'accesskey' => 'r');
             }
-            $action_links[] = array('href' => $app->ohref(oTxt($_SERVER['PHP_SELF'])), 'value' => _("Cancel"), 'class' => 'small button secondary', 'accesskey' => 'b');
+            $action_links[] = array('href' => $app->ohref('?op=cancel'), 'value' => _("Cancel"), 'class' => 'small button secondary', 'accesskey' => 'c');
             HTML::printButtons($action_links);
             ?>

trunk/services/templates/versions_list.ihtml

@@ -50 +50 @@
                 <div class="sc-help"><?php printf(_("When there are more than %s versions, those over %s days old are deleted."), $version->getParam('min_qty'), $version->getParam('min_days')); ?></div>
                 <?php
-                HTML::printButtons(array(
-                    array('name' => 'op', 'value' => _("Cancel"), 'class' => 'small button secondary', 'accesskey' => 'c'),
-                ));
+                // Buttons.
+                $action_links = array();
+                $action_links[] = array('href' => $app->ohref('?op=cancel'), 'value' => _("Cancel"), 'class' => 'small button secondary', 'accesskey' => 'c');
+                HTML::printButtons($action_links);
                 ?>
             </div>

trunk/services/templates/versions_view.ihtml

@@ -28 +28 @@
             $action_links = array();
             if (!getFormData('current', false)) {
-                $action_links[] = array('href' => $app->oHREF($_SERVER['PHP_SELF'] . '?op=restore', array('version_id', 'version_title')), 'value' => _("Restore this saved version"), 'class' => 'small button alert', 'accesskey' => 'r');
+                $action_links[] = array('href' => $app->oHREF('?op=restore', array('version_id', 'version_title')), 'value' => _("Restore this saved version"), 'class' => 'small button alert', 'accesskey' => 'r');
             }
-            $action_links[] = array('href' => $app->ohref(oTxt($_SERVER['PHP_SELF'])), 'value' => _("Cancel"), 'class' => 'small button secondary', 'accesskey' => 'b');
+            $action_links[] = array('href' => $app->ohref('?op=cancel'), 'value' => _("Cancel"), 'class' => 'small button secondary', 'accesskey' => 'c');
             HTML::printButtons($action_links);
             ?>

trunk/services/versions.php

@@ -78 +78 @@
 switch (getFormData('op')) {
 
-case _("Cancel") :
-    $app->dieBoomerangURL('versions', false);
+case 'cancel' :
+    if ($app->validBoomerangURL('version')) {
+        // Display boomerang page.
+        $app->dieBoomerangURL('version');
+    }
+    // Display default page.
+    $app->dieURL(false, false);
     break;