diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-06-02 22:59:16 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-06-02 22:59:16 +0200 |
| commit | 2e6a27614e8da443bd6b29fb2a3f4a64b274c2a0 (patch) | |
| tree | 742faa31dab1744ca5eb76085d1e2f0b5f5c9731 /settings | |
| parent | f12a5248a3ee4fd71ade32580afdf0455fbc6764 (diff) | |
| download | nextcloud-server-2e6a27614e8da443bd6b29fb2a3f4a64b274c2a0.tar.gz nextcloud-server-2e6a27614e8da443bd6b29fb2a3f4a64b274c2a0.zip | |
move Help section from controls bar to sidebar
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/css/settings.css | 21 | ||||
| -rw-r--r-- | settings/templates/help.php | 57 |
2 files changed, 61 insertions, 17 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index a265d12ba75..10d740c81b7 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -180,8 +180,6 @@ span.error { background: #ce3702; } -/* HELP */ -.pressed {background-color:#DDD;} /* PASSWORD */ .strengthify-wrapper { @@ -196,3 +194,22 @@ doesnotexist:-o-prefocus, .strengthify-wrapper { left: 185px; width: 129px; } + + + + + +/* HELP */ + +.help-includes { + overflow: hidden !important; +} + +.help-iframe { + width: 100%; + height: 100%; + margin: 0; + padding: 0; + border: 0; + overflow: auto; +} diff --git a/settings/templates/help.php b/settings/templates/help.php index 3739d220e6e..06cc98c5047 100644 --- a/settings/templates/help.php +++ b/settings/templates/help.php @@ -1,21 +1,48 @@ -<div id="controls"> +<div id="app-navigation"> + <ul> <?php if($_['admin']) { ?> - <a class="button newquestion <?php p($_['style1']); ?>" - href="<?php print_unescaped($_['url1']); ?>"><?php p($l->t( 'User Documentation' )); ?></a> - <a class="button newquestion <?php p($_['style2']); ?>" - href="<?php print_unescaped($_['url2']); ?>"><?php p($l->t( 'Administrator Documentation' )); ?></a> + <li> + <a class="<?php p($_['style1']); ?>" + href="<?php print_unescaped($_['url1']); ?>"> + <?php p($l->t( 'User Documentation' )); ?> + </a> + </li> + <li> + <a class="<?php p($_['style2']); ?>" + href="<?php print_unescaped($_['url2']); ?>"> + <?php p($l->t( 'Administrator Documentation' )); ?> + </a> + </li> <?php } ?> - <a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php - p($l->t( 'Online Documentation' )); ?></a> - <a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php - p($l->t( 'Forum' )); ?></a> + + <li> + <a href="http://owncloud.org/support" target="_blank"> + <?php p($l->t( 'Online Documentation' )); ?> + </a> + </li> + <li> + <a href="https://forum.owncloud.org" target="_blank"> + <?php p($l->t( 'Forum' )); ?> + </a> + </li> + <?php if($_['admin']) { ?> - <a class="button newquestion" href="https://github.com/owncloud/core/blob/master/CONTRIBUTING.md" target="_blank"><?php - p($l->t( 'Bugtracker' )); ?></a> + <li> + <a href="https://github.com/owncloud/core/blob/master/CONTRIBUTING.md" + target="_blank"> + <?php p($l->t( 'Bugtracker' )); ?> + </a> + </li> <?php } ?> - <a class="button newquestion" href="http://owncloud.com" target="_blank"><?php - p($l->t( 'Commercial Support' )); ?></a> + + <li> + <a href="https://owncloud.com" target="_blank"> + <?php p($l->t( 'Commercial Support' )); ?> + </a> + </li> </div> -<div class="help-includes"> - <iframe src="<?php print_unescaped($_['url']); ?>" class="help-iframe">abc</iframe> + +<div id="app-content" class="help-includes"> + <iframe src="<?php print_unescaped($_['url']); ?>" class="help-iframe"> + </iframe> </div> |