Project

General

Profile

« Previous | Next » 

Revision 59978

[Monitor Dashboard | Trunk]: Fix topics on admin

View differences:

modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/app.component.ts
113 113
      this.isViewPublic = (params['view'] == 'public');
114 114
    });
115 115
    this.layoutService.setOpen(false);
116
    this.layoutService.setSmallScreen((this.innerWidth && this.innerWidth < 1219));
117
    this.layoutService.setOpen(!(this.innerWidth && this.innerWidth < 1219));
116 118
    this.subscriptions.push(this.params.subscribe(params => {
117 119
      if (this.paramsResolved) {
118 120
        this.loading = true;
119
        this.layoutService.setSmallScreen((this.innerWidth && this.innerWidth < 1219));
120
        this.layoutService.setOpen(!(this.innerWidth && this.innerWidth < 1219));
121 121
        let isSearch = this.router.url.includes('search');
122 122
        if (params && params['stakeholder']) {
123 123
          // this.stakeholder = this.stakeholderService.stakeholder;
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/topic/topic.component.html
18 18
                <span *ngIf="topic.icon"></span>
19 19
                <div class="uk-width-expand uk-position-relative uk-flex uk-flex-middle"
20 20
                     [class.uk-flex-center]="open">
21
                  <span>
21
                  <span class="uk-flex-none">
22 22
                    <ng-container *ngTemplateOutlet="visibilityOptions; context:
23 23
                    {i:i, type: 'topic', visibility: stakeholder.topics[i].visibility}">
24 24
                    </ng-container>
25 25
                  </span>
26
                  <span [class.uk-text-center]="open" [class.uk-text-truncate]="!open" [class.uk-width-3-5]="!open">{{topic.name}}</span>
26
                  <span [class.uk-text-center]="open"
27
                        [class.uk-text-truncate]="!open" [class.uk-width-3-5]="!open">{{topic.name}}</span>
27 28
                  <span class="uk-invisible-hover color"
28 29
                        (click)="$event.stopPropagation();$event.preventDefault()">
29
                    <span class="uk-icon uk-position-center-right" uk-icon="more-vertical"></span>
30
                    <span class="uk-icon more" uk-icon="more-vertical"></span>
30 31
                    <div #element uk-dropdown="mode: click; pos: bottom-right; offset: 5; delay-hide: 0; flip: false">
31 32
                      <ul class="uk-nav uk-dropdown-nav uk-list">
32 33
                        <li><a (click)="editTopicOpen(i); hide(element)">Edit</a></li>
......
106 107
          <ng-template ngFor [ngForOf]="stakeholder.topics[topicIndex].categories" let-category let-i="index">
107 108
            <li class="uk-visible-toggle uk-flex uk-flex-middle"
108 109
                [class.uk-active]="category.alias === stakeholder.topics[topicIndex].categories[categoryIndex].alias">
109
              <ng-container *ngTemplateOutlet="visibilityOptions; context:
110
              <span class="uk-flex-none">
111
                <ng-container *ngTemplateOutlet="visibilityOptions; context:
110 112
                    {i:i, type: 'cat',
111 113
                    visibility: stakeholder.topics[topicIndex].categories[i].visibility}">
112
              </ng-container>
114
                </ng-container>
115
              </span>
113 116
              <a (click)="toggleCategory(i)">
114 117
                <span class="title"> {{category.name}}</span>
115 118
              </a>
......
152 155
              stakeholder.topics[topicIndex].categories[categoryIndex].subCategories[subCategoryIndex].alias)"
153 156
            class="uk-visible-toggle uk-position-relative uk-padding-remove-horizontal">
154 157
            <span>
155
              <ng-container *ngTemplateOutlet="visibilityOptions; context:
156
                {i:i, type: 'sub',
157
                visibility: stakeholder.topics[topicIndex].categories[categoryIndex].subCategories[i].visibility}">
158
              </ng-container>
158
              <span class="uk-flex-none">
159
                <ng-container *ngTemplateOutlet="visibilityOptions; context:
160
                  {i:i, type: 'sub',
161
                  visibility: stakeholder.topics[topicIndex].categories[categoryIndex].subCategories[i].visibility}">
162
                </ng-container>
163
              </span>
159 164
              <a (click)="chooseSubcategory(categoryIndex, i);$event.preventDefault()"
160 165
                 class="space">
161 166
                <span>{{subCategory.name}}</span>
......
249 254

  
250 255

  
251 256
<ng-template #visibilityOptions let-type="type" let-i="i" let-visibility="visibility">
252
   <span class="uk-invisible-hover visibility small" (click)="$event.stopPropagation();$event.preventDefault()">
253
      <span class="clickable">
257
   <span class="uk-invisible-hover" (click)="$event.stopPropagation();$event.preventDefault()">
258
      <span class="clickable visibility small">
254 259
        <icon [name]="stakeholderUtils.visibilityIcon.get(visibility)" [ratio]="0.5"></icon>
255 260
      </span>
256 261
      <div #element uk-dropdown="mode: click; pos: bottom-left; delay-hide: 0; flip: false">
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/assets/new.css
124 124
  transform: rotate(0deg);
125 125
  width: inherit;
126 126
  height: inherit;
127
  margin: 0;
127
  margin: 4px 0 0;
128 128
}
129 129

  
130 130

  
......
221 221
  padding: 3px 2px;
222 222
}
223 223

  
224
.more {
225
  position: absolute;
226
  transform: translate(-50%, -50%);
227
  right: -30px;
228
  top: 50%;
229
}
230

  
224 231
.descriptionIcon {
225 232
  position: absolute;
226 233
  bottom: 3px;

Also available in: Unified diff