Index: trunk/CHANGELOG =================================================================== --- trunk/CHANGELOG (revision 943) +++ trunk/CHANGELOG (revision 944) @@ -11,6 +11,8 @@ ! = Update/Change ------------------------------------- 2.8.0 ------------------------------------- +22-Feb-2009 Matthias Gallas ++ added skinable Admin Interface 21-Feb-2009 Christian Sommer + added update of search table missing in Changeset 941 # fixed wrong index in language array Index: trunk/wb/upgrade-script.php =================================================================== --- trunk/wb/upgrade-script.php (revision 943) +++ trunk/wb/upgrade-script.php (revision 944) @@ -52,7 +52,7 @@ #container { width:85%; - background: #A8BCCB url(/interface/background.png) repeat-x; + background: #A8BCCB url(/images/background.png) repeat-x; border:1px solid #000; color:#000; margin:2em auto; @@ -90,7 +90,7 @@
-Website Baker Logo +Website Baker Logo

Website Baker Upgrade

@@ -127,7 +127,6 @@ // function to add a new field into a table function db_add_field($field, $table, $desc) { global $database; global $OK; global $FAIL; - echo "Adding field '$field' to table '$table'
"; $table = TABLE_PREFIX.$table; $query = $database->query("DESCRIBE $table '$field'"); if($query->numRows() == 0) { // add field @@ -149,7 +148,7 @@ /********************************************************** * - Adding field sec_anchor to settings table */ -echo "
Adding key sec_anchor to settings table
"; +echo "
Adding sec_anchor to settings table
"; $cfg = array( 'sec_anchor' => 'wb_' ); @@ -157,7 +156,20 @@ db_add_key_value($key, $value); } + /********************************************************** + * - Adding field default_theme to settings table + */ +echo "
Adding default_theme to settings table
"; +$cfg = array( + 'default_theme' => 'wb_theme' +); +foreach($cfg as $key=>$value) { + db_add_key_value($key, $value); +} + + +/********************************************************** * - Adding redirect timer to settings table */ echo "
Adding redirect timer to settings table
"; @@ -168,6 +180,7 @@ db_add_key_value($key, $value); } + /********************************************************** * - Add field "redirect_type" to table "mod_menu_link" */ @@ -185,7 +198,60 @@ $database->query($sql); echo ($database->query($sql)) ? " $OK
" : " $FAIL
"; + /********************************************************** + * - Set Version to WB 2.8 BETA + */ +echo "
Update database version number to 2.8 BETA : "; +$version = '2.8 BETA'; +echo ($database->query("UPDATE `".TABLE_PREFIX."settings` SET `value` = '$version' WHERE `name` = 'wb_version'")) ? " $OK
" : " $FAIL
"; + + +/********************************************************** + * - Reload all addons + */ + +//delete modules +$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'module'"); +// Load all modules +if($handle = opendir(WB_PATH.'/modules/')) { + while(false !== ($file = readdir($handle))) { + if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'admin.php' AND $file != 'index.php') { + load_module(WB_PATH.'/modules/'.$file); + } + } + closedir($handle); +} +echo '
Modules reloaded
'; + +//delete templates +$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'template'"); +// Load all templates +if($handle = opendir(WB_PATH.'/templates/')) { + while(false !== ($file = readdir($handle))) { + if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'index.php') { + load_template(WB_PATH.'/templates/'.$file); + } + } + closedir($handle); +} +echo '
Templates reloaded
'; + +//delete languages +$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'language'"); +// Load all languages +if($handle = opendir(WB_PATH.'/languages/')) { + while(false !== ($file = readdir($handle))) { + if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'index.php') { + load_language(WB_PATH.'/languages/'.$file); + } + } + closedir($handle); +} +echo '
Languages reloaded
'; + + +/********************************************************** * - End of upgrade script */ echo '

Congratulations: The upgrade script is finished ...

