Conflicts: lib/template.phpremotes/origin/stable
commit
962907ee6f
@ -1,6 +1,6 @@ |
||||
<?php |
||||
|
||||
OC_App::addNavigationSubEntry('files_index', array( "id" => "files_publiclink_administration", "order" => 1, "href" => OC_Helper::linkTo( "files_publiclink", "admin.php" ), "name" => "Public Links")); |
||||
OC_App::addNavigationEntry(array( "id" => "files_publiclink_administration", "order" => 2, "href" => OC_Helper::linkTo( "files_publiclink", "admin.php" ), "name" => "Public Links")); |
||||
|
||||
|
||||
?> |
||||
|
@ -1,29 +1,25 @@ |
||||
#jp-interface{position:fixed;z-index:100;width:25em;left:201px;top:-20px;height:60px;border-bottom:none;} |
||||
#jp-interface div.player{height:0px} |
||||
#jp-interface ul.jp-controls{list-style-type:none;padding:0;} |
||||
#jp-interface ul.jp-controls li{display:inline;} |
||||
#jp-interface ul.jp-controls a{position:absolute;overflow:hidden;text-indent:-9999px;} |
||||
a.jp-play,a.jp-pause{width:40px;height:40px;z-index:1;top:20px;left:48px;} |
||||
#controls ul.jp-controls{list-style-type:none;padding:0;} |
||||
#controls ul.jp-controls li{display:inline;} |
||||
#controls ul.jp-controls a{position:absolute;overflow:hidden;text-indent:-9999px;} |
||||
a.jp-play,a.jp-pause{width:40px;height:40px;z-index:1;top:0;left:48px;} |
||||
a.jp-play{background:url("../img/jplayer.blue.monday.png") 0 0 no-repeat;} |
||||
a.jp-play:hover{background:url("../img/jplayer.blue.monday.png") -41px 0 no-repeat;} |
||||
a.jp-pause{background:url("../img/jplayer.blue.monday.png") 0 -42px no-repeat;display:none;} |
||||
a.jp-pause:hover{background:url("../img/jplayer.blue.monday.png") -41px -42px no-repeat;} |
||||
a.jp-stop{top:26px;left:126px;background:url("../img/jplayer.blue.monday.png") 0 -83px no-repeat;width:28px;height:28px;z-index:1;} |
||||
a.jp-stop:hover{background:url("../img/jplayer.blue.monday.png") -29px -83px no-repeat;} |
||||
a.jp-previous{left:20px;top:26px;background:url("../img/jplayer.blue.monday.png") 0 -112px no-repeat;width:28px;height:28px;} |
||||
a.jp-previous{left:20px;top:.5em;background:url("../img/jplayer.blue.monday.png") 0 -112px no-repeat;width:28px;height:28px;} |
||||
a.jp-previous:hover{background:url("../img/jplayer.blue.monday.png") -29px -112px no-repeat;} |
||||
a.jp-next{left:88px;top:26px;background:url("../img/jplayer.blue.monday.png") 0 -141px no-repeat;width:28px;height:28px;} |
||||
a.jp-next{left:88px;top:.5em;background:url("../img/jplayer.blue.monday.png") 0 -141px no-repeat;width:28px;height:28px;} |
||||
a.jp-next:hover{background:url("../img/jplayer.blue.monday.png") -29px -141px no-repeat;} |
||||
div.jp-progress{position:absolute;overflow:hidden;background-color:#293b51;top:32px;left:164px;width:122px;height:15px;} |
||||
div.jp-progress{position:absolute;overflow:hidden;background-color:#293b51;top:1em;left:164px;width:122px;height:15px;} |
||||
div.jp-seek-bar{background:url("../img/jplayer.blue.monday.png") 0 -202px repeat-x;width:0;height:100%;cursor:pointer;} |
||||
div.jp-play-bar{background:url("../img/jplayer.blue.monday.png") 0 -218px repeat-x;width:0;height:100%;} |
||||
div.jp-seeking-bg{background:url("../img/pbar-ani.gif");} |
||||
a.jp-mute,a.jp-unmute{height:15px;width:18px;top:32px;left:296px;} |
||||
a.jp-mute,a.jp-unmute{height:15px;width:18px;top:1em;left:296px;} |
||||
a.jp-mute{background:url("../img/jplayer.blue.monday.png") 0 -186px no-repeat;} |
||||
a.jp-mute:hover{background:url("../img/jplayer.blue.monday.png") -19px -170px no-repeat;} |
||||
a.jp-unmute{background:url("../img/jplayer.blue.monday.png") 0 -170px no-repeat;display:none;} |
||||
a.jp-unmute:hover{background:url("../img/jplayer.blue.monday.png") -19px -186px no-repeat;} |
||||
div.jp-volume-bar{position:absolute;overflow:hidden;background:url("../img/jplayer.blue.monday.png") 0 -250px repeat-x;width:46px;height:5px;cursor:pointer;top:37px;left:324px;} |
||||
div.jp-volume-bar{position:absolute;overflow:hidden;background:url("../img/jplayer.blue.monday.png") 0 -250px repeat-x;width:46px;height:5px;cursor:pointer;top:1.3em;left:324px;} |
||||
div.jp-volume-bar-value{background:url("../img/jplayer.blue.monday.png") 0 -256px repeat-x;width:0;height:5px;} |
||||
div.jp-current-time,div.jp-duration{position:absolute;font-size:.64em;font-style:oblique;top:45px;left:164px;width:122px;} |
||||
div.jp-current-time,div.jp-duration{position:absolute;font-size:.64em;font-style:oblique;top:1em;left:164px;width:122px;} |
||||
div.jp-duration{text-align:right;} |
||||
|
@ -1,65 +0,0 @@ |
||||
$(document).ready(function() { |
||||
$("button.scan").click(function(event){ |
||||
event.preventDefault(); |
||||
var parent=$(this).parent().parent(); |
||||
var path=parent.children('input').val(); |
||||
scan(path); |
||||
}); |
||||
$("button.rescan").live('click', function(event) { |
||||
event.preventDefault(); |
||||
var parent=$(this).parent().parent(); |
||||
var path=parent.contents().filter(function(){ return(this.nodeType == 3); }).text(); |
||||
path=path.trim(); |
||||
scan(path); |
||||
}); |
||||
$("button.delete").live('click', function(event) { |
||||
event.preventDefault(); |
||||
var parent=$(this).parent().parent(); |
||||
var path=parent.contents().filter(function(){ return(this.nodeType == 3); }).text(); |
||||
path=path.trim(); |
||||
var data="action=delete&path="+path; |
||||
$.ajax({ |
||||
type: 'POST', |
||||
url: 'ajax/api.php', |
||||
cache: false, |
||||
data: data, |
||||
success: function(){ |
||||
parent.remove(); |
||||
} |
||||
}); |
||||
}); |
||||
$( "#scanpath" ).autocomplete({ |
||||
source: "../../files/ajax/autocomplete.php?dironly=true", |
||||
minLength: 1 |
||||
}); |
||||
$('#autoupdate').change(function(){ |
||||
$.ajax({ |
||||
url: 'ajax/autoupdate.php', |
||||
data: "autoupdate="+$(this).attr('checked') |
||||
}); |
||||
}) |
||||
}); |
||||
|
||||
function scan(path){ |
||||
var data="action=scan&path="+path; |
||||
$.ajax({ |
||||
type: 'POST', |
||||
url: 'ajax/api.php', |
||||
cache: false, |
||||
data: data, |
||||
success: function(songCount){ |
||||
var found=false; |
||||
$('#folderlist').children('li').each(function(){ |
||||
var otherPath=$(this).contents().filter(function(){ return(this.nodeType == 3); }).text(); |
||||
otherPath=otherPath.trim(); |
||||
if(otherPath==path){ |
||||
found=true; |
||||
$(this).children("span").html(songCount+" songs <button class='rescan prettybutton'>Rescan</button></span>"); |
||||
} |
||||
}) |
||||
if(!found){ |
||||
$('#folderlist').children().last().before("<li>"+path+"<span class='right'>"+songCount+" songs <button class='rescan prettybutton'>Rescan</button></span></li>"); |
||||
} |
||||
} |
||||
}); |
||||
} |
@ -1,20 +0,0 @@ |
||||
<div id='scan'> |
||||
<p id='scancount' style='display:none'><span class='songCount'>0</span> Songs scanned</p> |
||||
<div id="scanprogressbar"></div> |
||||
<input type='button' class='start' value='Recan Collection'></input> |
||||
<input type='button' class='stop' style='display:none' value='Pause'></input> |
||||
</div> |
||||
<table id='collection'> |
||||
<thead> |
||||
<th>Artist</th> |
||||
<th>Album</th> |
||||
<th>Title</th> |
||||
</thead> |
||||
<tbody> |
||||
<tr class='template'> |
||||
<td class='artist'><a/></td> |
||||
<td class='album'><a/></td> |
||||
<td class='title'><a/></td> |
||||
</tr> |
||||
</tbody> |
||||
</table> |
@ -1,3 +1,71 @@ |
||||
<?php echo $_['player'];?> |
||||
<?php echo $_['playlist'];?> |
||||
<?php echo $_['collection'];?> |
||||
<div id="controls"> |
||||
<ul class="jp-controls"> |
||||
<li><a href="#" class="jp-play" tabindex="1">play</a></li> |
||||
<li><a href="#" class="jp-pause" tabindex="1">pause</a></li> |
||||
<li><a href="#" class="jp-mute" tabindex="1">mute</a></li> |
||||
<li><a href="#" class="jp-unmute" tabindex="1">unmute</a></li> |
||||
<li><a href="#" class="jp-previous" tabindex="1">previous</a></li> |
||||
<li><a href="#" class="jp-next" tabindex="1">next</a></li> |
||||
</ul> |
||||
<div class="jp-progress"> |
||||
<div class="jp-seek-bar"> |
||||
<div class="jp-play-bar"></div> |
||||
</div> |
||||
</div> |
||||
<div class="jp-volume-bar"> |
||||
<div class="jp-volume-bar-value"></div> |
||||
</div> |
||||
<div class="jp-current-time"></div> |
||||
<div class="jp-duration"></div> |
||||
<div class="player" id="jp-player"></div> |
||||
</div> |
||||
|
||||
<div id="leftcontent"> |
||||
<table id="playlist"> |
||||
<thead> |
||||
<tr> |
||||
<th class="name"><input id="selectAll" type="checkbox">Name</th> |
||||
<th class="artist">Artist</th> |
||||
</tr> |
||||
</thead> |
||||
<tbody> |
||||
<tr> |
||||
<td> |
||||
The playlist is empty |
||||
</td> |
||||
</tr> |
||||
</tbody> |
||||
<tfoot> |
||||
<tr class="template"> |
||||
<td class="name"> |
||||
<input type="checkbox"> |
||||
<span></span> |
||||
</td> |
||||
<td class="artist"></td> |
||||
</tr> |
||||
</tfoot> |
||||
</table> |
||||
</div> |
||||
|
||||
<div id="rightcontent"> |
||||
<div id="scan"> |
||||
<p id="scancount" style="display:none"><span class="songCount">0</span> Songs scanned</p> |
||||
<div id="scanprogressbar"></div> |
||||
<input type="button" class="start" value="Rescan Collection"></input> |
||||
<input type="button" class="stop" style="display:none" value="Pause"></input> |
||||
</div> |
||||
<table id="collection"> |
||||
<thead> |
||||
<th>Artist</th> |
||||
<th>Album</th> |
||||
<th>Title</th> |
||||
</thead> |
||||
<tbody> |
||||
<tr class="template"> |
||||
<td class="artist"><a/></td> |
||||
<td class="album"><a/></td> |
||||
<td class="title"><a/></td> |
||||
</tr> |
||||
</tbody> |
||||
</table> |
||||
</div> |
||||
|
@ -1,21 +0,0 @@ |
||||
<div id="jp-interface"> |
||||
<ul class="jp-controls"> |
||||
<li><a href="#" class="jp-play" tabindex="1">play</a></li> |
||||
<li><a href="#" class="jp-pause" tabindex="1">pause</a></li> |
||||
<li><a href="#" class="jp-mute" tabindex="1">mute</a></li> |
||||
<li><a href="#" class="jp-unmute" tabindex="1">unmute</a></li> |
||||
<li><a href="#" class="jp-previous" tabindex="1">previous</a></li> |
||||
<li><a href="#" class="jp-next" tabindex="1">next</a></li> |
||||
</ul> |
||||
<div class="jp-progress"> |
||||
<div class="jp-seek-bar"> |
||||
<div class="jp-play-bar"></div> |
||||
</div> |
||||
</div> |
||||
<div class="jp-volume-bar"> |
||||
<div class="jp-volume-bar-value"></div> |
||||
</div> |
||||
<div class="jp-current-time"></div> |
||||
<div class="jp-duration"></div> |
||||
<div class='player' id='jp-player'></div> |
||||
</div> |
@ -1,24 +0,0 @@ |
||||
<table id='playlist'> |
||||
<thead> |
||||
<tr> |
||||
<th class='name'><input id='selectAll' type='checkbox'>Name</th> |
||||
<th class='artist'>Artist</th> |
||||
</tr> |
||||
</thead> |
||||
<tbody> |
||||
<tr> |
||||
<td> |
||||
The playlist is empty |
||||
</td> |
||||
</tr> |
||||
</tbody> |
||||
<tfoot> |
||||
<tr class='template'> |
||||
<td class='name'> |
||||
<input type='checkbox'> |
||||
<span></span> |
||||
</td> |
||||
<td class='artist'></td> |
||||
</tr> |
||||
</tfoot> |
||||
</table> |
@ -1,23 +0,0 @@ |
||||
<form id="quota"> |
||||
<fieldset> |
||||
<legend>Music Directories</legend> |
||||
<ul id='folderlist'> |
||||
<?php foreach($_['folders'] as $folder):?> |
||||
<li> |
||||
<?php echo $folder['name'];?> |
||||
<span class='right'> |
||||
<?php echo $folder['songs'];?> songs
|
||||
<button class='rescan prettybutton'>Rescan</button> |
||||
<button class='delete prettybutton'>Delete</button> |
||||
</span> |
||||
</li> |
||||
<?php endforeach; ?> |
||||
<li> |
||||
<input placeholder='path' id='scanpath'/> |
||||
<span class='right'><button class='scan prettybutton'>Scan</button></span> |
||||
</li> |
||||
</ul> |
||||
<label for="autoupdate" title='Automaticaly scan new files in above directories'>Auto Update</label> |
||||
<input type='checkbox' <?php if($_['autoupdate']){echo 'checked="checked"';};?> id='autoupdate' title='Automaticaly scan new files in above directories'>
|
||||
</fieldset> |
||||
</form> |
@ -1,69 +0,0 @@ |
||||
<!DOCTYPE html> |
||||
<html> |
||||
<head> |
||||
<title>ownCloud</title> |
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
||||
<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
|
||||
<?php foreach($_['cssfiles'] as $cssfile): ?> |
||||
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
|
||||
<?php endforeach; ?> |
||||
<script type="text/javascript"> |
||||
var oc_webroot = '<?php global $WEBROOT; echo $WEBROOT; ?>';
|
||||
var oc_current_user = '<?php echo OC_User::getUser() ?>';
|
||||
// </script> |
||||
<?php foreach($_['jsfiles'] as $jsfile): ?> |
||||
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
|
||||
<?php endforeach; ?> |
||||
<?php foreach($_['headers'] as $header): ?> |
||||
<?php |
||||
echo '<'.$header['tag'].' '; |
||||
foreach($header['attributes'] as $name=>$value){ |
||||
echo "$name='$value' "; |
||||
}; |
||||
echo '>'; |
||||
echo $header['text']; |
||||
echo '</'.$header['tag'].'>'; |
||||
?> |
||||
<?php endforeach; ?> |
||||
</head> |
||||
|
||||
<body id="body-settings"> |
||||
<div id="header"> |
||||
<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img src="<?php echo image_path('', 'owncloud-logo-small-white.png'); ?>" alt="ownCloud" /></a>
|
||||
<ul id="metanav"> |
||||
<li><a href="<?php echo link_to('', 'index.php'); ?>" title="Back to files"><img class='svg' src="<?php echo image_path('', 'actions/back.svg'); ?>"></a></li>
|
||||
<li><a href="<?php echo link_to('', 'index.php?logout=true'); ?>" title="Log out"><img class='svg' src="<?php echo image_path('', 'actions/logout.svg'); ?>"></a></li>
|
||||
</ul> |
||||
</div> |
||||
|
||||
<div id="navigation"> |
||||
<ul> |
||||
<?php foreach($_['settingsnavigation'] as $entry):?> |
||||
<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a></li>
|
||||
<?php if( sizeof( $entry["subnavigation"] )): ?> |
||||
<?php foreach($entry["subnavigation"] as $subentry):?> |
||||
<li><a href="<?php echo $subentry['href']; ?>" title="" <?php if( $subentry['active'] ): ?>class="active"<?php endif; ?>><?php echo $subentry['name'] ?></a></li>
|
||||
<?php endforeach; ?> |
||||
<?php endif; ?> |
||||
<?php endforeach; ?> |
||||
<?php if(isset($_['adminnavigation'])):?> |
||||
<?php foreach($_['adminnavigation'] as $entry):?> |
||||
<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a>
|
||||
<?php if( sizeof( $entry["subnavigation"] )): ?> |
||||
<ul> |
||||
<?php foreach($entry["subnavigation"] as $subentry):?> |
||||
<li class="subentry"><a class="subentry<?php if( $subentry['active'] ): ?> active<?php endif; ?>" href="<?php echo $subentry['href']; ?>" title=""><?php echo $subentry['name'] ?></a></li>
|
||||
<?php endforeach; ?> |
||||
</ul> |
||||
<?php endif; ?> |
||||
</li> |
||||
<?php endforeach; ?> |
||||
<?php endif; ?> |
||||
</ul> |
||||
</div> |
||||
|
||||
<div id="content"> |
||||
<?php echo $_['content']; ?> |
||||
</div> |
||||
</body> |
||||
</html> |
@ -1,6 +1,5 @@ |
||||
<?php |
||||
|
||||
OC_App::register( array( "id" => "settings", "name" => "Settings" )); |
||||
OC_App::addSettingsPage( array( "id" => "settings", "order" => -1000, "href" => OC_Helper::linkTo( "settings", "index.php" ), "name" => "Personal", "icon" => OC_Helper::imagePath( "settings", "personal.png" ))); |
||||
|
||||
?> |
||||
|
Loading…
Reference in new issue