Commit graph

189 commits

Author SHA1 Message Date
Andreas Gohr
3a6c6601fa SVG dispatch: allow passing ini colors without underscores
The surrounding underscores can be left out.
2017-02-21 16:34:26 +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
a36c5fa052 reveal sidebar when clicking the search icon 2017-02-21 15:09:01 +01:00
Andreas Gohr
e988c1764f fix problems with ini handling in svg dispatch 2017-02-21 13:03:41 +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
0cdca1153e some more list adjustments for sidebar 2017-02-16 15:54:29 +01:00
Andreas Gohr
373f4a8f3a add level1 class to fake inpage lists 2017-02-16 15:48:36 +01:00
Andreas Gohr
9eec2b7fe2 adjusted language 2017-02-16 15:13:48 +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
285c4f96a7 style the fake icon
When no icon is provided, we use the first two letters as icon. A fancy
border makes it look more like an icon.
2017-02-15 14:58:36 +01:00
Andreas Gohr
f293a16b9c use jQuery slector to define the elements
This makes it possible to use multiple. For now I just use all headlines
2017-02-14 11:59:08 +01:00
Andreas Gohr
eaccab8168 Merge branch 'master' into sidebar
* master:
  show license not copyright SPR-794
  use proper translation mechanism for JS SPR-798
  added type ints for other plugins
  SPR-797 fix ID uniqueness
2017-02-14 11:21:52 +01:00
Andreas Gohr
a74658ac49 show license not copyright SPR-794 2017-02-14 11:15:18 +01:00
Andreas Gohr
fa2e06046c use proper translation mechanism for JS SPR-798 2017-02-14 10:41:41 +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
9fd3d99b8f directly embed SVGs for better styling
Now the SVGs are loaded via AJAX and are directly embedded into the
HTML. This allows for styling them via CSS and we can apply proper hover
styles.

The svg dispatcher was extended with an embed option (boolean parameter
'e') which will return an absolute minimum svg with absolutely no
styles.
2017-02-13 16:19:43 +01:00
Andreas Gohr
96fae1c8bc very simple styling of the new sidebar behaviour.
I had a really hard time to understand the existing CSS which seemed
much too complicated for what it does.

Variable use was suboptimal. I couldn't figure out which variable
defines the proper size for the icon and the resulting margin.
2017-02-13 15:28:40 +01:00
Andreas Gohr
9d8dba1489 New sidebar JavaScript logic
This implements the JS logic as discussed in our meeting. A sidebar can
now contain virtually any wiki syntax. (currently hardcoded) H2 elements
will toggle all their following content which is wrapped in a wrapper
div.

This is currently implemented on top of the old JavaScript which should
be removed.

The toggle element should be made configurable.

We probably want to reuse some of the toggle logic for the user tools.
2017-02-13 15:17:18 +01:00
Andreas Gohr
94def893f0 allow style.ini replacements in SVG dispatcher 2017-02-13 14:28:04 +01:00
Andreas Gohr
c24a2e1e52 SVG Dispatch: allow for referencing material design icons
A SVG not found in the template or in the local media storage will now
be looked up in the Material Design Icon library (via a cached HTTP
request to the rawgit CDN).
2017-02-13 14:02:16 +01:00
Andreas Gohr
09aeb71c54 Merge remote-tracking branch 'origin/svg-dispatch' into sidebar
* origin/svg-dispatch:
  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-13 13:42:29 +01:00
Andreas Gohr
9281ecfa76 fixed line endings CRLF -> LF 2017-02-09 17:48:44 +01:00
Andreas Gohr
6b795a1e14 move msg area down to content area. fixes SPR-792 2017-02-09 17:40:18 +01:00
Andreas Gohr
aef104329a fix name of toc tab 2017-02-09 17:38:51 +01:00
Andreas Gohr
59568563a3 use new admin.less instead of admin.css 2017-02-09 17:38:15 +01:00
Andreas Gohr
55a903a9da changed default logo location (and line endings) 2017-02-09 17:37:38 +01:00
Jana Deutschländer
9d282a57d4 debug breadcrumb height vs search toggle icon 2017-02-09 17:06:55 +01:00
Jana Deutschländer
6924827172 merge part 2 2017-02-09 17:03:14 +01:00
Jana Deutschländer
4b8b659179 merge part 2
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-02-09 16:59:16 +01:00
Jana Deutschländer
432353279d Merge remote-tracking branch 'origin/bar_search' part 1
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-02-09 16:53:43 +01:00
Jana Deutschländer
5671e6e5e8 merge jde_bar_search and bar_search branch 2017-02-09 16:48:46 +01:00
Jana Deutschländer
3bd1b21aee sidebar nav reset open toggle areas when switch to wide content view 2017-02-09 11:27:52 +01:00
Jana Deutschländer
28eb39b298 merge styles of prototype beuth hs project 2017-02-09 10:12:50 +01:00
Andreas Gohr
24ab1f725c add caching and fix <g> wrapping 2017-01-19 18:30:37 +01:00
Andreas Gohr
5a65cb36d8 Merge branch 'svg-background' into 'svg-dispatch'
feat: add background-colors to SVG-dispatcher

See merge request !12
2017-01-19 16:08:06 +01:00
Jana Deutschländer
fbb87b85c4 Merge branch 'spis-master' into 'master'
SPR-768: SprintMeeting Anpassungen

See merge request !13
2017-01-18 12:43:07 +01:00
Andreas Gohr
4fd6492bc9 fixed content type header 2017-01-12 09:25:28 +01:00
Andreas Gohr
3ec07d58b7 fixed auth check 2017-01-12 09:25:13 +01:00
Jana Deutschländer
edabe53b81 trigger defaultcontent in wide-content state main menu on click 2017-01-11 18:06:07 +01:00
Jana Deutschländer
d0530116c5 mobile + js: min-height for content > sidebar hight 2017-01-11 17:51:42 +01:00
Jana Deutschländer
b7592db0de merge debug 2017-01-11 16:19:20 +01:00
Jana Deutschländer
863ddc8263 Merge remote-tracking branch 'origin/spis-master' into bar_search
# Conflicts:
#	css/area_content.less
#	css/area_nav-breadcrumb.less
2017-01-11 15:59:24 +01:00
Jana Deutschländer
659ce8325f merge mit spis vorbereiten 2017-01-11 15:51:10 +01:00
Silke Pisulla
555efed804 Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master
# Conflicts:
#	css/area_content.less
#	css/area_nav-breadcrumb.less
#	css/area_nav-metabox.less
#	css/area_sidetools.less
#	css/base_design.less
2017-01-11 15:44:24 +01:00
Silke Pisulla
00c1ebdd53 new var @fix_border-radius for no custom border-radius 2017-01-11 15:21:29 +01:00
Silke Pisulla
acc4acbcf1 new var @fix_border-radius for no custom border-radius 2017-01-11 15:20:15 +01:00
Silke Pisulla
527e72e79a SPR-768: Anpassungen - SprintMeeting 10.1.2017 - tabbox 2017-01-11 15:18:39 +01:00