'; Index: trunk/wb/admin/images/visible_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/visible_16.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/noclock_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/noclock_16.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/clock_del_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/clock_del_16.png ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/clock_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/clock_16.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/help.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/help.png ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/hidden_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/hidden_16.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/home.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/home.png ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/none_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/none_16.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/folder_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/folder_16.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/keys_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/keys_16.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/view_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/view_16.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/restore_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/restore_16.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/plus_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/plus_16.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/modify_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/modify_16.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/view.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/view.png ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/reload_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/reload_16.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/dl.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/dl.png ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/delete_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/delete_16.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/icons/access.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/icons/access.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/icons/templates.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/icons/templates.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/icons/admintools.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/icons/admintools.png ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/icons/pages.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/icons/pages.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/icons/modules.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/icons/modules.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/icons/users.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/icons/users.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/icons/groups.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/icons/groups.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/icons/preferences.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/icons/preferences.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/icons/index.php =================================================================== --- trunk/wb/admin/images/icons/index.php (revision 943) +++ trunk/wb/admin/images/icons/index.php (nonexistent) @@ -1,28 +0,0 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -header("Location: ../../../index.php"); - -?> \ No newline at end of file Property changes on: trunk/wb/admin/images/icons/index.php ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Index: trunk/wb/admin/images/icons/addons.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/icons/addons.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/icons/languages.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/icons/languages.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/icons/view.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/icons/view.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/icons/settings.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/icons/settings.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/icons/media.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/icons/media.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/minus_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/minus_16.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/private_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/private_16.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/up_folder_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/up_folder_16.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/blank.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/blank.gif ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/up_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/up_16.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/index.php =================================================================== --- trunk/wb/admin/images/index.php (revision 943) +++ trunk/wb/admin/images/index.php (nonexistent) @@ -1,28 +0,0 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -header("Location: ../../index.php"); - -?> \ No newline at end of file Property changes on: trunk/wb/admin/images/index.php ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Index: trunk/wb/admin/images/deleted_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/deleted_16.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/down_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/down_16.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/images/clock_red_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/admin/images/clock_red_16.png ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: trunk/wb/admin/groups/template.html =================================================================== --- trunk/wb/admin/groups/template.html (revision 943) +++ trunk/wb/admin/groups/template.html (nonexistent) @@ -1,35 +0,0 @@ - - -
- - - - - - - - -
-

{HEADING_MODIFY_DELETE_GROUP}

- 		- {TEXT_MANAGE_USERS} -
- -
- - - - - - -
- -
- -

{HEADING_ADD_GROUP}

- - \ No newline at end of file Property changes on: trunk/wb/admin/groups/template.html ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Index: trunk/wb/admin/groups/group_form.html =================================================================== --- trunk/wb/admin/groups/group_form.html (revision 943) +++ trunk/wb/admin/groups/group_form.html (nonexistent) @@ -1,289 +0,0 @@ - - - - -

{HEADING_MODIFY_GROUP}

- -
- - - - - - - - -
{TEXT_NAME}: - -
- - - - - -
{TEXT_SYSTEM_PERMISSIONS}: - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - -
- - -    
-
- - - - - -
{TEXT_SYSTEM_PERMISSIONS}: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

{SECTION_PAGES}

-
- -   - ( - ) -
-

{SECTION_MEDIA}

-
  
-

{SECTION_MODULES}

-
  
-

{SECTION_TEMPLATES}

-
  
-

{SECTION_LANGUAGES}

-
  
-

{SECTION_SETTINGS}

-
-

{SECTION_USERS}

-
-

{SECTION_GROUPS}

-
- - -
- - - - - - - - -
- {TEXT_MODULE_PERMISSIONS}: - -
    - -
  • - - -
    • - -
- 		- {TEXT_TEMPLATE_PERMISSIONS}: - -
    - -
  • - - -
    • - -
-
- - - - - - - - - - - -
  - - - -
