|
From: Garvin H. <gar...@us...> - 2004-06-22 13:46:24
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28720 Modified Files: NEWS serendipity_admin_plugins.inc.php serendipity_sidebar_items.php Log Message: immediately show plugin defaults in configuration screen instead of leaving everything blank. !!!!PLEASE TEST!!!! Index: serendipity_sidebar_items.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- serendipity_sidebar_items.php 17 Jun 2004 20:45:13 -0000 1.66 +++ serendipity_sidebar_items.php 22 Jun 2004 13:45:42 -0000 1.67 @@ -15,6 +15,7 @@ $propbag->add('type', 'string'); $propbag->add('name', CALENDAR_BEGINNING_OF_WEEK); $propbag->add('description', CALENDAR_BOW_DESC); + $propbag->add('default', 1); break; default: @@ -124,6 +125,7 @@ $propbag->add('type', 'string'); $propbag->add('name', LIMIT_TO_NUMBER); $propbag->add('description', LIMIT_TO_NUMBER); + $propbag->add('default', 10); break; default: @@ -156,6 +158,7 @@ $propbag->add('type', 'string'); $propbag->add('name', LIMIT_TO_NUMBER); $propbag->add('description', LIMIT_TO_NUMBER); + $propbag->add('default', 10); break; default: @@ -207,36 +210,42 @@ $propbag->add('type', 'boolean'); $propbag->add('name', SYNDICATION_PLUGIN_091); $propbag->add('description', ''); + $propbag->add('default', 'true'); break; case 'show_1.0': $propbag->add('type', 'boolean'); $propbag->add('name', SYNDICATION_PLUGIN_10); $propbag->add('description', ''); + $propbag->add('default', 'true'); break; case 'show_2.0': $propbag->add('type', 'boolean'); $propbag->add('name', SYNDICATION_PLUGIN_20); $propbag->add('description', ''); + $propbag->add('default', 'true'); break; case 'show_2.0c': $propbag->add('type', 'boolean'); $propbag->add('name', SYNDICATION_PLUGIN_20c); $propbag->add('description', ''); + $propbag->add('default', 'true'); break; case 'show_atom0.3': $propbag->add('type', 'boolean'); $propbag->add('name', SYNDICATION_PLUGIN_ATOM03); $propbag->add('description', ''); + $propbag->add('default', 'true'); break; case 'show_opml1.0': $propbag->add('type', 'boolean'); $propbag->add('name', sprintf(SYNDICATION_PLUGIN_GENERIC_FEED, 'OPML 1.0')); $propbag->add('description', ''); + $propbag->add('default', 'false'); break; case 'seperator': @@ -247,48 +256,56 @@ $propbag->add('type', 'boolean'); $propbag->add('name', SYNDICATION_PLUGIN_PREVENT_CACHE); $propbag->add('description', SYNDICATION_PLUGIN_PREVENT_CACHE_DESC); + $propbag->add('default', 'false'); break; case 'field_managingEditor': $propbag->add('type', 'string'); $propbag->add('name', SYNDICATION_PLUGIN_MANAGINGEDITOR); $propbag->add('description', SYNDICATION_PLUGIN_MANAGINGEDITOR_DESC); + $propbag->add('default', ''); break; case 'field_webMaster': $propbag->add('type', 'string'); $propbag->add('name', SYNDICATION_PLUGIN_WEBMASTER); $propbag->add('description', SYNDICATION_PLUGIN_WEBMASTER_DESC); + $propbag->add('default', ''); break; case 'field_ttl': $propbag->add('type', 'string'); $propbag->add('name', SYNDICATION_PLUGIN_TTL); $propbag->add('description', SYNDICATION_PLUGIN_TTL_DESC); + $propbag->add('default', ''); break; case 'field_pubDate': $propbag->add('type', 'boolean'); $propbag->add('name', SYNDICATION_PLUGIN_PUBDATE); $propbag->add('description', SYNDICATION_PLUGIN_PUBDATE_DESC); + $propbag->add('default', ''); break; case 'bannerURL': $propbag->add('type', 'string'); $propbag->add('name', SYNDICATION_PLUGIN_BANNERURL); $propbag->add('description', SYNDICATION_PLUGIN_BANNERURL_DESC); + $propbag->add('default', ''); break; case 'bannerWidth': $propbag->add('type', 'string'); $propbag->add('name', SYNDICATION_PLUGIN_BANNERWIDTH); $propbag->add('description', SYNDICATION_PLUGIN_BANNERWIDTH_DESC); + $propbag->add('default', ''); break; case 'bannerHeight': $propbag->add('type', 'string'); $propbag->add('name', SYNDICATION_PLUGIN_BANNERHEIGHT); $propbag->add('description', SYNDICATION_PLUGIN_BANNERHEIGHT_DESC); + $propbag->add('default', ''); break; default: @@ -493,18 +510,21 @@ $propbag->add('type', 'string'); $propbag->add('name', TITLE); $propbag->add('description', TITLE_FOR_NUGGET); + $propbag->add('default', ''); break; case 'content': $propbag->add('type', 'html'); $propbag->add('name', CONTENT); $propbag->add('description', THE_NUGGET); + $propbag->add('default', ''); break; case 'markup': $propbag->add('type', 'boolean'); $propbag->add('name', DO_MARKUP); $propbag->add('description', DO_MARKUP_DESCRIPTION); + $propbag->add('default', 'true'); break; default: @@ -515,7 +535,7 @@ function generate_content(&$title) { - $title = $this->get_config('title', $title); + $title = $this->get_config('title', $title); if ($this->get_config('markup', 'true') == 'true') { $entry = array('html_nugget' => $this->get_config('content')); serendipity_plugin_api::hook_event('frontend_display', $entry); @@ -551,12 +571,16 @@ $propbag->add('name', CATEGORIES_TO_FETCH); $propbag->add('description', CATEGORIES_TO_FETCH_DESC); $propbag->add('select_values', $this->author_select_values); + $propbag->add('default', 'all'); break; + case 'image': $propbag->add('type', 'string'); $propbag->add('name', XML_IMAGE_TO_DISPLAY); $propbag->add('description', XML_IMAGE_TO_DISPLAY_DESC); + $propbag->add('default', serendipity_getTemplateFile('img/xml.gif')); break; + default: return false; } Index: serendipity_admin_plugins.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- serendipity_admin_plugins.inc.php 17 Jun 2004 20:30:17 -0000 1.31 +++ serendipity_admin_plugins.inc.php 22 Jun 2004 13:45:42 -0000 1.32 @@ -35,7 +35,7 @@ ?> <table cellspacing="0" align="center"> <tr> - <td colspan="2"> + <td colspan="2"> <select name="serendipity[plugin_to_add]"> <option value="0">[ <?php echo SELECT_A_PLUGIN_TO_ADD; ?> ]</option> <?php @@ -344,8 +344,12 @@ $value = $plugin->get_config($config_item, 'unset'); $is_unset = false; if ($value == 'unset') { + $value = $cbag->get('default'); $is_unset = true; - $value = $plugin->get_config($config_item, false, true); + if (empty($value)) { + // Backwards compatibility to Plugins with no default property bag item + $value = $plugin->get_config($config_item, false, true); + } } $hvalue = (isset($_POST['serendipity']['plugin'][$config_item]) ? htmlspecialchars($_POST['serendipity']['plugin'][$config_item]) : htmlspecialchars($value)); $radio = array(); Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.157 retrieving revision 1.158 diff -u -d -r1.157 -r1.158 --- NEWS 22 Jun 2004 10:07:31 -0000 1.157 +++ NEWS 22 Jun 2004 13:45:42 -0000 1.158 @@ -3,6 +3,10 @@ Version 0.7 () ------------------------------------------------------------------------ + * Updated plugins to show default values in plugin configuration + immediately. New bag property 'default' introduced to Plugin API, + backwards compatible. (garvinhicking) + * Remaining XHTML 1.1 issues fixed: - Use <div> instead of <span> for entry's contents. - Removed obsolete javascript-function for comments |
