[mxbb-commits] core/install/schemas mysql_schema_install.sql, 1.35, 1.36 mysql_schema_upgrade_to_2.8.0.sql, 1.1, 1.2

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/install/schemas
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15447

Modified Files:
	mysql_schema_install.sql mysql_schema_upgrade_to_2.8.0.sql 
Log Message:
Added custom styles for pages
Added style selection for the adminCP

Index: mysql_schema_install.sql
===================================================================
RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_install.sql,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** mysql_schema_install.sql	16 May 2007 19:18:38 -0000	1.35
--- mysql_schema_install.sql	4 Jun 2007 21:14:20 -0000	1.36
***************
*** 191,195 ****
    `column_id` smallint(5) NOT NULL default '0',
    `block_id` smallint(5) NOT NULL default '0',
!   `block_order` smallint(5) NOT NULL default '0'
  ) TYPE=MyISAM;
  
--- 191,196 ----
    `column_id` smallint(5) NOT NULL default '0',
    `block_id` smallint(5) NOT NULL default '0',
!   `block_order` smallint(5) NOT NULL default '0',
!   PRIMARY KEY  (`column_id`, `block_id`)
  ) TYPE=MyISAM;
  
***************
*** 411,414 ****
--- 412,417 ----
    `auth_view_group` varchar(255) NOT NULL default '0',
    `auth_moderator_group` varchar(255) NOT NULL default '0',
+   `default_style` smallint(5) NOT NULL default '-1',
+   `override_user_style` smallint(2) NOT NULL default '-1',
    `page_header` varchar(255) default '',
    `page_footer` varchar(255) default '',
***************
*** 421,433 ****
  
  
- 
  #
  # Dumping data for table 'mx_table_page'
  #
! INSERT INTO mx_table_page VALUES("5", "Site Search", "Site Search page", "icon_search.gif", "0", "0", "0", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1");
! INSERT INTO mx_table_page VALUES("4", "Sitestats", "Sitestats page", "icon_stats.gif", "0", "0", "0", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1");
! INSERT INTO mx_table_page VALUES("1", "Home", "This is the startpage", "icon_home.gif", "0", "0", "0", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1");
! INSERT INTO mx_table_page VALUES("2", "Forum", "This is the phpBB Forum startpage", "icon_forum.gif", "0", "0", "0", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "1");
! INSERT INTO mx_table_page VALUES("3", "Demo Page", "Block Demos", "icon_scate.gif", "0", "0", "0", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1");
  
  
--- 424,435 ----
  
  
  #
  # Dumping data for table 'mx_table_page'
  #
! INSERT INTO mx_table_page VALUES("1", "Home", "This is the startpage", "icon_home.gif", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1");
! INSERT INTO mx_table_page VALUES("2", "Forum", "This is the phpBB Forum startpage", "icon_forum.gif", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "1");
! INSERT INTO mx_table_page VALUES("3", "Demo Page", "Block Demos", "icon_scate.gif", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1");
! INSERT INTO mx_table_page VALUES("4", "Sitestats", "Sitestats page", "icon_stats.gif", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1");
! INSERT INTO mx_table_page VALUES("5", "Site Search", "Site Search page", "icon_search.gif", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1");
  
  
***************
*** 551,554 ****
--- 553,559 ----
    `portal_url` varchar(255) default NULL,
    `portal_version` varchar(255) default NULL,
+   `default_admin_style` smallint(5) NOT NULL default '-1',
+   `default_style` smallint(5) NOT NULL default '-1',
+   `override_user_style` smallint(2) NOT NULL default '1',
    `overall_header` varchar(255) default 'overall_header.tpl',
    `overall_footer` varchar(255) default 'overall_footer.tpl',

Index: mysql_schema_upgrade_to_2.8.0.sql
===================================================================
RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_upgrade_to_2.8.0.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mysql_schema_upgrade_to_2.8.0.sql	16 May 2007 19:18:38 -0000	1.1
--- mysql_schema_upgrade_to_2.8.0.sql	4 Jun 2007 21:14:20 -0000	1.2
***************
*** 9,12 ****
--- 9,14 ----
  # New Fields in Table `mx_page`
  ALTER TABLE mx_table_page ADD page_footer varchar(255) default '' AFTER page_header;
+ ALTER TABLE mx_table_page ADD default_style smallint(5) NOT NULL default '-1' AFTER auth_moderator_group;
+ ALTER TABLE mx_table_page ADD override_user_style smallint(2) NOT NULL default '-1' AFTER default_style;
  
  # ------------------------------------------------------------
***************
*** 14,16 ****
  # New Fields in Table `mx_portal`
  #
! ALTER TABLE mx_table_portal ADD overall_footer varchar(255) default 'overall_footer.tpl' AFTER overall_header;
\ No newline at end of file
--- 16,21 ----
  # New Fields in Table `mx_portal`
  #
! ALTER TABLE mx_table_portal ADD overall_footer varchar(255) default 'overall_footer.tpl' AFTER overall_header;
! ALTER TABLE mx_table_portal ADD default_admin_style smallint(5) NOT NULL default '-1' AFTER portal_version;
! ALTER TABLE mx_table_portal ADD default_style smallint(5) NOT NULL default '-1' AFTER default_admin_style;
! ALTER TABLE mx_table_portal ADD override_user_style smallint(2) NOT NULL default '1' AFTER default_style;
\ No newline at end of file