- -
- - \ No newline at end of file Property changes on: trunk/wb/admin/groups/group_form.html ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Index: trunk/wb/admin/groups/groups.php =================================================================== --- trunk/wb/admin/groups/groups.php (revision 943) +++ trunk/wb/admin/groups/groups.php (revision 944) @@ -50,8 +50,8 @@ $results = $database->query("SELECT * FROM ".TABLE_PREFIX."groups WHERE group_id = '".$_POST['group_id']."'"); $group = $results->fetchRow(); // Setup template object - $template = new Template(ADMIN_PATH.'/groups'); - $template->set_file('page', 'group_form.html'); + $template = new Template(THEME_PATH.'/templates'); + $template->set_file('page', 'groups_form.htt'); $template->set_block('page', 'main_block', 'main'); $template->set_var( array( 'ACTION_URL' => ADMIN_URL.'/groups/save.php', Index: trunk/wb/admin/groups/index.php =================================================================== --- trunk/wb/admin/groups/index.php (revision 943) +++ trunk/wb/admin/groups/index.php (revision 944) @@ -29,8 +29,8 @@ $admin = new admin('Access', 'groups'); // Create new template object for the modify/remove menu -$template = new Template(ADMIN_PATH.'/groups'); -$template->set_file('page', 'template.html'); +$template = new Template(THEME_PATH.'/templates'); +$template->set_file('page', 'groups.htt'); $template->set_block('page', 'main_block', 'main'); $template->set_var('ADMIN_URL', ADMIN_URL); @@ -92,8 +92,8 @@ $template->pparse('output', 'page'); // Setup template for add group form -$template = new Template(ADMIN_PATH.'/groups'); -$template->set_file('page', 'group_form.html'); +$template = new Template(THEME_PATH.'/templates'); +$template->set_file('page', 'groups_form.htt'); $template->set_block('page', 'main_block', 'main'); $template->set_var('DISPLAY_EXTRA', 'none'); $template->set_var('ACTION_URL', ADMIN_URL.'/groups/add.php'); Index: trunk/wb/admin/media/browse.html =================================================================== --- trunk/wb/admin/media/browse.html (revision 943) +++ trunk/wb/admin/media/browse.html (nonexistent) @@ -1,108 +0,0 @@ - - - - -Browse Media - - - - - - - - - - - - - - - - -
- - ^ - - - - {TEXT_UP} - - - {TEXT_CURRENT_FOLDER}: {MEDIA_DIRECTORY}{CURRENT_DIR} - - - - - - - {TEXT_RELOAD} - -
- - - - - - - - - - -
- - - - - - {NAME} - - - - {TEXT_RENAME} - - - - {TEXT_DELETE} - -
- - -
-    -{NONE_FOUND} - - - - - - \ No newline at end of file Property changes on: trunk/wb/admin/media/browse.html ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Index: trunk/wb/admin/media/template.html =================================================================== --- trunk/wb/admin/media/template.html (revision 943) +++ trunk/wb/admin/media/template.html (nonexistent) @@ -1,131 +0,0 @@ - - - - -

{HEADING_BROWSE_MEDIA}

- - - -
- - - -
- -
- -

{HEADING_CREATE_FOLDER}

- - - - - - -
{TEXT_TARGET_FOLDER}: - -
- - - - - - -
{TEXT_NAME}: - - - -
- -
- -
- -
- -

{HEADING_UPLOAD_FILES}

