yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 01:39:28 +02:00
Code Issues Releases Wiki Activity

Add google/wikipedia/lastfm search icons

Browse source
This commit is contained in:
Afterster 2014-02-17 22:00:08 +01:00
parent 2fcf50bc6a
commit e2b3b1ed51
11 changed files with 88 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
images/icon_google.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 751 B

BIN
images/icon_lastfm.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 833 B

BIN
images/icon_wikipedia.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 863 B

2
lib/class/plex_api.class.php
View file

@ -47,7 +47,7 @@ class Plex_Api
$lip = ip2long($ip); $lip = ip2long($ip);
$rangs = array( $rangs = array(
array('127.0.0.1', '127.0.0.1'), array('127.0.0.1', '127.0.0.1'),
array('10.0.0.1', '10.255.255.254 '), array('10.0.0.1', '10.255.255.254'),
array('172.16.0.1', '172.31.255.254'), array('172.16.0.1', '172.31.255.254'),
array('192.168.0.1', '192.168.255.254'), array('192.168.0.1', '192.168.255.254'),
); );

9
templates/show_album.inc.php
View file

@ -30,7 +30,13 @@ if ($album->disk) {
$title .= ' - ' . $album->f_artist_link; $title .= ' - ' . $album->f_artist_link;
?> ?>
<?php UI::show_box_top($title,'info-box'); ?> <?php UI::show_box_top($title,'info-box'); ?>
<div class="album_art"> <div class="item_right_info">
<div class="external_links">
<a href="http://www.google.com/search?q=%22<?php echo rawurlencode($album->f_artist); ?>%22+%22<?php echo rawurlencode($album->f_name); ?>%22" target="_blank"><?php echo UI::get_icon('google', T_('Search on Google ...')); ?></a>
<a href="http://en.wikipedia.org/wiki/Special:Search?search=%22<?php echo rawurlencode($album->f_name); ?>%22&go=Go" target="_blank"><?php echo UI::get_icon('wikipedia', T_('Search on Wikipedia ...')); ?></a>
<a href="http://www.last.fm/search?q=%22<?php echo rawurlencode($album->f_artist); ?>%22+%22<?php echo rawurlencode($album->f_name); ?>%22&type=album" target="_blank"><?php echo UI::get_icon('lastfm', T_('Search on Last.fm ...')); ?></a>
</div>
<div class="album_art">
<?php <?php
if ($album->name != T_('Unknown (Orphaned)')) { if ($album->name != T_('Unknown (Orphaned)')) {
$name = '[' . $album->f_artist . '] ' . scrub_out($album->full_name); $name = '[' . $album->f_artist . '] ' . scrub_out($album->full_name);
@ -41,6 +47,7 @@ $title .= '&nbsp;-&nbsp;' . $album->f_artist_link;
echo "</a>\n"; echo "</a>\n";
} }
?> ?>
</div>
</div> </div>
<?php if (AmpConfig::get('ratings')) { ?> <?php if (AmpConfig::get('ratings')) { ?>
<div style="display:table-cell;" id="rating_<?php echo $album->id; ?>_album"> <div style="display:table-cell;" id="rating_<?php echo $album->id; ?>_album">

11
templates/show_artist.inc.php
View file

@ -32,8 +32,15 @@ UI::show_box_top($artist->f_name, 'info-box');
if (AmpConfig::get('lastfm_api_key')) { if (AmpConfig::get('lastfm_api_key')) {
echo Ajax::observe('window','load', Ajax::action('?page=index&action=artist_info&artist='.$artist->id, 'artist_info')); echo Ajax::observe('window','load', Ajax::action('?page=index&action=artist_info&artist='.$artist->id, 'artist_info'));
?> ?>
<div id="artist_biography"> <div class="item_right_info">
<?php echo T_('Loading...'); ?> <div class="external_links">
<a href="http://www.google.com/search?q=%22<?php echo rawurlencode($artist->f_name); ?>%22" target="_blank"><?php echo UI::get_icon('google', T_('Search on Google ...')); ?></a>
<a href="http://en.wikipedia.org/wiki/Special:Search?search=%22<?php echo rawurlencode($artist->f_name); ?>%22&go=Go" target="_blank"><?php echo UI::get_icon('wikipedia', T_('Search on Wikipedia ...')); ?></a>
<a href="http://www.last.fm/search?q=%22<?php echo rawurlencode($artist->f_name); ?>%22&type=artist" target="_blank"><?php echo UI::get_icon('lastfm', T_('Search on Last.fm ...')); ?></a>
</div>
<div id="artist_biography">
<?php echo T_('Loading...'); ?>
</div>
</div> </div>
<?php } ?> <?php } ?>

15
themes/classic/templates/default.css
View file

@ -545,11 +545,24 @@ a.button{padding:1px 3px;}
#information_actions { margin-left:5px; font-size:0.7em; float:left; } #information_actions { margin-left:5px; font-size:0.7em; float:left; }
#information_actions h3 { font-size:1.2em; margin:0.2em; } #information_actions h3 { font-size:1.2em; margin:0.2em; }
#artist_biography { .item_right_info {
float: right; float: right;
max-width: 60%; max-width: 60%;
} }
.external_links {
text-align: right;
opacity: 0.3;
}
.external_links:hover {
opacity: 1;
}
.external_links a {
margin: 0px 5px 0px 0px;
}
#artist_summary { #artist_summary {
margin-right: 150px; margin-right: 150px;
} }

