diff --git a/css/area_content.less b/css/area_content.less index 76c8f30..8b83013 100755 --- a/css/area_content.less +++ b/css/area_content.less @@ -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%; diff --git a/css/area_footer.less b/css/area_footer.less index a76bb4b..57114e3 100755 --- a/css/area_footer.less +++ b/css/area_footer.less @@ -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 { diff --git a/css/area_header.less b/css/area_header.less index eedc601..81eb17a 100755 --- a/css/area_header.less +++ b/css/area_header.less @@ -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; - } } } diff --git a/css/area_main-content-secedit.less b/css/area_main-content-secedit.less index 3881c79..8725449 100644 --- a/css/area_main-content-secedit.less +++ b/css/area_main-content-secedit.less @@ -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 diff --git a/css/area_main-sidebar-content.less b/css/area_main-sidebar-content.less deleted file mode 100644 index 1797837..0000000 --- a/css/area_main-sidebar-content.less +++ /dev/null @@ -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; - } - } - } -} diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less index 0fac304..c94dd13 100755 --- a/css/area_main-sidebar-nav.less +++ b/css/area_main-sidebar-nav.less @@ -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; } } } } } - diff --git a/css/area_main-sidebar-search.less b/css/area_main-sidebar-search.less index 337ef5b..743b1b5 100644 --- a/css/area_main-sidebar-search.less +++ b/css/area_main-sidebar-search.less @@ -4,6 +4,7 @@ * @author Jana Deutschlaender */ + .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; + } } } } diff --git a/css/area_nav-metabox.less b/css/area_nav-metabox.less index 3e64ac8..9f97b85 100755 --- a/css/area_nav-metabox.less +++ b/css/area_nav-metabox.less @@ -2,6 +2,7 @@ * This file provides the design styles for the metatabbox * * @author Jana Deutschlaender + * @author Silke Pisulla */ @@ -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; + } + } + } + } + } } diff --git a/css/area_nav-page-attributes.less b/css/area_nav-page-attributes.less index b7ab433..a36e400 100644 --- a/css/area_nav-page-attributes.less +++ b/css/area_nav-page-attributes.less @@ -70,6 +70,7 @@ .num { top: -.6em; + font-size: @font-size-very-small; } } } diff --git a/css/area_nav-pagetools.less b/css/area_nav-pagetools.less index d86af60..56b1c5e 100755 --- a/css/area_nav-pagetools.less +++ b/css/area_nav-pagetools.less @@ -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(); diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less index 26f5a1a..65e252e 100755 --- a/css/area_nav-usertools.less +++ b/css/area_nav-usertools.less @@ -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 \ No newline at end of file +} // nav-usertools diff --git a/css/area_togglelink.less b/css/area_togglelink.less index 816799e..776dd5e 100755 --- a/css/area_togglelink.less +++ b/css/area_togglelink.less @@ -12,7 +12,6 @@ bottom: -1px; width: 2rem; left: -(@margin-default); - z-index: 1; @media @screen_max-md { display: none; diff --git a/css/base.less b/css/base.less index ea343b1..b79477c 100755 --- a/css/base.less +++ b/css/base.less @@ -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 diff --git a/css/base_mixins.less b/css/base_mixins.less index 9725764..e17ee37 100755 --- a/css/base_mixins.less +++ b/css/base_mixins.less @@ -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 { diff --git a/css/base_structure.less b/css/base_structure.less index f9ba184..4d88900 100755 --- a/css/base_structure.less +++ b/css/base_structure.less @@ -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; } } } diff --git a/css/plugins/data.less b/css/plugins/data.less index 9d03409..6a6cf57 100644 --- a/css/plugins/data.less +++ b/css/plugins/data.less @@ -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; } } } diff --git a/css/plugins/do_tasks.less b/css/plugins/do_tasks.less index ef1ae59..53ea3ec 100755 --- a/css/plugins/do_tasks.less +++ b/css/plugins/do_tasks.less @@ -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%; + } + } } diff --git a/css/plugins/edittable.less b/css/plugins/edittable.less index 04907ec..cdd0e3c 100644 --- a/css/plugins/edittable.less +++ b/css/plugins/edittable.less @@ -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; diff --git a/css/plugins/magic-matcher.less b/css/plugins/magic-matcher.less index e8924fc..72920d2 100755 --- a/css/plugins/magic-matcher.less +++ b/css/plugins/magic-matcher.less @@ -1,5 +1,8 @@ /** * This file provides styles for magic matcher plugin + * + * @author Jana Deutschlaender + * @author Silke Pisulla */ @@ -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; } } - diff --git a/css/plugins/qc.less b/css/plugins/qc.less index 25688b9..c140f77 100644 --- a/css/plugins/qc.less +++ b/css/plugins/qc.less @@ -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 { diff --git a/css/plugins/starred.less b/css/plugins/starred.less index 057a04c..7e3bada 100644 --- a/css/plugins/starred.less +++ b/css/plugins/starred.less @@ -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; } } } diff --git a/css/plugins/struct.less b/css/plugins/struct.less index 0bbbed3..c4aaca7 100755 --- a/css/plugins/struct.less +++ b/css/plugins/struct.less @@ -101,7 +101,6 @@ /* + + + + + struct inline-editor + + + + + */ .dokuwiki { .struct_inlineditor { - z-index: 3; box-shadow: @box-shadow-bottom; p.hint { diff --git a/css/plugins/tabinclude.less b/css/plugins/tabinclude.less index c1f3b12..39cef9c 100644 --- a/css/plugins/tabinclude.less +++ b/css/plugins/tabinclude.less @@ -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; diff --git a/css/print.less b/css/print.less index d655956..f764334 100755 --- a/css/print.less +++ b/css/print.less @@ -4,3 +4,138 @@ * @author Jana Deutschlaender */ +@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; + } +} diff --git a/css/template_detail.less b/css/template_detail.less index d73eb28..93f9c61 100644 --- a/css/template_detail.less +++ b/css/template_detail.less @@ -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, diff --git a/detail.php b/detail.php index e1df231..3e909ae 100755 --- a/detail.php +++ b/detail.php @@ -232,7 +232,7 @@ include('tpl/favicon_tiles.php');
- +
diff --git a/js/base/helper.js b/js/base/helper.js deleted file mode 100755 index 170773b..0000000 --- a/js/base/helper.js +++ /dev/null @@ -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); diff --git a/js/base/spc.js b/js/base/spc.js index a0bc71a..8ff1abd 100755 --- a/js/base/spc.js +++ b/js/base/spc.js @@ -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); diff --git a/js/base/velocity.min.js b/js/base/velocity.min.js new file mode 100644 index 0000000..de91ade --- /dev/null +++ b/js/base/velocity.min.js @@ -0,0 +1,4 @@ +/*! VelocityJS.org (1.5.0). (C) 2014 Julian Shapiro. MIT @license: en.wikipedia.org/wiki/MIT_License */ +/*! VelocityJS.org jQuery Shim (1.0.1). (C) 2014 The jQuery Foundation. MIT @license: en.wikipedia.org/wiki/MIT_License. */ +!function(a){"use strict";function b(a){var b=a.length,d=c.type(a);return"function"!==d&&!c.isWindow(a)&&(!(1!==a.nodeType||!b)||("array"===d||0===b||"number"==typeof b&&b>0&&b-1 in a))}if(!a.jQuery){var c=function(a,b){return new c.fn.init(a,b)};c.isWindow=function(a){return a&&a===a.window},c.type=function(a){return a?"object"==typeof a||"function"==typeof a?e[g.call(a)]||"object":typeof a:a+""},c.isArray=Array.isArray||function(a){return"array"===c.type(a)},c.isPlainObject=function(a){var b;if(!a||"object"!==c.type(a)||a.nodeType||c.isWindow(a))return!1;try{if(a.constructor&&!f.call(a,"constructor")&&!f.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(d){return!1}for(b in a);return b===undefined||f.call(a,b)},c.each=function(a,c,d){var e=0,f=a.length,g=b(a);if(d){if(g)for(;e0?e=g:c=g}while(Math.abs(f)>r&&++h=q?k(b,h):0===i?h:m(b,c,c+u)}function o(){y=!0,a===c&&d===e||l()}var p=4,q=.001,r=1e-7,s=10,t=11,u=1/(t-1),v="Float32Array"in b;if(4!==arguments.length)return!1;for(var w=0;w<4;++w)if("number"!=typeof arguments[w]||isNaN(arguments[w])||!isFinite(arguments[w]))return!1;a=Math.min(a,1),d=Math.min(d,1),a=Math.max(a,0),d=Math.max(d,0);var x=v?new Float32Array(t):new Array(t),y=!1,z=function(b){return y||o(),a===c&&d===e?b:0===b?0:1===b?1:i(n(b),c,e)};z.getControlPoints=function(){return[{x:a,y:c},{x:d,y:e}]};var A="generateBezier("+[a,c,d,e]+")";return z.toString=function(){return A},z}function l(a,b){var c=a;return u.isString(a)?y.Easings[a]||(c=!1):c=u.isArray(a)&&1===a.length?j.apply(null,a):u.isArray(a)&&2===a.length?z.apply(null,a.concat([b])):!(!u.isArray(a)||4!==a.length)&&k.apply(null,a),c===!1&&(c=y.Easings[y.defaults.easing]?y.defaults.easing:x),c}function m(a){if(a){var b=y.timestamp&&a!==!0?a:r.now(),c=y.State.calls.length;c>1e4&&(y.State.calls=e(y.State.calls),c=y.State.calls.length);for(var f=0;f4;a--){var b=c.createElement("div");if(b.innerHTML="",b.getElementsByTagName("span").length)return b=null,a}return d}(),q=function(){var a=0;return b.webkitRequestAnimationFrame||b.mozRequestAnimationFrame||function(b){var c,d=(new Date).getTime();return c=Math.max(0,16-(d-a)),a=d+c,setTimeout(function(){b(d+c)},c)}}(),r=function(){var a=b.performance||{};if("function"!=typeof a.now){var c=a.timing&&a.timing.navigationStart?a.timing.navigationStart:(new Date).getTime();a.now=function(){return(new Date).getTime()-c}}return a}(),s=function(){var a=Array.prototype.slice;try{return a.call(c.documentElement),a}catch(b){return function(b,c){var d=this.length;if("number"!=typeof b&&(b=0),"number"!=typeof c&&(c=d),this.slice)return a.call(this,b,c);var e,f=[],g=b>=0?b:Math.max(0,d+b),h=c<0?d+c:Math.min(c,d),i=h-g;if(i>0)if(f=new Array(i),this.charAt)for(e=0;e=0}:function(a,b){for(var c=0;c1e-4&&Math.abs(h.v)>1e-4))break;return f?function(a){return j[a*(j.length-1)|0]}:k}}();y.Easings={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},spring:function(a){return 1-Math.cos(4.5*a*Math.PI)*Math.exp(6*-a)}},o.each([["ease",[.25,.1,.25,1]],["ease-in",[.42,0,1,1]],["ease-out",[0,0,.58,1]],["ease-in-out",[.42,0,.58,1]],["easeInSine",[.47,0,.745,.715]],["easeOutSine",[.39,.575,.565,1]],["easeInOutSine",[.445,.05,.55,.95]],["easeInQuad",[.55,.085,.68,.53]],["easeOutQuad",[.25,.46,.45,.94]],["easeInOutQuad",[.455,.03,.515,.955]],["easeInCubic",[.55,.055,.675,.19]],["easeOutCubic",[.215,.61,.355,1]],["easeInOutCubic",[.645,.045,.355,1]],["easeInQuart",[.895,.03,.685,.22]],["easeOutQuart",[.165,.84,.44,1]],["easeInOutQuart",[.77,0,.175,1]],["easeInQuint",[.755,.05,.855,.06]],["easeOutQuint",[.23,1,.32,1]],["easeInOutQuint",[.86,0,.07,1]],["easeInExpo",[.95,.05,.795,.035]],["easeOutExpo",[.19,1,.22,1]],["easeInOutExpo",[1,0,0,1]],["easeInCirc",[.6,.04,.98,.335]],["easeOutCirc",[.075,.82,.165,1]],["easeInOutCirc",[.785,.135,.15,.86]]],function(a,b){y.Easings[b[0]]=k.apply(null,b[1])});var A=y.CSS={RegEx:{isHex:/^#([A-f\d]{3}){1,2}$/i,valueUnwrap:/^[A-z]+\((.*)\)$/i,wrappedValueAlreadyExtracted:/[0-9.]+ [0-9.]+ [0-9.]+( [0-9.]+)?/,valueSplit:/([A-z]+\(.+\))|(([A-z0-9#-.]+?)(?=\s|$))/gi},Lists:{colors:["fill","stroke","stopColor","color","backgroundColor","borderColor","borderTopColor","borderRightColor","borderBottomColor","borderLeftColor","outlineColor"],transformsBase:["translateX","translateY","scale","scaleX","scaleY","skewX","skewY","rotateZ"],transforms3D:["transformPerspective","translateZ","scaleZ","rotateX","rotateY"],units:["%","em","ex","ch","rem","vw","vh","vmin","vmax","cm","mm","Q","in","pc","pt","px","deg","grad","rad","turn","s","ms"],colorNames:{aliceblue:"240,248,255",antiquewhite:"250,235,215",aquamarine:"127,255,212",aqua:"0,255,255",azure:"240,255,255",beige:"245,245,220",bisque:"255,228,196",black:"0,0,0",blanchedalmond:"255,235,205",blueviolet:"138,43,226",blue:"0,0,255",brown:"165,42,42",burlywood:"222,184,135",cadetblue:"95,158,160",chartreuse:"127,255,0",chocolate:"210,105,30",coral:"255,127,80",cornflowerblue:"100,149,237",cornsilk:"255,248,220",crimson:"220,20,60",cyan:"0,255,255",darkblue:"0,0,139",darkcyan:"0,139,139",darkgoldenrod:"184,134,11",darkgray:"169,169,169",darkgrey:"169,169,169",darkgreen:"0,100,0",darkkhaki:"189,183,107",darkmagenta:"139,0,139",darkolivegreen:"85,107,47",darkorange:"255,140,0",darkorchid:"153,50,204",darkred:"139,0,0",darksalmon:"233,150,122",darkseagreen:"143,188,143",darkslateblue:"72,61,139",darkslategray:"47,79,79",darkturquoise:"0,206,209",darkviolet:"148,0,211",deeppink:"255,20,147",deepskyblue:"0,191,255",dimgray:"105,105,105",dimgrey:"105,105,105",dodgerblue:"30,144,255",firebrick:"178,34,34",floralwhite:"255,250,240",forestgreen:"34,139,34",fuchsia:"255,0,255",gainsboro:"220,220,220",ghostwhite:"248,248,255",gold:"255,215,0",goldenrod:"218,165,32",gray:"128,128,128",grey:"128,128,128",greenyellow:"173,255,47",green:"0,128,0",honeydew:"240,255,240",hotpink:"255,105,180",indianred:"205,92,92",indigo:"75,0,130",ivory:"255,255,240",khaki:"240,230,140",lavenderblush:"255,240,245",lavender:"230,230,250",lawngreen:"124,252,0",lemonchiffon:"255,250,205",lightblue:"173,216,230",lightcoral:"240,128,128",lightcyan:"224,255,255",lightgoldenrodyellow:"250,250,210",lightgray:"211,211,211",lightgrey:"211,211,211",lightgreen:"144,238,144",lightpink:"255,182,193",lightsalmon:"255,160,122",lightseagreen:"32,178,170",lightskyblue:"135,206,250",lightslategray:"119,136,153",lightsteelblue:"176,196,222",lightyellow:"255,255,224",limegreen:"50,205,50",lime:"0,255,0",linen:"250,240,230",magenta:"255,0,255",maroon:"128,0,0",mediumaquamarine:"102,205,170",mediumblue:"0,0,205",mediumorchid:"186,85,211",mediumpurple:"147,112,219",mediumseagreen:"60,179,113",mediumslateblue:"123,104,238",mediumspringgreen:"0,250,154",mediumturquoise:"72,209,204",mediumvioletred:"199,21,133",midnightblue:"25,25,112",mintcream:"245,255,250",mistyrose:"255,228,225",moccasin:"255,228,181",navajowhite:"255,222,173",navy:"0,0,128",oldlace:"253,245,230",olivedrab:"107,142,35",olive:"128,128,0",orangered:"255,69,0",orange:"255,165,0",orchid:"218,112,214",palegoldenrod:"238,232,170",palegreen:"152,251,152",paleturquoise:"175,238,238",palevioletred:"219,112,147",papayawhip:"255,239,213",peachpuff:"255,218,185",peru:"205,133,63",pink:"255,192,203",plum:"221,160,221",powderblue:"176,224,230",purple:"128,0,128",red:"255,0,0",rosybrown:"188,143,143",royalblue:"65,105,225",saddlebrown:"139,69,19",salmon:"250,128,114",sandybrown:"244,164,96",seagreen:"46,139,87",seashell:"255,245,238",sienna:"160,82,45",silver:"192,192,192",skyblue:"135,206,235",slateblue:"106,90,205",slategray:"112,128,144",snow:"255,250,250",springgreen:"0,255,127",steelblue:"70,130,180",tan:"210,180,140",teal:"0,128,128",thistle:"216,191,216",tomato:"255,99,71",turquoise:"64,224,208",violet:"238,130,238",wheat:"245,222,179",whitesmoke:"245,245,245",white:"255,255,255",yellowgreen:"154,205,50",yellow:"255,255,0"}},Hooks:{templates:{textShadow:["Color X Y Blur","black 0px 0px 0px"],boxShadow:["Color X Y Blur Spread","black 0px 0px 0px 0px"],clip:["Top Right Bottom Left","0px 0px 0px 0px"],backgroundPosition:["X Y","0% 0%"],transformOrigin:["X Y Z","50% 50% 0px"],perspectiveOrigin:["X Y","50% 50%"]},registered:{},register:function(){for(var a=0;a=1?"":"alpha(opacity="+parseInt(100*parseFloat(c),10)+")"}else switch(a){case"name":return"opacity";case"extract":return c;case"inject":return c}}},register:function(){function a(a,b,c){if("border-box"===A.getPropertyValue(b,"boxSizing").toString().toLowerCase()===(c||!1)){var d,e,f=0,g="width"===a?["Left","Right"]:["Top","Bottom"],h=["padding"+g[0],"padding"+g[1],"border"+g[0]+"Width","border"+g[1]+"Width"];for(d=0;d9)||y.State.isGingerbread||(A.Lists.transformsBase=A.Lists.transformsBase.concat(A.Lists.transforms3D));for(var c=0;c8)&&3===f.split(" ").length&&(f+=" 1"),f;case"inject":return/^rgb/.test(e)?e:(p<=8?4===e.split(" ").length&&(e=e.split(/\s+/).slice(0,3).join(" ")):3===e.split(" ").length&&(e+=" 1"),(p<=8?"rgb":"rgba")+"("+e.replace(/\s+/g,",").replace(/\.(\d)+(?=,)/g,"")+")")}}}();A.Normalizations.registered.innerWidth=b("width",!0),A.Normalizations.registered.innerHeight=b("height",!0),A.Normalizations.registered.outerWidth=b("width"),A.Normalizations.registered.outerHeight=b("height")}},Names:{camelCase:function(a){return a.replace(/-(\w)/g,function(a,b){return b.toUpperCase()})},SVGAttribute:function(a){var b="width|height|x|y|cx|cy|r|rx|ry|x1|x2|y1|y2";return(p||y.State.isAndroid&&!y.State.isChrome)&&(b+="|transform"),new RegExp("^("+b+")$","i").test(a)},prefixCheck:function(a){if(y.State.prefixMatches[a])return[y.State.prefixMatches[a],!0];for(var b=["","Webkit","Moz","ms","O"],c=0,d=b.length;c=2&&console.log("Get "+c+": "+i),i},setPropertyValue:function(a,c,d,e,f){var h=c;if("scroll"===c)f.container?f.container["scroll"+f.direction]=d:"Left"===f.direction?b.scrollTo(d,f.alternateValue):b.scrollTo(f.alternateValue,d);else if(A.Normalizations.registered[c]&&"transform"===A.Normalizations.registered[c]("name",a))A.Normalizations.registered[c]("inject",a,d),h="transform",d=g(a).transformCache[c];else{if(A.Hooks.registered[c]){var i=c,j=A.Hooks.getRoot(c);e=e||A.getPropertyValue(a,j),d=A.Hooks.injectValue(i,d,e),c=j}if(A.Normalizations.registered[c]&&(d=A.Normalizations.registered[c]("inject",a,d),c=A.Normalizations.registered[c]("name",a)),h=A.Names.prefixCheck(c)[0],p<=8)try{a.style[h]=d}catch(l){y.debug&&console.log("Browser does not support ["+d+"] for ["+h+"]")}else{var k=g(a);k&&k.isSVG&&A.Names.SVGAttribute(c)?a.setAttribute(c,d):a.style[h]=d}y.debug>=2&&console.log("Set "+c+" ("+h+"): "+d)}return[h,d]},flushTransformCache:function(a){var b="",c=g(a);if((p||y.State.isAndroid&&!y.State.isChrome)&&c&&c.isSVG){var d=function(b){return parseFloat(A.getPropertyValue(a,b))},e={translate:[d("translateX"),d("translateY")],skewX:[d("skewX")],skewY:[d("skewY")],scale:1!==d("scale")?[d("scale"),d("scale")]:[d("scaleX"),d("scaleY")],rotate:[d("rotateZ"),0,0]};o.each(g(a).transformCache,function(a){/^translate/i.test(a)?a="translate":/^scale/i.test(a)?a="scale":/^rotate/i.test(a)&&(a="rotate"),e[a]&&(b+=a+"("+e[a].join(" ")+") ",delete e[a])})}else{var f,h;o.each(g(a).transformCache,function(c){if(f=g(a).transformCache[c],"transformPerspective"===c)return h=f,!0;9===p&&"rotateZ"===c&&(c="rotate"),b+=c+f+" "}),h&&(b="perspective"+h+" "+b)}A.setPropertyValue(a,"transform",b)}};A.Hooks.register(),A.Normalizations.register(),y.hook=function(a,b,c){var e;return a=f(a),o.each(a,function(a,f){if(g(f)===d&&y.init(f),c===d)e===d&&(e=A.getPropertyValue(f,b));else{var h=A.setPropertyValue(f,b,c);"transform"===h[0]&&y.CSS.flushTransformCache(f),e=h}}),e};var B=function(){function a(){return k?z.promise||null:p}function e(a,e){function f(f){var k,n;if(i.begin&&0===D)try{i.begin.call(r,r)}catch(V){setTimeout(function(){throw V},1)}if("scroll"===G){var p,q,w,x=/^x$/i.test(i.axis)?"Left":"Top",B=parseFloat(i.offset)||0;i.container?u.isWrapped(i.container)||u.isNode(i.container)?(i.container=i.container[0]||i.container,p=i.container["scroll"+x],w=p+o(a).position()[x.toLowerCase()]+B):i.container=null:(p=y.State.scrollAnchor[y.State["scrollProperty"+x]],q=y.State.scrollAnchor[y.State["scrollProperty"+("Left"===x?"Top":"Left")]],w=o(a).offset()[x.toLowerCase()]+B),j={scroll:{rootPropertyValue:!1,startValue:p,currentValue:p,endValue:w,unitType:"",easing:i.easing,scrollData:{container:i.container,direction:x,alternateValue:q}},element:a},y.debug&&console.log("tweensContainer (scroll): ",j.scroll,a)}else if("reverse"===G){if(!(k=g(a)))return;if(!k.tweensContainer)return void o.dequeue(a,i.queue);"none"===k.opts.display&&(k.opts.display="auto"),"hidden"===k.opts.visibility&&(k.opts.visibility="visible"),k.opts.loop=!1,k.opts.begin=null,k.opts.complete=null,v.easing||delete i.easing,v.duration||delete i.duration,i=o.extend({},k.opts,i),n=o.extend(!0,{},k?k.tweensContainer:null);for(var E in n)if(n.hasOwnProperty(E)&&"element"!==E){var F=n[E].startValue;n[E].startValue=n[E].currentValue=n[E].endValue,n[E].endValue=F,u.isEmptyObject(v)||(n[E].easing=i.easing),y.debug&&console.log("reverse tweensContainer ("+E+"): "+JSON.stringify(n[E]),a)}j=n}else if("start"===G){k=g(a),k&&k.tweensContainer&&k.isAnimating===!0&&(n=k.tweensContainer);var H=function(e,f){var g,l=A.Hooks.getRoot(e),m=!1,p=f[0],q=f[1],r=f[2] +;if(!(k&&k.isSVG||"tween"===l||A.Names.prefixCheck(l)[1]!==!1||A.Normalizations.registered[l]!==d))return void(y.debug&&console.log("Skipping ["+l+"] due to a lack of browser support."));(i.display!==d&&null!==i.display&&"none"!==i.display||i.visibility!==d&&"hidden"!==i.visibility)&&/opacity|filter/.test(e)&&!r&&0!==p&&(r=0),i._cacheValues&&n&&n[e]?(r===d&&(r=n[e].endValue+n[e].unitType),m=k.rootPropertyValueCache[l]):A.Hooks.registered[e]?r===d?(m=A.getPropertyValue(a,l),r=A.getPropertyValue(a,e,m)):m=A.Hooks.templates[l][1]:r===d&&(r=A.getPropertyValue(a,e));var s,t,v,w=!1,x=function(a,b){var c,d;return d=(b||"0").toString().toLowerCase().replace(/[%A-z]+$/,function(a){return c=a,""}),c||(c=A.Values.getUnitType(a)),[d,c]};if(r!==p&&u.isString(r)&&u.isString(p)){g="";var z=0,B=0,C=[],D=[],E=0,F=0,G=0;for(r=A.Hooks.fixColors(r),p=A.Hooks.fixColors(p);z=4&&"("===H?E++:(E&&E<5||E>=4&&")"===H&&--E<5)&&(E=0),0===F&&"r"===H||1===F&&"g"===H||2===F&&"b"===H||3===F&&"a"===H||F>=3&&"("===H?(3===F&&"a"===H&&(G=1),F++):G&&","===H?++G>3&&(F=G=0):(G&&F<(G?5:4)||F>=(G?4:3)&&")"===H&&--F<(G?5:4))&&(F=G=0)}}z===r.length&&B===p.length||(y.debug&&console.error('Trying to pattern match mis-matched strings ["'+p+'", "'+r+'"]'),g=d),g&&(C.length?(y.debug&&console.log('Pattern found "'+g+'" -> ',C,D,"["+r+","+p+"]"),r=C,p=D,t=v=""):g=d)}g||(s=x(e,r),r=s[0],v=s[1],s=x(e,p),p=s[0].replace(/^([+-\/*])=/,function(a,b){return w=b,""}),t=s[1],r=parseFloat(r)||0,p=parseFloat(p)||0,"%"===t&&(/^(fontSize|lineHeight)$/.test(e)?(p/=100,t="em"):/^scale/.test(e)?(p/=100,t=""):/(Red|Green|Blue)$/i.test(e)&&(p=p/100*255,t="")));if(/[\/*]/.test(w))t=v;else if(v!==t&&0!==r)if(0===p)t=v;else{h=h||function(){var d={myParent:a.parentNode||c.body,position:A.getPropertyValue(a,"position"),fontSize:A.getPropertyValue(a,"fontSize")},e=d.position===M.lastPosition&&d.myParent===M.lastParent,f=d.fontSize===M.lastFontSize;M.lastParent=d.myParent,M.lastPosition=d.position,M.lastFontSize=d.fontSize;var g={};if(f&&e)g.emToPx=M.lastEmToPx,g.percentToPxWidth=M.lastPercentToPxWidth,g.percentToPxHeight=M.lastPercentToPxHeight;else{var h=k&&k.isSVG?c.createElementNS("http://www.w3.org/2000/svg","rect"):c.createElement("div");y.init(h),d.myParent.appendChild(h),o.each(["overflow","overflowX","overflowY"],function(a,b){y.CSS.setPropertyValue(h,b,"hidden")}),y.CSS.setPropertyValue(h,"position",d.position),y.CSS.setPropertyValue(h,"fontSize",d.fontSize),y.CSS.setPropertyValue(h,"boxSizing","content-box"),o.each(["minWidth","maxWidth","width","minHeight","maxHeight","height"],function(a,b){y.CSS.setPropertyValue(h,b,"100%")}),y.CSS.setPropertyValue(h,"paddingLeft","100em"),g.percentToPxWidth=M.lastPercentToPxWidth=(parseFloat(A.getPropertyValue(h,"width",null,!0))||1)/100,g.percentToPxHeight=M.lastPercentToPxHeight=(parseFloat(A.getPropertyValue(h,"height",null,!0))||1)/100,g.emToPx=M.lastEmToPx=(parseFloat(A.getPropertyValue(h,"paddingLeft"))||1)/100,d.myParent.removeChild(h)}return null===M.remToPx&&(M.remToPx=parseFloat(A.getPropertyValue(c.body,"fontSize"))||16),null===M.vwToPx&&(M.vwToPx=parseFloat(b.innerWidth)/100,M.vhToPx=parseFloat(b.innerHeight)/100),g.remToPx=M.remToPx,g.vwToPx=M.vwToPx,g.vhToPx=M.vhToPx,y.debug>=1&&console.log("Unit ratios: "+JSON.stringify(g),a),g}();var S=/margin|padding|left|right|width|text|word|letter/i.test(e)||/X$/.test(e)||"x"===e?"x":"y";switch(v){case"%":r*="x"===S?h.percentToPxWidth:h.percentToPxHeight;break;case"px":break;default:r*=h[v+"ToPx"]}switch(t){case"%":r*=1/("x"===S?h.percentToPxWidth:h.percentToPxHeight);break;case"px":break;default:r*=1/h[t+"ToPx"]}}switch(w){case"+":p=r+p;break;case"-":p=r-p;break;case"*":p*=r;break;case"/":p=r/p}j[e]={rootPropertyValue:m,startValue:r,currentValue:r,endValue:p,unitType:t,easing:q},g&&(j[e].pattern=g),y.debug&&console.log("tweensContainer ("+e+"): "+JSON.stringify(j[e]),a)};for(var I in s)if(s.hasOwnProperty(I)){var J=A.Names.camelCase(I),K=function(b,c){var d,f,g;return u.isFunction(b)&&(b=b.call(a,e,C)),u.isArray(b)?(d=b[0],!u.isArray(b[1])&&/^[\d-]/.test(b[1])||u.isFunction(b[1])||A.RegEx.isHex.test(b[1])?g=b[1]:u.isString(b[1])&&!A.RegEx.isHex.test(b[1])&&y.Easings[b[1]]||u.isArray(b[1])?(f=c?b[1]:l(b[1],i.duration),g=b[2]):g=b[1]||b[2]):d=b,c||(f=f||i.easing),u.isFunction(d)&&(d=d.call(a,e,C)),u.isFunction(g)&&(g=g.call(a,e,C)),[d||0,f,g]}(s[I]);if(t(A.Lists.colors,J)){var L=K[0],O=K[1],P=K[2];if(A.RegEx.isHex.test(L)){for(var Q=["Red","Green","Blue"],R=A.Values.hexToRgb(L),S=P?A.Values.hexToRgb(P):d,T=0;T + */ +(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); diff --git a/js/meta-box.js b/js/meta-box.js index 170d29e..c9b99aa 100755 --- a/js/meta-box.js +++ b/js/meta-box.js @@ -1,5 +1,10 @@ - +/** + * Sets up the behaviour of the meta box + * + * @author Andreas Gohr + * @author Jana Deutschlaender + */ (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(){ diff --git a/js/plugins/bookcreator.js b/js/plugins/bookcreator.js index 742091f..10ca372 100644 --- a/js/plugins/bookcreator.js +++ b/js/plugins/bookcreator.js @@ -1,6 +1,8 @@ /** * prevents Uncaught TypeError in detail template if bookcreator plug-in is installed * + * @author Jana Deutschlaender + * */ (function($) { diff --git a/js/plugins/folded.js b/js/plugins/folded.js index 2f954c2..9540842 100644 --- a/js/plugins/folded.js +++ b/js/plugins/folded.js @@ -1,6 +1,8 @@ /** * prevents Uncaught TypeError in detail template if folded plug-in is installed * + * @author Jana Deutschlaender + * */ (function($) { diff --git a/js/plugins/qc.js b/js/plugins/qc.js index 5a0de75..4d768f1 100644 --- a/js/plugins/qc.js +++ b/js/plugins/qc.js @@ -1,5 +1,8 @@ /** * Add custom QC functionality instead of using the plugin's mechanism + * + * @author Andreas Gohr + * @author Jana Deutschlaender */ jQuery(function () { var $panel = jQuery('div.qc-output').hide(); diff --git a/js/sidebar.js b/js/sidebar.js index 73bcf83..48c3874 100644 --- a/js/sidebar.js +++ b/js/sidebar.js @@ -1,5 +1,9 @@ /** * Sets up the sidebar behaviour + * + * @author Andreas Gohr + * @author Michael Große + * @author Jana Deutschlaender */ 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('
').prepend($toggler); + // wrap all following siblings til the next element in a wrapper var $wrap = jQuery('
') .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(''); + } + } + }, + + /** + * 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(); diff --git a/lang/de/lang.php b/lang/de/lang.php index 1dd858a..0f94a43 100755 --- a/lang/de/lang.php +++ b/lang/de/lang.php @@ -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'; diff --git a/lang/en/lang.php b/lang/en/lang.php index cbbf3c2..c0bdf34 100755 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -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'; \ No newline at end of file +$lang['__default_border_radius__'] = 'wiki icons, content (top right) - border radius'; diff --git a/main.php b/main.php index 43de9d5..925f091 100755 --- a/main.php +++ b/main.php @@ -278,7 +278,7 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
- +
diff --git a/script.js b/script.js index 503fea9..ebd2304 100755 --- a/script.js +++ b/script.js @@ -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 */ + diff --git a/style.ini b/style.ini index 4dc2e5d..ec7082a 100755 --- a/style.ini +++ b/style.ini @@ -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 diff --git a/tpl.php b/tpl.php index b5a432f..23f284b 100644 --- a/tpl.php +++ b/tpl.php @@ -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']); diff --git a/tpl/main-sidebar-search.php b/tpl/main-sidebar-search.php index f375d13..c6c2b7e 100755 --- a/tpl/main-sidebar-search.php +++ b/tpl/main-sidebar-search.php @@ -2,5 +2,5 @@ if(!defined('DOKU_INC')) die(); echo '
' . tpl_getLang('head_quick_search') . '
'; -echo '

' . tpl_getLang('a11y_search') . '

'; +echo '

' . tpl_getLang('jump_to_quicksearch') . '

'; tpl_searchform(true, false); diff --git a/tpl/nav-direct.php b/tpl/nav-direct.php index 6f4b6d9..09b91dd 100755 --- a/tpl/nav-direct.php +++ b/tpl/nav-direct.php @@ -10,9 +10,10 @@

: - / + / / - + / +