Commit graph

77 commits

Author SHA1 Message Date
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
Michael Große
a6b69bf894
fix the double-colon in the dashboard-link
SPR-941
2017-04-20 13:05:38 +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
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
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
Michael Große
22dab1a51e
Fix link to do-dashboard per the plugins config
SPR-931
2017-04-19 14:57:28 +02:00
Michael Große
4134f067df
Use favicons for square logos
Since our current approach is to crop non-square logos, we should try all
square logos first.

Since favicons are usually small, we prefer them for the shortcut icon.
However since wiki:logo-square.png is usually larger, it is more
suitable for downscaling, so it should be preferred over favicons, which
would need to be upscaled.

SPR-928
2017-04-19 11:52:48 +02:00
Michael Große
270380eb00
Remove $showTools, because it is set to true
Since the config-option for hide-tools no longer exists, this variable
has become superflous.
2017-04-18 13:48:52 +02:00
Michael Große
e302d67fb6
Remove references to removed options
In commit cb7cc643bf the other options
were removed, as discussed.

This commit now removes references to these options from the codebase.

SPR-754
2017-04-18 13:24:33 +02:00
Michael Große
d012fad75b
Move 'Back to top' pagetool to the end
SPR-906
2017-04-13 15:11:45 +02:00
Michael Große
3f9d4d521a
Merge branch 'master' into pageattributes
Adjusted some more files to account for changes in the over 100 commits
in master since the creation of this branch.

SPR-869
2017-04-11 16:13:02 +02:00
Michael Große
c0c0fa969b
fix mobile sidebar not shown if there is no logo
SPR-918
2017-04-10 16:37:54 +02:00
Michael Große
755c6c7959
Add icon for odt-export
This icon is somewhat suboptimal and should be replaced when a better
icon is found or created.

SPR-906
2017-04-10 12:28:08 +02:00
Michael Große
4d79698367
fix urls by actually using & 2017-04-10 12:17:46 +02:00
Michael Große
26c27b0ca0
Merge branch 'master' into pagetoolShims 2017-04-10 11:03:22 +02:00
Silke Pisulla
166f533b1a Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master 2017-03-22 12:09:36 +01:00
Michael Große
ff79b0e8c5
Add shims for move, dw2pdf and odt pagetools
In SPR-837 we decided to integrated the svg-pagetools with the approach
in splitbrain/dokuwiki#1821. However that had the consequence that the
pagetool-icons of plugins no longer work. Until the approach in the PR
is mainlined and the plugins have adapted, we will use manual shims to
include selected plugins in the pagetools.

This commits implements the pagetool-icons for odt, dw2pdf and move
plugin. The actual icon for the odt-export is still missing.

SPR-906
2017-03-21 18:19:51 +01:00
Silke Pisulla
31170e6e05 SPR-863: better order for usertool icons 2017-03-21 15:23:28 +01:00
Silke Pisulla
02dbc7fa49 SPR-837: page tools -> material design icons, default size - php from pullrequest included 2017-03-16 15:29:03 +01:00
Michael Große
e5d40c9a7e
Do not show a tab if the content is falsy
There may be occasions where plugin does not wish to show any output for
the current user/page. In that case the tab should not be shown at all.

SPR-895
2017-03-16 13:25:51 +01:00
Andreas Gohr
a94fc7a514 give tabs a class for special styling
I nearly needed that but then didn't. but it might come in handy
2017-03-09 16:16:19 +01:00
Andreas Gohr
fbf9e9d682 integrate QC plugin (ajax branch)
This refactors the page-attribute area a bit and intergrates the new
ajax branch of the QC plugin. I'm not really happy about the included
file - it should probably be moved to our Template class instead.
2017-03-09 16:15:10 +01:00
Silke Pisulla
72d714f8ea SPR-843: Fontello Icons umstellen auf Material Design Icons 2017-03-03 10:52:53 +01:00
Jana Deutschländer
75a1a114df Merge remote-tracking branch 'origin/mobilesidebar' 2017-03-02 12:11:51 +01:00
Andreas Gohr
15e86d9932 fixed broken closing tag 2017-02-22 17:32:50 +01:00
Andreas Gohr
e35789fd1e styled the menu button 2017-02-22 15:51:32 +01:00
Andreas Gohr
4055de39fa mobile handling of the sidebar SPR-840 2017-02-22 14:58:43 +01:00
Andreas Gohr
47bbf7c766 made search toggle translatable 2017-02-22 14:17:33 +01:00
Andreas Gohr
1202d1f832 Merge branch 'metabox' into details
* metabox:
  avoid empty ul