15
themes/fresh/templates/default.css
View file

@ -847,11 +847,24 @@ span.nodata {
color:#09c; color:#09c;
} }
#artist_biography { .item_right_info {
float: right; float: right;
max-width: 60%; max-width: 60%;
} }
.external_links {
text-align: right;
opacity: 0.3;
}
.external_links:hover {
opacity: 1;
}
.external_links a {
margin: 0px 5px 0px 0px;
}
#artist_summary { #artist_summary {
margin-right: 150px; margin-right: 150px;
} }

15
themes/greysme/templates/default.css
View file

@ -558,11 +558,24 @@ input[type=checkbox] { border:0;background:none; }
#information_actions { } #information_actions { }
#information_actions h3 { color:#8b3e38; font-size:1.2em; margin:0.2em; } #information_actions h3 { color:#8b3e38; font-size:1.2em; margin:0.2em; }
#artist_biography { .item_right_info {
float: right; float: right;
max-width: 60%; max-width: 60%;
} }
.external_links {
text-align: right;
opacity: 0.3;
}
.external_links:hover {
opacity: 1;
}
.external_links a {
margin: 0px 5px 0px 0px;
}
#artist_summary { #artist_summary {
margin-right: 150px; margin-right: 150px;
} }

15
themes/penguin/templates/default.css
View file

@ -712,11 +712,24 @@ right: expression(-this.parentNode.offsetWidth%2+"px");
margin: 0px 0px 20px 1px; margin: 0px 0px 20px 1px;
} }
#artist_biography { .item_right_info {
float: right; float: right;
max-width: 60%; max-width: 60%;
} }
.external_links {
text-align: right;
opacity: 0.3;
}
.external_links:hover {
opacity: 1;
}
.external_links a {
margin: 0px 5px 0px 0px;
}
#artist_summary { #artist_summary {
margin-right: 150px; margin-right: 150px;
} }

15
themes/reborn/templates/default.css
View file

@ -1286,11 +1286,24 @@ span.fatalerror {
vertical-align:bottom; vertical-align:bottom;
} }
#artist_biography { .item_right_info {
float: right; float: right;
max-width: 60%; max-width: 60%;
} }
.external_links {
text-align: right;
opacity: 0.3;
}
.external_links:hover {
opacity: 1;
}
.external_links a {
margin: 0px 5px 0px 0px
}
#artist_summary { #artist_summary {
margin-right: 150px; margin-right: 150px;
} }