[geeklog-cvs] geeklog: Changed the 'menu_elements' and 'notification' config o...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sun Nov 29 04:45:36 EST 2009
changeset 7492:11ffffd020e0
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/11ffffd020e0
user: Dirk Haun <dirk at haun-online.de>
date: Sun Nov 29 09:22:26 2009 +0100
description:
Changed the 'menu_elements' and 'notification' config options to dropdowns since there's only a fixed number of keywords that these two option recognize
diffstat:
language/english.php | 4 +++-
language/english_utf-8.php | 4 +++-
public_html/admin/install/config-install.php | 4 ++--
public_html/admin/install/index.php | 2 +-
public_html/admin/install/lib-install.php | 2 +-
public_html/admin/install/lib-upgrade.php | 8 ++++++++
public_html/docs/english/theme.html | 13 ++++++++++++-
public_html/docs/history | 5 ++++-
public_html/siteconfig.php.dist | 2 +-
sql/updates/mssql_1.6.1_to_1.6.2.php | 7 +++++++
sql/updates/mysql_1.6.1_to_1.6.2.php | 7 +++++++
11 files changed, 49 insertions(+), 9 deletions(-)
diffs (164 lines):
diff -r 0c79d91761c6 -r 11ffffd020e0 language/english.php
--- a/language/english.php Sat Nov 28 23:23:23 2009 +0100
+++ b/language/english.php Sun Nov 29 09:22:26 2009 +0100
@@ -1982,7 +1982,9 @@
20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'),
21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'),
22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
- 23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2)
+ 23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2),
+ 24 => array('Contribute' => 'contribute', 'Home' => 'home', 'Advanced Search' => 'search', 'Directory' => 'directory', 'My Account' => 'prefs', 'Plugin Entries' => 'plugins', 'Custom Entries' => 'custom'),
+ 25 => array('New Stories' => 'story', 'New Comments' => 'comment', 'New Trackbacks' => 'trackback', 'New Pingbacks' => 'pingback', 'New Users' => 'user')
);
?>
diff -r 0c79d91761c6 -r 11ffffd020e0 language/english_utf-8.php
--- a/language/english_utf-8.php Sat Nov 28 23:23:23 2009 +0100
+++ b/language/english_utf-8.php Sun Nov 29 09:22:26 2009 +0100
@@ -1982,7 +1982,9 @@
20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'),
21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'),
22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
- 23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2)
+ 23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2),
+ 24 => array('Contribute' => 'contribute', 'Home' => 'home', 'Advanced Search' => 'search', 'Directory' => 'directory', 'My Account' => 'prefs', 'Plugin Entries' => 'plugins', 'Custom Entries' => 'custom'),
+ 25 => array('New Stories' => 'story', 'New Comments' => 'comment', 'New Trackbacks' => 'trackback', 'New Pingbacks' => 'pingback', 'New Users' => 'user')
);
?>
diff -r 0c79d91761c6 -r 11ffffd020e0 public_html/admin/install/config-install.php
--- a/public_html/admin/install/config-install.php Sat Nov 28 23:23:23 2009 +0100
+++ b/public_html/admin/install/config-install.php Sun Nov 29 09:22:26 2009 +0100
@@ -140,7 +140,7 @@
$c->add('fs_theme', NULL, 'fieldset', 2, 10, NULL, 0, TRUE);
$c->add('theme','professional','select',2,10,NULL,190,TRUE);
$c->add('doctype','html401strict','select',2,10,21,195,TRUE);
- $c->add('menu_elements',array('contribute','search','stats','directory','plugins'),'%text',2,10,NULL,200,TRUE);
+ $c->add('menu_elements',array('contribute','search','stats','directory','plugins'),'%select',2,10,24,200,TRUE);
$c->add('path_themes','','text',2,10,NULL,210,TRUE);
$c->add('fs_theme_advanced', NULL, 'fieldset', 2, 11, NULL, 0, TRUE);
@@ -313,7 +313,7 @@
$c->add('cookiesecure',FALSE,'select',7,30,1,630,TRUE);
$c->add('fs_misc', NULL, 'fieldset', 7, 31, NULL, 0, TRUE);
- $c->add('notification',array(),'%text',7,31,NULL,800,TRUE);
+ $c->add('notification',array(),'%select',7,31,25,800,TRUE);
$c->add('cron_schedule_interval',0,'text',7,31,NULL,860,TRUE);
$c->add('disable_autolinks',0,'select',7,31,0,1750,TRUE);
$c->add('clickable_links',1,'select',7,31,1,1753,TRUE);
diff -r 0c79d91761c6 -r 11ffffd020e0 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php Sat Nov 28 23:23:23 2009 +0100
+++ b/public_html/admin/install/index.php Sun Nov 29 09:22:26 2009 +0100
@@ -341,7 +341,7 @@
. '<p>' . $LANG_INSTALL[91] . '</p>';
} else {
- $old_versions = array('1.2.5-1','1.3','1.3.1','1.3.2','1.3.2-1','1.3.3','1.3.4','1.3.5','1.3.6','1.3.7','1.3.8','1.3.9','1.3.10','1.3.11','1.4.0','1.4.1','1.5.0','1.5.1','1.5.2','1.6.0');
+ $old_versions = array('1.2.5-1','1.3','1.3.1','1.3.2','1.3.2-1','1.3.3','1.3.4','1.3.5','1.3.6','1.3.7','1.3.8','1.3.9','1.3.10','1.3.11','1.4.0','1.4.1','1.5.0','1.5.1','1.5.2','1.6.0','1.6.1');
if (empty($curv)) {
// If we were unable to determine the current GL
// version is then ask the user what it is
diff -r 0c79d91761c6 -r 11ffffd020e0 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php Sat Nov 28 23:23:23 2009 +0100
+++ b/public_html/admin/install/lib-install.php Sun Nov 29 09:22:26 2009 +0100
@@ -56,7 +56,7 @@
* This constant defines Geeklog's version number. It will be written to
* siteconfig.php and the database (in the latter case minus any suffix).
*/
- define('VERSION', '1.6.1');
+ define('VERSION', '1.6.2hg');
}
if (!defined('XHTML')) {
define('XHTML', ' /');
diff -r 0c79d91761c6 -r 11ffffd020e0 public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php Sat Nov 28 23:23:23 2009 +0100
+++ b/public_html/admin/install/lib-upgrade.php Sun Nov 29 09:22:26 2009 +0100
@@ -483,6 +483,14 @@
$current_gl_version = '1.6.1';
$_SQL = '';
break;
+
+ case '1.6.1':
+ require_once $_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.6.1_to_1.6.2.php';
+ INST_updateDB($_SQL);
+
+ $current_gl_version = '1.6.2';
+ $_SQL = '';
+ break;
default:
$done = true;
diff -r 0c79d91761c6 -r 11ffffd020e0 public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html Sat Nov 28 23:23:23 2009 +0100
+++ b/public_html/docs/english/theme.html Sun Nov 29 09:22:26 2009 +0100
@@ -195,7 +195,18 @@
</ol>
-<h2><a name="changes">Theme changes in Geeklog 1.6.1</a></h2>
+<h2><a name="changes">Theme changes in Geeklog 1.6.2</a></h2>
+
+<ul>
+<li>In <tt>admin/config/config_element.thtml</tt>, in the section for the
+ <code>select-element</code>, <code>{hide_row}</code> was added for the
+ table row and a <code>{delete}</code> option was added after the
+ <code>select</code>. These changes are required to allow dynamic addition /
+ removal of dropdowns, e.g. for <code>$_CONF['menu_elements']</code>.</li>
+</ul>
+
+
+<h2><a name="changes161">Theme changes in Geeklog 1.6.1</a></h2>
<ul>
<li>Added rules for the <tt>token-expirynotice</tt> and
diff -r 0c79d91761c6 -r 11ffffd020e0 public_html/docs/history
--- a/public_html/docs/history Sat Nov 28 23:23:23 2009 +0100
+++ b/public_html/docs/history Sun Nov 29 09:22:26 2009 +0100
@@ -3,8 +3,11 @@
??? ??, 20?? (1.6.2)
------------
+- Changed the 'menu_elements' and 'notification' config options to dropdowns
+ since there's only a fixed number of keywords that these two option recognize
+ [Dirk]
- Fixed delete option for dynamically added config options: Back in 1.5.1, we
- renamed the JavaScript remove() function to gl_cfg_remove() but forgot to
+ renamed our JavaScript remove() function to gl_cfg_remove() but forgot to
update the dynamically created function calls (cf. bug #0000681) [Dirk]
diff -r 0c79d91761c6 -r 11ffffd020e0 public_html/siteconfig.php.dist
--- a/public_html/siteconfig.php.dist Sat Nov 28 23:23:23 2009 +0100
+++ b/public_html/siteconfig.php.dist Sun Nov 29 09:22:26 2009 +0100
@@ -38,7 +38,7 @@
define('LB',"\n");
}
if (!defined('VERSION')) {
- define('VERSION', '1.6.1');
+ define('VERSION', '1.6.2');
}
?>
diff -r 0c79d91761c6 -r 11ffffd020e0 sql/updates/mssql_1.6.1_to_1.6.2.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/updates/mssql_1.6.1_to_1.6.2.php Sun Nov 29 09:22:26 2009 +0100
@@ -0,0 +1,7 @@
+<?php
+
+// make $_CONF['menu_elements'] and $_CONF['notification'] arrays of dropdowns
+$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = '%select', selectionArray = 24 WHERE name = 'menu_elements' AND group_name = 'Core'";
+$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = '%select', selectionArray = 25 WHERE name = 'notification' AND group_name = 'Core'";
+
+?>
diff -r 0c79d91761c6 -r 11ffffd020e0 sql/updates/mysql_1.6.1_to_1.6.2.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/updates/mysql_1.6.1_to_1.6.2.php Sun Nov 29 09:22:26 2009 +0100
@@ -0,0 +1,7 @@
+<?php
+
+// make $_CONF['menu_elements'] and $_CONF['notification'] arrays of dropdowns
+$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = '%select', selectionArray = 24 WHERE name = 'menu_elements' AND group_name = 'Core'";
+$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = '%select', selectionArray = 25 WHERE name = 'notification' AND group_name = 'Core'";
+
+?>
More information about the geeklog-cvs
mailing list