Merge branch 'spis-master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master

# Conflicts:
#	css/plugins/edittable.less
This commit is contained in:
Jana Deutschländer 2017-05-11 16:23:30 +02:00
commit 0a63fc83ec
43 changed files with 1111 additions and 474 deletions

View file

@ -10,14 +10,12 @@
#dokuwiki__content {
position: relative;
z-index: 10;
&::before {
content: '';
position: absolute;
top: 0;
left: 0;
z-index: -1;
height: @page-header_height;
box-sizing: border-box;
width: 100%;

View file

@ -38,9 +38,9 @@
#dokuwiki__footer {
.main-footer {
position: relative;
z-index: 2;
box-sizing: border-box;
background-color: @ini_background_site;
margin-top: 5px; // for box-shadow of content
}
p {

View file

@ -136,39 +136,28 @@
/* + + + mobile nav togglelink + + + */
.menu-togglelink {
position: relative;
z-index: 1;
margin: @headericons-margin-xxs -(@very-small-spacing) 0 0;
a {
.fontello();
.icon-menu();
.btn-hover();
display: block;
min-height: @toggle-size;
min-width: @toggle-size;
box-sizing: border-box;
background-color: #fff;
border: 1px solid @ini_border;
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
color: @ini_nav_menu_color;
font-size: 1rem;
text-align: center;
text-decoration: none;
line-height: 1;
transition: @transition color, @transition background-color, @transition border-color;
&::before {
font-size: 1.5rem;
margin: .1rem 0 0;
}
&:hover,
&:active,
&:focus {
background-color: @ini_nav_menu_hover_bg;
border-color: @ini_nav_menu_hover_color;
color: @ini_nav_menu_hover_color;
}
}
}

View file

@ -1,12 +1,11 @@
/**
* This styles the "section editing button"
* This styles the "section editing button" (data-plugin)
*/
#dokuwiki__content.main-content {
.editbutton_section {
.secedit:not([class*="plugin"]):not([class*="table"]) {
position: relative;
z-index: 2;
top: 0;
float: right;
margin-top: 0; // for best position of edit-tab beneeth table

View file

@ -1,63 +0,0 @@
/**
* This file provides the design styles the non-navigational elements in the sidebar
*/
#dokuwiki__aside {
ul,
ol {
margin-left: -.4rem;
padding-left: 0;
ul,
ol {
padding-left: 1.8rem;
@media @screen_md-lg {
padding-left: @menu-margin-lg;
}
li {
margin-left: 0;
}
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1023px */
@media @screen_max-md {
#dokuwiki__aside {
display: none;
}
body.show-mobile-sidebar {
#dokuwiki__aside {
display: block !important;
position: absolute;
left: 1.25rem; //left margin of content container
z-index: 200; // above all
box-shadow: @box-shadow-right-bottom;
min-width: 45%;
max-width: 90%;
height: auto;
&:after {
content: "";
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
width: 100%;
height: 100%;
background: @ini_background_site;
background: -webkit-linear-gradient(left, @ini_background_site, @ini_background);
background: linear-gradient(left, @ini_background_site, @ini_background);
z-index: 0;
}
}
}
}

View file

@ -10,19 +10,51 @@
@icon-size: @font-size-big;
@menu-margin: @icon-size + @margin-small * 2;
nav > p {
color: @ini_nav_menu_color;
@media @screen_md-lg {
margin-left: -1.25rem;
}
&.noissue {
color: @ini_text_webframe;
@media @screen_max-md {
display: none;
}
* {
color: inherit;
> ul,
> ol,
> nav {
padding-left: 0;
ul,
ol {
padding-left: 0;
li {
margin-left: 0;
}
}
}
nav {
&.nav-main {
margin-bottom: @nav-margin;
}
> p {
color: @ini_nav_menu_color;
&.noissue {
color: @ini_text_webframe;
* {
color: inherit;
}
}
}
ul,
div.nav {
margin-bottom: 0;
}
li {
color: @ini_nav_menu_color;
@ -39,14 +71,12 @@
li:not([class]),
.li {
padding: .15em 0;
}
}
> * {
margin-left: @menu-margin; // moves *all* sidebar content to the right
@media @screen_md-lg {
margin-left: @menu-margin-lg;
/* + + + + + active + + + + + */
span.curid {
font-weight: bold;
}
}
}
@ -62,73 +92,163 @@
}
}
// the wrapper around the toggle to reserve space
/* + + + the wrapper around the toggle to reserve space + + + */
div.nav {
height: @icon-size + @margin-small;
border: 1px solid transparent;
}
// the toggle element
div.nav a {
.display-flex();
.align-items();
cursor: pointer;
min-height: @icon-size + @margin-small;
opacity: 1;
border: 1px solid transparent;
border-radius: @fix_border-radius;
color: @ini_nav_menu_color;
font-size: @font-size-head6;
font-weight: normal;
margin: -1px 0 (@font-size-head6 / 2) -(@menu-margin - .4); // moves the toggles back to the left (.4 from li margin)
transition: @transition color, @transition background-color, @transition border-color;
@media @screen_md-lg {
margin-left: -(@menu-margin-lg + .8);
}
// the toggle element
a {
cursor: pointer;
display: table;
width: 100%;
min-height: @icon-size + @margin-small;
opacity: 1;
border: 1px solid transparent;
border-radius: @fix_border-radius;
color: @ini_nav_menu_color;
font-size: @font-size-head6;
font-weight: normal;
margin: -1px 0 @very-small-spacing;
padding-bottom: .4rem;
padding-top: .4rem;
transition: @transition color, @transition background-color, @transition border-color;
span {
display: inline-block;
vertical-align: middle;
color: inherit;
}
span {
display: inline-block;
vertical-align: middle;
color: inherit;
}
span.lbl {
flex-grow: 1;
// wordbreak too late in IE 10
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
&:hover,
&:focus,
&:active {
position: relative; // always show label, even with collapsed sidebar
width: 100%;
box-sizing: border-box;
padding-right: 13px;
background-color: @ini_nav_menu_hover_bg;
border-color: @ini_nav_menu_hover_color;
color: @ini_nav_menu_hover_color;
text-decoration: none;
span.ico {
&:after {
background-color: @ini_nav_menu_hover_color;
}
strong {
border-color: inherit;
}
svg {
path {
fill: @ini_nav_menu_hover_color;
}
}
}
}
/* + + + submenu entry is active + + + */
&.is-active {
font-weight: bold;
}
/* + + + toggle: open + + + */
&.is-open {
background-color: @ini_nav_menu_hover_color;
border-color: @ini_nav_menu_hover_color;
color: @ini_nav_menu_hover_bg;
span.ico {
&:after {
background-color: @ini_nav_menu_hover_bg;
}
strong {
border-color: @ini_nav_menu_hover_bg;
}
svg {
path {
fill: @ini_nav_menu_hover_bg;
}
}
}
&:hover,
&:focus,
&:active {
background-color: @ini_nav_menu_hover_bg;
border-color: @ini_nav_menu_hover_color;
color: @ini_nav_menu_hover_color;
span.ico {
&:after {
background-color: @ini_nav_menu_hover_color;
}
strong {
border-color: inherit;
}
svg {
path {
fill: @ini_nav_menu_hover_color;
}
}
}
}
}
}
span.ico {
.flex(0 0 auto);
position: relative;
display: table-cell;
width: @menu-margin;
min-width: @menu-margin;
height: @icon-size;
border-right: 1px solid @ini_nav_menu_color;
text-align: center;
margin-right: 4%;
vertical-align: middle;
color: inherit;
&::after {
@border-height: 1.5rem;
content: '';
position: absolute;
right: 0;
top: 50%;
bottom: auto;
height: @border-height;
width: 1px;
background-color: @ini_nav_menu_color;
margin-top: -(@border-height / 2);
// wordbreak too late in IE 10
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
top: 0;
bottom: .5rem;
height: 100%;
margin: 0;
}
}
// simple fake icon
strong {
display: inline-block;
font-size: @icon-size * 0.5;
width: @icon-size * 0.9;
height: @icon-size * 0.9;
line-height: @icon-size * 0.9;
margin: @icon-size * 0.05;
vertical-align: baseline;
text-align: center;
color: inherit;
border: 2px solid @ini_nav_menu_color;
width: @icon-size * 0.98;
height: @icon-size * 0.98;
border: 2px solid fade(@ini_nav_menu_color, 80%);
border-top-right-radius: 50%;
border-bottom-left-radius: 50%;
color: inherit;
font-size: @icon-size * 0.5;
line-height: @icon-size * 0.9;
vertical-align: baseline;
text-align: center;
margin: @icon-size * 0.05;
padding: 0 .05em .05em;
}
// real icon
@ -143,95 +263,32 @@
}
}
&:hover,
&:focus,
&:active {
background-color: @ini_nav_menu_hover_bg;
border-color: @ini_nav_menu_hover_color;
color: @ini_nav_menu_hover_color;
text-decoration: none;
// always show label, even with collapsed sidebar
position: absolute;
z-index: 100;
width: 100%;
span.ico {
border-color: inherit;
strong {
border-color: inherit;
}
svg {
path {
fill: @ini_nav_menu_hover_color;
}
}
}
span.lbl {
display: table-cell;
font-size: inherit;
padding-left: .5rem;
}
}
// without wrapping UL
nav > a.nav {
margin-left: -3.5rem;
@media @screen_md-lg {
margin-left: -2.5rem;
}
}
/* + + + + + active + + + + + */
span.curid a {
font-weight: bold;
}
/* + + + + + the panel (hidden by default) + + + + + */
div.nav-panel {
display: none;
margin-top: .5rem;
margin-left: @menu-margin;
ul {
margin-bottom: 1rem;
ul {
margin-bottom: 0;
margin-left: 16px;
}
}
}
}
/* + + + + + + wide page content border-bottom between a.nav (short width) + + + + +
.wide-content {
#dokuwiki__aside {
a.nav {
position: relative;
&::after {
content: '';
position: absolute;
bottom: -1px;
left: 0;
width: 100%;
height: 1px;
border-bottom: solid 1px @ini_border;
}
&:hover,
&:focus,
&:active {
&::after {
display: none;
}
}
}
}
} */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* min-width: 1440px */
@ -256,39 +313,31 @@
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1439px */
@media @screen_max-xlg {
#dokuwiki__aside {
nav {
li:not([class]),
.li {
font-size: @font-size-default;
* {
font-size: inherit;
font-weight: inherit;
}
}
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1023px */
@media @screen_max-md {
body.show-mobile-sidebar {
#dokuwiki__aside {
display: block !important;
position: absolute;
left: 1.25rem; // left margin of content container
box-shadow: @box-shadow-right-bottom;
min-width: 45%;
max-width: 90%;
height: auto;
background: @ini_background_site;
> nav {
position: relative;
z-index: 2;
&:first-child {
margin-top: 1.2rem;
}
a {
font-size: @font-size-small;
}
}
a.nav {
@ -297,30 +346,50 @@
border-left-width: 0;
}
.nav-panel,
div.nav-panel,
a.nav {
margin-top: 0;
padding-right: .8em;
}
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1439px */
/* max-width: 768px */
@media @screen_max-xlg {
#dokuwiki__aside {
nav {
li:not([class]),
.li {
font-size: @font-size-default;
@media @screen_max-xs {
body.show-mobile-sidebar {
.page-wrapper > .tools {
top: 2.5rem;
}
* {
font-size: inherit;
font-weight: inherit;
#dokuwiki__aside {
left: 1.25rem;
right: 1.25rem;
width: auto;
max-width: 100%;
margin-top: -1rem;
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 480px */
@media @screen_max-xxs {
body.show-mobile-sidebar {
#dokuwiki__aside {
left: 4px;
right: 4px;
> nav {
a {
font-size: @font-size-default;
}
}
}
}
}

View file

@ -4,6 +4,7 @@
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
.search.main-sidebar {
@main-ico-dummy: @font-size-big + @margin-small*2; //FIXME copied from area_main-sidebar-nav
@icon-size: @page-header_height;
@ -180,15 +181,16 @@
}
/* + + + + + wide page content + + + + + */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* min-width: 1024px */
@media @screen_min-md {
// wide page content
.wide-content {
.search.main-sidebar {
display: block;
p.toggleSearch {
position: relative;
z-index: 1;
display: block;
float: left;
width: auto;
@ -216,10 +218,26 @@
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1023px */
@media @screen_max-md {
.show-mobile-sidebar {
// show when toggled
body.show-mobile-sidebar {
p.toggleSearch {
display: none !important;
}
.search.main-sidebar {
display: block;
display: block !important;
position: relative;
margin-left: -1px;
margin-right: -1px;
form {
margin-bottom: 1rem;
}
}
}
}

View file

@ -2,6 +2,7 @@
* This file provides the design styles for the metatabbox
*
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
* @author Silke Pisulla <pisulla@cosmocode.de>
*/
@ -11,7 +12,6 @@
.justify-content(flex-end);
position: relative;
z-index: 10;
float: right;
max-width: 40%;
margin-top: -(@page_padding-top); // reverse padding-top of .page container
@ -157,7 +157,6 @@
}
&.active {
z-index: 1;
> a {
cursor: default;
@ -228,11 +227,12 @@
ul {
list-style: none;
padding-left: 0;
}
li {
margin-left: 0;
padding-left: 1em;
}
li {
list-style-image: none; // overwrite universally styles
margin-left: 0;
padding-left: 1em;
}
}
@ -304,7 +304,7 @@
ul.mmissuelist {
padding-left: 0;
margin-top: 1rem;
li {
&.noissue {
list-style-type: none;
@ -331,4 +331,76 @@
}
}
}
/* + + + + + tab issues + + + + + */
/* see plugins/magic-matcher.less */
#spr__tab-issues {
ul.mmissuelist {
padding-left: 0;
margin-top: .5rem;
margin-bottom: .6rem;
li {
list-style-type: none;
margin-top: .3rem;
margin-left: .5rem;
&.noissue {
list-style-type: none;
margin-left: 0;
}
}
a {
display: inline-block;
font-size: @font-size-small;
* {
font-size: inherit;
}
}
img {
vertical-align: bottom;
margin-right: .3rem;
}
.mm__status {
display: inline-block;
text-decoration: none;
padding-left: .3rem;
padding-right: .3rem;
}
form {
vertical-align: text-top;
button {
background: @ini_existing;
border-color: @ini_existing;
color: @ini_background;
font-size: @font-size-small;
padding: .2em .3em;
&[name="removeIssue"] {
min-width: 20px;
font-size: .94rem;
font-weight: bold;
line-height: 95%;
text-align: center;
padding: 0 .1rem .1rem;
margin-left: .5rem;
}
&:hover,
&:focus,
&:active {
background: @ini_background;
color: @ini_existing;
}
}
}
}
}
}

View file

@ -70,6 +70,7 @@
.num {
top: -.6em;
font-size: @font-size-very-small;
}
}
}

View file

@ -21,6 +21,7 @@
.pagetools-item(img_backto, 12);
*/
#dokuwiki__aside {
@media @screen_max-md {
display: none !important;
@ -31,7 +32,6 @@ nav#dokuwiki__pagetools {
@toolbox-size: 30px;
top: 3.05rem;
z-index: 100;
@media @screen_min-md {
right: -2.5rem;
@ -82,6 +82,27 @@ nav#dokuwiki__pagetools {
background-color: transparent;
}
&:focus {
box-shadow: @box-shadow;
background-image: none;
background-color: @ini_background;
color: @ini_existing;
padding-top: 2px;
padding-bottom: 2px;
padding-right: 0;
span {
position: relative;
display: inline;
width: auto;
height: auto;
}
svg {
fill: @ini_existing;
}
}
span {
.sr-only();

View file

@ -33,12 +33,19 @@
padding: 0;
margin: (@very-small-spacing * 2) -.25rem 0 0;
@media @screen_max-md {
margin-right: .5rem;
}
@media @screen_max-xxs {
margin-right: -.3rem;
}
li {
.btn-usertools-wrapper(); // uniform li
.btn-usertools-num();
float: right;
min-height: 28px;
@media @screen_max-xs {
display: block;
@ -46,6 +53,10 @@
margin-bottom: @headericons-margin-xxs;
}
@media @screen_max-xxs {
margin-bottom: (@headericons-margin-xxs - .2);
}
> span,
> a {
display: block;
@ -61,19 +72,13 @@
padding-top: .14rem;
}
@media @screen_max-xxlg {
min-height: 28px;
}
@media @screen_max-md {
min-height: @toggle-size;
}
@media @screen_only-lg {
min-width: 2rem;
}
}
/* !!! &.user-task FIND in plugins/do_tasks.less !!! */
&.user {
@space-min-xxlg: .35rem;
@space-max-xxlg: .4rem;
@ -83,7 +88,7 @@
position: relative;
display: table-cell;
background-color: @ini_background_site;
border: solid 1px @wikiicons-border; // @ini_border_light;
border: solid 1px @wikiicons-border;
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
color: @ini_text_webframe;
padding-right: .3rem;
@ -108,7 +113,7 @@
@media @screen_max-xs {
position: absolute;
top: @headericons-margin-xxs;
right: (@toggle-size + @headericons-margin-xxs);
right: (@toggle-size + @headericons-margin-xxs + @space-max-xlg + .5); // 1.75rem + .45 + .5 + (button login/out margin-right)
overflow: hidden;
white-space: nowrap;
margin: -1px 0 0;
@ -116,6 +121,7 @@
@media @screen_max-xxs {
left: -10px;
right: (@toggle-size + @headericons-margin-xxs); // 1.75rem + .45rem
width: auto;
}
@ -178,11 +184,11 @@
&:focus,
&:active {
background-color: @ini_nav_menu_hover_color;
border-color: @ini_nav_menu_hover_color;
color: @ini_nav_menu_hover_bg;
&::before {
opacity: 1;
border-color: @ini_nav_menu_hover_bg;
}
bdi,
@ -281,4 +287,4 @@
}
} // a
} // ul
} // nav-usertools
} // nav-usertools

View file

@ -12,7 +12,6 @@
bottom: -1px;
width: 2rem;
left: -(@margin-default);
z-index: 1;
@media @screen_max-md {
display: none;

View file

@ -23,6 +23,7 @@
@margin-small: 1rem;
@margin-default: 2rem;
@margin-big: 3.07rem;
@nav-margin: 1.3rem;
@small-spacing: .3rem;
@very-small-spacing: .2rem;
@ -43,7 +44,7 @@
@fix_border-radius: 3px; // inputs, editbox (textarea), buttons, content, code, quicksearch, msg
@toggle-showsidebar_width: 3.07rem; // shown sidebar after toggle
@toggle-showsidebar_width: 3.47rem; // shown sidebar after toggle
@headericons-margin-xxs: .45rem; // screen xxs margin-top for header icons

View file

@ -151,7 +151,7 @@
&:active,
&:focus {
background-color: @ini_nav_menu_hover_color;
border-color: @ini_nav_menu_hover_bg;
border-color: @ini_nav_menu_hover_color;
color: @ini_nav_menu_hover_bg;
.prefix {

View file

@ -63,16 +63,68 @@
}
}
/* + + + + + z-indeces + + + + + */
@media @screen_min-md {
/* + + + + + z-indices + + + + + */
@media screen {
.nav-direct p {
z-index: 1000;
z-index: 1000; // keyboard-navigation overlays always on top
}
.top-header {
z-index: 900;
z-index: 2; // put MagicMatcher-Dropdowns above .content and metabox-tabs
}
#dokuwiki__aside div.nav a {
&:hover, &:focus, &:active {
z-index: 100; // show label/link above content on hover etc.
}
}
#spr__meta-box {
z-index: 1; // put meta-box above positioned content-elements such as aggregations, edit-buttons
ul.meta-tabs > li.active {
z-index: 1; // put the active tab above the meta-content in .tab-pane.active
}
}
nav#dokuwiki__pagetools {
z-index: 100; // put labels of the pagetools above content on hover etc.
}
#dokuwiki__detail .img-link a::before {
z-index: 2; // put 'view original file'-overlay above image
}
/* plug-in do_tasks */
.plugin__do_usertasks_list {
z-index: 200; // put tasks-list above pagetools
}
/* plug-in editable */
#dokuwiki__content.main-content div.editbutton_table {
z-index: 1; // for IE
}
/* plug-in tabinclude */
div#dwpl-ti-container li.dwpl-ti-tab div.selected {
z-index: 1; // put .slected tab above div.dwpl-ti-content-box
}
}
@media @screen_min-md {
.wide-content .search.main-sidebar p.toggleSearch {
z-index: 1; // put search-toggle-button above #dw__search
}
}
@media @screen_max-md {
body.show-mobile-sidebar #dokuwiki__aside {
z-index: 200; // mobile sidebar above all except nav-direct
}
}
/* + + + + + end of z-indices + + + + + */
@media @screen_min-md {
.content .row > .col-xs-12 {
border-radius: 0 @ini_default_border_radius @fix_border-radius @fix_border-radius; // @ini_default_border_radius vs. @fix_border-radius
}
@ -166,7 +218,7 @@
.wide-content.showSidebar {
.content {
.row > .col-xs-12 {
margin-left: 2.1rem;
margin-left: 2.3rem;
}
}
}

View file

@ -1,5 +1,5 @@
/**
* This file provides styles for old data plugin
* This file provides styles for "data plugin"
* after importing struct data this can be deleted
*/
@ -12,37 +12,37 @@
margin-left: 0;
margin-right: 0;
}
}
+ .secedit.editbutton_plugin_data {
position: relative;
top: -1em; // as margin after DL
float: left;
font-size: @font-size-small; // for right position
margin-top: 0;
.editbutton_plugin_data {
position: relative;
top: -1em; // as margin after DL
float: left;
font-size: @font-size-small; // for right position
margin-top: 0;
form {
button {
min-height: 1rem;
height: 1.8em;
background-color: @ini_background;
border-top: solid 1px @ini_button_background;
border-color: @ini_border;
border-radius: 0 0 @fix_border-radius @fix_border-radius;
color: @ini_existing;
font-size: @font-size-small;
line-height: 1.8em;
margin-top: -1px; // for right position
margin-left: .6em;
padding: 0 .3em;
transition: @transition background-color, @transition border-color, @transition color;
form {
button {
min-height: 1rem;
height: 1.8em;
background-color: @ini_background;
border-top: solid 1px @ini_button_background;
border-color: @ini_border;
border-radius: 0 0 @fix_border-radius @fix_border-radius;
color: @ini_existing;
font-size: @font-size-small;
line-height: 1.8em;
margin-top: -1px; // for right position
margin-left: .6em;
padding: 0 .3em;
transition: @transition background-color, @transition border-color, @transition color;
&:hover,
&:focus,
&:active {
background-color: @ini_existing;
border-color: @ini_existing;
color: @ini_background;
}
&:hover,
&:focus,
&:active {
background-color: @ini_existing;
border-color: @ini_existing;
color: @ini_background;
}
}
}

View file

@ -25,36 +25,52 @@ ul.page-attributes {
}
}
/* + + + + + usertool icon in header + + + + + */
#dokuwiki__usertools.nav-usertools {
ul {
li {
&.user-task {
.btn-usertools-wrapper();
.btn-usertools-num();
position: relative;
a {
overflow: visible;
white-space: normal; // Is this still needed?
text-indent: 0;
.plugin__do_usertasks {
width: 100%;
min-width: @toggle-size;
min-height: @toggle-size;
border-radius: @ini_default_border_radius;
border: 1px solid @wikiicons-border;
padding: .14rem 0 0 0;
&::before {
content: ''; // remove when fontello is removed from usertools
}
}
svg {
width: 20px;
margin-top: 2px;
&:hover,
&:focus,
&:active {
background-color: @ini_nav_menu_hover_color;
border: none;
@media @screen_max-md {
margin-top: 4px;
svg path {
fill: @ini_nav_menu_hover_bg;
}
}
}
&:hover {
:not(.noopentasks) {
svg path {
fill: @ini_background;
}
button {
background-color: @ini_nav_menu_hover_bg;
}
svg {
width: 1.2rem;
height: 1.2rem; // for IE 11
margin-bottom: 2px;
path {
fill: @ini_nav_menu_hover_color;
}
}
@ -76,7 +92,7 @@ ul.page-attributes {
}
}
@media @screen_max-sm {
@media @screen_max-xs {
display: none;
}
} // user-task
@ -85,5 +101,19 @@ ul.page-attributes {
}
.plugin__do_usertasks_list {
z-index: 5;
background-color: transparent;
@media @screen_max-sm {
right: 1.25rem !important;
left: 1.25rem !important;
}
table.inline {
background-color: #FFF;
margin-top: .5rem;
@media @screen_max-sm {
width: 100%;
}
}
}

View file

@ -1,5 +1,5 @@
/**
* This file provides styles for qc edittable plugin
* This file provides styles for "edittable plugin"
*/
@ -8,9 +8,8 @@
#dokuwiki__content.main-content {
div.editbutton_table {
position: relative; // for IE
z-index: 1; // for IE
float: left;
margin-top: -1.46rem !important; // overwrite inline styles
margin-top: -1.4em !important; // overwrite inline styles
form div.no {
button,
@ -22,7 +21,7 @@
border-radius: 0 0 @fix_border-radius @fix_border-radius;
color: @ini_existing;
font-size: @font-size-small;
margin-top: 0; // for best position of edit-tab beneath table
margin-top: -1px; // for best position of edit-tab beneeth table
padding-right: .3em;
transition: @transition background-color, @transition border-color, @transition color;

View file

@ -1,5 +1,8 @@
/**
* This file provides styles for magic matcher plugin
*
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
* @author Silke Pisulla <pisulla@cosmocode.de>
*/
@ -44,7 +47,6 @@
#magicmatcher__context {
position: relative;
z-index: 100;
width: 100%;
min-height: @height-context-bar;
box-sizing: border-box;
@ -103,6 +105,59 @@ a.jiralink {
}
/* + + + + + tooltip in metabox + + + + + */
.dokuwiki {
.serverToolTip {
box-shadow: @box-shadow;
border-radius: @fix_border-radius;
font-size: @font-size-default;
h1.issueTitle {
font-size: @font-size-default;
}
h2 {
font-size: @font-size-small;
}
ul {
margin-top: @small-spacing;
}
p,
li {
font-size: (@font-size-small - .06);
* {
font-size: inherit;
}
}
p {
margin-top: @small-spacing;
margin-bottom: @small-spacing;
}
.components {
.component {
font-size: (@font-size-small - .06);
}
}
.labels {
.label {
font-size: (@font-size-small - .06);
}
}
.descriptionTeaser {
font-size: (@font-size-small - .06);
margin-top: (@small-spacing * 2);
margin-bottom: (@small-spacing * 2);
}
}
}
/* + + + + + no js version + + + + + */
.no-js {
#spr__magic-matcher {
@ -144,4 +199,3 @@ a.jiralink {
display: none;
}
}

View file

@ -16,6 +16,16 @@
font-size: (@font-size-small - .06);
}
}
a {
&:hover,
&:focus,
&:active {
svg path {
fill: @ini_nav_menu_hover_bg;
}
}
}
}
@ -25,6 +35,7 @@
width: auto;
font-size: 90%;
box-shadow: @box-shadow-bottom;
border-bottom: solid 1px @ini_border_light;
margin-bottom: 0;
h2 {

View file

@ -4,19 +4,20 @@
.page-attributes {
li.plugin_starred {
.starred svg {
margin-top: .1em;
width: 1.6em;
height: 1.6em;
font-size: 0.82rem;
fill: @ini_nav_menu_color;
}
.starred {
display: block;
padding-top: .05rem;
.starred.on svg {
fill: @ini_link;
svg {
width: 1.6em;
height: 1.6em;
font-size: 0.82rem;
fill: @ini_nav_menu_hover_color;
}
}
a:hover,
a:focus,
a:active {
.starred svg {
fill: @ini_nav_menu_hover_bg;
@ -27,12 +28,20 @@
}
nav.nav-starred {
margin-top: @nav-margin;
ul {
list-style: none;
&#sidebar-menu-starred {
margin-left: 0;
}
li {
margin-left: 0;
svg {
vertical-align: middle;
vertical-align: text-top;
}
}
}

View file

@ -101,7 +101,6 @@
/* + + + + + struct inline-editor + + + + + */
.dokuwiki {
.struct_inlineditor {
z-index: 3;
box-shadow: @box-shadow-bottom;
p.hint {

View file

@ -34,7 +34,6 @@ div#dwpl-ti-container {
&.selected {
position: relative;
z-index: 1;
background-color: @ini_background;
color: @ini_text;
}
@ -45,7 +44,6 @@ div#dwpl-ti-container {
/* + + + content box + + + */
div.dwpl-ti-content-box {
position: relative;
z-index: 0;
overflow: auto;
box-shadow: @box-shadow;
background-color: @ini_background;

View file

@ -4,3 +4,138 @@
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
@color-print: #000;
@background-print: transparent;
@border-color-print: #ccc;
html, body {
background: @background-print;
}
a:link, a:visited {
text-decoration: underline;
color: @color-print !important;
background: @background-print !important;
}
#spr__direct,
.top-header,
.main-footer,
.menu-togglelink,
.main-title.desktop-only,
#spr__meta-box,
.content .row > .col-xs-12 #dokuwiki__content::before,
.page-wrapper > .tools,
.breadcrumbs {
display: none !important;
}
.content .row > .col-xs-12 {
box-shadow: none;
}
.dokuwiki div.page,
.main-sidebar.claim,
.page-footer{
padding: 20pt 20pt 0;
}
/* admin */
// Extension Manager
#extension__manager {
form.search {
margin-bottom: 20pt;
display: inline-block;
}
}
#extension__list {
.extensionList {
padding: 0;
border-bottom: 1pt solid @border-color-print;
li {
border-top: 1pt solid @border-color-print;
margin-left: 0;
list-style-type: none;
&::after {
display: table;
content: ' ';
clear: both;
height: 10pt;
}
a.info,
.actions.col{
display: none;
}
.screenshot {
float: left;
margin: 0 10pt 5pt 0;
border: 1pt solid @border-color-print;
}
}
}
}
// Configuration Settings
#dokuwiki__content #config__manager td.label {
}
.do-admin div.ui-admin ul.admin_tasks,
.do-admin div.ui-admin ul.admin_plugins{
li {
list-style-type: none;
min-height: 2em;
a {
span.icon {
width: 22pt;
height: 22pt;
border: 1pt solid @border-color-print;
display: inline-block;
float: left;
clear: left;
margin: 0 10pt 0 0;
&:empty {
&:before {
content: "?";
display: inline-block;
padding-top: 1pt;
}
}
svg {
width: 20pt;
height: 20pt;
path {
fill: @color-print;
}
}
}
span.prompt {
min-height: 26pt;
display: inline-block;
margin: 0;
padding-top: 4pt;
}
}
}
}
/*Template Style Settings*/
#plugin__styling {
button {
display: none !important;
}
}

View file

@ -24,7 +24,6 @@
position: absolute;
top: 0;
left: 0;
z-index: 2;
display: block;
width: 100%;
box-sizing: border-box;
@ -38,7 +37,6 @@
display: block;
border: 1px dotted @ini_background_site;
position: relative;
z-index: 1;
}
&:hover,

View file

@ -232,7 +232,7 @@ include('tpl/favicon_tiles.php');
<div class="breadcrumbs" data-do="<?php echo tpl_getLang('image_detail') ?>">
<div class="togglelink page_main-content">
<a href="#"><span class="sr-out"><?php echo tpl_getLang('a11y_sidebartoggle') ?></span></a>
<a id="spr__toggle-content" href="#"><span class="sr-out"><?php echo tpl_getLang('a11y_sidebartoggle') ?></span></a>
</div>
<h6 class="sr-only" role="heading" aria-level="2"><?php echo tpl_getLang('head_menu_status') ?></h6>

View file

@ -1,85 +0,0 @@
/**
* @file helper funcs
*
*/
// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
// shuffle func for random values
// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Array.prototype.shuffle = function(){
var tmp, rand;
for(var i =0; i < this.length; i++){
rand = Math.floor(Math.random() * this.length);
tmp = this[i];
this[i] = this[rand];
this[rand] =tmp;
}
};
// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
// js trim func for ie
// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
if(typeof String.prototype.trim !== 'function') {
String.prototype.trim = function() {
return this.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
};
}
var linkTo_UnCryptMailto = function(s){
location.href=decryptString(s,-2);
};
var decryptCharcode = function(n, start, end, offset) {
n = n + offset;
if (offset > 0 && n > end) {
n = start + (n - end - 1);
} else if (offset < 0 && n < start) {
n = end - (start - n - 1);
}
return String.fromCharCode(n);
};
var decryptString = function(enc, offset) {
var dec = '';
var len = enc.length;
for (var i = 0; i < len; i++) {
var n = enc.charCodeAt(i);
if (n >= 43 && n <= 58) {
dec += decryptCharcode(n, 43, 58, offset);
} else if (n >= 64 && n <= 90) {
dec += decryptCharcode(n, 64, 90, offset);
} else if (n >= 97 && n <= 122) {
dec += decryptCharcode(n, 97, 122, offset);
} else {
dec += enc.charAt(i);
}
}
return dec;
};
/**
* simplify setting and getting state out of a node
* $("#my_id").data("my_data_attr") equals $$("#my_id").my_data_attr and
* $("#my_id").data("my_data_attr", "my_data_val") equals $$("#my_id").my_data_attr = my_data_val
* you can also do
* $$("#my_id").my_data_val = $$("#my_id").my_data_val + 1.
*/
var $$ = function(param) {
var node = $(param)[0];
var id = $.data(node);
$.cache[id] = $.cache[id] || {};
$.cache[id].node = node;
return $.cache[id];
};
var alertFB = false;
if (typeof console === "undefined" || typeof console.log === "undefined") {
console = {};
if (alertFB) {
console.log = function(msg) {
alert(msg);
};
} else {
console.log = function() {};
}
}
var wikiLang = "de";
/**
* anonymous func: get page language
*/
(function($){ $("html").attr("lang"); if(typeof(l)!= 'undefined' && l.length>=2) wikiLang=l.substr(0,2).toLowerCase(); if(wikiLang!='de'&& wikiLang!='en') wikiLang='de'; })(jQuery);

View file

@ -103,7 +103,6 @@
try{
var focusobj = document.getElementById(fid);
if(focusobj) focusobj.focus();
if(focusobj) console.log(focusobj);
}catch(err){
this._debug('exception: '+err);
}
@ -196,3 +195,65 @@
}
}
};
// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
// shuffle func for random values
// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Array.prototype.shuffle = function(){
var tmp, rand;
for(var i =0; i < this.length; i++){
rand = Math.floor(Math.random() * this.length);
tmp = this[i];
this[i] = this[rand];
this[rand] =tmp;
}
};
// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
// js trim func for ie
// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
if(typeof String.prototype.trim !== 'function') {
String.prototype.trim = function() {
return this.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
};
}
/**
* simplify setting and getting state out of a node
* $("#my_id").data("my_data_attr") equals $$("#my_id").my_data_attr and
* $("#my_id").data("my_data_attr", "my_data_val") equals $$("#my_id").my_data_attr = my_data_val
* you can also do
* $$("#my_id").my_data_val = $$("#my_id").my_data_val + 1.
*/
var $$ = function(param) {
var node = $(param)[0];
var id = $.data(node);
$.cache[id] = $.cache[id] || {};
$.cache[id].node = node;
return $.cache[id];
};
var alertFB = false;
if (typeof console === "undefined" || typeof console.log === "undefined") {
console = {};
if (alertFB) {
console.log = function(msg) {
alert(msg);
};
} else {
console.log = function() {};
}
}
/**
* custom event handler show/hide events for using .on()
*/
(function ($) {
$.each(['show', 'hide'], function (i, e) {
var el = $.fn[e];
$.fn[e] = function () {
this.trigger(e);
return el.apply(this, arguments);
};
});
})(jQuery);

4
js/base/velocity.min.js vendored Normal file

File diff suppressed because one or more lines are too long

130
js/direct.js Normal file
View file

@ -0,0 +1,130 @@
/**
* Sets up the behaviour of direct menu links
*
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
(function($) {
var $body,
/**
* Register the click handler for the direct links
* should scroll to the page area whether there is a fixed magic matcher bar or not
*
* @param $directMenu
*/
scrollingForDirectNav = function($directMenu) {
$body = $('body');
checkAnchorsOnLoad($directMenu);
registerClickForDirectLinks($directMenu);
},
/**
* register click event listener for direct links
* @param $menu
*/
registerClickForDirectLinks = function($menu) {
$menu.find('a').on('click', function (e) {
e.stopPropagation();
var target = $(this).attr('href');
tasksBeforeScrolling(target);
scrollToTarget(target);
});
},
/**
* scroll to / set focus to target of direct link if value of location hash equals direct link
* @param $menu
*/
checkAnchorsOnLoad = function($menu) {
var hash = window.location.hash;
if (hash) {
$menu.find('a').each(function() {
var target = $(this).attr('href');
if(hash === target) {
tasksBeforeScrolling(target);
scrollToTarget(target);
setFocusOnLoad(target);
}
});
}
},
/**
* todos that needs to be done before the scrolling can start
* @param target
*/
tasksBeforeScrolling = function(target) {
switch (target) {
case '#qsearch__in':
showSearchField(target);
break;
case '#dokuwiki__usertools':
$(target).find('li:first-child').find('a').focus();
break;
}
},
/**
* set focus on target or first link found in target
* @param target
*/
setFocusOnLoad = function(target) {
var $target = $(target);
switch (target) {
case '#qsearch__in':
case '#spr__toggle-content':
$target.focus();
break;
case '#dokuwiki__usertools':
break;
default:
$target.attr('tabindex',0);
$target.focus();
}
},
/**
* trigger content toggle link to make the search field visible otherwise it neither be used for scrolling nor
* for focus setting
* @param target
*/
showSearchField = function(target) {
if($body.hasClass('wide-content')) {
$('#spr__toggle-content').trigger('click');
}
},
/**
* scrolls to the target with an offset of 60px
* @param target
*/
scrollToTarget = function(target) {
// scroll to each target
$(target).velocity('scroll', {
duration: 400,
offset: -60,
easing: 'ease-in-out'
});
};
$(function(){
var $directMenu = $('#spr__direct');
if (!$directMenu.length) return;
scrollingForDirectNav($directMenu);
});
})(jQuery);

View file

@ -1,5 +1,10 @@
/**
* Sets up the behaviour of the meta box
*
* @author Andreas Gohr <gohr@cosmocode.de>
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
(function($) {
@ -11,12 +16,44 @@
*/
var registerClickForTabsInMetaBox = function($metaBox) {
$metaBox.on('click', '.meta-tabs a', function (e) {
e.preventDefault();
var $tab = $(this),
isopen = $tab.attr('aria-expanded') === 'true';
$metaBox.on('click', '.meta-tabs a', function (e) {
e.preventDefault();
var $tab = $(this),
isopen = $tab.attr('aria-expanded') === 'true';
// disable all existing tabs
// disable all existing tabs
disableExistingTabs($metaBox);
if (isopen) return; // tab was open, we closed it. we're done
// enable current tab
$tab
.attr('aria-expanded', 'true')
.closest('li')
.addClass('active');
$metaBox.find($tab.attr('href'))
.addClass('active')
.attr('aria-hidden', 'false');
}).find('.meta-content').on('click', 'a[href*="#"]', function (e) {
disableExistingTabs($metaBox);
/* uses custome event handler hide see spc.js */
}).find('#tagging__edit').on('hide', function(e){
disableExistingTabs($metaBox);
});
/**
* in admin templates show toc tab, if available
*/
if($('body').hasClass('do-admin')) {
var $tocLink = $metaBox.find('a[href="#spr__tab-toc"]');
if($tocLink.length === 1) {
$tocLink.trigger('click');
}
}
},
disableExistingTabs = function($metaBox) {
$metaBox.find('.meta-tabs li')
.removeClass('active')
.find('a')
@ -24,30 +61,7 @@
$metaBox.find('.meta-content .tab-pane')
.removeClass('active')
.attr('aria-hidden', 'false');
if (isopen) return; // tab was open, we closed it. we're done
// enable current tab
$tab
.attr('aria-expanded', 'true')
.closest('li')
.addClass('active');
$metaBox.find($tab.attr('href'))
.addClass('active')
.attr('aria-hidden', 'false');
});
/**
* in admin templates show toc tab, if available
*/
if($('body').hasClass('do-admin')) {
var $tocLink = $metaBox.find('a[href="#spr__tab-toc"]');
if($tocLink.length === 1) {
$tocLink.trigger('click');
}
}
};
};
$(function(){

View file

@ -1,6 +1,8 @@
/**
* prevents Uncaught TypeError in detail template if bookcreator plug-in is installed
*
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*
*/
(function($) {

View file

@ -1,6 +1,8 @@
/**
* prevents Uncaught TypeError in detail template if folded plug-in is installed
*
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*
*/
(function($) {

View file

@ -1,5 +1,8 @@
/**
* Add custom QC functionality instead of using the plugin's mechanism
*
* @author Andreas Gohr <gohr@cosmocode.de>
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
jQuery(function () {
var $panel = jQuery('div.qc-output').hide();

View file

@ -1,5 +1,9 @@
/**
* Sets up the sidebar behaviour
*
* @author Andreas Gohr <gohr@cosmocode.de>
* @author Michael Große <gohr@cosmocode.de>
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
jQuery(function () {
var $nav = jQuery('#dokuwiki__aside');
@ -24,7 +28,7 @@ jQuery(function () {
if (!item) {
continue;
}
window.sessionStorage.removeItem('sidebar-section-' + index + '-open');
window.sessionStorage.setItem('sidebar-section-' + index + '-open', 'false');
}
},
@ -45,6 +49,10 @@ jQuery(function () {
$elem.find('a').first().focus();
},
removeOpenStates = function() {
$nav.find('.is-open').removeClass('is-open');
},
/**
* Toggle a navigation panel
*
@ -59,6 +67,9 @@ jQuery(function () {
$panel.dw_toggle(!isOpen, function () {
if (!isOpen) {
focusFirstSubLink($panel);
$toggler.addClass('is-open');
} else {
$toggler.removeClass('is-open');
}
});
window.sessionStorage.setItem('sidebar-section-' + $toggler.data('index') + '-open', !isOpen);
@ -106,14 +117,17 @@ jQuery(function () {
;
$toggler = jQuery('<div class="nav">').prepend($toggler);
// wrap all following siblings til the next element in a wrapper
var $wrap = jQuery('<div>')
.addClass('nav-panel');
var $sibs = $me.nextAll();
for (var i = 0; i < $sibs.length; i++) {
var $sib = jQuery($sibs[i]);
if ($sib.is(ELEMENT)) break;
$sib.detach().appendTo($wrap);
addContentMenuCurrentStates($sib, $toggler);
}
$wrap.insertAfter($me);
@ -126,6 +140,7 @@ jQuery(function () {
if (window.sessionStorage.getItem('sidebar-section-' + index + '-open') === 'true') {
$wrap.css('display', 'block');
setTogglerClass($toggler,'is-open');
}
});
@ -141,6 +156,30 @@ jQuery(function () {
});
},
/**
* adds a given class to the toggler link
* @param $toggler link or parent of link to whom the class is added
* @param classVal class to be added
*/
setTogglerClass = function ($toggler, classVal) {
if($toggler.is('a')) {
$toggler.addClass(classVal);
} else {
$toggler.find('a').addClass(classVal);
}
},
/**
* marks a $toggler link as active if the following menu has an active state
* @param $menuObj jQuery Object of the menu / container
* @param $toggler
*/
addContentMenuCurrentStates = function ($menuObj, $toggler) {
if($menuObj[0] && String($menuObj[0].innerHTML).indexOf('curid') > 0) {
setTogglerClass($toggler,'is-active');
}
},
/**
* Make sure the content area is always as high as the sidebar
*/
@ -165,6 +204,7 @@ jQuery(function () {
setDefaultContent();
} else {
setWideContent();
removeOpenStates();
}
});
@ -194,11 +234,79 @@ jQuery(function () {
var $body = jQuery('body');
$body.toggleClass('show-mobile-sidebar');
});
},
/**
* set is-active class if body has at least one of the given selectors
* @param selectorArray Array of selectors
* @param $nav container in which the $toggler is situated
*/
setActive = function(selectorArray, $nav) {
for(var i=0; i< selectorArray.length; i++) {
var mode = selectorArray[i];
if(jQuery('body').is('.do-'+mode)){
setTogglerClass($nav.find('.nav'),'is-active');
$nav.find('a[href*="do='+mode+'"]').wrapAll('<span class="curid"></span>');
}
}
},
/**
* sets active states in site tool menu and user tool menu for certain modes
* adds sessionStorage behaviour equivalent approach to content menus
*
*/
initTemplateMenues = function () {
var $body = jQuery('body'),
$siteTools = $nav.find('> .nav-sitetools'),
$userTools = $nav.find('> .nav-usermenu'),
$templateMenus = $nav.find('> nav:not(.nav-main)'),
stModes = ['recent', 'media', 'index'],
utModes = ['profile','admin'],
isWideContent = false;
/* set active states for site tool menu and user tool menu */
setActive(stModes,$siteTools);
setActive(utModes,$userTools);
if($body.is('.wide-content')) {
window.sessionStorage.setItem('wide-content', true);
isWideContent = true;
}
/* set data attributes for sessionStorage and check onload if one of the template menus should be opened */
$templateMenus.each(function( index ) {
var $t = jQuery(this).find('.nav'),
y = $nav.find('.nav-main').find('.nav').length,
$toggler = ($t.is('a')) ? $t : $t.find('a:last'),
tIndex = y + index;
$toggler.data('index', tIndex);
var item = window.sessionStorage.getItem('sidebar-section-' + tIndex + '-open');
if (item) {
if(isWideContent) {
window.sessionStorage.setItem('sidebar-section-' + tIndex + '-open', 'false');
} else {
if (item === 'true') {
jQuery(this).find('.nav-panel').css('display', 'block');
setTogglerClass($toggler, 'is-open');
}
}
}
//console.log(window.sessionStorage);
});
};
// main
initContentNav();
initSidebarToggling();
initTemplateMenues();
initMenuHandling();
initContentMinHeight();
initSearchToggling();

View file

@ -8,11 +8,11 @@
$lang['direct_prefix'] = 'Direkt';
$lang['direct_content_main'] = 'Hauptinhalt dieser Seite';
$lang['direct_menu_main'] = 'Hauptmenü';
$lang['direct_quick_search'] = 'Schnellsuche';
$lang['direct_content_toggle'] = 'Breite des Contents ändern';
$lang['adjunct_start_logo_text'] = 'Logo: ';
$lang['adjunct_linked_logo_text'] = '. Link zur Startseite';
$lang['a11y_search'] = 'geh zur Suche';
$lang['a11y_sidebartoggle'] = 'Sidebar öffnen/schliessen';
$lang['nav-area-head'] = 'Navigationsmenüs und Suche';

View file

@ -7,12 +7,12 @@
$lang['direct_prefix'] = 'jump to';
$lang['direct_content_main'] = 'main content';
$lang['direct_menu_main'] = 'main menu';
$lang['direct_content_main'] = 'Main Content';
$lang['direct_quick_search'] = 'Search';
$lang['direct_content_toggle'] = 'Toggle Content Width';
$lang['adjunct_start_logo_text'] = 'Logo: ';
$lang['adjunct_linked_logo_text'] = '. homepage link';
$lang['a11y_search'] = 'Jump to the search';
$lang['a11y_sidebartoggle'] = 'Open/Close Sidebar';
$lang['nav-area-head'] = 'menus and quick search';
@ -94,4 +94,4 @@ $lang['__background_alt__'] = 'table head, table cell (hover), struct La
$lang['__text_alt__'] = 'table head (unlinked), table cell (hover), struct Label (hover) - font color (alternative)';
$lang['__border__'] = 'tables, form fields, blockquotes - border color';
$lang['__default_border_radius__'] = 'wiki icons, content (top right) - border radius';
$lang['__default_border_radius__'] = 'wiki icons, content (top right) - border radius';

View file

@ -278,7 +278,7 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
<div class="breadcrumbs" data-do="<?php echo $ACT?>">
<div class="togglelink page_main-content">
<a href="#"><span class="sr-out"><?php echo tpl_getLang('a11y_sidebartoggle')?></span></a>
<a id="spr__toggle-content" href="#"><span class="sr-out"><?php echo tpl_getLang('a11y_sidebartoggle')?></span></a>
</div>
<h6 class="sr-only" role="heading" aria-level="2"><?php echo tpl_getLang('head_menu_status') ?></h6>

View file

@ -1,5 +1,6 @@
/* DOKUWIKI:include js/base/helper.js */
/* DOKUWIKI:include js/base/spc.js */
/* DOKUWIKI:include js/base/velocity.min.js */
/* DOKUWIKI:include js/plugins/do_tasks.js */
/* DOKUWIKI:include js/plugins/qc.js */
@ -8,3 +9,5 @@
/* DOKUWIKI:include js/meta-box.js */
/* DOKUWIKI:include js/sidebar.js */
/* DOKUWIKI:include js/direct.js */

View file

@ -72,7 +72,6 @@ css/area_nav-pagetools.less = all
css/area_nav-metabox.less = all
css/area_main-sidebar-nav.less = all
css/area_main-sidebar-search.less = all
css/area_main-sidebar-content.less = all
css/area_main-content.less = all
css/area_main-content-secedit.less = all
css/area_togglelink.less = all
@ -113,7 +112,7 @@ css/plugins/data.less = all
; _____________ print styles _____________
css/print.css = print
css/print.less = print

View file

@ -83,7 +83,7 @@ class tpl {
$args['rel'] = 'nofollow';
}
$args['href'] = $link;
$args['href'] = $link ?: '#';
$svg = inlineSVG($svg);
if(!$svg) $svg = inlineSVG(__DIR__ . '/images/tools/' . self::$icons['default']);

View file

@ -2,5 +2,5 @@
if(!defined('DOKU_INC')) die();
echo '<h6 class="sr-only" role="heading" aria-level="2">' . tpl_getLang('head_quick_search') . '</h6>';
echo '<p class="toggleSearch"><a href="#qsearch__out"><span class="prefix">' . tpl_getLang('a11y_search') . '</span></a></p>';
echo '<p class="toggleSearch"><a href="#qsearch__out"><span class="prefix">' . tpl_getLang('jump_to_quicksearch') . '</span></a></p>';
tpl_searchform(true, false);

View file

@ -10,9 +10,10 @@
<p>
<span class="sr-out"><?php echo tpl_getLang('direct_prefix'); ?>: </span>
<span class="skip">
<a rel="nofollow" href="#content"><?php echo tpl_getLang('direct_content_main'); ?></a><span class="sr-out"> /</span>
<a rel="nofollow" href="#qsearch__in"><?php echo tpl_getLang('direct_quick_search'); ?></a><span class="sr-out"> /</span>
<a rel="nofollow" href="#dokuwiki__usertools"><?php echo $lang['user_tools']; ?></a><span class="sr-out"> /</span>
<a rel="nofollow" href="#nav-main"><?php echo tpl_getLang('direct_menu_main'); ?></a>
<a rel="nofollow" href="#dokuwiki__content"><?php echo tpl_getLang('direct_content_main'); ?></a><span class="sr-out"> /</span>
<a rel="nofollow" href="#spr__toggle-content"><?php echo tpl_getLang('direct_content_toggle'); ?></a>
</span>
</p>