mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Browse Source
This commit is contained in:
Garvin Hicking 2014-08-08 10:56:16 +02:00
commit e4a44c3663
4 changed files with 14 additions and 6 deletions
include/admin
category.inc.php
plugins/serendipity_plugin_syndication
serendipity_plugin_syndication.php
templates/2k11/admin
category.inc.tplplugins.inc.tpl

4
include/admin/category.inc.php

@ -181,7 +181,11 @@ if ( $serendipity['GET']['adminAction'] == 'edit' || $serendipity['GET']['adminA
$categories = serendipity_fetchCategories('all');
$categories = serendipity_walkRecursive($categories, 'categoryid', 'parentid', VIEWMODE_THREADED);
$data['categories'] = $categories;
// hook content as var to category.inc.tpl, to place inside the form
ob_start();
serendipity_plugin_api::hook_event('backend_category_showForm', $cid, $this_cat);
$data['category_showForm'] = ob_get_contents();
ob_end_clean();
}

10
plugins/serendipity_plugin_syndication/serendipity_plugin_syndication.php

@ -9,7 +9,7 @@ class serendipity_plugin_syndication extends serendipity_plugin {
$propbag->add('description', SHOWS_RSS_BLAHBLAH);
$propbag->add('stackable', true);
$propbag->add('author', 'Serendipity Team');
$propbag->add('version', '2.0');
$propbag->add('version', '2.1');
$propbag->add('configuration', array(
'title',
'big_img',
@ -30,6 +30,8 @@ class serendipity_plugin_syndication extends serendipity_plugin {
function introspect_config_item($name, &$propbag)
{
global $serendipity;
switch($name) {
case 'title':
$propbag->add('type', 'string');
@ -80,7 +82,7 @@ class serendipity_plugin_syndication extends serendipity_plugin {
$propbag->add('type', 'string');
$propbag->add('name', SYNDICATION_PLUGIN_FEEDICON);
$propbag->add('description', SYNDICATION_PLUGIN_FEEDICON_DESC);
$propbag->add('default', 'templates/2k11/img/subtome.png');
$propbag->add('default', $serendipity['serendipityHTTPPath'] . 'templates/2k11/img/subtome.png');
break;
case 'feed_name':
@ -126,7 +128,7 @@ class serendipity_plugin_syndication extends serendipity_plugin {
$small_icon = serendipity_getTemplateFile($this->get_config('iconURL', 'img/xml.gif'));
$custom_feed = trim($this->get_config('feed_name'));
$custom_comm = trim($this->get_config('comment_name'));
$custom_img = trim($this->get_config('big_img', 'templates/2k11/img/subtome.png'));
$custom_img = trim($this->get_config('big_img', $serendipity['serendipityHTTPPath'] . 'templates/2k11/img/subtome.png'));
$subtome = serendipity_db_bool($this->get_config('subToMe', true));
$fbid = $this->get_config('fb_id');
$custom_url = serendipity_db_bool($this->get_config('custom_url', false));
@ -149,7 +151,7 @@ class serendipity_plugin_syndication extends serendipity_plugin {
$icon = "http://feeds.feedburner.com/~fc/$fbid?bg=99CCFF&fg=444444&anim=0";
}
if ($fbid == "" && $custom_img == 'feedburner') {
$icon = 'templates/2k11/img/subtome.png';
$icon = $serendipity['serendipityHTTPPath'] . 'templates/2k11/img/subtome.png';
}
}

4
templates/2k11/admin/category.inc.tpl

@ -115,7 +115,7 @@
<div class="form_multiselect">
<label for="write_authors">{$CONST.PERM_WRITE}</label>
<select id="write_authors"size="6" multiple name="serendipity[cat][write_authors][]">
<select id="write_authors" size="6" multiple name="serendipity[cat][write_authors][]">
<option value="0"{if $selectAllReadAuthors} selected{/if}>{$CONST.ALL_AUTHORS}</option>
{foreach $groups as $group}
<option value="{$group.confkey}"{if isset($read_groups.{$group.confkey})} selected{/if}>{$group.confvalue|escape}</option>
@ -143,6 +143,8 @@
</figure>
</div>
{$category_showForm|default:''}
<a class="button_link" href="?serendipity[adminModule]=category&serendipity[adminAction]=view">{$CONST.BACK}</a>
<input class="standalone" name="SAVE" type="submit" value="{$save}">
</form>

2
templates/2k11/admin/plugins.inc.tpl

@ -75,7 +75,7 @@
{foreach $pluggroups AS $pluggroup => $groupstack}
{if empty($pluggroup)}
{if $only_group == UPGRADE}<span class="msg_notice"><span class="icon-attention-circled"></span> {$CONST.NO_UPDATES}</span>{/if}
{if $only_group == UPGRADE && empty($groupstack)}<span class="msg_notice"><span class="icon-attention-circled"></span> {$CONST.NO_UPDATES}</span>{/if}
{if !empty($only_group)}{continue}{/if}
{elseif !empty($only_group) && $pluggroup != $only_group}{continue}{else}
<h3>{foreach $groupnames as $available_group => $available_name}{if $pluggroup == $available_group}{$available_name}{/if}{/foreach}</h3>