diff options
| author | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-08-21 13:14:57 +0400 |
|---|---|---|
| committer | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-08-21 13:14:57 +0400 |
| commit | 3f8e4e2a302622ecb84b989f0f9d24f76419c3fe (patch) | |
| tree | 95704ca0c8cf23b8bfd67ea4081fc8e6e46e9a19 /settings | |
| parent | 0eda75a19378302fcdadd72cf6537745fd7ee736 (diff) | |
added controls bar for Apps and Help
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/css/settings.css | 10 | ||||
| -rw-r--r-- | settings/templates/apps.php | 15 | ||||
| -rw-r--r-- | settings/templates/help.php | 20 |
3 files changed, 23 insertions, 22 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index 587626bec07..429e96ddb9a 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -23,10 +23,6 @@ table { width:100%; } /* APPS */ -li{color:#888} -li.active{color:#000} -span.version{margin-left:3em;color:#ddd} - - -/* HELP */ -tr.pager:hover { background:#fff; } +li { color:#888; } +li.active { color:#000; } +span.version { margin-left:3em; color:#ddd; } diff --git a/settings/templates/apps.php b/settings/templates/apps.php index d5375c06fc4..d420b6ad0ba 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -1,11 +1,14 @@ +<div id="controls"> + <a class="button" target="_blank" href="http://apps.owncloud.com/"><?php echo $l->t('Add your application');?></a> +</div> <ul id="leftcontent"> <?php foreach($_['apps'] as $app):?> - <li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>"> - <?php echo $app['name'] ?> - <span class="hidden"> - <?php echo json_encode($app) ?> - </span> - </li> + <li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>"> + <?php echo $app['name'] ?> + <span class="hidden"> + <?php echo json_encode($app) ?> + </span> + </li> <?php endforeach;?> </ul> <div id="rightcontent"> diff --git a/settings/templates/help.php b/settings/templates/help.php index d44438add9b..8e54493764e 100644 --- a/settings/templates/help.php +++ b/settings/templates/help.php @@ -1,21 +1,23 @@ +<div id="controls"> + <a class="button newquestion" href="http://apps.owncloud.com/knowledgebase/editquestion.php?action=new" target="_blank"><?php echo $l->t( 'Ask a question' ); ?></a> + <?php + $url=OC_Helper::linkTo( "settings", "help.php" ).'?page='; + $pageNavi=OC_Util::getPageNavi($_['pagecount'],$_['page'],$url); + $pageNavi->printPage(); + ?> +</diV> <?php if(is_null($_["kbe"])):?> - <div class="personalblock"> + <div class="helpblock"> <p><?php echo $l->t('Problems connecting to help database.');?></p> <p><a href="http://apps.owncloud.com/kb"><?php echo $l->t('Go there manually.');?></a></p> </div> <?php else:?> <?php foreach($_["kbe"] as $kb): ?> - <div class="personalblock"> + <div class="helpblock"> <?php if($kb["preview1"] <> "") { echo('<img class="preview" src="'.$kb["preview1"].'" />'); } ?> <?php if($kb['detailpage']<>'') echo('<p><a target="_blank" href="'.$kb['detailpage'].'"><strong>'.$kb["name"].'</strong></a></p>');?> <p><?php echo $kb['description'];?></p> <?php if($kb['answer']<>'') echo('<p><strong>'.$l->t('Answer').':</strong><p>'.$kb['answer'].'</p>');?> </div> - <?php endforeach; ?> - - <a class="button newquestion" href="http://apps.owncloud.com/knowledgebase/editquestion.php?action=new" target="_blank"><?php echo $l->t( 'Ask a question' ); ?></a> - <?php - $url=OC_Helper::linkTo( "settings", "help.php" ).'?page='; - $pageNavi=OC_Util::getPageNavi($_['pagecount'],$_['page'],$url); - $pageNavi->printPage(); + <?php endforeach; endif?> |