mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into calendar_repeat

This commit is contained in:
Georg Ehrke 2012-06-04 10:35:00 +02:00
parent 4d1428db0f f3c1d1eded
commit bb02330bec
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
settings/js/apps.js
View File

@ -17,7 +17,7 @@ $(document).ready(function(){
}); });
$('#leftcontent li').click(function(){ $('#leftcontent li').click(function(){
var app=$(this).data('app'); var app=$(this).data('app');
$('#rightcontent p').show(); $('#rightcontent p.license').show();
$('#rightcontent span.name').text(app.name); $('#rightcontent span.name').text(app.name);
$('#rightcontent small.externalapp').text(app.internallabel); $('#rightcontent small.externalapp').text(app.internallabel);
$('#rightcontent span.version').text(app.version); $('#rightcontent span.version').text(app.version);
@ -31,6 +31,10 @@ $(document).ready(function(){
$('#rightcontent input.enable').val((app.active)?t('settings','Disable'):t('settings','Enable')); $('#rightcontent input.enable').val((app.active)?t('settings','Disable'):t('settings','Enable'));
$('#rightcontent input.enable').data('appid',app.id); $('#rightcontent input.enable').data('appid',app.id);
$('#rightcontent input.enable').data('active',app.active); $('#rightcontent input.enable').data('active',app.active);
if ( app.internal == false ) {
$('#rightcontent p.appslink').show();
$('#rightcontent a').attr('href','http://apps.owncloud.com/content/show.php?content='+app.id);
}
return false; return false;
}); });
$('#rightcontent input.enable').click(function(){ $('#rightcontent input.enable').click(function(){

3
settings/templates/apps.php
View File

@ -22,6 +22,7 @@
<h3><strong><span class="name"><?php echo $l->t('Select an App');?></span></strong><span class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3> <h3><strong><span class="name"><?php echo $l->t('Select an App');?></span></strong><span class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3>
<p class="description"></p> <p class="description"></p>
<img src="" class="preview" /> <img src="" class="preview" />
<p class="hidden"><span class="licence"></span><?php echo $l->t('-licensed');?> <?php echo $l->t('by');?> <span class="author"></span></p> <p class="appslink hidden"><a href="#" target="_blank"><?php echo $l->t('See application page at apps.owncloud.com');?></a></p>
<p class="license hidden"><span class="licence"></span><?php echo $l->t('-licensed');?> <?php echo $l->t('by');?> <span class="author"></span></p>
<input class="enable hidden" type="submit" /> <input class="enable hidden" type="submit" />
</div> </div>