- - - - - - -
{TEXT_TARGET_FOLDER}: - -
- - - - -
- - - - -
- - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- -
- - \ No newline at end of file Property changes on: trunk/wb/admin/media/template.html ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Index: trunk/wb/admin/media/basic_header.html =================================================================== --- trunk/wb/admin/media/basic_header.html (revision 943) +++ trunk/wb/admin/media/basic_header.html (nonexistent) @@ -1,22 +0,0 @@ - - - -Website Baker Administration - Media - - - - - - - - - -
\ No newline at end of file Property changes on: trunk/wb/admin/media/basic_header.html ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Index: trunk/wb/admin/media/rename.html =================================================================== --- trunk/wb/admin/media/rename.html (revision 943) +++ trunk/wb/admin/media/rename.html (nonexistent) @@ -1,54 +0,0 @@ - - - - -
- - - - - - - - - - - - - - - - - - -
{TEXT_RENAME} '{FILENAME}' {TEXT_TO}:
- - - - -
- - -
- - -
- -
- -
- - - - - \ No newline at end of file Property changes on: trunk/wb/admin/media/rename.html ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Index: trunk/wb/admin/media/rename2.php =================================================================== --- trunk/wb/admin/media/rename2.php (revision 943) +++ trunk/wb/admin/media/rename2.php (revision 944) @@ -31,9 +31,6 @@ // Include the WB functions file require_once(WB_PATH.'/framework/functions.php'); -// Include the basic header file -require(ADMIN_PATH.'/media/basic_header.html'); - // Get list of file types to which we're supposed to append 'txt' $get_result=$database->query("SELECT value FROM ".TABLE_PREFIX."settings WHERE name='rename_files_on_upload' LIMIT 1"); $file_extension_string=''; Index: trunk/wb/admin/media/browse.php =================================================================== --- trunk/wb/admin/media/browse.php (revision 943) +++ trunk/wb/admin/media/browse.php (revision 944) @@ -32,8 +32,8 @@ require_once(WB_PATH.'/framework/functions.php'); // Setup template object -$template = new Template(ADMIN_PATH.'/media'); -$template->set_file('page', 'browse.html'); +$template = new Template(THEME_PATH.'/templates'); +$template->set_file('page', 'media_browse.htt'); $template->set_block('page', 'main_block', 'main'); // Get the current dir @@ -71,6 +71,7 @@ // Insert values $template->set_var(array( + 'THEME_URL' => THEME_URL, 'CURRENT_DIR' => $directory, 'PARENT_DIR_LINK' => $parent_dir_link, 'DISPLAY_UP_ARROW' => $display_up_arrow @@ -110,7 +111,7 @@ 'LINK' => "browse.php?dir=$directory/$link_name", 'LINK_TARGET' => '', 'ROW_BG_COLOR' => $row_bg_color, - 'FILETYPE_ICON' => ADMIN_URL.'/images/folder_16.png' + 'FILETYPE_ICON' => THEME_URL.'/images/folder_16.png' ) ); $template->parse('list', 'list_block', true); @@ -133,7 +134,7 @@ 'LINK' => WB_URL.MEDIA_DIRECTORY.$directory.'/'.$name, 'LINK_TARGET' => '_blank', 'ROW_BG_COLOR' => $row_bg_color, - 'FILETYPE_ICON' => ADMIN_URL.'/images/blank.gif' + 'FILETYPE_ICON' => THEME_URL.'/images/blank.gif' ) ); $template->parse('list', 'list_block', true); Index: trunk/wb/admin/media/delete.php =================================================================== --- trunk/wb/admin/media/delete.php (revision 943) +++ trunk/wb/admin/media/delete.php (revision 944) @@ -31,9 +31,6 @@ // Include the WB functions file require_once(WB_PATH.'/framework/functions.php'); -// Include the stripped-down header file -require('basic_header.html'); - // Get the current dir $directory = $admin->get_get('dir'); if($directory == '/') { Index: trunk/wb/admin/media/index.php =================================================================== --- trunk/wb/admin/media/index.php (revision 943) +++ trunk/wb/admin/media/index.php (revision 944) @@ -29,8 +29,8 @@ $admin = new admin('Media', 'media'); // Setup template object -$template = new Template(ADMIN_PATH.'/media'); -$template->set_file('page', 'template.html'); +$template = new Template(THEME_PATH.'/templates'); +$template->set_file('page', 'media.htt'); $template->set_block('page', 'main_block', 'main'); // Include the WB functions file Index: trunk/wb/admin/media/rename.php =================================================================== --- trunk/wb/admin/media/rename.php (revision 943) +++ trunk/wb/admin/media/rename.php (revision 944) @@ -31,9 +31,6 @@ // Include the WB functions file require_once(WB_PATH.'/framework/functions.php'); -// Include the basic header file -require(ADMIN_PATH.'/media/basic_header.html'); - // Get the current dir $directory = $admin->get_get('dir'); if($directory == '/') { @@ -97,8 +94,8 @@ } // Setup template object -$template = new Template(ADMIN_PATH.'/media'); -$template->set_file('page', 'rename.html'); +$template = new Template(THEME_PATH.'/templates'); +$template->set_file('page', 'media_rename.htt'); $template->set_block('page', 'main_block', 'main'); //echo WB_PATH.'/media/'.$directory.'/'.$rename_file; if($type == 'folder') { @@ -116,6 +113,7 @@ } $template->set_var(array( + 'THEME_URL' => THEME_URL, 'FILENAME' => $rename_file, 'DIR' => $directory, 'FILE_ID' => $file_id, Index: trunk/wb/admin/start/template.html =================================================================== --- trunk/wb/admin/start/template.html (revision 943) +++ trunk/wb/admin/start/template.html (nonexistent) @@ -1,190 +0,0 @@ - - - - - - - - - - - - - - - - -
- {WELCOME_MESSAGE}. {CURRENT_USER} {DISPLAY_NAME} -
- {WARNING} -
- - - - - - - - - -
- - - - - {PAGES} -
- {PAGES_OVERVIEW} -
- - - - - - - - - -
- - - - - {ADDONS} -
- {ADDONS_OVERVIEW} -
- - - - - - - - - -
- - - - - {SETTINGS} -
- {SETTINGS_OVERVIEW} -
- - - - - - - - - -
- - - - - {ACCESS} -
- {ACCESS_OVERVIEW} -
- - 		-   - - - - - - - - - - -
- - - - - {MEDIA} -
- {MEDIA_OVERVIEW} -
- - - - - - - - - -
- - - - - {PREFERENCES} -
- {PREFERENCES_OVERVIEW} -
- - - - - - - - - -
- - - - - {ADMINTOOLS} -
- {ADMINTOOLS_OVERVIEW} -
- -
- - \ No newline at end of file Property changes on: trunk/wb/admin/start/template.html ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Index: trunk/wb/admin/start/index.php =================================================================== --- trunk/wb/admin/start/index.php (revision 943) +++ trunk/wb/admin/start/index.php (revision 944) @@ -28,8 +28,8 @@ $admin = new admin('Start','start'); // Setup template object -$template = new Template(ADMIN_PATH.'/start'); -$template->set_file('page', 'template.html'); +$template = new Template(THEME_PATH.'/templates'); +$template->set_file('page', 'start.htt'); $template->set_block('page', 'main_block', 'main'); // Insert values into the template object @@ -39,6 +39,7 @@ 'DISPLAY_NAME' => $admin->get_display_name(), 'ADMIN_URL' => ADMIN_URL, 'WB_URL' => WB_URL, + 'THEME_URL' => THEME_URL, 'WB_VERSION' => WB_VERSION ) ); Index: trunk/wb/admin/templates/template.html =================================================================== --- trunk/wb/admin/templates/template.html (revision 943) +++ trunk/wb/admin/templates/template.html (nonexistent) @@ -1,79 +0,0 @@ - - -
- {URL_MODULES}  {URL_LANGUAGES} -
- -
-{CHANGE_TEMPLATE_NOTICE}

