diff options
| -rw-r--r-- | core/css/styles.css | 9 | ||||
| -rw-r--r-- | settings/css/settings.css | 21 | ||||
| -rw-r--r-- | settings/templates/help.php | 57 |
3 files changed, 61 insertions, 26 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 4a84568244c..692c76f552c 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -975,15 +975,6 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;} .arrow.left { left:-13px; bottom:1.2em; -webkit-transform:rotate(270deg); -moz-transform:rotate(270deg); -o-transform:rotate(270deg); -ms-transform:rotate(270deg); transform:rotate(270deg); } .arrow.up { top:-8px; right:6px; } .arrow.down { -webkit-transform:rotate(180deg); -moz-transform:rotate(180deg); -o-transform:rotate(180deg); -ms-transform:rotate(180deg); transform:rotate(180deg); } -.help-includes { - overflow: hidden; - width: 100%; - height: 100%; - -moz-box-sizing: border-box; - box-sizing: border-box; - padding-top: 44px; -} -.help-iframe {width: 100%; height: 100%; margin: 0;padding: 0; border: 0; overflow: auto;} /* ---- BREADCRUMB ---- */ 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> |