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

# Conflicts:
#	css/area_nav-pagetools.less
#	css/base_mixins.less
This commit is contained in:
Jana Deutschländer 2017-01-02 15:15:47 +01:00
commit 4e16e9e596
15 changed files with 390 additions and 199 deletions

View file

@ -3,3 +3,55 @@
*
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* no print */
@media screen {
#dokuwiki__footer {
.main-footer {
position: relative;
box-sizing: border-box;
}
p {
font-size: @font-size-default;
}
bdi {
font-weight: bold;
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* min-width: 1024px */
@media @screen_min-md {
#dokuwiki__footer {
.col-xs-12 {
float: right;
width: 73%;
}
.main-footer {
padding: @margin-default 0;
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1023px */
@media @screen_max-md {
#dokuwiki__footer {
.main-footer {
padding: @margin-default (@margin-big - .5);
}
}
}

View file

@ -4,6 +4,7 @@
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
nav#dokuwiki__pagetools{
ul {
@ -56,3 +57,13 @@ nav#dokuwiki__pagetools{
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1023px */
@media @screen_max-md {
nav#dokuwiki__pagetools {
right: 0;
}
}

View file

@ -4,6 +4,32 @@
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* converted vars */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
@height-context-bar: 50px;
@border-radius: __default_border_radius__;
@font_family_screen: __font_family_screen__;
@color-border: __border__;
@color-nav: __nav_menu_color__;
@color-nav-hover: __nav_menu_hover_color__;
@color-nav-hover-bg: __nav_menu_hover_bg__;
@color-content-bg: __background_content__;
@color-site-bg: __background_site__;
@color-link: __existing__;
@margin-small: .5rem;
@margin-default: 1.5rem;
@margin-big: 2.5rem;
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* global vars */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
@ -11,6 +37,12 @@
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* fonts */
@font-size-small: .75rem;
@font-size-default: .88rem;
@font-size-big: 1.5rem;
@font-size-bigger: 1.75rem;
@line-height-default: 125%;
@line-height-big: 135%;
@line-height-bigger: 140%;
@ -18,6 +50,7 @@
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* breakpoints */
@break-min-xxs: 480;
@break-max-xxs: (@break-min-xxs - 1);
@ -68,6 +101,7 @@
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* col width */
@c12: 100%;
@c11: 91.66666667%;
@c10: 83.33333333%;
@ -83,25 +117,6 @@
@grid-columns: 12;
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* margin / padding */
@margin-big: 2.5rem;
@border-radius: __default_border_radius__;
@color-border: __border__;
@color-nav: __nav_menu_color__;
@color-nav-hover: __nav_menu_hover_color__;
@color-nav-hover-bg:__nav_menu_hover_bg__;
@color-content-bg: __background_content__;
@color-site-bg: __background_site__;
@color-link: __existing__;
@height-context-bar: 50px;
@box-shadow-offset: __box_shadow_offset__;
@box-shadow: __box_shadow__;
@ -110,45 +125,85 @@
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* all media */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
html, body{
font-size: 100.1%;
html,
body {
.reset();
font-size: 100.1%;
}
header, .nav-direct{
header,
.nav-direct{
.elementsReset();
}
div, span, object,
h1, h2, h3, h4, h5, h6, p, blockquote,
a, abbr, em,acronym, img, strong,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
input, select, option, textarea, button{
font-size: 1rem; line-height: 100%;
input, select, option, textarea, button {
font-size: 1rem;
line-height: 100%;
}
ol, ul{ list-style: none outside none; }
blockquote, q{ quotes: none; }
acronym{ cursor: help; border-bottom: dotted 1px #333; }
ol,
ul {
list-style: none outside none;
}
*:focus{ outline: 0; }
blockquote,
q {
quotes: none;
}
table{ border-collapse: collapse; border-spacing: 0; empty-cells: show; caption-side: top; }
caption, th, td{ text-align: left; vertical-align: top; }
acronym {
cursor: help;
border-bottom: dotted 1px #333;
}
img{ display: block; float: none; border: none 0; line-height: @line-height-default; }
*:focus {
outline: 0;
}
*, div, nav, header{
table{
border-collapse: collapse;
border-spacing: 0;
empty-cells: show;
caption-side: top;
}
caption,
th,
td {
text-align: left;
vertical-align: top;
}
img {
display: block;
float: none;
border: none 0;
line-height: @line-height-default;
}
*,
div,
nav,
header {
box-sizing: border-box;
}
header, footer, .container, .row, nav, nav > ul{
&::before, &::after{
header,
footer,
.container,
.row, nav,
nav > ul {
&::before,
&::after {
display: table;
content: " ";
clear: both;
@ -156,6 +211,8 @@ header, footer, .container, .row, nav, nav > ul{
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* css behaviour */
.sr-out {
.sr-out();
@ -165,7 +222,9 @@ header, footer, .container, .row, nav, nav > ul{
.sr-only();
}
.structure, .none, .mobile-only {
.structure,
.none,
.mobile-only {
display: none;
}
@ -186,13 +245,11 @@ header, footer, .container, .row, nav, nav > ul{
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* screen only */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
@media screen{
@media screen {
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
@ -203,7 +260,10 @@ header, footer, .container, .row, nav, nav > ul{
display: block;
}
audio, canvas, progress, video {
audio,
canvas,
progress,
video {
display: inline-block;
vertical-align: baseline;
}
@ -255,9 +315,11 @@ header, footer, .container, .row, nav, nav > ul{
box-sizing: content-box;
height: 0;
}
pre {
overflow: auto;
}
code,
kbd,
pre,
@ -275,42 +337,50 @@ header, footer, .container, .row, nav, nav > ul{
font: inherit;
margin: 0;
}
button {
overflow: visible;
}
button,
select {
text-transform: none;
}
input[type="checkbox"],
input[type="radio"] {
box-sizing: border-box;
padding: 0;
button {
overflow: visible;
}
input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button {
height: auto;
input {
&[type="checkbox"],
&[type="radio"] {
box-sizing: border-box;
padding: 0;
}
&[type="number"] {
&::-webkit-inner-spin-button,
&::-webkit-outer-spin-button {
height: auto;
}
}
&[type="search"] {
-webkit-appearance: textfield;
box-sizing: content-box;
&::-webkit-search-cancel-button,
&::-webkit-search-decoration {
-webkit-appearance: none;
}
}
}
input[type="search"] {
-webkit-appearance: textfield;
box-sizing: content-box;
}
input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
legend {
border: 0;
padding: 0;
}
textarea {
overflow: auto;
}
table {
border-collapse: collapse;
border-spacing: 0;
@ -333,17 +403,18 @@ header, footer, .container, .row, nav, nav > ul{
figure, figcaption, footer, header,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
font-family: __font_family_screen__;
font-family: @font_family_screen;
color: @ini_text;
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* print only */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
@media print{
body{
@media print {
body {
font-size: 12pt;
}
}

View file

@ -4,10 +4,12 @@
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Fonts */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
.setLocalFontFace(@fontFamily,@fontWeight,@localFontName,@localFontNameVar,@filename){
.setLocalFontFace(@fontFamily,@fontWeight,@localFontName,@localFontNameVar,@filename) {
@font-face {
font-family: @fontFamily;
font-style: normal;
@ -17,7 +19,7 @@
}
}
.setIconFontFace(@fontFamily,@filename){
.setIconFontFace(@fontFamily,@filename) {
@font-face {
font-family: @fontFamily;
src: ~"url('fonts/icons/"~"@{filename}.eot?6762325')";
@ -27,9 +29,8 @@
}
}
.fontello(){
&::before{
.fontello() {
&::before {
font-family: "fontello";
font-style: normal;
font-weight: normal;
@ -62,12 +63,11 @@
/* Uncomment for 3D effect */
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
}
}
.fontello-double(){
&::before, &::after{
.fontello-double() {
&::before,
&::after {
font-family: "fontello";
font-style: normal;
font-weight: normal;
@ -100,14 +100,13 @@
/* Uncomment for 3D effect */
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Screenreader / Hide */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
.sr-out() {
display: block;
width: 1px;
@ -118,7 +117,7 @@
left: -200000em;
}
.sr-only(){
.sr-only() {
position: absolute;
width: 1px;
height: 1px;
@ -141,14 +140,15 @@
}
}
.btn-default-size(){
.btn-default-size() {
height: 1rem;
width: 1rem;
min-height: 1.2em;
min-width: 1.4em;
}
.btn-default-height(){
.btn-default-height() {
height: 1rem;
min-height: 1.2em;
min-width: 1.4em;
@ -160,10 +160,16 @@
white-space: nowrap;
text-indent: -9999px;
.btn-default-size();
height: 1rem;
width: 1rem;
min-height: 1.2em;
min-width: 1.4em;
&::before{
text-indent: 0;
float: left;
}
&::after{
text-indent: 0;
float: left;
@ -171,7 +177,7 @@
}
.hide-text-show-after(){
.hide-text-show-after() {
display: inline-block;
overflow: hidden;
white-space: nowrap;
@ -186,25 +192,26 @@
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Screenreader / Hide */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
.reset(){
.reset() {
background: transparent;
border: none 0; outline: 0; vertical-align: baseline;
font-style: normal;
margin: 0; padding: 0;
}
.elementsReset(){
.elementsReset() {
div, span, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote,
a, abbr, em,acronym, img, strong,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
input, select, option, textarea, button{
input, select, option, textarea, button {
.reset();
}
}
@ -213,6 +220,7 @@
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Col Grid */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
.make-grid(@class) {
.float-grid-columns(@class);
.loop-grid-columns(@grid-columns, @class, width);
@ -235,6 +243,3 @@
width: percentage((@index / @grid-columns));
}
}

View file

@ -55,3 +55,12 @@ Font license info
Homepage: http://designmodo.com/linecons-free/
## Iconic
Copyright (C) 2012 by P.J. Onori
Author: P.J. Onori
License: SIL (http://scripts.sil.org/OFL)
Homepage: http://somerandomdude.com/work/iconic/

View file

@ -251,6 +251,18 @@
"css": "plus",
"code": 59422,
"src": "fontawesome"
},
{
"uid": "7222571caa5c15f83dcfd447c58d68d9",
"css": "search",
"code": 59423,
"src": "entypo"
},
{
"uid": "7034e4d22866af82bef811f52fb1ba46",
"css": "code",
"code": 61729,
"src": "fontawesome"
}
]
}

Binary file not shown.

Binary file not shown.

View file

@ -1,7 +1,7 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>Copyright (C) 2016 by original authors @ fontello.com</metadata>
<metadata>Copyright (C) 2017 by original authors @ fontello.com</metadata>
<defs>
<font id="fontello" horiz-adv-x="1000" >
<font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
@ -68,6 +68,8 @@
<glyph glyph-name="plus" unicode="&#xe81e;" d="M786 439v-107q0-22-16-38t-38-15h-232v-233q0-22-16-37t-38-16h-107q-22 0-38 16t-15 37v233h-232q-23 0-38 15t-16 38v107q0 23 16 38t38 16h232v232q0 22 15 38t38 16h107q23 0 38-16t16-38v-232h232q23 0 38-16t16-38z" horiz-adv-x="785.7" />
<glyph glyph-name="search" unicode="&#xe81f;" d="M772 78q30-34 6-62l-46-46q-36-32-68 0l-190 190q-74-42-156-42-128 0-223 95t-95 223 90 219 218 91 224-95 96-223q0-88-46-162z m-678 358q0-88 68-156t156-68 151 63 63 153q0 88-68 155t-156 67-151-63-63-151z" horiz-adv-x="789" />
<glyph glyph-name="bookmark-empty" unicode="&#xf097;" d="M643 707h-572v-693l237 227 49 47 50-47 236-227v693z m7 72q12 0 24-5 19-8 29-23t11-35v-719q0-19-11-35t-29-23q-10-4-24-4-27 0-47 18l-246 236-246-236q-20-19-46-19-13 0-25 5-18 7-29 23t-11 35v719q0 19 11 35t29 23q12 5 25 5h585z" horiz-adv-x="714.3" />
<glyph glyph-name="docs" unicode="&#xf0c5;" d="M946 636q23 0 38-16t16-38v-678q0-23-16-38t-38-16h-535q-23 0-38 16t-16 38v160h-303q-23 0-38 16t-16 38v375q0 22 11 49t27 42l228 228q15 16 42 27t49 11h232q23 0 38-16t16-38v-183q38 23 71 23h232z m-303-119l-167-167h167v167z m-357 214l-167-167h167v167z m109-361l176 176v233h-214v-233q0-22-15-37t-38-16h-233v-357h286v143q0 22 11 49t27 42z m534-449v643h-215v-232q0-22-15-38t-38-15h-232v-358h500z" horiz-adv-x="1000" />
@ -84,6 +86,8 @@
<glyph glyph-name="meh" unicode="&#xf11a;" d="M643 243q0-15-11-25t-25-11h-357q-14 0-25 11t-11 25 11 25 25 11h357q15 0 25-11t11-25z m-286 250q0-30-21-51t-50-21-51 21-21 51 21 50 51 21 50-21 21-50z m286 0q0-30-21-51t-51-21-50 21-21 51 21 50 50 21 51-21 21-50z m143-143q0 73-29 139t-76 114-114 76-138 28-139-28-114-76-76-114-29-139 29-139 76-113 114-77 139-28 138 28 114 77 76 113 29 139z m71 0q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
<glyph glyph-name="code" unicode="&#xf121;" d="M344 69l-28-28q-5-5-12-5t-13 5l-260 261q-6 5-6 12t6 13l260 260q5 6 13 6t12-6l28-28q6-5 6-13t-6-12l-219-220 219-219q6-6 6-13t-6-13z m330 596l-208-721q-2-7-9-11t-13-1l-34 9q-8 3-11 9t-2 14l209 720q2 8 8 11t13 2l35-10q7-2 11-9t1-13z m367-363l-260-261q-6-5-13-5t-13 5l-28 28q-5 6-5 13t5 13l219 219-219 220q-5 5-5 12t5 13l28 28q6 6 13 6t13-6l260-260q5-5 5-13t-5-12z" horiz-adv-x="1071.4" />
<glyph glyph-name="puzzle" unicode="&#xf12e;" d="M929 237q0-45-25-75t-69-30q-23 0-43 10t-33 21-32 21-39 10q-62 0-62-69 0-22 9-65t8-64v-3q-12 0-18 0-19-2-54-7t-65-7-54-3q-35 0-58 15t-23 47q0 20 9 39t22 32 21 33 10 43q0 44-31 69t-75 25q-47 0-80-26t-33-71q0-24 9-46t18-36 19-30 8-28q0-25-25-50-21-19-65-19-54 0-137 13-5 1-16 2t-15 3l-7 1q-1 0-2 0-1 0-1 1v571q1 0 10-2t19-2 12-2q83-14 137-14 44 0 65 20 25 24 25 49 0 13-8 29t-19 29-18 36-9 47q0 45 33 71t81 25q44 0 74-25t31-69q0-23-10-43t-21-33-22-31-9-40q0-32 23-47t58-14q35 0 100 8t91 9v-1q-1-1-2-9t-3-19-2-12q-13-84-13-137 0-45 19-65 25-26 50-26 12 0 28 8t30 19 36 19 46 8q46 0 71-33t26-80z" horiz-adv-x="928.6" />
<glyph glyph-name="file-pdf" unicode="&#xf1c1;" d="M819 638q16-16 27-42t11-50v-642q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h500q22 0 49-11t42-27z m-248 136v-210h210q-5 17-12 23l-175 175q-6 7-23 12z m215-853v572h-232q-23 0-38 16t-16 37v233h-429v-858h715z m-287 331q18-14 47-31 33 4 65 4 82 0 99-27 9-13 1-29 0-1-1-1l-1-2v0q-3-21-39-21-27 0-64 11t-73 29q-123-13-219-46-85-146-135-146-8 0-15 4l-14 7q0 0-3 2-6 6-4 20 5 23 32 51t73 54q8 5 13-3 1-1 1-2 29 47 60 110 38 76 58 146-13 46-17 89t4 71q6 22 23 22h12q13 0 20-8 10-12 5-38-1-3-2-4 0-2 0-5v-17q-1-68-8-107 31-91 82-133z m-321-229q29 13 76 88-29-22-49-47t-27-41z m222 513q-9-23-2-73 1 4 4 24 0 2 4 24 1 3 3 5-1 0-1 1-1 1-1 2 0 12-7 20 0-1 0-1v-2z m-70-368q76 30 159 45-1 0-7 5t-9 8q-43 37-71 98-15-48-46-110-17-31-26-46z m361 9q-13 13-78 13 42-16 69-16 8 0 10 1 0 0-1 2z" horiz-adv-x="857.1" />

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Before After
Before After

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
fonts/icons/fontello.zip Normal file

Binary file not shown.

252
main.php
View file

@ -86,19 +86,19 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
?>
<body id="dokuwiki__top" class="<?php echo tpl_classes(); ?> <?php echo ($showSidebar) ? 'showSidebar' : ''; ?>">
<div id="dokuwiki__site">
<?php
<div id="dokuwiki__site">
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* template Include: tpl/nav-direct */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
?>
<?php include('tpl/nav-direct.php') ?>
?>
<?php include('tpl/nav-direct.php') ?>
<div class="page-wrapper <?php echo ($showSidebar) ? 'hasSidebar' : ''; ?>">
<?php
<div class="page-wrapper <?php echo ($showSidebar) ? 'hasSidebar' : ''; ?>">
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
@ -112,62 +112,64 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
/* Include Hook: header.html */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
tpl_includeFile('header.html');
?>
?>
<div id="dokuwiki__header" class="header no-print">
<div class="container">
<div class="row">
<div class="col-xs-12">
<div class="claim main-sidebar">
<?php if (tpl_getConf('logo') && file_exists(mediaFN(tpl_getConf('logo')))){
<div id="dokuwiki__header" class="header no-print">
<div class="container">
<div class="row">
<div class="col-xs-12">
<div class="claim main-sidebar">
<?php if (tpl_getConf('logo') && file_exists(mediaFN(tpl_getConf('logo')))){
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Logo */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* upload your logo into the data/media folder (root of the media manager) and replace 'logo.png' in der template config accordingly: */
include('tpl/main-sidebar-logo.php');
} ?>
<?php if ($conf['tagline']): ?>
<p class="claim"><?php echo $conf['tagline'] ?></p>
<?php endif ?>
include('tpl/main-sidebar-logo.php');
} ?>
<?php if ($conf['tagline']): ?>
<p class="claim"><?php echo $conf['tagline'] ?></p>
<?php endif ?>
</div><!-- .headings -->
</div><!-- .col -->
</div><!-- .row -->
</div><!-- .container -->
</div><!-- .header -->
<?php
</div><!-- .headings -->
</div><!-- .col -->
</div><!-- .row -->
</div><!-- .container -->
</div><!-- .header -->
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* headline menu area (Accessibility ) */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
?>
?>
<div class="sr-only nav-area-head">
<h5 class="sr-only" role="heading" aria-level="1"><?php echo tpl_getLang('nav-area-head') ?></h5>
</div><!-- .nav-area-head -->
<?php if ($showSidebar): ?>
<div class="sr-only nav-area-head">
<h5 class="sr-only" role="heading" aria-level="1"><?php echo tpl_getLang('nav-area-head') ?></h5>
</div><!-- .nav-area-head -->
<?php if ($showSidebar): ?>
<div class="tools">
<div class="container">
<div class="row">
<div class="col-xs-12">
<div class="sidebarheader main-sidebar">
<?php
<div class="tools">
<div class="container">
<div class="row">
<div class="col-xs-12">
<div class="sidebarheader main-sidebar">
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Include Hook: sidebarheader.html */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
tpl_includeFile('sidebarheader.html') ?>
tpl_includeFile('sidebarheader.html')
?>
</div><!-- .sidebarheader -->
</div><!-- .sidebarheader -->
<div class="search main-sidebar">
<?php if (tpl_getConf('logo') && file_exists(mediaFN(tpl_getConf('logo')))){
<div class="search main-sidebar">
<?php
if (tpl_getConf('logo') && file_exists(mediaFN(tpl_getConf('logo')))){
if (tpl_getConf('logo_spacer') && file_exists(mediaFN(tpl_getConf('logo_spacer')))){
echo '<img width="5" height="5" src="'.ml(tpl_getConf('logo_spacer')).'" alt="" />';
} else{
@ -179,58 +181,57 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* search form */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
include('tpl/main-sidebar-search.php'); ?>
include('tpl/main-sidebar-search.php');
?>
</div><!-- .search -->
</div><!-- .search -->
<div id="dokuwiki__aside" class="menu main-sidebar">
<?php
<div id="dokuwiki__aside" class="menu main-sidebar">
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* main menu */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
include('tpl/nav-main.php');
?>
?>
</div><!-- .menu -->
</div><!-- .menu -->
<div class="site-tools main-sidebar">
<?php
<div class="site-tools main-sidebar">
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* site tools */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
include('tpl/nav-sitetools.php'); ?>
</div><!-- .site-tools -->
include('tpl/nav-sitetools.php');
?>
</div><!-- .site-tools -->
<div class="sidebarfooter main-sidebar">
<?php
<div class="sidebarfooter main-sidebar">
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Include Hook: sidebarfooter.html */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
tpl_includeFile('sidebarfooter.html') ?>
tpl_includeFile('sidebarfooter.html')
?>
</div><!-- .sidebarheader -->
</div><!-- .sidebarheader -->
</div><!-- .col -->
</div><!-- .row -->
</div><!-- .container -->
</div><!-- .tools -->
<?php endif ?>
</div><!-- .col -->
</div><!-- .row -->
</div><!-- .container -->
</div><!-- .tools -->
<?php endif ?>
<div class="top-header">
<div class="container">
<div class="row">
<div class="col-xs-12">
<div class="top-header">
<div class="container">
<div class="row">
<div class="col-xs-12">
<?php
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
@ -254,93 +255,118 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
/* Include Hook: header.html */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
tpl_includeFile('header.html');
?>
?>
</div><!-- .col -->
</div><!-- .row -->
</div><!-- .container -->
</div><!-- /top-header -->
</div><!-- .col -->
</div><!-- .row -->
</div><!-- .container -->
</div><!-- /top-header -->
<div class="content">
<div class="container">
<div class="row">
<div class="col-xs-12">
<div class="container">
<div class="row">
<div class="col-xs-12">
<?php tpl_flush(); /* flush the output buffer */
<?php tpl_flush(); /* flush the output buffer */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Include Hook: pageheader.html */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
tpl_includeFile('pageheader.html')
?>
<div class="breadcrumbs">
<h6 class="sr-only" role="heading" aria-level="2"><?php echo tpl_getLang('head_menu_status') ?></h6>
<?php
?>
<div class="breadcrumbs">
<h6 class="sr-only" role="heading" aria-level="2"><?php echo tpl_getLang('head_menu_status') ?></h6>
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* page quality / page tasks */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
include('tpl/nav-page-quality-tasks.php');
?>
include('tpl/nav-page-quality-tasks.php');
?>
<?php
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* breadcrumb */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
include('tpl/nav-breadcrumb.php'); ?>
include('tpl/nav-breadcrumb.php');
?>
<h6 class="sr-only" role="heading" aria-level="2"><?php echo $lang['page_tools'] ?></h6>
<h6 class="sr-only" role="heading" aria-level="2"><?php echo $lang['page_tools'] ?></h6>
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* page tools */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
include('tpl/nav-page-tools.php'); ?>
</div>
include('tpl/nav-page-tools.php');
?>
<div id="dokuwiki__content" class="page main-content">
</div>
<?php
<div id="dokuwiki__content" class="page main-content">
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* wikipage start / main content */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
tpl_content(false); /* the main content */ ?>
tpl_content(false); /* the main content */
?>
</div><!-- .main-content -->
</div><!-- .main-content -->
</div><!-- .col -->
</div><!-- .row -->
</div><!-- .container -->
</div><!-- .col -->
</div><!-- .row -->
</div><!-- .container -->
<?php tpl_flush() ?>
<?php tpl_includeFile('pagefooter.html') ?>
</div><!-- /content -->
<div class="clearer"></div>
</div><!-- /wrapper -->
<!-- ********** FOOTER ********** -->
<div id="dokuwiki__footer">
<div class="container">
<div class="row">
<div class="col-xs-12">
<div class="main-footer">
<p>
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* 'Last modified' etc */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
tpl_pageinfo()
?>
</p>
</div>
</div>
</div>
</div>
</div><!-- /footer -->
<?php tpl_includeFile('footer.html') ?>
</div><!-- .dokuwiki__site -->
<?php tpl_flush() ?>
<?php tpl_includeFile('pagefooter.html') ?>
</div></div><!-- /content -->
<div class="clearer"></div>
</div><!-- /wrapper -->
<!-- ********** FOOTER ********** -->
<div id="dokuwiki__footer"><div class="pad">
<div class="doc"><?php tpl_pageinfo() /* 'Last modified' etc */ ?></div>
<?php tpl_license('button') /* content license, parameters: img=*badge|button|0, imgonly=*0|1, return=*0|1 */ ?>
</div></div><!-- /footer -->
<?php tpl_includeFile('footer.html') ?>
</div><!-- .dokuwiki__site -->
<div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
<div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
</body>
</html>

View file

@ -76,6 +76,7 @@ css/area_nav-pagetools.less = all
css/plugins/magic-matcher.less = all
css/plugins/do_tasks.less = all
; _____________ print styles _____________
css/print.css = print