- -
- -

{HEADING_INSTALL_TEMPLATE}

- - - - - - -
- - - - -
- -
- -
- -
- -

{HEADING_UNINSTALL_TEMPLATE}

- - - - - - -
- - - -
- -
- -
- -
- -

{HEADING_TEMPLATE_DETAILS}

- - - - - - -
- - - -
- -
-
- - \ No newline at end of file Property changes on: trunk/wb/admin/templates/template.html ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Index: trunk/wb/admin/templates/details.html =================================================================== --- trunk/wb/admin/templates/details.html (revision 943) +++ trunk/wb/admin/templates/details.html (nonexistent) @@ -1,32 +0,0 @@ - - -

{HEADING_TEMPLATE_DETAILS}

- - - - - - - - - - - - - - - - - - - - - - -
{TEXT_NAME}:{NAME}
{TEXT_AUTHOR}:{AUTHOR}
{TEXT_VERSION}:{VERSION}
{TEXT_DESIGNED_FOR}:Website Baker {DESIGNED_FOR}
{TEXT_DESCRIPTION}:{DESCRIPTION}
- -
- - - - \ No newline at end of file Property changes on: trunk/wb/admin/templates/details.html ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Index: trunk/wb/admin/templates/uninstall.php =================================================================== --- trunk/wb/admin/templates/uninstall.php (revision 943) +++ trunk/wb/admin/templates/uninstall.php (revision 944) @@ -63,6 +63,13 @@ if (!array_key_exists('CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE', $MESSAGE['GENERIC'] ) ) $MESSAGE['GENERIC']['CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE'] = "Can't uninstall this template {{name}} because it's the standardtemplate!"; +// check whether the template is used as default wb theme +if($file == DEFAULT_THEME) { + $temp = array ('name' => $file ); + $msg = replace_all( $MESSAGE['GENERIC']['CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE'], $temp ); + $admin->print_error( $msg ); +} + if ($file == DEFAULT_TEMPLATE) { $temp = array ('name' => $file ); $msg = replace_all( $MESSAGE['GENERIC']['CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE'], $temp ); Index: trunk/wb/admin/templates/details.php =================================================================== --- trunk/wb/admin/templates/details.php (revision 943) +++ trunk/wb/admin/templates/details.php (revision 944) @@ -45,8 +45,8 @@ $admin = new admin('Addons', 'templates_view'); // Setup template object -$template = new Template(ADMIN_PATH.'/templates'); -$template->set_file('page', 'details.html'); +$template = new Template(THEME_PATH.'/templates'); +$template->set_file('page', 'templates_details.htt'); $template->set_block('page', 'main_block', 'main'); // Insert values Index: trunk/wb/admin/templates/install.php =================================================================== --- trunk/wb/admin/templates/install.php (revision 943) +++ trunk/wb/admin/templates/install.php (revision 944) @@ -53,8 +53,9 @@ // Include the PclZip class file (thanks to require_once(WB_PATH.'/include/pclzip/pclzip.lib.php'); -// Remove any vars with name "template_directory" +// Remove any vars with name "template_directory" and "theme_directory" unset($template_directory); +unset($theme_directory); // Setup the PclZip object $archive = new PclZip($temp_file); Index: trunk/wb/admin/templates/index.php =================================================================== --- trunk/wb/admin/templates/index.php (revision 943) +++ trunk/wb/admin/templates/index.php (revision 944) @@ -29,8 +29,8 @@ $admin = new admin('Addons', 'templates'); // Setup template object -$template = new Template(ADMIN_PATH.'/templates'); -$template->set_file('page', 'template.html'); +$template = new Template(THEME_PATH.'/templates'); +$template->set_file('page', 'templates.htt'); $template->set_block('page', 'main_block', 'main'); // Insert values into template list Index: trunk/wb/admin/pages/template.html =================================================================== --- trunk/wb/admin/pages/template.html (revision 943) +++ trunk/wb/admin/pages/template.html (nonexistent) @@ -1,103 +0,0 @@ - - -
- -
-
- -

