diff --git a/core/css/styles.css b/core/css/styles.css
index 5c364b6fcd009c398623253b9ce495093b652d0e..356de968ea67539bdbbc88b25c4493f8b32ec55d 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -32,11 +32,11 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', end
/* INPUTS */
input[type="text"], input[type="password"] { cursor:text; }
-input, select, .button, #quota, div.jp-progress { font-size:1em; width:10em; margin:.3em; padding:.6em .5em .4em; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #fff, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
+input, select, .button, #quota, div.jp-progress, .pager li a { font-size:1em; width:10em; margin:.3em; padding:.6em .5em .4em; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #fff, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
input[type="text"], input[type="password"] { background:#f8f8f8; color:#555; cursor:text; }
input[type="text"]:hover, input[type="text"]:focus, input[type="password"]:hover, input[type="password"]:focus { background:#fff; color:#333; outline: none;}
-input[type="submit"], input[type="button"], .button, #quota, div.jp-progress { width:auto; padding:.4em; border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
+input[type="submit"], input[type="button"], .button, #quota, div.jp-progress, .pager li a { width:auto; padding:.4em; border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
input[type="submit"]:hover, input[type="submit"]:focus, input[type="button"]:hover, input[type="button"]:focus, .button:hover { background:#fff; color:#333; outline: none;}
input[type="checkbox"] { width:auto; outline: none;}
@@ -51,6 +51,7 @@ input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-
/* CONTENT ------------------------------------------------------------------ */
#controls { width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; }
+#controls .button { display:inline-block; }
#content { margin:3.5em 0 0 12.5em; }
#leftcontent { position:absolute; top:6.4em; width:20em; background:#f8f8f8; height:100%; border-right:1px solid #ddd; }
#leftcontent li { padding:.3em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; }
@@ -101,13 +102,14 @@ input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-
table tr { -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; }
tbody tr:hover, tr:active { background-color:#f8f8f8; }
-#body-settings .personalblock, .pager li a { padding:.5em 1em; margin:1em; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
+#body-settings .personalblock, #body-settings .helpblock { padding:.5em 1em; margin:1em; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
#body-settings .personalblock#quota { position:relative; margin-top:4.5em; padding:0; }
+#body-settings #controls+.helpblock { position:relative; margin-top:7.3em; }
#quota div, div.jp-play-bar, div.jp-seek-bar { padding:.6em 1em; background:#e6e6e6; font-weight:normal; white-space:nowrap; -moz-border-radius-bottomleft:.4em; -webkit-border-bottom-left-radius:.4em; border-bottom-left-radius:.4em; -moz-border-radius-topleft:.4em; -webkit-border-top-left-radius:.4em; border-top-left-radius:.4em; }
div.jp-play-bar, div.jp-seek-bar { padding:0; }
-.pager { list-style:none; margin:1em; float:right; }
-.pager li { display:inline-block; margin:0; }
+.pager { list-style:none; float:right; display:inline; margin:.7em 12.7em 0 0; }
+.pager li { display:inline-block; }
li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; }
diff --git a/files/css/files.css b/files/css/files.css
index 651b99923c95ed0f480800079013f6504979db3a..787efa49e04cd90193ff70ce310e068c3e0ebf1d 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -13,7 +13,7 @@
.file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; padding-left:0; overflow:hidden; position:relative; margin:.1em 1em;}
.file_upload_wrapper .file_upload_button_wrapper { position:absolute; top:0; left:0; width:100%; height:100%; cursor:pointer; z-index:1000; }
-#file_newfolder_name { background-image:url('../../core/img/places/folder.svg'); font-weight:normal; width:6em; }
+#file_newfolder_name { background-image:url('../../core/img/places/folder.svg'); font-weight:normal; width:7em; }
.file_upload_start, .file_upload_filename { font-size:1em; }
#file_newfolder_submit, #file_upload_submit { width:3em; }
.file_upload_target { display:none; }
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 587626bec07e887eb74754401f1526fc9d079c46..429e96ddb9a0f9177fb8e6c4e2e767d794f67783 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 d5375c06fc4fed71046d9e8fb89a00b82a1e7811..d420b6ad0ba63b06674a8f85f4a73e8601ed87ca 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 d44438add9bffff663dda5473a6dab262aa99f21..8e54493764eda6221b4373334457ec2922ee9af5 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?>