EH22/dokuwiki-template-sprintdoc-modified
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 'live'

Browse source 
Release Master

See merge request !57
This commit is contained in:
Michael Große 2017-04-26 11:09:54 +02:00
commit 2d6d4e947b
37 changed files with 463 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Template.php
View file

@ -88,7 +88,7 @@ class Template {
* @return array
*/
public function getMetaBoxTabs() {
global $lang;
global $lang, $INFO;
$tabs = array();
$toc = tpl_toc(true);
@ -106,7 +106,7 @@ class Template {
'id' => 'spr__tab-tags',
'label' => tpl_getLang('tab_tags'),
'tab' => $this->plugins['tagging']->tpl_tags(false),
'count' => null, // FIXME
'count' => count($this->plugins['tagging']->findItems(array('pid' => $INFO['id']), 'tag')),
);
}

9
css/area_footer.less
View file

@ -26,10 +26,11 @@
}
bdi {
font-weight: bold;
max-width: 100%;
display: inline-block;
overflow: auto;
max-width: 100%;
overflow-x: auto;
overflow-y: hidden;
font-weight: bold;
vertical-align: bottom;
}
}
@ -39,7 +40,7 @@
position: relative;
z-index: 2;
box-sizing: border-box;
background-color: @ini_background;
background-color: @ini_background_site;
}
p {

41
css/area_header.less
View file

@ -8,14 +8,13 @@
#dokuwiki__header {
@header-font-opacity: 1;
@media @screen_max-xs {
min-height: 120px;
}
/* + + + wiki logo + + + */
@media @screen_min-md {
div.claim {
display: table-cell;
height: 100%;
vertical-align: middle;
}
.logo {
padding: 1rem 0 .3rem;
@ -48,7 +47,7 @@
}
/* + + + wiki title + claim + + + */
/* + + + + + DESKTOP - wiki title + claim + + + + + */
.main-title.desktop-only {
@media @screen_min-md {
display: table-cell;
@ -70,20 +69,30 @@
display: block;
padding-bottom: 1rem;
}
@media @screen_max-xs {
padding-right: (@toggle-size + @headericons-margin-xxs);
}
}
}
/* + + + + + MOBILE - wiki title wrapper + + + + + */
.main-title:not([class*="desktop-only"]) {
@media @screen_max-md {
display: table-cell;
vertical-align: middle;
}
@media @screen_max-xs {
padding-right: (@toggle-size + @headericons-margin-xxs);
}
}
/* + + + wiki title + + + */
p.title {
background-color: @ini_background;
background-color: @ini_background_site;
opacity: @header-font-opacity;
color: @ini_text_webframe;
line-height: @line-height-default;
@ -101,6 +110,16 @@
}
/* + + + + + DESKTOP - wiki claim, logo, title wrapper + + + + + */
@media @screen_min-md {
div.claim {
display: table-cell;
height: 100%;
vertical-align: middle;
}
}
/* + + + wiki claim + + + */
p.claim {
opacity: @header-font-opacity;
@ -116,7 +135,9 @@
/* + + + mobile nav togglelink + + + */
.menu-togglelink {
margin: .45rem -(@very-small-spacing) 0 0;
position: relative;
z-index: 1;
margin: @headericons-margin-xxs -(@very-small-spacing) 0 0;
a {
.fontello();
@ -156,7 +177,7 @@
&.has-magicmatcher {
.logo {
@media @screen_min-md {
padding-top: 2rem;
padding-top: 3rem;
}
}

1
css/area_main-content-secedit.less
View file

@ -21,7 +21,6 @@
z-index: 2;
top: 0;
float: right;
margin-top: 0;
form div.no {
button {

2
css/area_main-content.less
View file

@ -9,7 +9,7 @@
.level2 {
p a.media {
img {
border: 1px dotted @ini_background;
border: 1px dotted @ini_background_site;
}
&:hover,

16
css/area_main-sidebar-content.less
View file

@ -4,16 +4,18 @@
#dokuwiki__aside {
// do not indent the first level of lists
// and use less indention in deeper levels
ul,
ol {
margin-left: -.4rem;
padding-left: 0;
ul,
ol {
padding-left: @margin-small;
padding-left: 1.8rem;
@media @screen_md-lg {
padding-left: @menu-margin-lg;
}
li {
margin-left: 0;
@ -51,9 +53,9 @@
right: 0;
width: 100%;
height: 100%;
background: @ini_background;
background: -webkit-linear-gradient(left, @ini_background, @ini_background_content);
background: linear-gradient(left, @ini_background, @ini_background_content);
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;
}
}

49
css/area_main-sidebar-nav.less
View file

@ -8,7 +8,7 @@
#dokuwiki__aside {
@icon-size: @font-size-big;
@menu-margin: @icon-size + @margin-small*2; // FIXME this is still wrong
@menu-margin: @icon-size + @margin-small * 2;
nav > p,
.mmissuelist li,
@ -37,6 +37,11 @@
margin-left: 0;
}
}
li:not([class]),
.li {
padding: .15em 0;
}
}
@ -70,6 +75,10 @@
> * {
margin-left: @menu-margin; // moves *all* sidebar content to the right
@media @screen_md-lg {
margin-left: @menu-margin-lg;
}
}
a {
@ -90,16 +99,20 @@
.align-items();
cursor: pointer;
height: @icon-size + @margin-small;
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 * -1); // moves the toggles back to the left
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);
}
span {
display: inline-block;
vertical-align: middle;
@ -108,12 +121,20 @@
span.lbl {
flex-grow: 1;
// wordbreak too late in IE 10
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
width: 100%;
box-sizing: border-box;
padding-right: 13px;
}
}
span.ico {
.flex(0 0 auto);
width: @menu-margin;
height: @icon-size;
flex-grow: 0;
border-right: 1px solid @ini_nav_menu_color;
text-align: center;
margin-right: 4%;
@ -172,7 +193,23 @@
}
}
// the panel (hidden by default)
// 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;
@ -225,7 +262,6 @@
li:not([class]),
.li {
font-size: @font-size-head6;
padding: .15em 0;
* {
font-size: inherit;
@ -294,7 +330,6 @@
li:not([class]),
.li {
font-size: @font-size-default;
padding: .15em 0 .15em .25rem;
* {
font-size: inherit;

7
css/area_sidebar-search.less → css/area_main-sidebar-search.less Executable file → Normal file
View file

@ -9,6 +9,10 @@
@icon-size: @page-header_height;
@icon-search_font-size: @font-size-big;
@media @screen_md-lg {
margin-left: -(@menu-margin-lg);
}
p.toggleSearch a,
button[type="submit"] {
.fontello();
@ -165,10 +169,13 @@
}
}
/* + + + + + suggestionlist + + + + + */
#qsearch__out {
left: auto;
top: auto;
width: 100%;
min-width: 20rem;
}
}

7
css/area_msg.less
View file

@ -19,7 +19,10 @@
}
/* short fix: SPR-891 - Icons für Notifications in Message Area werden gekachelt */
div.success, div.error, div.info, div.notify {
div.success,
div.error,
div.info,
div.notify {
background-repeat: no-repeat;
background-position: 8px 50%;
border: 1px solid #eeb;
@ -28,7 +31,7 @@ div.success, div.error, div.info, div.notify {
padding: .4em;
padding-left: 32px;
overflow: hidden;
border-radius: 5px;
border-radius: @fix_border-radius;
* {
color: inherit;

4
css/area_nav-breadcrumb.less
View file

@ -9,7 +9,7 @@
position: relative;
min-height: @page-header_height;
box-sizing: border-box;
background-color: @ini_background_content;
background-color: @ini_background;
border-bottom: 1px solid @ini_border_light;
padding: 1rem 1.8rem .2rem;
@ -23,7 +23,7 @@
}
@media @screen_xs-lg {
background-color: @ini_background_content;
background-color: @ini_background;
}
> p {

18
css/area_nav-metabox.less
View file

@ -102,9 +102,9 @@
transition: @transition background-color, @transition border-color, @transition color;
@media @screen_min-md {
background-color: @ini_background;
background-color: @ini_background_site;
border: 1px solid @noopentasks-border;
border-bottom-color: @ini_background;
border-bottom-color: @ini_background_site;
border-radius: @ini_default_border_radius @ini_default_border_radius 0 0; // @ini_default_border_radius vs. @fix_border-radius
color: @ini_nav_menu_color;
margin-left: 4px;
@ -137,15 +137,15 @@
text-decoration: none;
@media @screen_min-md {
background-color: @ini_background_content;
background-color: @ini_background;
border-color: @ini_existing;
color: @ini_existing;
}
@media @screen_max-md {
background-color: @ini_existing;
border-color: @ini_background_content;
color: @ini_background_content;
border-color: @ini_background;
color: @ini_background;
}
}
}
@ -155,16 +155,16 @@
> a {
cursor: default;
background-color: @ini_background_content;
background-color: @ini_background;
border-color: @ini_existing;
border-bottom-color: @ini_background_content;
border-bottom-color: @ini_background;
color: @ini_existing;
@media @screen_max-md {
background-color: @ini_existing;
border-bottom-color: @ini_existing;
border-radius: 0;
color: @ini_background_content;
color: @ini_background;
}
}
}
@ -187,7 +187,7 @@
right: 0;
display: none;
width: 100%;
background-color: @ini_background_content;
background-color: @ini_background;
border: 1px solid @ini_existing;
@media @screen_min-xs {

4
css/area_nav-pagetools.less
View file

@ -116,7 +116,7 @@ nav#dokuwiki__pagetools {
&:hover {
ul {
box-shadow: @box-shadow; // @box-shadow-offset;
background-color: @ini_background_content;
background-color: @ini_background;
border-color: @wikiicons-border;
li {
@ -142,7 +142,7 @@ nav#dokuwiki__pagetools {
svg {
background-color: @ini_existing;
border-color: @ini_existing;
fill: @ini_background_content;
fill: @ini_background;
}
}

103
css/area_nav-usertools.less
View file

@ -5,10 +5,25 @@
*/
.nav-usertools {
#dokuwiki__usertools.nav-usertools {
@media @screen_min-md {
right: 1.25rem;
}
@media @screen_max-md {
position: absolute;
top: 0;
left: (@toggle-size + 1.25); // margin-left content
right: @headericons-margin-xxs;
margin-top: 0;
margin-right: 0;
}
&.has-bar {
margin-top: @height-context-bar;
padding-top: .5em;
@media @screen_min-md {
margin-top: @height-context-bar;
padding-top: .5em;
}
}
@ -25,7 +40,13 @@
float: right;
min-height: 28px;
> strong,
@media @screen_max-xs {
display: block;
float: none;
margin-bottom: @headericons-margin-xxs;
}
> span,
> a {
display: block;
width: auto;
@ -36,7 +57,7 @@
text-align: center;
margin: 0;
@media @screen_only-lg {
@media @screen_md-xlg {
padding-top: .14rem;
}
@ -47,6 +68,10 @@
@media @screen_max-md {
min-height: @toggle-size;
}
@media @screen_only-lg {
min-width: 2rem;
}
}
&.user {
@ -57,8 +82,8 @@
position: relative;
display: table-cell;
background-color: @ini_background;
border: solid 1px @noopentasks-border;//@ini_border_light;
background-color: @ini_background_site;
border: solid 1px @wikiicons-border; // @ini_border_light;
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
color: @ini_text_webframe;
padding-right: .3rem;
@ -80,6 +105,20 @@
padding-top: @space-max-md;
}
@media @screen_max-xs {
position: absolute;
top: @headericons-margin-xxs;
right: (@toggle-size + @headericons-margin-xxs);
overflow: hidden;
white-space: nowrap;
margin: -1px 0 0;
}
@media @screen_max-xxs {
left: -10px;
width: auto;
}
> a {
.display-flex();
.align-items();
@ -117,6 +156,10 @@
margin-top: -(@space-max-md);
}
@media @screen_max-xxs {
min-height: (@toggle-size - .15);
}
&::before {
content: '';
top: -1px;
@ -176,53 +219,13 @@
top: -.2rem;
}
@media @screen_max-xxs {
@media @screen_max-xs {
top: -.25rem;
}
}
}
} // user
&.user-task {
position: relative;
a {
position: relative;
overflow: visible;
white-space: normal;
text-indent: 0;
&::before {
content: '';
position: absolute;
}
}
.prefix {
.btn-prefix();
.icon-clipboard();
display: block;
font-size: 1.2rem;
text-align: center;
margin-bottom: -1px;
}
} // user-task
&.noopentasks {
strong {
background-color: @ini_background;
border-color: @noopentasks-border;
color: @ini_text_webframe;
}
.num {
background-color: @noopentasks-border; // fix
color: @noopentasks-color; // fix
margin-top: 1px;
}
}
} // li
@ -237,7 +240,7 @@
line-height: 1;
text-decoration: none;
@media @screen_only-lg {
@media @screen_md-xlg {
min-width: 2rem;
}
@ -278,4 +281,4 @@
}
} // a
} // ul
} // nav-usertools
} // nav-usertools

8
css/area_recent.less
View file

@ -71,8 +71,8 @@
.diffnav {
a {
background-color: @ini_background;
border: solid 1px @ini_background;
background-color: @ini_background_site;
border: solid 1px @ini_background_site;
border-radius: @ini_default_border_radius;
color: @ini_nav_menu_color;
transition: @transition background-color, @transition color, @transition border-color;
@ -88,7 +88,7 @@
&:active {
background-color: @ini_nav_menu_color;
border: solid 1px @ini_nav_menu_color;
color: @ini_background;
color: @ini_background_site;
&::before {
background-color: inherit;
@ -114,7 +114,7 @@
}
th {
background-color: @ini_background_content;
background-color: @ini_background;
color: @ini_text;
padding-top: 10px;
padding-bottom: 10px;

16
css/base.less
View file

@ -12,7 +12,7 @@
@font_family_screen: arial, sans-serif;
@font_family_print: "Times New Roman", serif;
@nav_direct_background: @ini_background_content;
@nav_direct_background: @ini_background;
@nav_direct_color: @ini_existing;
@ini_sidebar_width: (100 - @ini_site_width) - 4;
@ -40,10 +40,12 @@
/* + + + for programmers customizing + + + */
@fix_border-radius: 3px;
@fix_border-radius: 3px; // inputs, editbox (textarea), buttons, content, code, quicksearch, msg
@toggle-showsidebar_width: 3.07rem; // shown sidebar after toggle
@headericons-margin-xxs: .45rem; // screen xxs margin-top for header icons
@page_padding-top: @margin-small; // padding-top for 'dokuwiki__content'
@page-header_height: 2.8rem; // minimum: 2.8rem (height for breadcrumb, page-header, page-footer)
@meta-box_height: (@page-header_height - @page_padding-top);
@ -61,18 +63,21 @@
@wikiicons-border: #CCC; /* usertools, breadcrumbs icons, pagetools box-hover */
/* navigation left */
@menu-margin-lg: 1.3rem;
@quicksearch-button-color: @noopentasks-color; /* autosuggest, submit in quicksearch */
@suggestion-zebra: #EEE;
/* edit mode */
@highlight-odd-ini_text: fade(@ini_background_content, 95%);
@highlight-odd-ini_text: fade(@ini_background, 95%);
@highlight-even-ini_text: fade(@ini_text, 5%);
@color-editBox: #252525; // editmode for tables, revision states
//@nolinkedicon-ini_background: fade(@ini_background, 10%);
//@nolinkedicon-ini_background: fade(@ini_background_site, 10%);
//@opacity-ini_nav_menu_color: fade(@ini_nav_menu_color, 40%);
@ -152,8 +157,9 @@
@screen_max-xxlg: ~"only screen and (max-width: " ~"@{break-max-xxlg}px)";
@screen_only-md: ~"only screen and (min-width: 800px) and (max-width: " ~"@{break-max-md}px)";
@screen_only-lg: ~"only screen and (min-width: " ~"@{break-min-md}px) and (max-width: " ~"@{break-max-xlg}px)";
@screen_only-xlg: ~"only screen and (min-width: " ~"@{break-min-xlg}px) and (max-width: " ~"@{break-max-xxlg}px)";
@screen_md-xlg: ~"only screen and (min-width: " ~"@{break-min-md}px) and (max-width: " ~"@{break-max-xlg}px)";
@screen_md-lg: ~"only screen and (min-width: " ~"@{break-min-md}px) and (max-width: " ~"@{break-max-lg}px)";
@screen_xs-lg: ~"only screen and (min-width: " ~"@{break-min-xs}px) and (max-width: " ~"@{break-max-md}px)";

8
css/base_design.less
View file

@ -7,7 +7,7 @@
html, body {
background-color: @ini_background;
background-color: @ini_background_site;
}
@ -45,7 +45,7 @@ html, body {
font-size: @font-size-small;
border: solid @ini_background_alt;
border-width: 1px 1px 0;
background-color: @ini_background;
background-color: @ini_background_site;
color: @ini_text_alt;
padding: .1em .35em;
border-top-left-radius: 2px;
@ -59,7 +59,7 @@ html, body {
clear: both;
overflow: hidden;
word-wrap: break-word;
background: @ini_background_content;
background: @ini_background;
color: inherit;
padding: @page_padding-top @margin-default @margin-default;
@ -520,7 +520,7 @@ button img {
hr {
border-top: solid @ini_border;
border-bottom: solid @ini_background;
border-bottom: solid @ini_background_site;
border-width: 1px 0;
height: 0;
text-align: center;

32
css/base_structure.less
View file

@ -73,9 +73,16 @@
z-index: 900;
}
/* if z-index is needed for .tools col, then use this:
.tools .row > .col-xs-12 {
z-index: 5; // SPR-945 sometimes too small space for suggestionlist
}
.wide-content .tools .row > .col-xs-12 {
z-index: 1;
}
*/
.header .row > .col-xs-12 {
z-index: 2;
@ -170,20 +177,23 @@
}
}
@media @screen_md-lg {
.wide-content.showSidebar {
.content {
.row > .col-xs-12 {
margin-left: 2.1rem;
}
}
}
}
@media @screen_max-md {
.container {
margin: 0 1.25rem;
}
#dokuwiki__usertools {
margin-top: 0;
max-width: 75%;
position: absolute;
top: 0;
margin-right: 0;
right: 1.25rem;
}
.content {
position: relative;
@ -214,10 +224,6 @@
left: @mobileMargin;
}
#dokuwiki__usertools {
right: @mobileMargin;
}
#dokuwiki__footer {
.main-footer {
> * {

50
css/plugins/data.less Normal file
View file

@ -0,0 +1,50 @@
/**
* This file provides styles for old data plugin
* after importing struct data this can be deleted
*/
/* + + + + + global + + + + + */
#dokuwiki__content {
.dataplugin_entry.mitarbeiter.sectionedit2 {
dl {
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;
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;
}
}
}
}
}
}

80
css/plugins/do_tasks.less
View file

@ -2,22 +2,21 @@
* This file provides styles for do-task plugin
*/
/* + + + + + global + + + + + */
ul.page-attributes {
.plugin__do_pagetasks {
.plugin_do_pagetasks {
position: relative;
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
strong {
overflow: hidden;
background-color: @ini_background_site;
border-color: @noopentasks-border;
color: @ini_text_webframe;
}
&.do_none {
position: relative;
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
strong {
overflow: hidden;
background-color: @ini_background;
border-color: @noopentasks-border;
color: @ini_text_webframe;
}
.num {
background-color: @noopentasks-border; // fix
color: @noopentasks-color; // fix
@ -25,3 +24,60 @@ ul.page-attributes {
}
}
}
#dokuwiki__usertools.nav-usertools {
ul {
li {
&.user-task {
position: relative;
a {
overflow: visible;
white-space: normal; // Is this still needed?
text-indent: 0;
&::before {
content: ''; // remove when fontello is removed from usertools
}
}
svg {
width: 20px;
margin-top: 2px;
@media @screen_max-md {
margin-top: 4px;
}
}
&:hover {
:not(.noopentasks) {
svg path {
fill: @ini_background;
}
}
}
.noopentasks {
background-color: @ini_background;
border-color: @noopentasks-border;
color: @ini_text_webframe;
.num {
background-color: @noopentasks-border; // fix
color: @noopentasks-color; // fix
margin-top: 1px;
}
}
@media @screen_max-sm {
display: none;
}
} // user-task
} // li
} // ul
}
.plugin__do_usertasks_list {
z-index: 5;
}

1
css/plugins/edit.less
View file

@ -22,7 +22,6 @@
div.editBox {
background-color: #FFF;
border: solid 2px #FFF;
border-radius: @ini_default_border_radius;
.editButtons {
display: inline-block;

5
css/plugins/edittable.less
View file

@ -16,9 +16,10 @@
button,
input.button {
min-height: 1rem;
background-color: @ini_background_content;
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;
margin-top: 0;
@ -30,7 +31,7 @@
&:active {
background-color: @ini_existing;
border-color: @ini_existing;
color: @ini_background_content;
color: @ini_background;
}
}
}

8
css/plugins/magic-matcher.less
View file

@ -12,6 +12,12 @@
left: 0;
width: 100%;
.container {
@media @screen_md-lg {
margin-left: 1.8rem;
}
}
#mm__issueselect_chosen {
max-width: 50%;
}
@ -43,7 +49,7 @@
min-height: @height-context-bar;
box-sizing: border-box;
box-shadow: @box-shadow;
background-color: @ini_background_content;
background-color: @ini_background;
border-radius: 0 0 @ini_default_border_radius @ini_default_border_radius;
font-size: @font-size-default;
padding: .8em 1em .5em;

33
css/plugins/starred.less
View file

@ -2,9 +2,38 @@
* This file provides styles for starred plugin
*/
.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;
}
/* + + + + + global + + + + + */
.starred.on svg {
fill: @ini_link;
}
#dokuwiki__site {
a:hover,
a:active {
.starred svg {
fill: @ini_nav_menu_hover_bg;
}
}
}
}
nav.nav-starred {
ul {
list-style: none;
li {
margin-left: 0;
svg {
vertical-align: middle;
}
}
}
}

4
css/plugins/struct.less
View file

@ -47,9 +47,11 @@
&.export {
bottom: 1px;
overflow-x: hidden;
background: transparent url("svg.php?svg=file-export.svg&f=existing") left center no-repeat;
background-size: auto 20px;
border: solid 1px @ini_border;
border-radius: 0 0 @fix_border-radius @fix_border-radius;
color: @ini_existing;
font-size: @font-size-small;
line-height: 1;
@ -63,7 +65,7 @@
background-color: @ini_existing;
background-image: url("svg.php?svg=file-export.svg&f=background_content");
border-color: @ini_existing;
color: @ini_background_content;
color: @ini_background;
text-decoration: none;
}
}

14
css/plugins/structstatus.less Normal file
View file

@ -0,0 +1,14 @@
/**
* This file provides styles for structstatus plugin
*/
/* + + + + + global + + + + + */
#dokuwiki__content {
.struct_status {
border-color: @ini_border;
border-radius: @fix_border-radius;
font-size: @font-size-small;
}
}

4
css/plugins/tabinclude.less
View file

@ -35,7 +35,7 @@ div#dwpl-ti-container {
&.selected {
position: relative;
z-index: 1;
background-color: @ini_background_content;
background-color: @ini_background;
color: @ini_text;
}
}
@ -48,7 +48,7 @@ div#dwpl-ti-container {
z-index: 0;
overflow: auto;
box-shadow: @box-shadow;
background-color: @ini_background_content;
background-color: @ini_background;
border: solid 1px @ini_border;
border-radius: 0;
margin-top: -1px;

6
css/template_admin.less
View file

@ -52,7 +52,7 @@
svg {
width: 26px;
height: 26px;
border: solid 1px @ini_background_content;
border: solid 1px @ini_background;
border-radius: @ini_default_border_radius;
fill: @ini_existing;
transition: @transition background-color, @transition border-color, @transition fill;
@ -71,10 +71,10 @@
svg {
background-color: @ini_existing;
border-color: @ini_existing;
fill: @ini_background_content;
fill: @ini_background;
path {
fill: @ini_background_content;
fill: @ini_background;
}
}
}

2
css/template_detail.less
View file

@ -36,7 +36,7 @@
img {
margin: 0;
display: block;
border: 1px dotted @ini_background;
border: 1px dotted @ini_background_site;
position: relative;
z-index: 1;
}

1
img/star-circle.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M16.23 18L12 15.45 7.77 18l1.12-4.81-3.73-3.23 4.92-.42L12 5l1.92 4.53 4.92.42-3.73 3.23L16.23 18M12 2C6.47 2 2 6.5 2 12a10 10 0 0 0 10 10 10 10 0 0 0 10-10A10 10 0 0 0 12 2z"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 275 B

19
js/sidebar.js
View file

@ -12,18 +12,19 @@ jQuery(function () {
$nav.find('div.nav-panel').hide(); // close all panels
jQuery('body').addClass('wide-content');
removeToggleStorage();
window.sessionStorage.setItem('wide-content', true);
},
/**
* removes information about the toggle-state
*/
removeToggleStorage = function () {
for (var index=0; index <= sessionStorage.length; index += 1) {
var item = sessionStorage.getItem('sidebar-section-' + index + '-open');
for (var index=0; index <= window.sessionStorage.length; index += 1) {
var item = window.sessionStorage.getItem('sidebar-section-' + index + '-open');
if (!item) {
break;
continue;
}
sessionStorage.removeItem('sidebar-section-' + index + '-open');
window.sessionStorage.removeItem('sidebar-section-' + index + '-open');
}
},
@ -32,7 +33,7 @@ jQuery(function () {
*/
setDefaultContent = function () {
jQuery('body').removeClass('wide-content');
window.sessionStorage.setItem('wide-content', false);
},
/**
@ -60,7 +61,7 @@ jQuery(function () {
focusFirstSubLink($panel);
}
});
sessionStorage.setItem('sidebar-section-' + $toggler.data('index') + '-open', !isOpen);
window.sessionStorage.setItem('sidebar-section-' + $toggler.data('index') + '-open', !isOpen);
},
/**
@ -123,7 +124,7 @@ jQuery(function () {
$toggler.parent('li').addClass('toggler');
}
if (sessionStorage.getItem('sidebar-section-' + index + '-open') === 'true') {
if (window.sessionStorage.getItem('sidebar-section-' + index + '-open') === 'true') {
$wrap.css('display', 'block');
}
@ -166,6 +167,10 @@ jQuery(function () {
setWideContent();
}
});
if (window.sessionStorage.getItem('wide-content') === 'true') {
setWideContent();
}
},
/**

5
lang/de/lang.php
View file

@ -35,7 +35,6 @@ $lang['tab_tags'] = 'Tags';
$lang['quality_trigger'] = 'Seitenanalyse ein- bzw. ausblenden';
$lang['prefix_tasks'] = 'offene Aufgaben: ';
$lang['prefix_tasks_user'] = 'Ihre offenen Aufgaben: ';
$lang['prefix_tasks_page'] = 'offene Aufgaben auf dieser Seite: ';
$lang['tasks_page_none'] = 'keine offenen Aufgaben für diese Seite';
@ -55,14 +54,14 @@ $lang['image_detail'] = 'Detailinformationen zum Bild';
$lang['__site_width__'] = 'Content - Breite (in %)';
$lang['__background__'] = 'Website - Hintergrundfarbe';
$lang['__background_site__'] = 'Website - Hintergrundfarbe';
$lang['__text_webframe__'] = 'Website unverlinkt: Claim, Titel, Footer, Navigation - Schriftfarbe';
$lang['__nav_menu_color__'] = 'verlinkt: Navigation, Footer, Pagetools Icons, Tabbox - Schriftfarbe';
$lang['__nav_menu_hover_color__'] = 'verlinkt: Navigation (hover) - Schriftfarbe, Rahmenfarbe; Wiki Icons - Schriftfarbe; Wiki Icons (hover) - Hintergrundfarbe';
$lang['__nav_menu_hover_bg__'] = 'verlinkt: Navigation (hover) - Hintergrundfarbe; Wiki Icons - Hintergrundfarbe; Wiki Icons (hover) - Schriftfarbe';
$lang['__background_content__'] = 'Content, Breadcrumb, Pagetools (hover) - Hintergrundfarbe';
$lang['__background__'] = 'Content, Breadcrumb, Pagetools (hover) - Hintergrundfarbe';
$lang['__text__'] = 'Content: Text - Schriftfarbe';
$lang['__background_neu__'] = 'Content neutral (nicht zu unterschiedlich zum Content-Hintergrund) - Hintergrundfarbe';

4
lang/en/lang.php
View file

@ -23,6 +23,7 @@ $lang['head_menu_status'] = 'site status';
$lang['head_breadcrumb'] = 'location indicator';
$lang['head_menu_trace'] = 'Last Visited Pages';
$lang['head_meta_box'] = 'meta data for this page';
$lang['head_menu_starred'] = 'Starred Pages';
$lang['jump_to_quicksearch'] = 'Jump to quick search';
@ -36,13 +37,10 @@ $lang['tab_issues'] = 'Issues';
$lang['quality_trigger'] = 'toggle page analysis';
$lang['prefix_tasks'] = 'open tasks: ';
$lang['prefix_tasks_user'] = 'your open tasks: ';
$lang['prefix_tasks_page'] = 'open tasks for this page: ';
$lang['tasks_page_none'] = 'There are no open tasks for this page.';
$lang['tasks_page_intime'] = 'There are %1$d open tasks on this page.';
$lang['tasks_page_late'] = 'There are %1$d open tasks on this page, %2$d are late.';
$lang['tasks_user_none'] = 'You have no open tasks.';
$lang['tasks_user_intime'] = 'You have %1$d open tasks.';
$lang['discussion'] = 'Discussion';
$lang['back_to_article'] = 'Back to article';

8
main.php
View file

@ -325,7 +325,13 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
</div>
<div class="qc-output"></div>
<?php
/** @var action_plugin_highlightparent $highlightParent */
$highlightParent = plugin_load('action', 'highlightparent');
if ($highlightParent) {
echo $highlightParent->tpl();
}
?>
<div class="msg-area"><?php html_msgarea();/*msg('Information.', 0);msg('Success', 1);msg('Notification', 2);msg('Fehler', -1);*/ ?></div>
<div class="clearer"></div>
<?php

10
style.ini
View file

@ -68,10 +68,10 @@ css/area_nav-direct.less = all
css/area_nav-breadcrumb.less = all
css/area_nav-page-attributes.less = all
css/area_nav-usertools.less = all
css/area_sidebar-search.less = all
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
@ -94,6 +94,7 @@ css/plugins/magic-matcher.less = all
css/plugins/do_tasks.less = all
css/plugins/qc.less = all
css/plugins/struct.less = all
css/plugins/structstatus.less = all
css/plugins/bureaucracy.less = all
css/plugins/highlight_parent.less = all
css/plugins/edit.less = all
@ -105,6 +106,9 @@ css/plugins/edittable.less = all
css/plugins/extension__manager.less = all
css/plugins/folded.less = all
css/plugins/configmanager.less = all
css/plugins/starred.less = all
css/plugins/data.less = all
; _____________ print styles _____________
@ -131,7 +135,7 @@ __site_width__ = "73%" ; @ini_site_width
; alternative text and background colors
__background__ = "#ECECEC" ; @ini_background (guaranteed for every plugin)
__background_site__ = "#ECECEC" ; @ini_background_site
__text_webframe__ = "#696969" ; @ini_text_webframe
@ -141,7 +145,7 @@ __nav_menu_color__ = "#696969" ; @ini_nav_menu_color
__nav_menu_hover_color__ = "#286da8" ; @ini_nav_menu_hover_color
__nav_menu_hover_bg__ = "#FFF" ; @ini_nav_menu_hover_bg
__background_content__ = "#FFF" ; @ini_background_content
__background __ = "#FFF" ; @ini_background (guaranteed for every plugin)
__text__ = "#252525" ; @ini_text (guaranteed for every plugin)
__background_neu__ = "#ffffff" ; @ini_background_neu (guaranteed for every plugin)

29
tpl/main-sidebar-nav.php
View file

@ -48,6 +48,35 @@
</div>
</nav>
<?php
/** @var helper_plugin_starred $plugin_starred */
$plugin_starred = plugin_load('helper', 'starred');
$stars = array();
if($plugin_starred) $stars = $plugin_starred->loadStars();
if($stars):
?>
<nav class="nav-starred">
<a class="nav" role="heading" aria-level="2">
<span class="ico"><?php echo inlineSVG(__DIR__ . '/../img/star-circle.svg') ?></span>
<span class="lbl"><?php echo tpl_getLang('head_menu_starred'); ?></span>
</a>
<div class="nav-panel level1 plugin_starred">
<ul>
<?php
foreach($stars as $pid => $time) {
echo '<li>';
echo $plugin_starred->starHtml($ID, $pid);
echo '&nbsp;';
echo html_wikilink(":$pid");
echo '</li>';
}
?>
</ul>
</div>
</nav>
<?php endif; ?>
<?php if($conf['breadcrumbs']): ?>
<nav class="nav-trace">

27
tpl/nav-page-attributes.php
View file

@ -5,9 +5,10 @@ if(!defined('DOKU_INC')) die();
$doPlugin = plugin_load('helper', 'do');
/** @var \helper_plugin_qc $qcPlugin */
$qcPlugin = plugin_load('helper', 'qc');
/** @var \action_plugin_starred $starredPlugin */
$starredPlugin = plugin_load('action', 'starred');
if($doPlugin !== null || $qcPlugin !== null) {
if($doPlugin !== null || $qcPlugin !== null || $starredPlugin !== null) {
echo '<ul class="page-attributes">';
}
@ -35,23 +36,17 @@ if($doPlugin !== null) {
$class = 'do_late';
$title = sprintf(tpl_getLang('tasks_page_late'), $count['undone'], $count['late']);
}
$markup = "<li class=\"plugin__do_pagetasks $class\" title=\"$title\"><strong><span class=\"prefix\">" . tpl_getLang('prefix_tasks_page') . " </span><span class=\"num\">{$count['undone']}</span></strong></li>";
$markup = "<li class=\"plugin_do_pagetasks $class\" title=\"$title\"><strong><span class=\"num\">{$count['undone']}</span><span class=\"prefix\">" . tpl_getLang('prefix_tasks_page') . " </span></strong></li>";
echo $markup;
}
if($doPlugin !== null || $qcPlugin !== null) {
echo "</ul>";
if($starredPlugin !== null) {
echo '<li class="plugin_starred">';
$starredPlugin->tpl_starred();
echo '</li>';
}
/*
$out = '<div class="plugin__do_pagetasks" title="' . $title . '"><span class="' . $class . '">';
$out .= $count['undone'];
$out .= '</span></div>';
if($return) return $out;
echo $out;*/
if($doPlugin !== null || $qcPlugin !== null || $starredPlugin !== null) {
echo "</ul>";
}

23
tpl/nav-usertools-buttons.php
View file

@ -23,25 +23,12 @@
/** @var \helper_plugin_do $doplugin */
$doplugin = plugin_load('helper','do');
if ($doplugin !== null && isset($_SERVER['REMOTE_USER'])) {
$tasks = $doplugin->loadTasks(array('status' => array('undone'),'user' => $_SERVER['REMOTE_USER']));
$num = count($tasks);
if ($num === 0) {
$title = tpl_getLang('tasks_user_none');
} else {
$title = sprintf(tpl_getLang('tasks_user_intime'), $num);
$icon = $doplugin->tpl_getUserTasksIconHTML();
if ($icon) {
echo '<li class="user-task">' . $icon . '</li>';
}
$doInner = "<span class=\"prefix\">".tpl_getLang('prefix_tasks_user')." </span><span class=\"num\">".count($tasks)."</span>";
$userpage = $doplugin->getConf('userpage');
if ($userpage && $_SERVER['REMOTE_USER'] && $num > 0) {
$linktarget = sprintf($userpage, $_SERVER['REMOTE_USER']) . ':' . 'dashboard';
$linktarget = str_replace('::', ':', $linktarget);
echo '<li class="user-task" title="'.$title.'"><a href="'.wl($linktarget).'">'.$doInner.'</a></li>';
} else {
echo '<li class="user-task" title="'.$title.'"><strong>'.$doInner.'</strong></li>';
}
} ?>
}
?>
</ul>
</nav><!-- #dokuwiki__usertools -->