use create report instead of save as report. also brand rc1

diff --git a/display.php b/display.php
index 59a88a3e6747022af0e6af3204552aad42595112..06d8e64001951290925cb3871b0450f4c82d09e7 100644 (file)
--- a/display.php
+++ b/display.php
@@ -9,7 +9,7 @@
         * @param $return_desc The return link name
         * @param $page The current page
         *
-        * $Id: display.php,v 1.27 2003/09/05 09:06:45 chriskl Exp $
+        * $Id: display.php,v 1.28 2003/09/10 07:25:49 chriskl Exp $
         */
 
        // Include application functions
@@ -77,7 +77,7 @@
        echo "<p><a class=\"navlink\" href=\"{$_REQUEST['return_url']}\">{$_REQUEST['return_desc']}</a>";
        if ($conf['show_reports'] && isset($rs) && is_object($rs) && $rs->recordCount() > 0) {
                echo " | <a class=\"navlink\" href=\"reports.php?action=create&db_name=", urlencode($_REQUEST['database']), "&report_sql=",
-                       urlencode($_REQUEST['query']), "\">{$lang['strsaveasreport']}</a>\n";
+                       urlencode($_REQUEST['query']), "\">{$lang['strcreatereport']}</a>\n";
        }
        if (isset($rs) && is_object($rs) && $rs->recordCount() > 0) {           
                echo " | <a class=\"navlink\" href=\"views.php?action=create&formDefinition=",

diff --git a/lang/english.php b/lang/english.php
index 4c1f5f580afdf50fe435330583a05ed01f8e756f..13ab2ba7344f7e5fa1fc84abe4a8891a3f611d3d 100755 (executable)
--- a/lang/english.php
+++ b/lang/english.php
@@ -4,7 +4,7 @@
         * English language file for phpPgAdmin.  Use this as a basis
         * for new translations.
         *
-        * $Id: english.php,v 1.103 2003/09/08 09:26:17 chriskl Exp $
+        * $Id: english.php,v 1.104 2003/09/10 07:25:49 chriskl Exp $
         */
 
        // Language and character set
@@ -454,7 +454,6 @@
        $lang['strreportneedsdef'] = 'You must give SQL for your report.';
        $lang['strreportcreated'] = 'Report saved.';
        $lang['strreportcreatedbad'] = 'Failed to save report.';
-       $lang['strsaveasreport'] = 'Save as Report';
 
        // Domains
        $lang['strdomain'] = 'Domain';

diff --git a/lang/recoded/english.php b/lang/recoded/english.php
index 72a2bea97aebb78c590d96ffd58224605b16b52f..3b24f1dc29ae9aee3056bb08cc3abdec8ba8fecc 100644 (file)
--- a/lang/recoded/english.php
+++ b/lang/recoded/english.php
@@ -4,7 +4,7 @@
         * English language file for phpPgAdmin.  Use this as a basis
         * for new translations.
         *
-        * $Id: english.php,v 1.55 2003/09/08 09:26:17 chriskl Exp $
+        * $Id: english.php,v 1.56 2003/09/10 07:25:49 chriskl Exp $
         */
 
        // Language and character set
@@ -454,7 +454,6 @@
        $lang['strreportneedsdef'] = 'You must give SQL for your report.';
        $lang['strreportcreated'] = 'Report saved.';
        $lang['strreportcreatedbad'] = 'Failed to save report.';
-       $lang['strsaveasreport'] = 'Save as Report';
 
        // Domains
        $lang['strdomain'] = 'Domain';

diff --git a/libraries/lib.inc.php b/libraries/lib.inc.php
index 5f3af02471961aded81284dd3be85b76b9339236..a69722bab97ac0832578546f44de6ebe5b886e7d 100644 (file)
--- a/libraries/lib.inc.php
+++ b/libraries/lib.inc.php
@@ -3,7 +3,7 @@
        /**
         * Function library read in upon startup
         *
-        * $Id: lib.inc.php,v 1.59 2003/09/10 01:55:52 chriskl Exp $
+        * $Id: lib.inc.php,v 1.60 2003/09/10 07:25:49 chriskl Exp $
         */
        
        // Set error reporting level to max
@@ -13,7 +13,7 @@
        $appName = 'phpPgAdmin';
 
        // Application version
-       $appVersion = '3.1-dev';
+       $appVersion = '3.1-rc1';
 
 
        // Check to see if the configuration file exists, if not, explain

diff --git a/sql.php b/sql.php
index d5d0e31b603340601d9721b28d61791db80424c1..b13c0c48efdb58439d3a67b03713c167ef45f157 100644 (file)
--- a/sql.php
+++ b/sql.php
@@ -6,7 +6,7 @@
         * how many SQL statements have been strung together with semi-colons
         * @param $query The SQL query string to execute
         *
-        * $Id: sql.php,v 1.10 2003/09/05 04:58:14 chriskl Exp $
+        * $Id: sql.php,v 1.11 2003/09/10 07:25:49 chriskl Exp $
         */
 
        // Include application functions
@@ -69,7 +69,7 @@
                "&amp;action=sql\">{$lang['strback']}</a>";
        if ($conf['show_reports'] && isset($rs) && is_object($rs) && $rs->recordCount() > 0) {
                echo " | <a class=\"navlink\" href=\"reports.php?action=create&amp;db_name=", urlencode($_REQUEST['database']), "&amp;report_sql=",
-                       urlencode($_POST['query']), "\">{$lang['strsaveasreport']}</a>";
+                       urlencode($_POST['query']), "\">{$lang['strcreatereport']}</a>";
        }
        echo "</p>\n";