implement (incomplete) sortable feedlist

diff --git a/feedlist.js b/feedlist.js
index f0e4951d77fe6bc0a3000defd9c3ab9d0da1e3d2..1f14810431f0181b408305de91beaba0bda25840 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -354,6 +354,8 @@ function feedlist_init() {
 
                init_collapsable_feedlist(getInitParam("theme"));
 
+               Sortable.create('feedList');
+
        } catch (e) {
                exception_error("feedlist/init", e);
        }

diff --git a/functions.php b/functions.php
index e09ff932e4be40fe2e562657552da20ff7ca1eec..2401947310c69c4f9f0306b858b431b52c47ca40 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -4109,7 +4109,7 @@
 
                        print "</span>";
 
-                       print "</li>";
+                       //print "</li>";
 
                        print "<ul class=\"feedCatList\" id=\"FCATLIST-$cat_id\" style='$holder_style'>";
 

diff --git a/sanity_check.php b/sanity_check.php
index 5a2974dd68f9602a70b1851febd933a3f8d1f8f8..814a673c27be8c257d7092d175914d4203dbe351 100644 (file)
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -2,7 +2,7 @@
        require_once "functions.php";
 
        define('EXPECTED_CONFIG_VERSION', 17);
-       define('SCHEMA_VERSION', 40);
+       define('SCHEMA_VERSION', 41);
 
        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 2bf8da59d59e64029aa48e90eab705188dad4a05..6b003439f8585e553151e310b95fd2aec477a151 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -53,6 +53,7 @@ create table ttrss_feed_categories(id integer not null primary key auto_incremen
        owner_uid integer not null,
        title varchar(200) not null,
        collapsed bool not null default false,
+       order_id integer not null default 0,
        index(owner_uid),
        foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) TYPE=InnoDB;
 
@@ -209,7 +210,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 (40);
+insert into ttrss_version values (41);
 
 create table ttrss_enclosures (id serial not null primary key,
        content_url text not null,

diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index bb2d7d2e855d3d0fa79eb605a0e90d987b8c2e89..5ba024d034dfec0416dced35339dcf46f3902b9b 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -48,6 +48,7 @@ insert into ttrss_users (login,pwd_hash,access_level) values ('admin',
 create table ttrss_feed_categories(id serial not null primary key,
        owner_uid integer not null references ttrss_users(id) on delete cascade,
        collapsed boolean not null default false,
+       order_id integer not null default 0,
        title varchar(200) not null);
 
 create table ttrss_feeds (id serial not null primary key,
@@ -189,7 +190,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 (40);
+insert into ttrss_version values (41);
 
 create table ttrss_enclosures (id serial not null primary key,
        content_url text not null,

diff --git a/schema/versions/mysql/41.sql b/schema/versions/mysql/41.sql
new file mode 100644 (file)
index 0000000..bf58873
--- /dev/null
+++ b/schema/versions/mysql/41.sql
@@ -0,0 +1,6 @@
+alter table ttrss_feed_categories add column order_id integer;
+update ttrss_feed_categories set order_id = 0;
+alter table ttrss_feed_categories change order_id order_id integer not null;
+alter table ttrss_feed_categories alter column order_id set default 0;
+
+update ttrss_version set schema_version = 41;

diff --git a/schema/versions/pgsql/41.sql b/schema/versions/pgsql/41.sql
new file mode 100644 (file)
index 0000000..bdb8723
--- /dev/null
+++ b/schema/versions/pgsql/41.sql
@@ -0,0 +1,6 @@
+alter table ttrss_feed_categories add column order_id int;
+update ttrss_feed_categories set order_id = 0;
+alter table ttrss_feed_categories alter column order_id set not null;
+alter table ttrss_feed_categories alter column order_id set default 0;
+
+update ttrss_version set schema_version = 41;