{HEADING_ADD_PAGE}

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{TEXT_TITLE}: - - - {TEXT_ADMINISTRATORS}: -
    - -
  • - - -
    • - -
- 		- -
{TEXT_TYPE}: - -
{TEXT_PARENT}: - -
{TEXT_VISIBILITY}: - -
  - - -
  
- -
- -
-
- -
- -

{HEADING_MODIFY_INTRO_PAGE}

- - -{INTRO_LINK} - - -
- - \ No newline at end of file Property changes on: trunk/wb/admin/pages/template.html ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Index: trunk/wb/admin/pages/modify.html =================================================================== --- trunk/wb/admin/pages/modify.html (revision 943) +++ trunk/wb/admin/pages/modify.html (nonexistent) @@ -1,22 +0,0 @@ - - - - - - - -
-

{HEADING_MODIFY_PAGE}

- 		- {TEXT_CURRENT_PAGE}: - {PAGE_TITLE} - - - {TEXT_CHANGE_SETTINGS} - - - {TEXT_MANAGE_SECTIONS} -
- {LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN} - -
- - \ No newline at end of file Property changes on: trunk/wb/admin/pages/modify.html ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Index: trunk/wb/admin/pages/settings.html =================================================================== --- trunk/wb/admin/pages/settings.html (revision 943) +++ trunk/wb/admin/pages/settings.html (nonexistent) @@ -1,199 +0,0 @@ - - - - - - - - - -
-

