Sperate correctly jquery-jplayer and jquery-ui from jquery
Afterster
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 783 B After Width: | Height: | Size: 783 B |
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 212 B After Width: | Height: | Size: 212 B |
|
Before Width: | Height: | Size: 208 B After Width: | Height: | Size: 208 B |
|
Before Width: | Height: | Size: 335 B After Width: | Height: | Size: 335 B |
|
Before Width: | Height: | Size: 207 B After Width: | Height: | Size: 207 B |
|
Before Width: | Height: | Size: 262 B After Width: | Height: | Size: 262 B |
|
Before Width: | Height: | Size: 262 B After Width: | Height: | Size: 262 B |
|
Before Width: | Height: | Size: 332 B After Width: | Height: | Size: 332 B |
|
Before Width: | Height: | Size: 280 B After Width: | Height: | Size: 280 B |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.4 KiB |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.4 KiB |
|
|
@ -40,10 +40,10 @@ if (AmpConfig::get('use_rss')) { ?>
|
||||||
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=<?php echo AmpConfig::get('site_charset'); ?>" />
|
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=<?php echo AmpConfig::get('site_charset'); ?>" />
|
||||||
<title><?php echo scrub_out(AmpConfig::get('site_title')); ?> - <?php echo $location['title']; ?></title>
|
<title><?php echo scrub_out(AmpConfig::get('site_title')); ?> - <?php echo $location['title']; ?></title>
|
||||||
<?php require_once AmpConfig::get('prefix') . '/templates/stylesheets.inc.php'; ?>
|
<?php require_once AmpConfig::get('prefix') . '/templates/stylesheets.inc.php'; ?>
|
||||||
<link rel="stylesheet" href="<?php echo $web_path; ?>/modules/jquery/jquery-ui.min.css" type="text/css" media="screen" />
|
<link rel="stylesheet" href="<?php echo $web_path; ?>/modules/jquery-ui/jquery-ui.min.css" type="text/css" media="screen" />
|
||||||
<link rel="stylesheet" href="<?php echo $web_path; ?>/modules/tag-it/jquery.tagit.css" type="text/css" media="screen" />
|
<link rel="stylesheet" href="<?php echo $web_path; ?>/modules/tag-it/jquery.tagit.css" type="text/css" media="screen" />
|
||||||
<script src="<?php echo $web_path; ?>/modules/jquery/jquery.min.js" language="javascript" type="text/javascript"></script>
|
<script src="<?php echo $web_path; ?>/modules/jquery/jquery.min.js" language="javascript" type="text/javascript"></script>
|
||||||
<script src="<?php echo $web_path; ?>/modules/jquery/jquery-ui.min.js" language="javascript" type="text/javascript"></script>
|
<script src="<?php echo $web_path; ?>/modules/jquery-ui/jquery-ui.min.js" language="javascript" type="text/javascript"></script>
|
||||||
<script src="<?php echo $web_path; ?>/modules/prettyPhoto/js/jquery.prettyPhoto.js" language="javascript" type="text/javascript"></script>
|
<script src="<?php echo $web_path; ?>/modules/prettyPhoto/js/jquery.prettyPhoto.js" language="javascript" type="text/javascript"></script>
|
||||||
<script src="<?php echo $web_path; ?>/modules/tag-it/tag-it.min.js" language="javascript" type="text/javascript"></script>
|
<script src="<?php echo $web_path; ?>/modules/tag-it/tag-it.min.js" language="javascript" type="text/javascript"></script>
|
||||||
<script src="<?php echo $web_path; ?>/modules/noty/packaged/jquery.noty.packaged.min.js" language="javascript" type="text/javascript"></script>
|
<script src="<?php echo $web_path; ?>/modules/noty/packaged/jquery.noty.packaged.min.js" language="javascript" type="text/javascript"></script>
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,7 @@ div.jp-video-full div.jp-interface {
|
||||||
|
|
||||||
div.jp-interface {
|
div.jp-interface {
|
||||||
position: relative;
|
position: relative;
|
||||||
/*background: #191919 url("../modules/jplayer/jplayer.midnight.black.interface.png") repeat-x;*/
|
/*background: #191919 url("../modules/jquery-jplayer/jplayer.midnight.black.interface.png") repeat-x;*/
|
||||||
background-color: rgb(25, 25, 25);
|
background-color: rgb(25, 25, 25);
|
||||||
width: 100%;
|
width: 100%;
|
||||||
z-index: 9999;
|
z-index: 9999;
|
||||||
|
|
@ -190,7 +190,7 @@ a.jp-pause {
|
||||||
}
|
}
|
||||||
|
|
||||||
a.jp-play, a.jp-play:hover, a.jp-pause, a.jp-pause:hover, a.jp-stop, a.jp-stop:hover, a.jp-previous, a.jp-previous:hover, a.jp-next, a.jp-next:hover, div.jp-seek-bar, div.jp-play-bar, a.jp-mute, a.jp-mute:hover, a.jp-unmute, a.jp-unmute:hover, a.jp-volume-max, a.jp-volume-max:hover, div.jp-volume-bar, div.jp-audio, div.jp-volume-bar, div.jp-volume-bar-value, a.jp-full-screen, a.jp-full-screen:hover, a.jp-restore-screen, a.jp-restore-screen:hover, a.jp-repeat, a.jp-repeat:hover, a.jp-repeat-off, a.jp-repeat-off:hover, a.jp-shuffle, a.jp-shuffle:hover, a.jp-shuffle-off, a.jp-shuffle-off:hover {
|
a.jp-play, a.jp-play:hover, a.jp-pause, a.jp-pause:hover, a.jp-stop, a.jp-stop:hover, a.jp-previous, a.jp-previous:hover, a.jp-next, a.jp-next:hover, div.jp-seek-bar, div.jp-play-bar, a.jp-mute, a.jp-mute:hover, a.jp-unmute, a.jp-unmute:hover, a.jp-volume-max, a.jp-volume-max:hover, div.jp-volume-bar, div.jp-audio, div.jp-volume-bar, div.jp-volume-bar-value, a.jp-full-screen, a.jp-full-screen:hover, a.jp-restore-screen, a.jp-restore-screen:hover, a.jp-repeat, a.jp-repeat:hover, a.jp-repeat-off, a.jp-repeat-off:hover, a.jp-shuffle, a.jp-shuffle:hover, a.jp-shuffle-off, a.jp-shuffle-off:hover {
|
||||||
background: url("../modules/jplayer/jplayer.midnight.black.png") no-repeat;
|
background: url("../modules/jquery-jplayer/jplayer.midnight.black.png") no-repeat;
|
||||||
}
|
}
|
||||||
|
|
||||||
a.jp-play {
|
a.jp-play {
|
||||||
|
|
@ -457,7 +457,7 @@ div.jp-title {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
color: #FFF;
|
color: #FFF;
|
||||||
background: #343433 url("../modules/jplayer/jplayer.midnight.black.playlist.png") repeat-x
|
background: #343433 url("../modules/jquery-jplayer/jplayer.midnight.black.playlist.png") repeat-x
|
||||||
}
|
}
|
||||||
|
|
||||||
div.playing_info {
|
div.playing_info {
|
||||||
|
|
@ -563,7 +563,7 @@ div.jp-title li {
|
||||||
div.jp-playlist li {
|
div.jp-playlist li {
|
||||||
padding: 6px 15px;
|
padding: 6px 15px;
|
||||||
border-bottom: 1px solid #121212;
|
border-bottom: 1px solid #121212;
|
||||||
/*background: #343433 url("../modules/jplayer/jplayer.midnight.black.playlist.png") repeat-x;*/
|
/*background: #343433 url("../modules/jquery-jplayer/jplayer.midnight.black.playlist.png") repeat-x;*/
|
||||||
text-shadow: 0 1px 0 rgba(0,0,0,0.3);
|
text-shadow: 0 1px 0 rgba(0,0,0,0.3);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -649,11 +649,11 @@ a.jp-video-play-icon {
|
||||||
left: 50%;
|
left: 50%;
|
||||||
top: 50%;
|
top: 50%;
|
||||||
|
|
||||||
background: url("../modules/jplayer/jplayer.midnight.black.video.play.png") 0 0 no-repeat;
|
background: url("../modules/jquery-jplayer/jquery-jplayer.midnight.black.video.play.png") 0 0 no-repeat;
|
||||||
text-indent: -9999px;
|
text-indent: -9999px;
|
||||||
}
|
}
|
||||||
div.jp-video-play:hover a.jp-video-play-icon {
|
div.jp-video-play:hover a.jp-video-play-icon {
|
||||||
background: url("../modules/jplayer/jplayer.midnight.black.video.play.png") 0 -100px no-repeat;
|
background: url("../modules/jquery-jplayer/jplayer.midnight.black.video.play.png") 0 -100px no-repeat;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -782,7 +782,7 @@ a.jp-shuffle-off:hover {
|
||||||
.jp-no-solution {
|
.jp-no-solution {
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
font-size: .67em;
|
font-size: .67em;
|
||||||
background: #121112 url("../modules/jplayer/jplayer.midnight.black.interface.png") repeat-x;
|
background: #121112 url("../modules/jquery-jplayer/jplayer.midnight.black.interface.png") repeat-x;
|
||||||
border-top: 1px solid #191919;
|
border-top: 1px solid #191919;
|
||||||
color: #CCC;
|
color: #CCC;
|
||||||
display: none;
|
display: none;
|
||||||
|
|
|
||||||
|
|
@ -98,7 +98,7 @@ div.jp-video-full div.jp-interface {
|
||||||
|
|
||||||
div.jp-interface {
|
div.jp-interface {
|
||||||
position: relative;
|
position: relative;
|
||||||
/*background: #191919 url("../modules/jplayer/jplayer.midnight.black.interface.png") repeat-x;*/
|
/*background: #191919 url("../modules/jquery-jplayer/jplayer.midnight.black.interface.png") repeat-x;*/
|
||||||
background-color: rgb(25, 25, 25);
|
background-color: rgb(25, 25, 25);
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
@ -178,7 +178,7 @@ a.jp-pause {
|
||||||
}
|
}
|
||||||
|
|
||||||
a.jp-play, a.jp-play:hover, a.jp-pause, a.jp-pause:hover, a.jp-stop, a.jp-stop:hover, a.jp-previous, a.jp-previous:hover, a.jp-next, a.jp-next:hover, div.jp-seek-bar, div.jp-play-bar, a.jp-mute, a.jp-mute:hover, a.jp-unmute, a.jp-unmute:hover, a.jp-volume-max, a.jp-volume-max:hover, div.jp-volume-bar, div.jp-audio, div.jp-volume-bar, div.jp-volume-bar-value, a.jp-full-screen, a.jp-full-screen:hover, a.jp-restore-screen, a.jp-restore-screen:hover, a.jp-repeat, a.jp-repeat:hover, a.jp-repeat-off, a.jp-repeat-off:hover, a.jp-shuffle, a.jp-shuffle:hover, a.jp-shuffle-off, a.jp-shuffle-off:hover {
|
a.jp-play, a.jp-play:hover, a.jp-pause, a.jp-pause:hover, a.jp-stop, a.jp-stop:hover, a.jp-previous, a.jp-previous:hover, a.jp-next, a.jp-next:hover, div.jp-seek-bar, div.jp-play-bar, a.jp-mute, a.jp-mute:hover, a.jp-unmute, a.jp-unmute:hover, a.jp-volume-max, a.jp-volume-max:hover, div.jp-volume-bar, div.jp-audio, div.jp-volume-bar, div.jp-volume-bar-value, a.jp-full-screen, a.jp-full-screen:hover, a.jp-restore-screen, a.jp-restore-screen:hover, a.jp-repeat, a.jp-repeat:hover, a.jp-repeat-off, a.jp-repeat-off:hover, a.jp-shuffle, a.jp-shuffle:hover, a.jp-shuffle-off, a.jp-shuffle-off:hover {
|
||||||
background: url("../modules/jplayer/jplayer.midnight.black.png") no-repeat;
|
background: url("../modules/jquery-jplayer/jplayer.midnight.black.png") no-repeat;
|
||||||
}
|
}
|
||||||
|
|
||||||
a.jp-play {
|
a.jp-play {
|
||||||
|
|
@ -443,7 +443,7 @@ div.jp-title {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
color: #FFF;
|
color: #FFF;
|
||||||
background: #343433 url("../modules/jplayer/jplayer.midnight.black.playlist.png") repeat-x
|
background: #343433 url("../modules/jquery-jplayer/jplayer.midnight.black.playlist.png") repeat-x
|
||||||
}
|
}
|
||||||
|
|
||||||
div.playing_info {
|
div.playing_info {
|
||||||
|
|
@ -493,7 +493,7 @@ div.jp-title li {
|
||||||
div.jp-playlist li {
|
div.jp-playlist li {
|
||||||
padding: 6px 15px;
|
padding: 6px 15px;
|
||||||
border-bottom: 1px solid #121212;
|
border-bottom: 1px solid #121212;
|
||||||
background: #343433 url("../modules/jplayer/jplayer.midnight.black.playlist.png") repeat-x;
|
background: #343433 url("../modules/jquery-jplayer/jplayer.midnight.black.playlist.png") repeat-x;
|
||||||
text-shadow: 0 1px 0 rgba(0,0,0,0.3);
|
text-shadow: 0 1px 0 rgba(0,0,0,0.3);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -579,11 +579,11 @@ a.jp-video-play-icon {
|
||||||
left: 50%;
|
left: 50%;
|
||||||
top: 50%;
|
top: 50%;
|
||||||
|
|
||||||
background: url("../modules/jplayer/jplayer.midnight.black.video.play.png") 0 0 no-repeat;
|
background: url("../modules/jquery-jplayer/jplayer.midnight.black.video.play.png") 0 0 no-repeat;
|
||||||
text-indent: -9999px;
|
text-indent: -9999px;
|
||||||
}
|
}
|
||||||
div.jp-video-play:hover a.jp-video-play-icon {
|
div.jp-video-play:hover a.jp-video-play-icon {
|
||||||
background: url("../modules/jplayer/jplayer.midnight.black.video.play.png") 0 -100px no-repeat;
|
background: url("../modules/jquery-jplayer/jplayer.midnight.black.video.play.png") 0 -100px no-repeat;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -712,7 +712,7 @@ a.jp-shuffle-off:hover {
|
||||||
.jp-no-solution {
|
.jp-no-solution {
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
font-size: .67em;
|
font-size: .67em;
|
||||||
background: #121112 url("../modules/jplayer/jplayer.midnight.black.interface.png") repeat-x;
|
background: #121112 url("../modules/jquery-jplayer/jplayer.midnight.black.interface.png") repeat-x;
|
||||||
border-top: 1px solid #191919;
|
border-top: 1px solid #191919;
|
||||||
color: #CCC;
|
color: #CCC;
|
||||||
display: none;
|
display: none;
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,8 @@ if (!$iframed || $is_share) {
|
||||||
?>
|
?>
|
||||||
<script src="<?php echo AmpConfig::get('web_path'); ?>/modules/jquery/jquery.min.js" language="javascript" type="text/javascript"></script>
|
<script src="<?php echo AmpConfig::get('web_path'); ?>/modules/jquery/jquery.min.js" language="javascript" type="text/javascript"></script>
|
||||||
<script src="<?php echo AmpConfig::get('web_path'); ?>/modules/jquery/jquery.cookie.js" language="javascript" type="text/javascript"></script>
|
<script src="<?php echo AmpConfig::get('web_path'); ?>/modules/jquery/jquery.cookie.js" language="javascript" type="text/javascript"></script>
|
||||||
<script src="<?php echo AmpConfig::get('web_path'); ?>/modules/jplayer/jquery.jplayer.min.js" language="javascript" type="text/javascript"></script>
|
<script src="<?php echo AmpConfig::get('web_path'); ?>/modules/jquery-jplayer/jquery.jplayer.min.js" language="javascript" type="text/javascript"></script>
|
||||||
<script src="<?php echo AmpConfig::get('web_path'); ?>/modules/jplayer/jplayer.playlist.min.js" language="javascript" type="text/javascript"></script>
|
<script src="<?php echo AmpConfig::get('web_path'); ?>/modules/jquery-jplayer/jplayer.playlist.min.js" language="javascript" type="text/javascript"></script>
|
||||||
<?php
|
<?php
|
||||||
if ($iframed) {
|
if ($iframed) {
|
||||||
?>
|
?>
|
||||||
|
|
@ -57,7 +57,7 @@ var timeoffset = 0;
|
||||||
removeTime: 'fast',
|
removeTime: 'fast',
|
||||||
shuffleTime: 'slow'
|
shuffleTime: 'slow'
|
||||||
},
|
},
|
||||||
swfPath: "<?php echo AmpConfig::get('web_path'); ?>/modules/jplayer/",
|
swfPath: "<?php echo AmpConfig::get('web_path'); ?>/modules/jquery-jplayer/",
|
||||||
audioFullScreen: true,
|
audioFullScreen: true,
|
||||||
smoothPlayBar: true,
|
smoothPlayBar: true,
|
||||||
keyEnabled: true,
|
keyEnabled: true,
|
||||||
|
|
|
||||||