Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Left menu tweaks #8974

Merged
merged 4 commits into from
Oct 13, 2015
Merged

Left menu tweaks #8974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ed9bcb
prevent flicker of menu category when there is no menu item for that…
tsteur Oct 12, 2015
57c1235
construct search tooltip depending on available selectors
tsteur Oct 12, 2015
007cf09
show top controls only after all are most likely rendered
tsteur Oct 12, 2015
8a0e135
remove no longer needed parameter
tsteur Oct 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions plugins/CoreHome/CoreHome.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@ public function getClientSideTranslationKeys(&$translationKeys)
$translationKeys[] = 'Intl_Day_Min_StandAlone_5';
$translationKeys[] = 'Intl_Day_Min_StandAlone_6';
$translationKeys[] = 'Intl_Day_Min_StandAlone_7';
$translationKeys[] = 'General_And';
$translationKeys[] = 'General_Search';
$translationKeys[] = 'General_Clear';
$translationKeys[] = 'General_MoreDetails';
Expand All @@ -272,5 +273,7 @@ public function getClientSideTranslationKeys(&$translationKeys)
$translationKeys[] = 'CoreHome_PivotBySubtable';
$translationKeys[] = 'CoreHome_QuickAccessTitle';
$translationKeys[] = 'CoreHome_Segments';
$translationKeys[] = 'CoreHome_MenuEntries';
$translationKeys[] = 'SitesManager_Sites';
}
}
2 changes: 1 addition & 1 deletion plugins/CoreHome/angularjs/quick-access/quick-access.directive.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="quick-access" title="{{ 'CoreHome_QuickAccessTitle' | translate }}"
<div class="quick-access" title="{{ quickAccessTitle }}"
ng-class="{active: view.searchActive, expanded: view.searchActive}"
piwik-focus-anywhere-but-here="view.searchActive = false;">
<span class="icon-search" ng-hide="search.term || view.searchActive"
Expand Down
30 changes: 27 additions & 3 deletions plugins/CoreHome/angularjs/quick-access/quick-access.directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
(function () {
angular.module('piwikApp').directive('piwikQuickAccess', QuickAccessDirective);

QuickAccessDirective.$inject = ['$rootElement', '$timeout', 'piwik'];
QuickAccessDirective.$inject = ['$rootElement', '$timeout', 'piwik', '$filter'];

function QuickAccessDirective ($rootElement, $timeout, piwik) {
function QuickAccessDirective ($rootElement, $timeout, piwik, $filter) {

return {
restrict: 'A',
Expand All @@ -33,7 +33,31 @@
var leftMenuItems = []; // cache for left menu items
var segmentItems = []; // cache for segment items
var hasSegmentSelector = angular.element('.segmentEditorPanel').length;
scope.hasSitesSelector = angular.element('[piwik-siteselector]').length;
scope.hasSitesSelector = angular.element('.top_controls [piwik-siteselector]').length;


var translate = $filter('translate');
var searchAreasTitle = '';
var searchAreas = [translate('CoreHome_MenuEntries')]

if (hasSegmentSelector) {
searchAreas.push(translate('CoreHome_Segments'))
}

if (scope.hasSitesSelector) {
searchAreas.push(translate('SitesManager_Sites'))
}

while (searchAreas.length) {
searchAreasTitle += searchAreas.shift();
if (searchAreas.length >= 2) {
searchAreasTitle += ', ';
} else if (searchAreas.length === 1) {
searchAreasTitle += ' ' + translate('General_And') + ' ';
}
}

scope.quickAccessTitle = translate('CoreHome_QuickAccessTitle', searchAreasTitle);

function trim(str) {
return str.replace(/^\s+|\s+$/g,'');
Expand Down
3 changes: 0 additions & 3 deletions plugins/CoreHome/javascripts/menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ menu.prototype =

var href = link.attr('href');
if (!href) {
if (main_menu && !$this.find('li').length) {
$this.hide(); // no link and no child menu items -> hide it
}
return;
}
var url = href.substr(1);
Expand Down
5 changes: 3 additions & 2 deletions plugins/CoreHome/javascripts/menu_init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ $(function () {
initTopControls();
}

if(isPageIsAdmin) {
if (isPageIsAdmin) {
// don't use broadcast in admin page
initTopControls();
return;
}
if(isPageHasMenu) {

if (isPageHasMenu) {
broadcast.init();
} else {
broadcast.init(true);
Expand Down
16 changes: 15 additions & 1 deletion plugins/CoreHome/javascripts/top_controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ function initTopControls() {
var $topControlsContainer = $('.top_controls'),
left = 0;

var allRendered = true;

if ($topControlsContainer.length) {
$('.piwikTopControl').each(function () {
var $control = $(this);
Expand All @@ -34,10 +36,22 @@ function initTopControls() {
}

$control.css('left', left);
var width = $control.outerWidth(true);

var isControlFullyRendered = width >= 30;
if (!isControlFullyRendered) {
allRendered = false;
}

left += $control.outerWidth(true);
left += width;
});

if (allRendered) {
// we make top controls visible only after all selectors are rendered
$('.top_controls').css('visibility', 'visible');
$('.top_controls').css('opacity', '1');
}

var header = $('#header_message.isPiwikDemo');
if (header.length) {
// make sure isPiwikDemo message is always fully visible, move it to the right if needed
Expand Down
3 changes: 2 additions & 1 deletion plugins/CoreHome/lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
"ClickRowToExpandOrContract": "Click this row to expand or contract the subtable.",
"UndoPivotBySubtable": "This report has been pivoted %s Undo pivot",
"PivotBySubtable": "This report is not pivoted %s Pivot by %s",
"QuickAccessTitle": "Search for menu entries, segments and websites. Shortcut: Press 'f' to search.",
"QuickAccessTitle": "Search for %s. Shortcut: Press 'f' to search.",
"MenuEntries": "Menu entries",
"Segments": "Segments",
"AdblockIsMaybeUsed": "In case you are using an ad blocker, please disable it for this site to make sure Piwik works without any issues."
}
Expand Down
2 changes: 2 additions & 0 deletions plugins/CoreHome/stylesheets/layout.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,8 @@

#root {
.top_controls {
visibility: hidden;
opacity: 0;
.piwikTopControl {
margin-top: 8px;
margin-bottom: 8px;
Expand Down
47 changes: 30 additions & 17 deletions plugins/CoreHome/templates/_menu.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,37 @@
</div>
<ul class="navbar">
{% for level1,level2 in menu %}
<li id="{% if level2._url is defined and level2._url is not empty %}{{ _self.getId(level2._url) }}{% endif %}" class="menuTab">
{% set hasMainCategoryUrl = level2._url is defined and level2._url is not empty %}

<a class="item" {% if level2._url is defined and level2._url is not empty %}href="{% if anchorlink %}#{% else %}index.php?{% endif %}{{ _self.getFirstUrl(level2._url) }}"{% endif %}>
<span class="menu-icon {{ level2._icon|default('icon-arrow-right') }}"></span>{{ level1|translate }}
<span class="hidden">
{{ 'CoreHome_Menu'|translate }}
</span>
</a>
<ul>
{% for name,urlParameters in level2 %}
{% if urlParameters._url is defined and urlParameters._url is not iterable %}
{{ _self.groupedItem(name,urlParameters._url, anchorlink) }}
{% elseif name|slice(0,1) != '_' %}
{{ _self.submenuItem(name,urlParameters._url, anchorlink) }}
{% endif %}
{% endfor %}
</ul>
</li>
{% set hasSubmenuItem = false %}
{% for name,urlParameters in level2 %}
{% if urlParameters._url is defined and urlParameters._url is not iterable %}
{% set hasSubmenuItem = true %}
{% elseif name|slice(0,1) != '_' %}
{% set hasSubmenuItem = true %}
{% endif %}
{% endfor %}

{% if hasMainCategoryUrl or hasSubmenuItem %}
<li id="{% if level2._url is defined and level2._url is not empty %}{{ _self.getId(level2._url) }}{% endif %}" class="menuTab">

<a class="item" {% if hasMainCategoryUrl %}href="{% if anchorlink %}#{% else %}index.php?{% endif %}{{ _self.getFirstUrl(level2._url) }}"{% endif %}>
<span class="menu-icon {{ level2._icon|default('icon-arrow-right') }}"></span>{{ level1|translate }}
<span class="hidden">
{{ 'CoreHome_Menu'|translate }}
</span>
</a>
<ul>
{% for name,urlParameters in level2 %}
{% if urlParameters._url is defined and urlParameters._url is not iterable %}
{{ _self.groupedItem(name,urlParameters._url, anchorlink) }}
{% elseif name|slice(0,1) != '_' %}
{{ _self.submenuItem(name,urlParameters._url, anchorlink) }}
{% endif %}
{% endfor %}
</ul>
</li>
{% endif %}
{% endfor %}
</ul>
</div>
Expand Down