{HEADING_MODIFY_PAGE_SETTINGS}

- 		- {TEXT_CURRENT_PAGE}: - {PAGE_TITLE} - - - {TEXT_MODIFY_PAGE} - - - {TEXT_MANAGE_SECTIONS} -
- - {LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN} - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{TEXT_PAGE_TITLE}: - - - {TEXT_ADMINISTRATORS}: -
    - -
  • - - -
    • - -
- 		-
- {TEXT_ALLOWED_VIEWERS}: -
    - -
  • - - -
    • - -
-
-
{TEXT_MENU_TITLE}: - -
{TEXT_PARENT}: - -
{TEXT_VISIBILITY}: - -
{TEXT_DESCRIPTION}: - -
{TEXT_KEYWORDS}: - -
- {TEXT_TARGET}: - - -
{TEXT_TEMPLATE}: - -
{TEXT_MENU}: - -
{TEXT_LANGUAGE}: - -
{TEXT_SEARCHING}: - -
  - - -
  
- -
- - \ No newline at end of file Property changes on: trunk/wb/admin/pages/settings.html ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Index: trunk/wb/admin/pages/intro.php =================================================================== --- trunk/wb/admin/pages/intro.php (revision 943) +++ trunk/wb/admin/pages/intro.php (revision 944) @@ -59,14 +59,14 @@ show_wysiwyg_editor('content','content',$content,'100%','500px'); ?> - +
- -
- + + + - +
Index: trunk/wb/admin/pages/settings.php =================================================================== --- trunk/wb/admin/pages/settings.php (revision 943) +++ trunk/wb/admin/pages/settings.php (revision 944) @@ -81,8 +81,8 @@ } // Setup template object, parse vars to it, then parse it -$template = new Template(ADMIN_PATH.'/pages'); -$template->set_file('page', 'settings.html'); +$template = new Template(THEME_PATH.'/templates'); +$template->set_file('page', 'pages_settings.htt'); $template->set_block('page', 'main_block', 'main'); $template->set_var(array( 'PAGE_ID' => $results_array['page_id'], @@ -290,10 +290,10 @@ if($results_array['parent'] == $page['page_id']) { $template->set_var('SELECTED', ' selected'); } elseif($results_array['page_id'] == $page['page_id']) { - $template->set_var('SELECTED', ' disabled="disabled" style="color: #aaa;"'); + $template->set_var('SELECTED', ' disabled="disabled" class="disabled"'); $list_next_level=false; } elseif($can_modify != true) { - $template->set_var('SELECTED', ' disabled="disabled" style="color: #aaa;"'); + $template->set_var('SELECTED', ' disabled="disabled" class="disabled"'); } else { $template->set_var('SELECTED', ''); } Index: trunk/wb/admin/pages/index.php =================================================================== --- trunk/wb/admin/pages/index.php (revision 943) +++ trunk/wb/admin/pages/index.php (revision 944) @@ -58,9 +58,9 @@ } } var plus = new Image; -plus.src = "/images/plus_16.png"; +plus.src = "/images/plus_16.png"; var minus = new Image; -minus.src = "/images/minus_16.png"; +minus.src = "/images/minus_16.png"; function toggle_plus_minus(id) { var img_src = document.images['plus_minus_' + id].src; if(img_src == plus.src) { @@ -71,27 +71,6 @@ } - - - -