2017-02-22 14:04:21 +01:00
Andreas Gohr
a0eb50e598 avoid empty ul
An empty UL is not valid in HTML, but since we don't know if LIs are
added later on by JavaScript, we add an invisible LI by default now.
2017-02-22 14:03:04 +01:00
Andreas Gohr
560d730c9c Merge branch 'sidebar' into details
* sidebar:
  use a instead of h6 in navigation
  make sidebar headers toggable via keyboard
2017-02-22 13:57:26 +01:00
Andreas Gohr
06938c6d7c use a instead of h6 in navigation
this makes focusing and selecting in assistive technologies easier
2017-02-22 12:12:04 +01:00
Andreas Gohr
d8b607a333 Merge branch 'sidebar' into live
* sidebar:
  simplistic qsearch support
  reveal sidebar when clicking the search icon
2017-02-21 15:22:00 +01:00
Andreas Gohr
95732eecdc simplistic qsearch support
This disabled the browser's own autocompletion, but every other position
looks weird.
2017-02-21 15:16:28 +01:00
Andreas Gohr
248d08817b Merge branch 'sidebar' into live
* sidebar:
  fix problems with ini handling in svg dispatch
  added profile link to usertools in sidebar
  finally align the menu items correctly
  some more list adjustments for sidebar
  add level1 class to fake inpage lists
  adjusted language
  some style adjustments for the sidebar
  complete refactor of the sidebar behaviour javascript RES-754
  style the fake icon
  use jQuery slector to define the elements
  directly embed SVGs for better styling
  very simple styling of the new sidebar behaviour.
  New sidebar JavaScript logic
  allow style.ini replacements in SVG dispatcher
  SVG Dispatch: allow for referencing material design icons
  add caching and fix <g> wrapping
  fixed content type header
  fixed auth check
  feat: add background-colors to SVG-dispatcher
  first go at a dispatcher to dynamically recolor SVGs
2017-02-21 13:46:23 +01:00
Andreas Gohr
3a6eaa0b7a SPR-787 use proper fallbacks for main logo as well 2017-02-21 13:32:57 +01:00
Andreas Gohr
06cdf1484d SPR-787 use same logo resized 2017-02-20 16:21:45 +01:00
Andreas Gohr
ef84665d4a added profile link to usertools in sidebar 2017-02-20 12:38:01 +01:00
Andreas Gohr
fa1028ad60 finally align the menu items correctly
I had to wrap the labels in their own span and use flex box to make them
behave correctly. Simplifications welcome.
2017-02-16 16:58:36 +01:00
Andreas Gohr
373f4a8f3a add level1 class to fake inpage lists 2017-02-16 15:48:36 +01:00
Andreas Gohr
83e6372c7d some style adjustments for the sidebar
There is no need to differentiate between site tools and the navigation
anymore. Instead now it's differentiated between the navigation tools
and the displayed content.
2017-02-16 15:10:50 +01:00
Andreas Gohr
6c61749bf2 complete refactor of the sidebar behaviour javascript RES-754
Now all toggling of the sidebar and the related menus is done through
the same click handler. HTML has been unified. All sidebar related
content is now in a single include file instead of several. Icons for
the site tools user tools and trace have been added.

The CSS for the whole sidebar still has to be refactored.
2017-02-16 14:40:25 +01:00
Andreas Gohr
2387fd467e moved tab logic to a new class
More of the logic should be moved to this class
2017-02-15 17:05:00 +01:00
Andreas Gohr
ec6c921996 fixed missing closing a tag 2017-02-15 16:25:26 +01:00
Andreas Gohr
038d4bfe8d moved tab generation to PHP, no empty tabs SPR-799
I still don't like the code directly in the template there. I think it
should be moved to a helper class.

The TOC CSS seems to be broken when there are no tabs right of the TOC.
2017-02-15 16:17:17 +01:00
Andreas Gohr
a1de3dc148 added type ints for other plugins 2017-02-14 10:21:20 +01:00
Andreas Gohr
e1fee95368 SPR-797 fix ID uniqueness
As explained on https://www.dokuwiki.org/devel:javascript#using_ids IDs
may not clash with headlines. To avoid that all IDs have to use two
subsequent underscores.
2017-02-13 16:53:06 +01:00
Andreas Gohr
9281ecfa76 fixed line endings CRLF -> LF 2017-02-09 17:48:44 +01:00
Andreas Gohr
aef104329a fix name of toc tab 2017-02-09 17:38:51 +01:00