Commit graph

481 commits

Author SHA1 Message Date
Jana Deutschländer
0ddfd51e0d Merge branch 'fixDoButton' into 'master'
Prevent interaction between do-js and our page-tasks-icon

See merge request !52
2017-04-24 12:08:06 +02:00
Jana Deutschländer
f0798ec8f1 Merge branch 'showTagCount' into 'master'
Show number of tags in metabox label

See merge request !50
2017-04-24 11:41:48 +02:00
Jana Deutschländer
927c20ea4f Merge branch 'fixSidebarToggling' into 'master'
Fix sidebar toggling

See merge request !46
2017-04-24 11:37:02 +02:00
Michael Große
81a9f400e7
Prevent interaction between do-js and our page-tasks-icon
The javascript of the do-plugin tries to update the container with the
plugin__do_pagetasks class. However, since our container has a different
structure than the icon produced by the do-plugin, this attempt fails
and leaves the icon in a broken state.

This commit changes the class of the container and thus ceases to be
affected by the do-plugin's javascript.

SPR-946
2017-04-24 11:21:26 +02:00
Jana Deutschländer
0b91a3629e Merge branch 'reduceSecEditMargin' into 'master'
Editbutton should be closely below section

See merge request !51
2017-04-24 11:20:17 +02:00
Michael Große
d29aa0daac
Editbutton should be closely below section
The `margin-top: 0` overwrites DokuWiki's default `margin-top: -1.4em`
and causes the edit button to be far below the section it is supposed to
edit. This causes a visual disconnect between button and section,
especially for small or empty sections. This is even more
apparent when contrasted with the button-placement for tables etc.
2017-04-21 17:59:24 +02:00
Michael Große
67d7dea5e8
Show number of tags in metabox label
SPR-939
2017-04-21 16:36:05 +02:00
Jana Deutschländer
21a259a048 Merge branch 'moveHighlightparent' into 'master'
Move the highlightparent-plugin, because messages

See merge request !48
2017-04-21 15:09:32 +02:00
Michael Große
aa2452b0a5
Move the highlightparent-plugin, because messages
The link from the highlightparent-plugin is supposed to stay inside the
grey bar at top of the page, even if there are messages. To facilitate
that, it's easiest to explicitly place it above the msg-area.

For this to work, the highlightparent-plugin must be updated.

SPR-944
2017-04-21 13:55:46 +02:00
Michael Große
6df4603459
Explicitly refer to the global sessionStorage
Using this as a local variable might break in some browsers.
2017-04-20 16:30:50 +02:00
Michael Große
fdf5eaea74
Remember sidebar toggle-state
While browsing a wiki, it would be nice if it would remember whether the
content is wide or not.

SPR-883
2017-04-20 16:23:26 +02:00
Michael Große
b8a4cc913e
Fix not correctly forgetting section-open state
The sidebar is intended to close all sections when the content is wide
and set their default back to closed.

SPR-883
2017-04-20 15:50:53 +02:00
Jana Deutschländer
e6acdc2663 Merge branch 'mobileHideMM' into 'master'
Hide MagicMatcher-Header in mobile

See merge request !44
2017-04-20 15:19:29 +02:00
Jana Deutschländer
35213e3ae1 Merge branch 'addClearerBeforeContent' into 'master'
Add clearer before content

See merge request !42
2017-04-20 15:12:51 +02:00
Jana Deutschländer
931ed0511c Merge branch 'SPR-935' into 'master'
SPR-935, SPR-949

See merge request !43
2017-04-20 15:11:26 +02:00
Jana Deutschländer
b45353102a SPR-935: meta box toc tab open after pageload 2017-04-20 15:05:05 +02:00
Michael Große
aaf5973db0
Hide MagicMatcher-Header in mobile
SPR-948
2017-04-20 15:02:23 +02:00
Michael Große
5dbeba2a97
Add clearer before content
If the content does not begin with a h1, then it should still start
below the meta-box.
2017-04-20 13:52:01 +02:00
Jana Deutschländer
a0a9f24e9d SPR-949: long path in page footer set to overflow auto 2017-04-20 13:43:16 +02:00
Jana Deutschländer
727bbf22ce Merge branch 'fixDoubleColon' into 'master'
fix the double-colon in the dashboard-link

See merge request !40
2017-04-20 13:09:33 +02:00
Michael Große
a6b69bf894
fix the double-colon in the dashboard-link
SPR-941
2017-04-20 13:05:38 +02:00
Jana Deutschländer
9a3784cf2f Merge branch 'fixDoTitlesEtc' into 'master'
Fix do-Icon titles

