Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1213 from ArthurHoaro/plugins/isso-icon

Browse source 
Isso plugin: add an icon in linklist if enabled
This commit is contained in:
ArthurHoaro 2018-09-20 23:33:44 +02:00 committed by GitHub
commit bede8e1b63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 44 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
plugins/isso/comment.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 277 B

31
plugins/isso/isso.php
View file

@ -46,9 +46,36 @@ function hook_isso_render_linklist($data, $conf)
$isso = sprintf($issoHtml, $issoUrl, $issoUrl, $link['id'], $link['id']);
$data['plugin_end_zone'][] = $isso;
} else {
$button = '<span><a href="?%s#isso-thread">';
// For the default theme we use a FontAwesome icon which is better than an image
if ($conf->get('resource.theme') === 'default') {
$button .= '<i class="linklist-plugin-icon fa fa-comment"></i>';
} else {
$button .= '<img class="linklist-plugin-icon" src="plugins/isso/comment.png" ';
$button .= 'title="Comment on this shaare" alt="Comments" />';
}
$button .= '</a></span>';
foreach ($data['links'] as &$value) {
$commentLink = sprintf($button, $value['shorturl']);
$value['link_plugin'][] = $commentLink;
}
}
// Hackish way to include this CSS file only when necessary.
$data['plugins_includes']['css_files'][] = PluginManager::$PLUGINS_PATH . '/isso/isso.css';
return $data;
}
/**
* When linklist is displayed, include isso CSS file.
*
* @param array $data - header data.
*
* @return mixed - header data with isso CSS file added.
*/
function hook_isso_render_includes($data)
{
if ($data['_PAGE_'] == Router::$PAGE_LINKLIST) {
$data['css_files'][] = PluginManager::$PLUGINS_PATH . '/isso/isso.css';
}
return $data;

5
plugins/isso/isso_button.html Normal file
View file

@ -0,0 +1,5 @@
<span>
<a href="?%s#isso-thread">
<img class="linklist-plugin-icon" src="plugins/archiveorg/internetarchive.png" title="%s" alt="archive.org" />
</a>
</span>

16
tests/plugins/PluginIssoTest.php
View file

@ -21,7 +21,7 @@ public function setUp()
/**
* Test Isso init without errors.
*/
public function testWallabagInitNoError()
public function testIssoInitNoError()
{
$conf = new ConfigManager('');
$conf->set('plugins.ISSO_SERVER', 'value');
@ -32,7 +32,7 @@ public function testWallabagInitNoError()
/**
* Test Isso init with errors.
*/
public function testWallabagInitError()
public function testIssoInitError()
{
$conf = new ConfigManager('');
$errors = isso_init($conf);
@ -96,19 +96,22 @@ public function testIssoMultipleLinks()
array(
'id' => 12,
'url' => $str,
'shorturl' => $short1 = 'abcd',
'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $date1),
),
array(
'id' => 13,
'url' => $str . '2',
'shorturl' => $short2 = 'efgh',
'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $date2),
),
)
);
$processed = hook_isso_render_linklist($data, $conf);
// data shouldn't be altered
$this->assertEquals($data, $processed);
// link_plugin should be added for the icon
$this->assertContains('<a href="?'. $short1 .'#isso-thread">', $processed['links'][0]['link_plugin'][0]);
$this->assertContains('<a href="?'. $short2 .'#isso-thread">', $processed['links'][1]['link_plugin'][0]);
}
/**
@ -127,6 +130,7 @@ public function testIssoNotDisplayedWhenSearch()
array(
'id' => 12,
'url' => $str,
'shorturl' => $short1 = 'abcd',
'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $date),
)
),
@ -135,8 +139,8 @@ public function testIssoNotDisplayedWhenSearch()
$processed = hook_isso_render_linklist($data, $conf);
// data shouldn't be altered
$this->assertEquals($data, $processed);
// link_plugin should be added for the icon
$this->assertContains('<a href="?'. $short1 .'#isso-thread">', $processed['links'][0]['link_plugin'][0]);
}
/**