From 803984a4117fb4668ec61c12bc37b4323fd9cf45 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Fri, 20 Oct 2017 11:18:43 +0200 Subject: [PATCH 01/13] SPR-908: QS "no issues" --- css/area_nav-metabox.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/css/area_nav-metabox.less b/css/area_nav-metabox.less index f3fe6b5..684fce5 100755 --- a/css/area_nav-metabox.less +++ b/css/area_nav-metabox.less @@ -306,8 +306,14 @@ li { &.noissue { + font-size: @font-size-small; list-style-type: none; margin-left: 0; + + .li { + font-size: @font-size-small; + margin-left: .5rem; + } } a { From 1ef4a6ce924095a0f49b111c5f8173eb76d3c427 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Fri, 20 Oct 2017 11:20:03 +0200 Subject: [PATCH 02/13] SPR-908: QS no incremental loops in less --- css/base_mixins.less | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/css/base_mixins.less b/css/base_mixins.less index e17ee37..1e9af0a 100755 --- a/css/base_mixins.less +++ b/css/base_mixins.less @@ -332,19 +332,40 @@ .make-grid(@class) { .float-grid-columns(@class); - .loop-grid-columns(@grid-columns, @class, width); + .grid-columns(1, @class, width); + .grid-columns(2, @class, width); + .grid-columns(3, @class, width); + .grid-columns(4, @class, width); + .grid-columns(5, @class, width); + .grid-columns(6, @class, width); + .grid-columns(7, @class, width); + .grid-columns(8, @class, width); + .grid-columns(9, @class, width); + .grid-columns(10, @class, width); + .grid-columns(11, @class, width); + .grid-columns(12, @class, width); } .float-grid-columns(@class) { - .col-@{class}-1, .col-@{class}-2, .col-@{class}-3, .col-@{class}-4, .col-@{class}-5, .col-@{class}-6, .col-@{class}-7, .col-@{class}-8, .col-@{class}-9, .col-@{class}-10, .col-@{class}-11, .col-@{class}-12 { + .col-@{class}-1, + .col-@{class}-2, + .col-@{class}-3, + .col-@{class}-4, + .col-@{class}-5, + .col-@{class}-6, + .col-@{class}-7, + .col-@{class}-8, + .col-@{class}-9, + .col-@{class}-10, + .col-@{class}-11, + .col-@{class}-12 { float: left; } } -.loop-grid-columns(@index, @class, @type) when (@index >= 0) { +// todo: no recusion - fix it !!! +.grid-columns(@index, @class, @type) { .calc-grid-column(@index, @class, @type); - // next iteration - .loop-grid-columns((@index - 1), @class, @type); } .calc-grid-column(@index, @class, @type) when (@type = width) and (@index > 0) { From 6a2e017953cff1e673760fb67a9a9a97bca2a1cd Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Fri, 20 Oct 2017 14:54:34 +0200 Subject: [PATCH 03/13] SPR-908: QS tabbox hidden by content (detail, mediamanager) --- css/base_structure.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/base_structure.less b/css/base_structure.less index 2b0cfe9..0048ad4 100755 --- a/css/base_structure.less +++ b/css/base_structure.less @@ -83,7 +83,7 @@ } #spr__meta-box { - z-index: 1; // put meta-box above positioned content-elements such as aggregations, edit-buttons + z-index: 10; // put meta-box above positioned content-elements such as aggregations, edit-buttons ul.meta-tabs > li.active { z-index: 1; // put the active tab above the meta-content in .tab-pane.active } From 4fa29dcb7066bd6aec3962b211f6cca3294fe864 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Fri, 20 Oct 2017 14:55:32 +0200 Subject: [PATCH 04/13] SPR-947: check Lang-Strings --- lang/de/lang.php | 37 ++++++++++++++++++------------------- lang/en/lang.php | 26 +++++++++++++------------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/lang/de/lang.php b/lang/de/lang.php index bbfb5ab..272d784 100755 --- a/lang/de/lang.php +++ b/lang/de/lang.php @@ -11,55 +11,54 @@ $lang['direct_content_main'] = 'Hauptinhalt dieser Seite'; $lang['direct_quick_search'] = 'Schnellsuche'; $lang['direct_content_toggle'] = 'Breite des Contents ändern'; -$lang['adjunct_start_logo_text'] = 'Logo: '; -$lang['adjunct_linked_logo_text'] = '. Link zur Startseite'; -$lang['a11y_sidebartoggle'] = 'Sidebar öffnen/schliessen'; +$lang['adjunct_linked_logo_text'] = ' - Link zur Startseite'; +$lang['a11y_sidebartoggle'] = 'Navigation anzeigen/verbergen'; $lang['nav-area-head'] = 'Navigationsmenüs und Suche'; $lang['head_magic_matcher'] = 'MagicMatcher'; -$lang['head_quick_search'] = 'wikiübergreifende Schnellsuche'; -$lang['head_menu_main'] = 'Hauptmenü'; +$lang['head_quick_search'] = 'Wikiübergreifende Schnellsuche'; $lang['head_menu_status'] = 'Seitenstatus'; $lang['head_breadcrumb_youarehere'] = 'Standortanzeiger'; $lang['head_menu_trace'] = 'Zuletzt Angesehen'; $lang['head_meta_box'] = 'Metainformationen zur Seite'; -$lang['head_menu_starred'] = 'gemerkte Seite'; +$lang['head_menu_starred'] = 'Gemerkte Seiten'; $lang['head_menu_tool-select'] = 'Werkzeuge'; $lang['jump_to_quicksearch'] = 'Springe zur Schnellsuche'; +/** it will be shown from plugin lang.php: $lang['meta_box_jira_tickets_none'] = 'Keine Jira-Tickets verknüpft'; $lang['meta_box_tags_none'] = 'Keine Tags verknüpft'; $lang['js']['meta_box_toc_none'] = 'kein Inhaltsverzeichnis vorhanden'; +$lang['prefix_tasks_user'] = 'Ihre offenen Aufgaben: '; +*/ $lang['tab_tags'] = 'Tags'; $lang['tab_issues'] = 'Issues'; -$lang['quality_trigger'] = 'Seitenanalyse ein- bzw. ausblenden'; +$lang['quality_trigger'] = 'Seitenanalyse anzeigen/verbergen'; -$lang['prefix_tasks'] = 'offene Aufgaben: '; $lang['prefix_tasks_page'] = 'offene Aufgaben auf dieser Seite: '; -$lang['prefix_tasks_user'] = 'Ihre offenen Aufgaben: '; $lang['tasks_page_none'] = 'keine offenen Aufgaben für diese Seite'; -$lang['tasks_page_intime'] = 'Es gibt %1$d offenen Aufgaben für diese Seite.'; -$lang['tasks_page_late'] = 'Es gibt %1$d offenen Aufgaben für diese Seite, %2$d sind zu spät.'; +$lang['tasks_page_intime'] = 'offenen Aufgaben für diese Seite: %1$d'; +$lang['tasks_page_late'] = 'offenen Aufgaben für diese Seite: %1$d, zu spät: %2$d'; -$lang['discussion'] = 'Diskussion'; -$lang['back_to_article'] = 'Zurück zum Artikel'; -$lang['userpage'] = 'Benutzer-Seite'; +$lang['discussion'] = 'xxx Diskussion'; +$lang['back_to_article'] = 'xxx Zurück zum Artikel'; +$lang['userpage'] = 'xxx Benutzer-Seite'; -$lang['meta_data'] = 'Meta Daten des Bildes'; +$lang['meta_data'] = 'Meta Daten des Bildes'; /** wird aufgerufen aber nicht ausgegeben - Fehler? */ $lang['osm_zoom_link_text'] = 'größere Karte anzeigen'; -$lang['osm_zoom_link_title'] = 'externer Link - öffnet in neuem Fenster'; +$lang['osm_zoom_link_title'] = 'externer Link - öffnet in neuem Fenster'; /** in streetmaps - konnte ich nicht finden */ + $lang['image_detail'] = 'Detailinformationen zum Bild'; - $lang['mode_edit'] = 'Seite bearbeiten'; -$lang['mode_detail'] = 'Details zum Bild'; + /** - * colors + * preferences colors */ $lang['__site_width__'] = 'Content - Breite (in %)'; diff --git a/lang/en/lang.php b/lang/en/lang.php index 7474e88..a047b46 100755 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -9,16 +9,14 @@ $lang['direct_prefix'] = 'jump to'; $lang['direct_content_main'] = 'Main Content'; $lang['direct_quick_search'] = 'Search'; -$lang['direct_content_toggle'] = 'Toggle Content Width'; +$lang['direct_content_toggle'] = 'Change Content Width'; -$lang['adjunct_start_logo_text'] = 'Logo: '; -$lang['adjunct_linked_logo_text'] = '. homepage link'; -$lang['a11y_sidebartoggle'] = 'Open/Close Sidebar'; +$lang['adjunct_linked_logo_text'] = ' - homepage link'; +$lang['a11y_sidebartoggle'] = 'Show/Hide Navigation'; $lang['nav-area-head'] = 'menus and quick search'; $lang['head_magic_matcher'] = 'MagicMatcher'; $lang['head_quick_search'] = 'quick search'; -$lang['head_menu_main'] = 'main menu'; $lang['head_menu_status'] = 'site status'; $lang['head_breadcrumb_youarehere'] = 'location indicator'; $lang['head_menu_trace'] = 'Last Visited Pages'; @@ -28,22 +26,23 @@ $lang['head_menu_tool-select'] = 'Tools'; $lang['jump_to_quicksearch'] = 'Jump to quick search'; +/** it will be shown from plugin lang.php: $lang['meta_box_jira_tickets_none'] = 'jira associated tickets found: none'; $lang['meta_box_tags_none'] = 'tags found: none'; $lang['js']['meta_box_toc_none'] = 'no Table of Contents available'; +$lang['prefix_tasks_user'] = 'Your open tasks: '; +*/ $lang['tab_tags'] = 'Tags'; $lang['tab_issues'] = 'Issues'; -$lang['quality_trigger'] = 'toggle page analysis'; +$lang['quality_trigger'] = 'Show/Hide page analysis'; -$lang['prefix_tasks'] = 'open tasks: '; $lang['prefix_tasks_page'] = 'open tasks for this page: '; -$lang['prefix_tasks_user'] = 'Your open tasks: '; -$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_page_none'] = 'no open tasks on this page'; +$lang['tasks_page_intime'] = 'open tasks on this page: %1$d'; +$lang['tasks_page_late'] = 'open tasks on this page: %1$d, to late: %2$d'; $lang['discussion'] = 'Discussion'; $lang['back_to_article'] = 'Back to article'; @@ -52,13 +51,14 @@ $lang['userpage'] = 'User page'; $lang['meta_data'] = 'Meta Data'; $lang['osm_zoom_link_text'] = 'view larger map'; $lang['osm_zoom_link_title'] = 'external link opens new window'; + $lang['image_detail'] = 'image details'; $lang['mode_edit'] = 'Editing Page'; -$lang['mode_detail'] = 'Image Details'; + /** - * colors + * preferences colors */ $lang['__site_width__'] = 'content - width (in %)'; From 3ce7dd3b16c39c1f130dc993bb398e0325291033 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Thu, 26 Oct 2017 13:50:56 +0200 Subject: [PATCH 05/13] link style in TH added --- css/base_design.less | 4 ++++ css/plugins/struct.less | 20 +++++++++++++++----- lang/de/lang.php | 3 ++- lang/en/lang.php | 3 ++- style.ini | 1 + 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/css/base_design.less b/css/base_design.less index 2cbe4df..97c8f84 100755 --- a/css/base_design.less +++ b/css/base_design.less @@ -477,6 +477,10 @@ th { background-color: @ini_background_alt; color: @ini_text_alt; text-align: left; + + a { + color: @ini_link_alt; + } } [dir=rtl] th { diff --git a/css/plugins/struct.less b/css/plugins/struct.less index c4aaca7..5c07d5c 100755 --- a/css/plugins/struct.less +++ b/css/plugins/struct.less @@ -18,11 +18,17 @@ line-height: @line-height-default; a { - color: @ini_existing; + //color: @ini_existing; line-height: @line-height-default; } } + th { + a { + color: @ini_link_alt; + } + } + // search button in table (f.i. "All products") table th input { &:not(:focus) { @@ -65,15 +71,19 @@ background-color: @ini_existing; background-image: url("svg.php?svg=file-export.svg&f=background"); border-color: @ini_existing; - color: @ini_background; + //color: @ini_background; text-decoration: none; } } } } - #plugin__struct_output{ + #plugin__struct_output { margin-right: 0; + + th { + background-color: @ini_background_alt; + } } .struct_entry_form { @@ -163,6 +173,6 @@ form { padding-top: 1rem; } } - } + } // fieldset } -} +} // form diff --git a/lang/de/lang.php b/lang/de/lang.php index 272d784..a9c55ee 100755 --- a/lang/de/lang.php +++ b/lang/de/lang.php @@ -92,7 +92,8 @@ $lang['__button_color__'] = 'Buttons - Schriftfarbe'; $lang['__button_background__'] = 'Buttons - Hintergrundfarbe'; $lang['__background_alt__'] = 'Tabellenkopf, Tabellenzeile (hover), struct Label (hover) - Hintergrundfarbe (alternativ)'; -$lang['__text_alt__'] = 'Tabellenkopf (unverlinkt), Tabellenzeile (hover), struct Label (hover) - Schriftfarbe (alternativ)'; +$lang['__text_alt__'] = 'Tabellenkopf: unverlinkt, Tabellenzeile (hover), struct Label (hover) - Schriftfarbe (alternativ)'; +$lang['__link_alt__'] = 'Tabellenkopf: verlinkt - Schriftfarbe (alternativ)'; $lang['__border__'] = 'Tabellen, Formularfelder, Zitate - Rahmenfarbe'; $lang['__default_border_radius__'] = 'Wiki Icons, Content (oben rechts) - Borderradius'; diff --git a/lang/en/lang.php b/lang/en/lang.php index a047b46..f6088d3 100755 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -92,7 +92,8 @@ $lang['__button_color__'] = 'buttons - font color'; $lang['__button_background__'] = 'buttons - background color'; $lang['__background_alt__'] = 'table head, table cell (hover), struct Label (hover) - background color (alternative)'; -$lang['__text_alt__'] = 'table head (unlinked), table cell (hover), struct Label (hover) - font color (alternative)'; +$lang['__text_alt__'] = 'table head: unlinked, table cell (hover), struct Label (hover) - font color (alternative)'; +$lang['__link_alt__'] = 'table head: linked - font color (alternative)'; $lang['__border__'] = 'tables, form fields, blockquotes - border color'; $lang['__default_border_radius__'] = 'wiki icons, content (top right) - border radius'; diff --git a/style.ini b/style.ini index ec7082a..515d8f6 100755 --- a/style.ini +++ b/style.ini @@ -172,6 +172,7 @@ __button_background__ = "#286DA8" ; @ini_button_background __background_alt__ = "#F6F6F6" ; @ini_background_alt (guaranteed for every plugin) __text_alt__ = "#454545" ; @ini_text_alt (guaranteed for every plugin) +__link_alt__ = "#286DA8" ; @ini_link_alt ; border color From 6b6e2bd6f7c3480955ad930b85c690650a3228ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Fri, 19 Jan 2018 11:52:30 +0100 Subject: [PATCH 06/13] refactor: use the new menu classes from master if available This is still fully compatible with the current stable Frusterick Manners, however these old method calls should be removed after the release of Greebo. --- main.php | 9 ++++++- tpl/main-sidebar-nav.php | 44 +++++++++++++++++++++-------------- tpl/nav-page-tools.php | 12 ++++++---- tpl/nav-usertools-buttons.php | 40 +++++++++++++++++++++++++++---- 4 files changed, 78 insertions(+), 27 deletions(-) diff --git a/main.php b/main.php index 7374d5f..ca30f2e 100755 --- a/main.php +++ b/main.php @@ -140,7 +140,14 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
- + getDropdown(); + } else { + //Pre-Greebo Backwards compatibility + tpl_actiondropdown($lang['tools'], "test"); + } + ?>
diff --git a/tpl/main-sidebar-nav.php b/tpl/main-sidebar-nav.php index a084504..7157957 100644 --- a/tpl/main-sidebar-nav.php +++ b/tpl/main-sidebar-nav.php @@ -12,14 +12,19 @@
@@ -34,15 +39,20 @@
diff --git a/tpl/nav-page-tools.php b/tpl/nav-page-tools.php index c261be0..bf4e352 100755 --- a/tpl/nav-page-tools.php +++ b/tpl/nav-page-tools.php @@ -11,12 +11,16 @@ if (!defined('DOKU_INC')) {
    getListItems(); + } else { + //Pre-Greebo Backwards compatibility + $data = dokuwiki\template\sprintdoc\tpl::assemblePageTools(); - foreach ($data['items'] as $k => $html) { - echo $html; + foreach ($data['items'] as $k => $html) { + echo $html; + } } - ?>
diff --git a/tpl/nav-usertools-buttons.php b/tpl/nav-usertools-buttons.php index c321a85..f93cbb4 100755 --- a/tpl/nav-usertools-buttons.php +++ b/tpl/nav-usertools-buttons.php @@ -6,7 +6,19 @@