diff options
| author | Frank Karlitschek <karlitschek@kde.org> | 2011-04-16 23:07:18 +0200 |
|---|---|---|
| committer | Frank Karlitschek <karlitschek@kde.org> | 2011-04-16 23:07:18 +0200 |
| commit | fc63882fe2bcbacd1ec880c9f689da3a334c51cb (patch) | |
| tree | d900e7e168cff798fb87a880a602a86845f7b5bc /admin | |
| parent | a7da3cd6a0f847820efd71a7aa2f58fb4fcf05a0 (diff) | |
| download | nextcloud-server-fc63882fe2bcbacd1ec880c9f689da3a334c51cb.tar.gz nextcloud-server-fc63882fe2bcbacd1ec880c9f689da3a334c51cb.zip | |
more layout fixes
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/apps.php | 8 | ||||
| -rw-r--r-- | admin/css/apps.css | 42 | ||||
| -rw-r--r-- | admin/templates/apps.php | 6 |
3 files changed, 49 insertions, 7 deletions
diff --git a/admin/apps.php b/admin/apps.php index b433fe0875b..bff3089dc5e 100644 --- a/admin/apps.php +++ b/admin/apps.php @@ -29,8 +29,7 @@ if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin' } // Load the files we need -//OC_UTIL::addStyle( "", "files" ); -//OC_UTIL::addScript( "", "files" ); +OC_UTIL::addStyle( "admin", "apps" ); if(isset($_GET['id'])) $id=$_GET['id']; else $id=0; @@ -41,7 +40,9 @@ $categories=OC_OCSCLIENT::getCategories(); if($id==0) { if($cat==0){ - $apps=OC_OCSCLIENT::getApplications($categories); + $numcats=array(); + foreach($categories as $key=>$value) $numcats[]=$key; + $apps=OC_OCSCLIENT::getApplications($numcats); }else{ $apps=OC_OCSCLIENT::getApplications($cat); } @@ -59,6 +60,7 @@ if($id==0) { $app=OC_OCSCLIENT::getApplication($id); $tmpl = new OC_TEMPLATE( "admin", "app", "admin" ); + $tmpl->assign( "categories", $categories ); $tmpl->assign( "app", $app ); $tmpl->printPage(); unset($tmpl); diff --git a/admin/css/apps.css b/admin/css/apps.css new file mode 100644 index 00000000000..68bd9cf63d3 --- /dev/null +++ b/admin/css/apps.css @@ -0,0 +1,42 @@ +/* APPS TABLE */ + +table td.date +{ + width: 5em; + padding: 0.5em 1em; + text-align: right; +} + +.preview +{ + padding: 3px; + text-align: left; +} + +table td.date +{ + width: 11em; + color: #555555; +} + +table td.selection, table th.selection, table td.fileaction +{ + width: 2em; + text-align: center; +} + +table td.name a +{ + padding: 6px; + text-decoration: none; + color: #555555; +} + +.type +{ + padding: 6px; + text-decoration: none; + color: #888888; + font-size: 0.8em; +} + diff --git a/admin/templates/apps.php b/admin/templates/apps.php index 2f584775815..36a7cd53029 100644 --- a/admin/templates/apps.php +++ b/admin/templates/apps.php @@ -12,16 +12,14 @@ <th></th> <th>Name</th> <th>Modified</th> - <th></th> </tr> </thead> <tbody> <?php foreach($_["apps"] as $app): ?> <tr> - <td width="1"><?php if($app["preview"] <> "") { echo('<a href=""><img border="0" src="'.$app["preview"].'" /></a>'); } ?> </a></td> - <td class="filename"><a href="" title=""><?php echo $app["name"]; ?></a></td> + <td width="1"><?php if($app["preview"] <> "") { echo('<a href="'.OC_HELPER::linkTo( "admin", "apps.php" ).'?id='.$app['id'].'"><img class="preview" border="0" src="'.$app["preview"].'" /></a>'); } ?> </a></td> + <td class="name"><a href="<?php echo(OC_HELPER::linkTo( "admin", "apps.php" ).'?id='.$app['id']); ?>" title=""><?php echo $app["name"]; ?></a><br /><?php echo('<span class="type">'.$app['typename'].'</span>'); ?></td> <td class="date"><?php echo OC_UTIL::formatdate($app["changed"]); ?></td> - <td class="fileaction"><a href="" title=""><img src="images/drop-arrow.png" alt="+" /></a></td> </tr> <?php endforeach; ?> </tbody> |