Merge pull request #8828 from owncloud/design-help-sidebar
move Help section from controls bar to sidebar
This commit is contained in:
commit
d6e521006a
|
@ -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.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.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); }
|
.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 ---- */
|
/* ---- BREADCRUMB ---- */
|
||||||
|
|
|
@ -180,8 +180,6 @@ span.error {
|
||||||
background: #ce3702;
|
background: #ce3702;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* HELP */
|
|
||||||
.pressed {background-color:#DDD;}
|
|
||||||
|
|
||||||
/* PASSWORD */
|
/* PASSWORD */
|
||||||
.strengthify-wrapper {
|
.strengthify-wrapper {
|
||||||
|
@ -196,3 +194,22 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
|
||||||
left: 185px;
|
left: 185px;
|
||||||
width: 129px;
|
width: 129px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* HELP */
|
||||||
|
|
||||||
|
.help-includes {
|
||||||
|
overflow: hidden !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.help-iframe {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
border: 0;
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
|
|
|
@ -1,21 +1,48 @@
|
||||||
<div id="controls">
|
<div id="app-navigation">
|
||||||
|
<ul>
|
||||||
<?php if($_['admin']) { ?>
|
<?php if($_['admin']) { ?>
|
||||||
<a class="button newquestion <?php p($_['style1']); ?>"
|
<li>
|
||||||
href="<?php print_unescaped($_['url1']); ?>"><?php p($l->t( 'User Documentation' )); ?></a>
|
<a class="<?php p($_['style1']); ?>"
|
||||||
<a class="button newquestion <?php p($_['style2']); ?>"
|
href="<?php print_unescaped($_['url1']); ?>">
|
||||||
href="<?php print_unescaped($_['url2']); ?>"><?php p($l->t( 'Administrator Documentation' )); ?></a>
|
<?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 } ?>
|
<?php } ?>
|
||||||
<a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php
|
|
||||||
p($l->t( 'Online Documentation' )); ?></a>
|
<li>
|
||||||
<a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php
|
<a href="http://owncloud.org/support" target="_blank">
|
||||||
p($l->t( 'Forum' )); ?></a>
|
<?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']) { ?>
|
<?php if($_['admin']) { ?>
|
||||||
<a class="button newquestion" href="https://github.com/owncloud/core/blob/master/CONTRIBUTING.md" target="_blank"><?php
|
<li>
|
||||||
p($l->t( 'Bugtracker' )); ?></a>
|
<a href="https://github.com/owncloud/core/blob/master/CONTRIBUTING.md"
|
||||||
|
target="_blank">
|
||||||
|
<?php p($l->t( 'Bugtracker' )); ?> ↗
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
<?php } ?>
|
<?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>
|
||||||
<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>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue