Project

General

Profile

« Previous | Next » 

Revision 57603

Added by Konstantinos Triantafyllou about 5 years ago

[Monitor Dashboard]: Fix links on sidebar menu. Fix sidebar when fullheader is on

View differences:

modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/home/home.component.html
11 11 
      <li [class.current_section]="analysisOpen"
12 12 
          [class.act_section]="analysisOpen"
13 13 
          class="submenu_trigger">
14 
        <a [routerLink]="" (click)="analysisOpen = !analysisOpen">
14 
        <a href="#" (click)="analysisOpen = !analysisOpen; $event.preventDefault()">
15 15 
          <span class="menu_icon"><i class="material-icons">donut_large</i></span>
16 16 
          <span class="menu_title">Analysis Indicators</span>
17 17 
        </a>
18 18 
        <ul [style.display]="(analysisOpen?'block':'none')">
19 19 
          <ng-template ngFor [ngForOf]="stakeholder.topics" let-topic let-i="index">
20 20 
            <li>
21 
              <a (click)="navigateTo(topic.alias)">
21 
              <a [routerLink]="topic.alias">
22 22 
                <span *ngIf="topic.icon" class="menu_icon uk-margin-small-right"><i
23 23 
                  class="material-icons">{{topic.icon}}</i></span>
24 24 
                <div class="menu_title uk-inline">
25 25 
                  {{topic.name}}
26 26 
                  <button class="uk-position-center-right-out uk-margin-right uk-button uk-button-link onHover"
27 
                          (click)="$event.stopPropagation();saveTopicOpen(editTopic, i)">
27 
                          (click)="$event.stopPropagation();saveTopicOpen(editTopic, i); $event.preventDefault()">
28 28 
                    <i class="material-icons">more_horiz</i>
29 29 
                  </button>
30 30 
                </div>
......
80 80 
            </li>
81 81 
          </ng-template>
82 82 
          <li>
83 
            <a (click)="saveTopicOpen(newTopic)">
83 
            <a href="#" (click)="saveTopicOpen(newTopic); $event.preventDefault()">
84 84 
              <span class="menu_icon"><i class="material-icons">add</i></span>
85 85 
              <span class="menu_title">Create new Topic</span>
86 86 
            </a>
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/topic/topic.component.html
9 9 
  <div *ngIf="stakeholder" class="menu_section">
10 10 
    <ul>
11 11 
      <li class="uk-margin-bottom md-bg-blue-900 uk-padding-small">
12 
        <a class="md-color-white uk-flex uk-flex-middle" (click)="back()">
12 
        <a [routerLink]="'../'" class="md-color-white uk-flex uk-flex-middle">
13 13 
          <span class="menu_icon"><i class="material-icons md-color-white">arrow_back</i></span>
14 14 
          <div class="menu_title uk-inline">
15 15 
            {{stakeholder.topics[topicIndex].name.toUpperCase()}}
16 16 
            <button class="uk-position-center-right-out uk-margin-right uk-button uk-button-link onHover"
17 
                    (click)="$event.stopPropagation();editTopicOpen(editTopic)">
17 
                    (click)="$event.stopPropagation();editTopicOpen(editTopic);$event.preventDefault()">
18 18 
              <i class="material-icons md-color-white">more_horiz</i>
19 19 
            </button>
20 20 
          </div>
......
72 72 
            [class.act_section]="selectedCategoryIndex === i && toggle"
73 73 
            [title]="category.name"
74 74 
            class="submenu_trigger">
75 
          <a (click)="toggleCategory(i);hide(editCategory)">
75 
          <a href="#" (click)="toggleCategory(i);hide(editCategory);$event.preventDefault()">
76 76 
            <span *ngIf="category.icon" class="menu_icon"><i
77 77 
              class="material-icons">{{category.icon}}</i></span>
78 78 
            <div class="menu_title uk-inline">
......
129 129 
            <ng-template ngFor [ngForOf]="stakeholder.topics[topicIndex].categories[i].subCategories"
130 130 
                         let-subcategory let-j="index">
131 131 
              <li [class.act_item]="categoryIndex === i && subCategoryIndex === j">
132 
                <a (click)="chooseSubcategory(i, j)">
132 
                <a href="#" (click)="chooseSubcategory(i, j);$event.preventDefault()">
133 133 
                <span *ngIf="subcategory.icon" class="menu_icon uk-margin-small-right"><i
134 134 
                  class="material-icons">{{subcategory.icon}}</i></span>
135 135 
                  <div class="menu_title uk-inline">
136 136 
                    {{subcategory.name}}
137 137 
                    <button class="uk-position-center-right-out uk-margin-right uk-button uk-button-link onHover"
138 
                            (click)="$event.stopPropagation();editSubCategoryOpen(j, editSubCategory)">
138 
                            (click)="$event.stopPropagation();editSubCategoryOpen(j, editSubCategory);$event.preventDefault()">
139 139 
                    <i class="material-icons">more_horiz</i>
140 140 
                  </button>
141 141 
                  </div>
......
185 185 
              </li>
186 186 
            </ng-template>
187 187 
            <li>
188 
              <a (click)="editSubCategoryOpen()">
188 
              <a href="#" (click)="editSubCategoryOpen();$event.preventDefault()">
189 189 
                <span class="menu_icon"><i class="material-icons">add</i></span>
190 190 
                <span class="menu_title">Create new Subcategory</span>
191 191 
              </a>
......
236 236 
        </li>
237 237 
      </ng-template>
238 238 
      <li>
239 
        <a (click)="editCategoryOpen()">
239 
        <a href="#" (click)="editCategoryOpen();$event.preventDefault()">
240 240 
          <span class="menu_icon"><i class="material-icons">add</i></span>
241 241 
          <span class="menu_title">Create new Category</span>
242 242 
        </a>
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/assets/theme-assets/dashboard-custom.css
23 23 
}
24 24 

  		




  25
  25
  
    
/* Custom width of sidebar, change var: sidebar-width*/


  		




  
  26
  
    
.dashboard .main_logo_top {


  		




  
  27
  
    
  min-width: var(--sidebar-width);


  		




  
  28
  
    
}


  		




  
  29
  
    

  		




  26
  30
  
    
.dashboard #sidebar_main {


  		




  27
  31
  
    
  width: var(--sidebar-width);


  		




  28
  32
  
    
  -webkit-transform: translate3d(calc(-1 * var(--sidebar-width)),0,0);


  		




  ......




  62
  66
  
    
  padding-top: var(--header-height);


  		




  63
  67
  
    
}


  		




  64
  68
  
    

  		




  
  69
  
    
.dashboard .header_full #sidebar_main {


  		




  
  70
  
    
  top: var(--header-height);


  		




  
  71
  
    
}


  		




  
  72
  
    

  		




  65
  73
  
    
.dashboard #header_main {


  		




  66
  74
  
    
  padding: calc((var(--header-height) - 48px)/2) 25px;


  		




  67
  75
  
    
}


  		












Also available in:  Unified diff