Small changes to allow updating main menu dynamically.

This commit is contained in:
Thomas Tanghus 2012-08-05 01:40:19 +02:00
parent 538e72fe61
commit cc445e4e47
3 changed files with 8 additions and 7 deletions

View File

@ -55,7 +55,7 @@
<nav><div id="navigation">
<ul id="apps" class="svg">
<?php foreach($_['navigation'] 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 data-id="<?php echo $entry['id']; ?>"><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 endforeach; ?>
</ul>

View File

@ -183,7 +183,7 @@ class OC_App{
if(!OC_Installer::isInstalled($app)){
// check if app is a shipped app or not. OCS apps have an integer as id, shipped apps use a string
if(!is_numeric($app)){
OC_Installer::installShippedApp($app);
$app = OC_Installer::installShippedApp($app);
}else{
$download=OC_OCSClient::getApplicationDownload($app,1);
if(isset($download['downloadlink']) and $download['downloadlink']!='') {
@ -205,6 +205,7 @@ class OC_App{
}else{
return false;
}
return $app;
}
/**

View File

@ -335,7 +335,7 @@ class OC_Installer{
OC_App::setAppTypes($info['id']);
return $info;
return $info['id'];
}