Browse Source

Urgent bugfix with onboarding tooltip.

pull/131/head
Sebastian Stehle 9 years ago
parent
commit
7bcc87653a
  1. 6
      src/Squidex/app/features/content/pages/content/content-field.component.html
  2. 4
      src/Squidex/app/features/content/pages/contents/contents-page.component.html
  3. 3
      src/Squidex/app/framework/angular/onboarding-tooltip.component.ts

6
src/Squidex/app/features/content/pages/content/content-field.component.html

@ -7,9 +7,11 @@
<div [formGroup]="fieldForm">
<div *ngIf="field.partitioning === 'language' && languages.length > 1">
<sqx-language-selector size="sm" class="languages-buttons" (selectedLanguageChanged)="selectLanguage($event)" [languages]="languages" #languages></sqx-language-selector>
<div class="languages-buttons" #buttonLanguages>
<sqx-language-selector size="sm" (selectedLanguageChanged)="selectLanguage($event)" [languages]="languages"></sqx-language-selector>
</div>
<sqx-onboarding-tooltip id="languages" [for]="languages" position="topRight" after="120000">
<sqx-onboarding-tooltip id="languages" [for]="buttonLanguages" position="topRight" after="120000">
Please remember to check all languages when you see validation errors.
</sqx-onboarding-tooltip>
</div>

4
src/Squidex/app/features/content/pages/contents/contents-page.component.html

@ -13,7 +13,7 @@
<sqx-shortcut keys="ctrl+shift+g" (trigger)="newButton.click()" *ngIf="!isReadOnly"></sqx-shortcut>
<form class="form-inline" (ngSubmit)="search()">
<input class="form-control form-control-expandable" #inputFind [formControl]="contentsFilter" placeholder="Search for content" #searchInput />
<input class="form-control form-control-expandable" #inputFind [formControl]="contentsFilter" placeholder="Search for content" />
<a class="expand-search" (click)="searchModal.toggle()" #archive>
<i class="icon-caret-down"></i>
@ -28,7 +28,7 @@
Search for content using full text search over all fields and languages!
</sqx-onboarding-tooltip>
<div class="dropdown-menu" *sqxModalView="searchModal" closeAlways="true" [sqxModalTarget]="searchInput">
<div class="dropdown-menu" *sqxModalView="searchModal" closeAlways="true" [sqxModalTarget]="inputFind">
<sqx-search-form
[canArchive]="!isReadOnly"
(queryChanged)="contentsFilter.setValue($event, { emitEvent: false })"

3
src/Squidex/app/framework/angular/onboarding-tooltip.component.ts

@ -8,6 +8,7 @@
import { Component, Input, OnDestroy, OnInit, Renderer } from '@angular/core';
import { ModalView } from './../utils/modal-view';
import { Types } from './../utils/types';
import { OnboardingService } from './../services/onboarding.service';
@ -59,7 +60,7 @@ export class OnboardingTooltipComponent implements OnDestroy, OnInit {
}
public ngOnInit() {
if (this.for && this.id) {
if (this.for && this.id && Types.isFunction(this.for.addEventListener)) {
this.showTimer = setTimeout(() => {
if (this.onboardingService.shouldShow(this.id)) {
this.tooltipModal.show();

Loading…
Cancel
Save