add _PREFS_ACTIVE_TAB hidden option, tweak update.php, move SCHEMA_VERSION definition...

diff --git a/backend.php b/backend.php
index 1b318906e86ed16bc3f9bdeb90fbdb62126e83e2..a71b649e44e1b10dc1ee270663f054d6edc194ba 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -12,8 +12,6 @@
        
        error_reporting(DEFAULT_ERROR_LEVEL); */
 
-       define('SCHEMA_VERSION', 16);
-
        require_once "sanity_check.php";
        require_once "config.php";
        

diff --git a/sanity_check.php b/sanity_check.php
index 721c7140ff692f42093451579ca5122d0feb6f6a..adb7ab878711fcd8513603ad526aed0e4da7f286 100644 (file)
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -2,6 +2,7 @@
        require_once "functions.php";
 
        define('EXPECTED_CONFIG_VERSION', 7);
+       define('SCHEMA_VERSION', 17);
 
        if (!file_exists("config.php")) {
                print __("<b>Fatal Error</b>: You forgot to copy 

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 92ab10302aa5e80cf5115aeb47502f494eb58bbf..c7e5677c65ebf5d608053f5341097cf8394f2727 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -189,7 +189,7 @@ create table ttrss_tags (id integer primary key auto_increment,
 
 create table ttrss_version (schema_version int not null) TYPE=InnoDB;
 
-insert into ttrss_version values (16);
+insert into ttrss_version values (17);
 
 create table ttrss_prefs_types (id integer not null primary key, 
        type_name varchar(100) not null) TYPE=InnoDB;
@@ -272,6 +272,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_VIEW_LIMIT', 3, '30', '', 1);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_ACTIVE_TAB', 3, '', '', 1);
+
 create table ttrss_user_prefs (
    owner_uid integer not null,
    pref_name varchar(250),

diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 6e89455ab01e1f03eac490c7271d59953894aa91..35dc31e4f7c82c130e74d41a91ed62f39763d44e 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -173,7 +173,7 @@ create index ttrss_tags_owner_uid_index on ttrss_tags(owner_uid);
 
 create table ttrss_version (schema_version int not null);
 
-insert into ttrss_version values (16);
+insert into ttrss_version values (17);
 
 create table ttrss_prefs_types (id integer not null primary key, 
        type_name varchar(100) not null);
@@ -252,6 +252,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_VIEW_LIMIT', 3, '30', '', 1);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_ACTIVE_TAB', 3, '', '', 1);
+
 create table ttrss_user_prefs (
        owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
        pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE,

diff --git a/update.php b/update.php
index 665ec94956ce5c6ff3f41fb581933c1ebeda3eed..e3a25f47cf68504dbb53f140d0418fbef9a8ad82 100644 (file)
--- a/update.php
+++ b/update.php
@@ -24,8 +24,7 @@
                render_login_form($link);
                exit;
        }
-       
-       define('SCHEMA_VERSION', 16);
+
 
 ?>
 
@@ -94,7 +93,7 @@ function confirmOP() {
        }
        
        if (!$op) {
-               print "<p class='warning'>".__("<b>Warning:</b> Please backup your database before proceeding.")."</p>";
+               print_warning("Please backup your database before proceeding.");
        
                print "<p>" . T_sprintf("Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to <b>%d</b>).", $version, $latest_version) . "</p>";
        

diff --git a/utility.css b/utility.css
index 9bdb77c21405bdd879a94a8c31413049702e5ead..f51182a7a5fa7cb5853a99bf02e20cf6cc7005e8 100644 (file)
--- a/utility.css
+++ b/utility.css
@@ -28,3 +28,27 @@ a:hover {
        color : black;
 }
 
+div.notice {
+       background : #ffffff;
+       border : 1px solid #88b0f0;
+       width : 50%;
+       padding : 5px;
+       margin : 0px 0px 5px 0px;
+       font-size : 9pt;
+}
+
+div.warning {
+       background : #fff7d5;
+       border : 1px solid #d7c47a;
+       font-size : 9pt;
+       width : 50%;
+       padding : 5px;
+       margin : 0px 0px 5px 0px;
+}
+
+
+div.warning img, div.notice img {
+       vertical-align : middle;
+       padding : 5px;
+}
+