See merge request !39
2017-04-20 12:56:32 +02:00
Jana Deutschländer
2eaf821dd2 Merge branch 'spis-master' into 'master'
spis-master: SPR-908, SPR-814, SPR-882, SPR-926, SPR-930

See merge request !38
2017-04-20 12:54:36 +02:00
Jana Deutschländer
e3a3cb9f4f Merge branch 'spis-master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master 2017-04-20 12:50:39 +02:00
Jana Deutschländer
4e86a8f0c2 SPR-930: pseudo state for breadcrumb on detail template
SPR-814: prevent Uncaught TypeErrors of JSINFO in detail template
2017-04-20 12:50:16 +02:00
Michael Große
df867fe362
fix page-tasks icon to show open tasks, not all
SPR-936
2017-04-20 12:39:10 +02:00
Silke Pisulla
98451cac1c SPR-908: line-height for DL 2017-04-20 12:38:21 +02:00
Silke Pisulla
9d6c0ae999 SPR-814: detail.php "show img " - responsive dl 2017-04-20 12:29:06 +02:00
Michael Große
1140677f44
Show more descriptive titles for the do-icons
This should also fix an occasional fatal-error when all tasks on a page
are done.

We remove here also the $class from the button in the usertools, since
it served no apparent purpose.

SPR-936
2017-04-20 12:11:54 +02:00
Silke Pisulla
ee135d5f6e SPR-814: detail.php "show img " 2017-04-20 11:56:22 +02:00
Jana Deutschländer
6db1065031 SPR-814: bugfix for content toggle / sidebar section toggle in detail template 2017-04-20 11:42:42 +02:00
Silke Pisulla
1741a375bc SPR-908: stop floating after msg-box 2017-04-20 10:49:24 +02:00
Silke Pisulla
41b18cd7b1 Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master 2017-04-20 08:54:57 +02:00
Jana Deutschländer
c22ee858b3 Merge branch 'fixDoDashboardLink' into 'master'
Fix link to do-dashboard per the plugins config

See merge request !36
2017-04-19 17:18:30 +02:00
Michael Große
c75ed2051f
Merge branch 'master' into fixDoDashboardLink 2017-04-19 16:17:32 +02:00
Jana Deutschländer
9fbd182782 Merge branch 'pageattributes' into 'master'
refactoring der Pageattributes (qc und do)

See merge request !29
2017-04-19 16:16:08 +02:00
Jana Deutschländer
2b368d03e6 SPR-869: headline hierarchies did not match font-sizes 2017-04-19 16:13:20 +02:00
Jana Deutschländer
8bd1d76c66 Merge branch 'bugfix/wrongLogoOrder' into 'master'
Use favicons for square logos

See merge request !35
2017-04-19 16:04:05 +02:00
Jana Deutschländer
16a4631324 SPR-814: detail template local merges 2017-04-19 15:51:32 +02:00
Jana Deutschländer
7b09296348 Merge remote-tracking branch 'origin/detailView'
# Conflicts:
#	lang/de/settings.php
#	lang/en/settings.php
2017-04-19 15:44:01 +02:00
Jana Deutschländer
c6f48ce933 SPR-814: remove comment 2017-04-19 15:36:44 +02:00
Jana Deutschländer
571fa3c684 SPR-814: remove comment 2017-04-19 15:33:47 +02:00
Jana Deutschländer
76f5706461 SPR-814: detail template bugfix meta data in webkit 2017-04-19 15:24:25 +02:00
Jana Deutschländer
58aee1016a SPR-814: detail template 2017-04-19 15:21:55 +02:00
Michael Große
22dab1a51e
Fix link to do-dashboard per the plugins config
SPR-931
2017-04-19 14:57:28 +02:00
Silke Pisulla
8a35e69462 SPR-908: footer widescreen 2017-04-19 14:24:11 +02:00
Silke Pisulla
c14dbc7492 SPR-882: section edit button improvements 2017-04-19 14:17:13 +02:00
Silke Pisulla
476022bd24 SPR-926: contrast for CODE 2017-04-19 13:42:18 +02:00
Silke Pisulla
8028368430 SPR-926: contrast for CODE 2017-04-19 13:38:01 +02:00
Silke Pisulla
401950068f SPR-869: QC Plugin output responsive 2017-04-19 13:04:37 +02:00