From fbf9e9d682e580dc2d020d23ecc173315327ec1e Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 9 Mar 2017 16:15:10 +0100 Subject: [PATCH 01/26] 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. --- css/area_nav-breadcrumb.less | 139 ------------------------------ css/area_nav-page-attributes.less | 30 +++++++ css/plugins/qc.less | 28 +++++- js/plugins/do_tasks.js | 94 ++++++++++---------- js/plugins/qc.js | 37 ++++++++ main.php | 3 +- script.js | 1 + style.ini | 1 + tpl/nav-page-attributes.php | 57 ++++++++++++ tpl/nav-page-quality-tasks.php | 54 ------------ 10 files changed, 200 insertions(+), 244 deletions(-) create mode 100644 css/area_nav-page-attributes.less create mode 100644 js/plugins/qc.js create mode 100755 tpl/nav-page-attributes.php delete mode 100755 tpl/nav-page-quality-tasks.php diff --git a/css/area_nav-breadcrumb.less b/css/area_nav-breadcrumb.less index cd3f5b6..4376701 100755 --- a/css/area_nav-breadcrumb.less +++ b/css/area_nav-breadcrumb.less @@ -67,145 +67,6 @@ padding: .1em .1em 0; } } - - -/* + + + + + icon list + + + + + */ - .page-attributes { - list-style: none; - float: right; - display: inline-block; - max-width: 30%; - margin: -.45em 0 0; - padding: 0; - @media @screen_max-xs{ - max-width: 90%; - } - - > li { - .btn-usertools-wrapper(); // uniform li - .btn-usertools-num(); - - float: left; - - > strong, - > a { - display: block; - width: auto; - min-height: 2em; - border: 1px solid @color-border; - border-radius: @border-radius; - color: @color-nav; - text-align: center; - margin: 0; - } - - .prefix { - .btn-prefix (); - .icon-clipboard(); - } - -/* check !!! */ - &.do_none { - position: relative; - - strong { - background-color: @color-site-bg; - } - - .num { - background-color: @color-border; - color: @color-nav; - } - } -/* end check !!! */ - - &.plugin__qc { - display: inline-block; - overflow: visible; - position: static; - } - } // li - - a { - transition: @transition color, @transition background-color, @transition border-color; - - &[aria-expanded="false"] + #plugin__qc__wrapper { - display: none; - } - - &:hover, - &:active, - &:focus { - background-color: @button_color; - border-color: @button_background; - color: @button_background; - - .prefix { - color: @button_background; - } - } - } - - #plugin__qc__wrapper { - position: absolute; - right: 0; - width: auto; - border: 0 none; - background: @background_page-header; - background: -webkit-linear-gradient(top, @background_page-header, @color-content-bg); - background: linear-gradient(top, @background_page-header, @color-content-bg); - box-shadow: @box-shadow-bottom; - z-index: 2000; - - #plugin__qc__out{ - h1 { - font-size: @font-size-head3; - } - - h2 { - margin-top: 1.6em; - font-size: @font-size-head5; - } - > h1, - > h2, - > p, - > dl, - > div { - padding-left: 1rem; - margin-left: 0; - } - - > div p { - padding-left: 0; - margin-left: 0; - } - } - - &[aria-hidden="false"] { - margin-top: .5rem; - } - } - - #plugin__qc__icon { - display: none; - } - - #plugin__qc__link { - position: relative; - - .prefix { - .icon-emo-happy(); - - width: 100%; - font-size: @font-size-default; - - &::before { - width: 100%; - margin: .1em 0 0; - } - } - } - } } diff --git a/css/area_nav-page-attributes.less b/css/area_nav-page-attributes.less new file mode 100644 index 0000000..228f667 --- /dev/null +++ b/css/area_nav-page-attributes.less @@ -0,0 +1,30 @@ +/** + * Page Attribute Icons in the breadcrumb bar + */ +.page-attributes { + list-style: none; + float: right; + display: inline-block; + max-width: 30%; + margin: -.45em 0 0; + padding: 0; + @media @screen_max-xs { + max-width: 90%; + } + + > li { + .btn-usertools-wrapper(); // uniform li + .btn-usertools-num(); + + position: relative; + float: left; + display: block; + width: auto; + min-height: 2em; + border: 1px solid @color-border; + border-radius: @border-radius; + color: @color-nav; + text-align: center; + margin: 0; + } +} diff --git a/css/plugins/qc.less b/css/plugins/qc.less index dff5a32..42c57a5 100644 --- a/css/plugins/qc.less +++ b/css/plugins/qc.less @@ -1,6 +1,26 @@ -#plugin__qc__wrapper{ - font-size: @font-size-default; - p{ - font-size: @font-size-default; +/** + * Styles for the QC plugin + */ + +// icon in page attributes +.page-attributes .plugin_qc { + .qc_icon { + margin: 0; + width: 2em; + height: 2em; + + svg { + margin-top: 0.1em; + margin-left: 0.1em; + width: 1.6em; + height: 1.6em; + } } } + +// output +.qc-output { + font-size: 90%; + border-bottom: 1px solid @ini_border; +} + diff --git a/js/plugins/do_tasks.js b/js/plugins/do_tasks.js index 78a8f34..1ff8717 100755 --- a/js/plugins/do_tasks.js +++ b/js/plugins/do_tasks.js @@ -1,47 +1,49 @@ -( function( $, spc ) { - - var togglePageAnalysis = function(){ - var $this = $('.page-attributes').find('.plugin__qc'); - try{ - var $link = $this.find('#plugin__qc__link'), - $container = $this.find('#plugin__qc__wrapper'); - - if($container.length < 1){ - $this.remove(); - }else{ - $container.attr('aria-hidden','true'); - var $icon = $container.find('#plugin__qc__icon'); - $container.find('#plugin__qc__out').removeAttr('style'); - $link.on( 'click', function(e){ - e.preventDefault(); - $icon.trigger('click'); - var oldState = ($link.attr('aria-expanded')=== "true" ); - $container.attr('aria-hidden',oldState); - $(this).attr('aria-expanded',!oldState); - - }); - - if($container.length > 0){ - var num = $container.attr('data-errors'); - if(num){ - $link.find('.num').empty().append(num); - $link.closest('li').removeClass('do_none'); - } - } - - } - - }catch(err){ - $this.remove(); - } - }; - - $(function(){ - togglePageAnalysis(); - }); - -} )( jQuery, spc ); - - - +// FIXME figure out what this did and why +// ( function( $, spc ) { +// +// var togglePageAnalysis = function(){ +// var $this = $('.page-attributes').find('.plugin__qc'); +// try{ +// var $link = $this.find('#plugin__qc__link'), +// $container = $this.find('#plugin__qc__wrapper'); +// +// if($container.length < 1){ +// $this.remove(); +// }else{ +// $container.attr('aria-hidden','true'); +// var $icon = $container.find('#plugin__qc__icon'); +// $container.find('#plugin__qc__out').removeAttr('style'); +// $link.on( 'click', function(e){ +// e.preventDefault(); +// $icon.trigger('click'); +// var oldState = ($link.attr('aria-expanded')=== "true" ); +// $container.attr('aria-hidden',oldState); +// $(this).attr('aria-expanded',!oldState); +// +// }); +// +// if($container.length > 0){ +// var num = $container.attr('data-errors'); +// if(num){ +// $link.find('.num').empty().append(num); +// $link.closest('li').removeClass('do_none'); +// } +// } +// +// } +// +// }catch(err){ +// $this.remove(); +// } +// }; +// +// $(function(){ +// togglePageAnalysis(); +// }); +// +// } )( jQuery, spc ); +// +// +// +// diff --git a/js/plugins/qc.js b/js/plugins/qc.js new file mode 100644 index 0000000..65d795b --- /dev/null +++ b/js/plugins/qc.js @@ -0,0 +1,37 @@ +/** + * Add custom QC functionality instead of using the plugin's mechanism + */ +jQuery(function () { + var $panel = jQuery('div.qc-output').hide(); + + // load summary + jQuery('.page-attributes .plugin_qc a').load( + DOKU_BASE + '/lib/exe/ajax.php', + { + call: 'plugin_qc_short', + id: JSINFO['id'] + }, + function () { + jQuery(this).find('span span').addClass('num'); + } + ).click(function (e) { + e.preventDefault(); + + if ($panel.html() == '') { + // load output + $panel.load( + DOKU_BASE + '/lib/exe/ajax.php', + { + call: 'plugin_qc_long', + id: JSINFO['id'] + }, + function () { + $panel.dw_show(); + } + ); + } else { + $panel.dw_toggle(); + } + }); + +}); diff --git a/main.php b/main.php index 2934e3f..22fa813 100755 --- a/main.php +++ b/main.php @@ -230,7 +230,7 @@ $classWideContent = ($ACT === "show") ? "": "wide-content "; /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* page quality / page tasks */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - include('tpl/nav-page-quality-tasks.php'); + include('tpl/nav-page-attributes.php'); ?> +
'; +} + + +if($qcPlugin && $qcPlugin->shouldShow()) { + echo '
  • …
    • '; // filled by javascript +} + + +if($doPlugin !== null) { + $count = $doPlugin->getPageTaskCount(); + $num = $count['count']; + $title = ""; + + if($num == 0) { // no tasks - does not exist do in plug-in + $class = "do_none"; + $title = tpl_getLang('tasks_page_none'); + } elseif($count['undone'] == 0) { // all tasks done + $class = 'do_done'; + $title = $this->getLang('title_alldone'); + } elseif($count['late'] == 0) { // open tasks but none late + $class = 'do_undone'; + $title = sprintf($this->getLang('title_intime'), $count['undone']); + } else { // late tasks + $class = 'do_late'; + $title = sprintf($this->getLang('title_late'), $count['undone'], $count['late']); + } + $markup = "
  • " . tpl_getLang('prefix_tasks_page') . " " . $num . "
    • "; + + echo $markup; +} + +if($doPlugin !== null || $qcPlugin !== null) { + echo ""; +} + + + +/* + + +$out = '
    '; +$out .= $count['undone']; +$out .= '
    '; + +if($return) return $out; +echo $out;*/ diff --git a/tpl/nav-page-quality-tasks.php b/tpl/nav-page-quality-tasks.php deleted file mode 100755 index 2a1977c..0000000 --- a/tpl/nav-page-quality-tasks.php +++ /dev/null @@ -1,54 +0,0 @@ - - -"; - } - if ($qc) { - echo "
  • ".tpl_getLang('quality_trigger')."0"; - $qc->tplErrorCount(); - echo "
    • "; - } - if ($doPlugin !== null ) { - $count = $doPlugin->getPageTaskCount(); - $num = $count['count']; - $title = ""; - - if($num == 0){ // no tasks - does not exist do in plug-in - $class = "do_none"; - $title = tpl_getLang('tasks_page_none'); - } elseif($count['undone'] == 0){ // all tasks done - $class = 'do_done'; - $title = $this->getLang('title_alldone'); - }elseif($count['late'] == 0) { // open tasks but none late - $class = 'do_undone'; - $title = sprintf($this->getLang('title_intime'), $count['undone']); - } else { // late tasks - $class = 'do_late'; - $title = sprintf($this->getLang('title_late'), $count['undone'], $count['late']); - } - $markup = "
  • ".tpl_getLang('prefix_tasks_page')." ".$num."
    • "; - - echo $markup; - } - - if ($doPlugin !== null ||$qc ) { - echo ""; - } - -/* - - -$out = '
    '; -$out .= $count['undone']; -$out .= '
    '; - -if($return) return $out; -echo $out;*/ From a94fc7a514a474778ffdc5e7e998f441ce1d2576 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 9 Mar 2017 16:16:19 +0100 Subject: [PATCH 02/26] give tabs a class for special styling I nearly needed that but then didn't. but it might come in handy --- tpl/nav-meta-box.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tpl/nav-meta-box.php b/tpl/nav-meta-box.php index 77328c5..abf95a3 100755 --- a/tpl/nav-meta-box.php +++ b/tpl/nav-meta-box.php @@ -9,7 +9,7 @@ $tabs = \dokuwiki\template\sprintdoc\Template::getInstance()->getMetaBoxTabs();
  •  
    • '; + echo '
  • '; echo '
    View Larger Map'; + echo '
    '; + echo '
    '; + } + } + ?>
    Date: Mon, 10 Apr 2017 13:43:43 +0200 Subject: [PATCH 06/26] Adjust to changed main html --- detail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/detail.php b/detail.php index 70ddd7c..5cce646 100755 --- a/detail.php +++ b/detail.php @@ -117,7 +117,7 @@ header('X-UA-Compatible: IE=edge,chrome=1');
    - < > +
    From 5c6ddbf8b29351dbab45fb87cd45106e942d7e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Mon, 10 Apr 2017 13:45:43 +0200 Subject: [PATCH 07/26] Use correct pagetools for details.php SPR-814 --- detail.php | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/detail.php b/detail.php index 5cce646..9aa119e 100755 --- a/detail.php +++ b/detail.php @@ -139,17 +139,16 @@ header('X-UA-Compatible: IE=edge,chrome=1');
    - +
    @@ -227,11 +226,6 @@ header('X-UA-Compatible: IE=edge,chrome=1');
    -

    -
    - ← -

    -
    From 6f352bafb27d6b8a6819ca65a04198c78d30d566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Mon, 10 Apr 2017 13:49:08 +0200 Subject: [PATCH 08/26] function tpl_img_meta reliably exists --- detail.php | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/detail.php b/detail.php index 9aa119e..fdd2cbc 100755 --- a/detail.php +++ b/detail.php @@ -167,7 +167,6 @@ header('X-UA-Compatible: IE=edge,chrome=1');

    - - -
    - $tag){ - $t = array(); - if (!empty($tag[0])) { - $t = array($tag[0]); - } - if(is_array($tag[3])) { - $t = array_merge($t,$tag[3]); - } - $value = tpl_img_getTag($t); - if ($value) { - echo '
    '.$lang[$tag[1]].':
    '; - if ($tag[2] == 'date') { - echo dformat($value); - } else { - echo hsc($value); - } - echo '
    '; - } - } - ?> -
    -
    From ecb77cc51cadc644f63b3cf5e3c2a7d1fb3c45a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Mon, 10 Apr 2017 13:49:54 +0200 Subject: [PATCH 09/26] Fix indent and more style-issues in details.php --- detail.php | 103 ++++++++++++++++++++++++++++------------------------- 1 file changed, 55 insertions(+), 48 deletions(-) diff --git a/detail.php b/detail.php index fdd2cbc..8c87871 100755 --- a/detail.php +++ b/detail.php @@ -9,21 +9,25 @@ */ // must be run from within DokuWiki -if (!defined('DOKU_INC')) die(); +if (!defined('DOKU_INC')) { + die(); +} header('X-UA-Compatible: IE=edge,chrome=1'); ?> - + - + - <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?> - [<?php echo strip_tags($conf['title'])?>] + <?php echo hsc(tpl_img_getTag('IPTC.Headline', $IMG)) ?> + [<?php echo strip_tags($conf['title']) ?>] - - - + + + @@ -43,7 +47,7 @@ header('X-UA-Compatible: IE=edge,chrome=1');
    - - +
    -
    +
    - +
    -
    +
    -
    +
    @@ -201,11 +209,10 @@ header('X-UA-Compatible: IE=edge,chrome=1'); -
    +
    -
    From e1c37e409cc404c96f18025a6a5e52220b15ea16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Tue, 11 Apr 2017 11:20:40 +0200 Subject: [PATCH 10/26] Fix js errors by initializing JSINFO on details.php SPR-814 --- detail.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/detail.php b/detail.php index 8c87871..faf5eef 100755 --- a/detail.php +++ b/detail.php @@ -14,6 +14,11 @@ if (!defined('DOKU_INC')) { } header('X-UA-Compatible: IE=edge,chrome=1'); +global $JSINFO; +if (empty($JSINFO)) { + $JSINFO = array(); +} + ?> From 2ac13e14316e4dcdcd92344027505d3695d158fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschla=CC=88nder?= Date: Tue, 11 Apr 2017 12:53:03 +0200 Subject: [PATCH 11/26] SPR-814: style linked image --- css/template_detail.less | 64 ++++++++++++++++++++++++++++++++++++++++ detail.php | 6 ++-- style.ini | 4 ++- 3 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 css/template_detail.less diff --git a/css/template_detail.less b/css/template_detail.less new file mode 100644 index 0000000..b11c551 --- /dev/null +++ b/css/template_detail.less @@ -0,0 +1,64 @@ +/** + * This file provides the design styles for the the detail template + * (media details) + * + * @author Jana Deutschlaender + */ +#dokuwiki__detail { + + // linked image + .img-link{ + + text-align: center; + + a { + display: inline-block; + margin: 0 auto 1.4em; + position: relative; + + img { + margin: 0; + display: block; + border: 1px dotted @ini_background; + position: relative; + z-index: 1; + } + + &:hover, + &:focus, + &:active { + &:before{ + position: absolute; + top: 0; + left: 0; + width: 100%; + box-sizing: border-box; + display: block; + padding: @margin-small; + + z-index:2; + background: @ini_button_background; + color: @ini_button_color; + content:attr(title); + } + img { + border: 1px solid @ini_button_background; + } + } + + } + } + + // meta data + .img_detail { + /* vertical minus margin of .img-detail corresponds to the padding of .page */ + margin: @margin-default -(@margin-default); + @media @screen_max-md { + margin-right: -(@margin-default * 1.6); + } + + @media @screen_max-xs { + margin-left: -(@margin-small); + } + } +} diff --git a/detail.php b/detail.php index 8c87871..5768eb1 100755 --- a/detail.php +++ b/detail.php @@ -168,9 +168,9 @@ header('X-UA-Compatible: IE=edge,chrome=1'); echo p_locale_xhtml('showrev'); } ?>

    - - - +
    + +

    diff --git a/style.ini b/style.ini index 1fd8b20..64e1480 100755 --- a/style.ini +++ b/style.ini @@ -72,7 +72,6 @@ css/area_nav-pagetools.less = all css/area_nav-metabox.less = all css/area_main-sidebar-nav.less = all css/area_main-sidebar-content.less = all -;css/area_sidetools.less = all css/area_main-content.less = all css/area_main-content-secedit.less = all css/area_togglelink.less = all @@ -80,7 +79,10 @@ css/area_forms.less = all css/area_search.less = all css/area_tabs.less = all +; ____________ template styles _____________ + css/template_admin.less = all +css/template_detail.less = all ; _____________ plugin styles _____________ From fa31b96cc4fcf7b1ac51920ced1fb7822903d1f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschla=CC=88nder?= Date: Wed, 12 Apr 2017 15:14:46 +0200 Subject: [PATCH 12/26] SPR-814: html5 instead of xhtml --- detail.php | 72 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 23 deletions(-) diff --git a/detail.php b/detail.php index 25b09d5..d964f3d 100755 --- a/detail.php +++ b/detail.php @@ -1,17 +1,16 @@ - * @author Anika Henke + * @link FIXME + * @author Jana Deutschlaender + * @author Michael Grosse * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) */ +use dokuwiki\template\sprintdoc\Template; -// must be run from within DokuWiki -if (!defined('DOKU_INC')) { - die(); -} +if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ header('X-UA-Compatible: IE=edge,chrome=1'); global $JSINFO; @@ -20,21 +19,44 @@ if (empty($JSINFO)) { } ?> - + - - - <?php echo hsc(tpl_img_getTag('IPTC.Headline', $IMG)) ?> - [<?php echo strip_tags($conf['title']) ?>] - - - - - - + + + + + +<?php echo hsc(tpl_img_getTag('IPTC.Headline', $IMG)) ?> [<?php echo strip_tags($conf['title']) ?>] + + + + + + @@ -177,8 +199,12 @@ if (empty($JSINFO)) {
    -
    -

    +
    0) { ?> +

    Date: Thu, 13 Apr 2017 12:44:53 +0200 Subject: [PATCH 13/26] SPR-869: debug for wiki in root --- css/area_nav-page-attributes.less | 25 +++++++++++++++++++++++++ js/plugins/qc.js | 4 ++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/css/area_nav-page-attributes.less b/css/area_nav-page-attributes.less index eb9d612..6cfa847 100644 --- a/css/area_nav-page-attributes.less +++ b/css/area_nav-page-attributes.less @@ -12,6 +12,13 @@ max-width: 90%; } + li.plugin_qc .qc_icon svg { + margin-left: 0; + margin-top: 0.2em; + width: 1.5em; + height: 1.5em; + } + > li { .btn-usertools-wrapper(); // uniform li .btn-usertools-num(); @@ -26,6 +33,24 @@ text-align: center; margin: 0 .25rem; + a { + display: block; + width: auto; + min-height: 26px; + &:hover, &:focus, &:active { + background-color: @ini_nav_menu_hover_color; + border-color: @ini_nav_menu_hover_color; + color: @ini_nav_menu_hover_bg; + span.qc_icon { + &.qc_bad, &.qc_meh, &.qc_good { + fill: @ini_nav_menu_hover_bg; + color: @ini_nav_menu_hover_bg; + } + } + + } + } + .prefix { .btn-prefix (); .icon-clipboard(); diff --git a/js/plugins/qc.js b/js/plugins/qc.js index 65d795b..5a0de75 100644 --- a/js/plugins/qc.js +++ b/js/plugins/qc.js @@ -6,7 +6,7 @@ jQuery(function () { // load summary jQuery('.page-attributes .plugin_qc a').load( - DOKU_BASE + '/lib/exe/ajax.php', + DOKU_BASE + 'lib/exe/ajax.php', { call: 'plugin_qc_short', id: JSINFO['id'] @@ -20,7 +20,7 @@ jQuery(function () { if ($panel.html() == '') { // load output $panel.load( - DOKU_BASE + '/lib/exe/ajax.php', + DOKU_BASE + 'lib/exe/ajax.php', { call: 'plugin_qc_long', id: JSINFO['id'] From 9161dde6469491dc934c9c23d730ad0eb9f2a7a9 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Thu, 13 Apr 2017 15:29:36 +0200 Subject: [PATCH 14/26] SPR-869: QC Plugin icon qs --- css/area_nav-page-attributes.less | 41 +++++++++++++++++-------------- css/base_mixins.less | 4 +-- css/plugins/qc.less | 10 +++++--- 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/css/area_nav-page-attributes.less b/css/area_nav-page-attributes.less index 6cfa847..f433a32 100644 --- a/css/area_nav-page-attributes.less +++ b/css/area_nav-page-attributes.less @@ -1,6 +1,10 @@ /** * Page Attribute Icons in the breadcrumb bar */ + + +/* + + + + + icons in breadcrumb area + + + + + */ + .page-attributes { list-style: none; float: right; @@ -8,17 +12,11 @@ max-width: 30%; margin: -.45em 0 0; padding: 0; + @media @screen_max-xs { max-width: 90%; } - li.plugin_qc .qc_icon svg { - margin-left: 0; - margin-top: 0.2em; - width: 1.5em; - height: 1.5em; - } - > li { .btn-usertools-wrapper(); // uniform li .btn-usertools-num(); @@ -28,26 +26,34 @@ display: block; width: auto; min-height: @toggle-size; - border: 1px solid @wikiicons-border; - border-radius: @ini_default_border_radius; text-align: center; margin: 0 .25rem; + strong { + display: block; + min-height: 1.64rem; + border: 1px solid @wikiicons-border; + border-radius: @ini_default_border_radius; + } + a { display: block; width: auto; - min-height: 26px; - &:hover, &:focus, &:active { + min-height: 1.64rem; + border: 1px solid @wikiicons-border; + border-radius: @ini_default_border_radius; + + &:hover, + &:focus, + &:active { background-color: @ini_nav_menu_hover_color; border-color: @ini_nav_menu_hover_color; color: @ini_nav_menu_hover_bg; - span.qc_icon { - &.qc_bad, &.qc_meh, &.qc_good { - fill: @ini_nav_menu_hover_bg; - color: @ini_nav_menu_hover_bg; - } - } + span { + fill: @ini_nav_menu_hover_bg; + color: @ini_nav_menu_hover_bg; + } } } @@ -59,6 +65,5 @@ font-size: 1.2rem; line-height: 1; } - } } diff --git a/css/base_mixins.less b/css/base_mixins.less index 82a5291..f287552 100755 --- a/css/base_mixins.less +++ b/css/base_mixins.less @@ -200,7 +200,7 @@ font-size: @font-size-default; @media @screen_min-xxlg { - margin-top: .25rem; + margin-top: .22rem; } @media @screen_max-xxlg { @@ -208,7 +208,7 @@ } @media @screen_max-md { - margin-top: .25rem; + margin-top: .2rem; } } diff --git a/css/plugins/qc.less b/css/plugins/qc.less index df44e98..71d3167 100644 --- a/css/plugins/qc.less +++ b/css/plugins/qc.less @@ -2,23 +2,25 @@ * Styles for the QC plugin */ -// icon in page attributes + +/* + + + + + icon in page attributes3 + + + + + */ + .page-attributes .plugin_qc { .qc_icon { margin: 0; svg { - margin-top: 0.1em; - margin-left: 0.1em; + margin-top: .1em; width: 1.6em; height: 1.6em; + font-size: (@font-size-small - .06); } } } + // output .qc-output { font-size: 90%; border-bottom: 1px solid @ini_border; } - From b457c328a9a6b6ccd9bb3fdb0e76e30bbb4ca958 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Thu, 13 Apr 2017 15:35:03 +0200 Subject: [PATCH 15/26] SPR-908: QS - wiki-icons --- css/area_nav-page-attributes.less | 4 ++++ css/plugins/do_tasks.less | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/css/area_nav-page-attributes.less b/css/area_nav-page-attributes.less index f433a32..a04dfa6 100644 --- a/css/area_nav-page-attributes.less +++ b/css/area_nav-page-attributes.less @@ -65,5 +65,9 @@ font-size: 1.2rem; line-height: 1; } + + .num { + top: -.6em; + } } } diff --git a/css/plugins/do_tasks.less b/css/plugins/do_tasks.less index 261f5de..6b66253 100755 --- a/css/plugins/do_tasks.less +++ b/css/plugins/do_tasks.less @@ -19,7 +19,6 @@ ul.page-attributes { } .num { - margin-top: 1px; background-color: @noopentasks-border; // fix color: @noopentasks-color; // fix } From 4134f067dfee5c2cc8a0097b00bfd428b2946213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Wed, 19 Apr 2017 11:52:48 +0200 Subject: [PATCH 16/26] 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 --- tpl/favicon_tiles.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tpl/favicon_tiles.php b/tpl/favicon_tiles.php index a29b2e3..ebd8d8a 100755 --- a/tpl/favicon_tiles.php +++ b/tpl/favicon_tiles.php @@ -17,7 +17,7 @@ echo Template::getResizedImgTag( 'link', array( 'rel' => 'shortcut icon', - 'href' => array('wiki:favicon.ico', 'wiki:favicon.png') + 'href' => array('wiki:favicon.ico', 'wiki:favicon.png', 'wiki:logo-square.png') ), 0, 0 // no scaling ); @@ -29,7 +29,7 @@ foreach(array(57, 60, 72, 76, 114, 120, 144, 152, 180) as $size) { array( 'rel' => 'apple-touch-icon', 'sizes' => $size . 'x' . $size, - 'href' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:logo.png') + 'href' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:favicon.ico', 'wiki:favicon.png', 'wiki:logo.png'), ), $size, $size ); @@ -42,7 +42,7 @@ foreach(array(32, 96, 192) as $size) { array( 'rel' => 'icon', 'sizes' => $size . 'x' . $size, - 'href' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:logo.png') + 'href' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:favicon.ico', 'wiki:favicon.png', 'wiki:logo.png') ), $size, $size ); @@ -54,7 +54,7 @@ foreach(array(70, 310) as $size) { 'meta', array( 'name' => 'msapplication-square' . $size . 'x' . $size . 'logo', - 'content' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:logo.png') + 'content' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:favicon.ico', 'wiki:favicon.png', 'wiki:logo.png'), ), $size, $size ); From e8d58fb55be094623b563540e67d899511883d10 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Wed, 19 Apr 2017 11:52:59 +0200 Subject: [PATCH 17/26] SPR-869: QC Plugin output + icon in breadcrumb --- css/area_nav-page-attributes.less | 4 +++- css/base_mixins.less | 6 +++--- css/plugins/qc.less | 16 +++++++++++++--- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/css/area_nav-page-attributes.less b/css/area_nav-page-attributes.less index a04dfa6..b7ab433 100644 --- a/css/area_nav-page-attributes.less +++ b/css/area_nav-page-attributes.less @@ -40,8 +40,10 @@ display: block; width: auto; min-height: 1.64rem; + background-color: @ini_nav_menu_hover_bg; border: 1px solid @wikiicons-border; border-radius: @ini_default_border_radius; + transition: @transition background-color, @transition border-color, @transition color; &:hover, &:focus, @@ -58,7 +60,7 @@ } .prefix { - .btn-prefix (); + .btn-prefix(.26rem); .icon-clipboard(); display: block; diff --git a/css/base_mixins.less b/css/base_mixins.less index f287552..4f7428b 100755 --- a/css/base_mixins.less +++ b/css/base_mixins.less @@ -175,7 +175,7 @@ } } -.btn-usertools-num () { +.btn-usertools-num() { .num { position: absolute; right: -.4rem; @@ -192,7 +192,7 @@ } } -.btn-prefix () { +.btn-prefix(@margin-top:.3rem) { .fontello(); .hide-text-show-before(); @@ -204,7 +204,7 @@ } @media @screen_max-xxlg { - margin-top: .3rem; + margin-top: @margin-top; } @media @screen_max-md { diff --git a/css/plugins/qc.less b/css/plugins/qc.less index 71d3167..3119ed8 100644 --- a/css/plugins/qc.less +++ b/css/plugins/qc.less @@ -3,7 +3,7 @@ */ -/* + + + + + icon in page attributes3 + + + + + */ +/* + + + + + icon in breadcrumb + + + + + */ .page-attributes .plugin_qc { .qc_icon { @@ -19,8 +19,18 @@ } -// output +/* + + + + + slideout output + + + + + */ .qc-output { + min-width: 100%; + width: auto; font-size: 90%; - border-bottom: 1px solid @ini_border; + box-shadow: @box-shadow-bottom; + margin: -(@page_padding-top) -(@margin-default) 0; + + .qc_icon { + background-color: #fff; + border-radius: @fix_border-radius; + vertical-align: top; + padding: .1rem; + } } From f078e012ce4e55da1e38efc240aae2d34a2dace4 Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Wed, 19 Apr 2017 12:59:06 +0200 Subject: [PATCH 18/26] SPR-869: QC Plugin output responsive --- css/plugins/qc.less | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/css/plugins/qc.less b/css/plugins/qc.less index 3119ed8..1365b82 100644 --- a/css/plugins/qc.less +++ b/css/plugins/qc.less @@ -25,7 +25,48 @@ width: auto; font-size: 90%; box-shadow: @box-shadow-bottom; - margin: -(@page_padding-top) -(@margin-default) 0; + margin-bottom: 0; + + @media @screen_min-xxs { + margin-top: -(@page_padding-top); + margin-right: -(@margin-default); + margin-left: -(@margin-default); + padding-left: @margin-default; + padding-right: @margin-default; + } + + @media @screen_max-md { + margin-top: -(@page_padding-top + 2); + margin-right: -(@margin-default * 1.6); + margin-left: -(@margin-default); + padding-top: @margin-default; + } + + @media @screen_max-xxs { + margin-left: -(@margin-small); + padding-left: @margin-small; + padding-right: @margin-default; + } + + div, + p { + margin-left: 0; + } + + dl { + dt, + dd { + @media @screen_max-xxs { + float: none; + display: inline-block; + width: 49%; + max-width: 10em; + vertical-align: top; + margin-left: 0; + padding-bottom: @small-spacing; + } + } + } .qc_icon { background-color: #fff; From 401950068f61a711e5371fd1d08c13b1a288881c Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Wed, 19 Apr 2017 13:04:37 +0200 Subject: [PATCH 19/26] SPR-869: QC Plugin output responsive --- css/plugins/qc.less | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/css/plugins/qc.less b/css/plugins/qc.less index 1365b82..35476c6 100644 --- a/css/plugins/qc.less +++ b/css/plugins/qc.less @@ -28,7 +28,7 @@ margin-bottom: 0; @media @screen_min-xxs { - margin-top: -(@page_padding-top); + margin-top: -(@margin-default + 1); margin-right: -(@margin-default); margin-left: -(@margin-default); padding-left: @margin-default; @@ -56,6 +56,8 @@ dl { dt, dd { + padding-bottom: @small-spacing; + @media @screen_max-xxs { float: none; display: inline-block; @@ -63,7 +65,6 @@ max-width: 10em; vertical-align: top; margin-left: 0; - padding-bottom: @small-spacing; } } } From 22dab1a51e14d68571ab6298907f717b153edba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Wed, 19 Apr 2017 14:57:28 +0200 Subject: [PATCH 20/26] Fix link to do-dashboard per the plugins config SPR-931 --- tpl/nav-usertools-buttons.php | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/tpl/nav-usertools-buttons.php b/tpl/nav-usertools-buttons.php index 7c99099..efd0dd4 100755 --- a/tpl/nav-usertools-buttons.php +++ b/tpl/nav-usertools-buttons.php @@ -34,17 +34,12 @@ } $doInner = "".tpl_getLang('prefix_tasks_user')." ".count($tasks).""; - if($linktarget){ - if (substr($linktarget, 0, 1) !== ':') { - $linktarget = 'user:' . $_SERVER['REMOTE_USER'] .':' . 'dashboard'; - } - if($num == 0){ - echo '
  • '.$doInner.'
    • '; - }else{ - echo '
  • '.$doInner.'
    • '; - } - } - else{ + + $userpage = $doplugin->getConf('userpage'); + if ($userpage && $_SERVER['REMOTE_USER'] && $num > 0) { + $linktarget = sprintf($userpage, $_SERVER['REMOTE_USER']) . ':' . 'dashboard'; + echo '
  • '.$doInner.'
    • '; + } else { echo '
  • '.$doInner.'
    • '; } } ?> From 58aee1016a9f6ed968fb0c9eb5e1d267a2317b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschla=CC=88nder?= Date: Wed, 19 Apr 2017 15:21:55 +0200 Subject: [PATCH 21/26] SPR-814: detail template --- css/template_detail.less | 58 ++++++++++- detail.php | 176 ++++++++++++++++++++++++++------- lang/de/lang.php | 3 + lang/de/settings.php | 5 +- lang/en/lang.php | 3 + lang/en/settings.php | 5 +- tpl/nav-page-quality-tasks.php | 2 +- 7 files changed, 204 insertions(+), 48 deletions(-) diff --git a/css/template_detail.less b/css/template_detail.less index b11c551..f11cfcf 100644 --- a/css/template_detail.less +++ b/css/template_detail.less @@ -50,15 +50,71 @@ } // meta data - .img_detail { + div.img_detail { /* vertical minus margin of .img-detail corresponds to the padding of .page */ margin: @margin-default -(@margin-default); + + border: solid @ini_border_light; + border-width: 1px 0; + background-color: @ini_background_page_header; + h1, h2, h3, h4, h5, h6, p{ + padding-left: @margin-default; + padding-right: @margin-default; + } + + dl { + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + flex-direction: row; + -ms-flex-direction: row; + flex-wrap: wrap; + -ms-flex-wrap: wrap; + width: 100%; + + dt, dd { + box-sizing: border-box; + margin: .2em 0; + padding: (@small-spacing * 2) @small-spacing; + } + + dt { + width: 33.3%; + background-color: @ini_highlight; + color: @ini_highlight_text; + + } + dd { + width: 66.6%; + padding-left: (@small-spacing * 2); + } + + } + .os-map { + p { + text-align: right; + } + iframe { + padding: 0; + margin: 0; + border: solid @ini_button_background; + border-width: 1px 0; + } + } + @media @screen_max-md { margin-right: -(@margin-default * 1.6); + h1, h2, h3, h4, h5, h6, p { + padding-right: (@margin-default * 1.6); + } } @media @screen_max-xs { margin-left: -(@margin-small); + h1, h2, h3, h4, h5, h6, p { + padding-left: @margin-small; + } } + } } diff --git a/detail.php b/detail.php index d964f3d..0250f6f 100755 --- a/detail.php +++ b/detail.php @@ -61,12 +61,24 @@ include('tpl/favicon_tiles.php');
    +
    @@ -76,19 +88,57 @@ include('tpl/favicon_tiles.php');
    - -

    - +
    + +

    + +
    +
    +
    + +

    + + +

    + +
    +
    +
    +
    @@ -98,20 +148,37 @@ include('tpl/favicon_tiles.php');
    -
    - -
    +
    + +
    + +
    @@ -127,8 +194,18 @@ include('tpl/favicon_tiles.php');
    @@ -139,7 +216,8 @@ include('tpl/favicon_tiles.php');
    - + +
    @@ -148,30 +226,28 @@ include('tpl/favicon_tiles.php');
    - +
    -
    +
    -
    +