Project

General

Profile

« Previous | Next » 

Revision 58110

Refactored the landing page to become home and to have a second about page as well

View differences:

topmenu-landing.component.html
24 24
              <div>
25 25
                <a *ngIf="!getIsUserLoggedIn()" (click)="login()">Sign in| Register</a>
26 26
                <span *ngIf="getIsUserLoggedIn()">{{getUserName()}}</span>
27
                <ul *ngIf="getIsUserLoggedIn()" class="uk-list uk-margin-top">
27
                <ul  class="uk-list uk-margin-top">
28 28
                  <li>
29
                    <a class="uk-search-input" [routerLink]="['home']" [routerLinkActive]="['uk-active']">Home</a>
30
                  </li>
31
                  <li>
32
                    <a class="uk-search-input" [routerLink]="['about']" [routerLinkActive]="['uk-active']">About</a>
33
                  </li>
34
                  <li>
35
                  <li *ngIf="getIsUserLoggedIn()">
29 36
                    <a class="uk-search-input" [routerLink]="['emptyPage']" [routerLinkActive]="['uk-active']">Dashboard</a>
30 37
                  </li>
31
                  <!--<li>-->
32
                    <!--<a class="uk-search-input" [routerLink]="['landing']" [routerLinkActive]="['uk-active']">Home</a>-->
33
                  <!--</li>-->
34
                  <!--<li>-->
35
                    <!--<a class="uk-search-input" [routerLink]="['dashboard']" [routerLinkActive]="['uk-active']">Dashboard</a>-->
36
                  <!--</li>-->
37
                  <!--<li>-->
38

  
38 39
                    <!--Sources-->
39 40
                    <!--<ul>-->
40 41
                      <!--<li><a [routerLink]="['sources', 'register']" [routerLinkActive]="['uk-active']">Register</a></li>-->
......
124 125

  
125 126
            <div class="uk-navbar-right">
126 127

  
127
              <ul class="uk-navbar-nav" *ngIf="getIsUserLoggedIn()" >
128
                <li class="uk-parent" [routerLinkActive]="['uk-active']">
129
                  <a [routerLink]="['emptyPage']" [routerLinkActive]="['uk-active']">
128
              <ul class="uk-navbar-nav" >
129
                <li *ngIf="getIsUserLoggedIn()" class="uk-parent" [routerLinkActive]="['uk-active']">
130
                  <a [routerLink]="['home']" [routerLinkActive]="['uk-active']">
131
                    Home
132
                  </a>
133
                </li>
134
                <li *ngIf="getIsUserLoggedIn()" class="uk-parent" [routerLinkActive]="['uk-active']">
135
                  <a [routerLink]="['about']" [routerLinkActive]="['uk-active']">
136
                    About
137
                  </a>
138
                </li>
139
                <li *ngIf="getIsUserLoggedIn()" class="uk-parent" [routerLinkActive]="['uk-active']">
140
                  <a [routerLink]="['join']" [routerLinkActive]="['uk-active']">
130 141
                    Dashboard
131 142
                  </a>
132 143
                </li>
133
                <!--<li class="uk-parent" [routerLinkActive]="['uk-active']">-->
134
                  <!--<a [routerLink]="['dashboard']" [routerLinkActive]="['uk-active']">-->
135
                    <!--Dashboard-->
136
                  <!--</a>-->
137
                <!--</li>-->
138
                <!--<li class="uk-parent" [routerLinkActive]="['uk-active']"><a href="#" class=""-->
139
                                                                            <!--aria-expanded="false">Sources</a>-->
140
                  <!--<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 106.55px;"-->
141
                       <!--id="sourcesMenu" (click)="onClick('sourcesMenu')">-->
142
                    <!--<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">-->
143
                      <!--<div class="uk-first-column">-->
144
                        <!--<ul class="uk-nav uk-navbar-dropdown-nav">-->
145
                          <!--<li><a [routerLink]="['/sources','register']" id="registerLink">Register</a></li>-->
146
                          <!--<li><a [routerLink]="['/sources', 'update']">Update</a></li>-->
147
                        <!--</ul>-->
148
                      <!--</div>-->
149
                    <!--</div>-->
150
                  <!--</div>-->
151
                <!--</li>-->
152
                <!--<li class="uk-parent" [routerLinkActive]="['uk-active']"><a href="#" class=""-->
153
                                                                            <!--aria-expanded="false">Compatibility</a>-->
154
                  <!--<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 106.55px;"-->
155
                       <!--id="compatibilityMenu" (click)="onClick('compatibilityMenu')">-->
156
                    <!--<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">-->
157
                      <!--<div class="uk-first-column">-->
158
                        <!--<ul class="uk-nav uk-navbar-dropdown-nav">-->
159
                          <!--<li><a [routerLink]="['/compatibility','validate']">Validate</a></li>-->
160
                          <!--<li><a [routerLink]="['/compatibility','browseHistory']">Validation History</a></li>-->
161
                          <!--<li><a [routerLink]="['/compatibility','monitor']">Collection Monitor</a></li>-->
162
                        <!--</ul>-->
163
                      <!--</div>-->
164
                    <!--</div>-->
165
                  <!--</div>-->
166
                <!--</li>-->
167
                <!--<li class="uk-parent" [routerLinkActive]="['uk-active']"><a href="#" class=""-->
168
                                                                            <!--aria-expanded="false">Content</a>-->
169
                  <!--<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 106.55px;"-->
170
                       <!--id="contentMenu" (click)="onClick('contentMenu')">-->
171
                    <!--<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">-->
172
                      <!--<div class="uk-first-column">-->
173
                        <!--<ul class="uk-nav uk-navbar-dropdown-nav">-->
174
                          <!--<li><a [routerLink]="['/content','events']">Events</a></li>-->
175
                          <!--<li><a [routerLink]="['/content','notifications']">Notifications</a></li>-->
176
                        <!--</ul>-->
177
                      <!--</div>-->
178
                    <!--</div>-->
179
                  <!--</div>-->
180
                <!--</li>-->
181
                <!--<li class="uk-parent">-->
182
                  <!--<a [routerLink]="['/getImpact']" [routerLinkActive]="['uk-active']">-->
183
                    <!--Metrics-->
184
                  <!--</a>-->
185
                <!--</li>-->
186
              </ul>
187 144

  
188
              <div class="uk-navbar-item">
189

  
190
                <ul *ngIf="!getIsUserLoggedIn()" class="uk-navbar-nav">
191
                  <li class="uk-parent">
192
                    <a class="" (click)="login()">
193
                      Sign in
194
                      <span class="uk-margin-small-left uk-icon">
145
                <li *ngIf="!getIsUserLoggedIn()" class="uk-parent">
146
                  <a class="" (click)="login()">
147
                    Sign in
148
                    <span class="uk-margin-small-left uk-icon">
195 149
                      <svg height="20" ratio="1" viewBox="0 0 20 20" width="20" xmlns="http://www.w3.org/2000/svg">
196 150
                        <circle cx="9.9" cy="6.4" fill="none" r="4.4" stroke="#000" stroke-width="1.1"></circle>
197 151
                        <path d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2" fill="none" stroke="#000" stroke-width="1.1"></path>
198 152
                      </svg>
199 153
                    </span>
200
                    </a>
201
                  </li>
202
                </ul>
203

  
204
                <ul *ngIf="getIsUserLoggedIn()" class="uk-navbar-nav">
205
                  <li class="uk-parent">
206
                    <a class="" aria-expanded="false">
207
                      {{ getUserName() }}
208
                      <span class="uk-margin-small-left uk-icon">
154
                  </a>
155
                </li>
156
                <li *ngIf="getIsUserLoggedIn()" class="uk-parent">
157
                  <a class="" aria-expanded="false">
158
                    {{ getUserName() }}
159
                    <span class="uk-margin-small-left uk-icon">
209 160
                      <svg height="20" ratio="1" viewBox="0 0 20 20" width="20" xmlns="http://www.w3.org/2000/svg">
210 161
                        <circle cx="9.9" cy="6.4" fill="none" r="4.4" stroke="#000" stroke-width="1.1"></circle>
211 162
                        <path d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2" fill="none" stroke="#000" stroke-width="1.1"></path>
212 163
                      </svg>
213 164
                    </span>
214
                    </a>
215
                    <div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 106.55px;"
216
                         id="userMenu" (click)="onClick('userMenu')">
217
                      <div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
218
                        <div class="uk-first-column">
219
                          <ul class="uk-nav uk-navbar-dropdown-nav">
220
                            <!--<ul *ngIf="getIsUserAdmin()" class="uk-nav uk-navbar-dropdown-nav">-->
221
                              <!--<li class="uk-nav-header" style="display: block;">Admin</li>-->
222
                              <!--<li style="display: block"><a href="{{adminHomePage}}" target="_blank">Help Texts</a></li>-->
223
                              <!--<li style="display: block"><a [routerLink]="['/admin/metrics']">Metrics</a></li>-->
224
                              <!--<li style="display: block" class="uk-margin-small-bottom"><a [routerLink]="['/admin/registrations']">Registrations</a></li>-->
225
                            <!--</ul>-->
226
                            <li><a class="" (click)="logout()">Log out</a></li>
227
                          </ul>
228
                        </div>
165
                  </a>
166
                  <div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 106.55px;"
167
                       id="userMenu" (click)="onClick('userMenu')">
168
                    <div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
169
                      <div class="uk-first-column">
170
                        <ul class="uk-nav uk-navbar-dropdown-nav">
171
                          <!--<ul *ngIf="getIsUserAdmin()" class="uk-nav uk-navbar-dropdown-nav">-->
172
                          <!--<li class="uk-nav-header" style="display: block;">Admin</li>-->
173
                          <!--<li style="display: block"><a href="{{adminHomePage}}" target="_blank">Help Texts</a></li>-->
174
                          <!--<li style="display: block"><a [routerLink]="['/admin/metrics']">Metrics</a></li>-->
175
                          <!--<li style="display: block" class="uk-margin-small-bottom"><a [routerLink]="['/admin/registrations']">Registrations</a></li>-->
176
                          <!--</ul>-->
177
                          <li><a class="" (click)="logout()">Log out</a></li>
178
                        </ul>
229 179
                      </div>
230 180
                    </div>
231
                  </li>
232
                </ul>
181
                  </div>
182
                </li>
233 183

  
234
              </div>
184
              </ul>
235 185

  
186
              <!--<div class="uk-navbar-item">-->
236 187

  
188
                <!--<ul *ngIf="!getIsUserLoggedIn()" class="uk-navbar-nav">-->
189
                  <!--<li class="uk-parent">-->
190
                    <!--<a class="" (click)="login()">-->
191
                      <!--Sign in-->
192
                      <!--<span class="uk-margin-small-left uk-icon">-->
193
                      <!--<svg height="20" ratio="1" viewBox="0 0 20 20" width="20" xmlns="http://www.w3.org/2000/svg">-->
194
                        <!--<circle cx="9.9" cy="6.4" fill="none" r="4.4" stroke="#000" stroke-width="1.1"></circle>-->
195
                        <!--<path d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2" fill="none" stroke="#000" stroke-width="1.1"></path>-->
196
                      <!--</svg>-->
197
                    <!--</span>-->
198
                    <!--</a>-->
199
                  <!--</li>-->
200
                <!--</ul>-->
201

  
202
                <!--<ul *ngIf="getIsUserLoggedIn()" class="uk-navbar-nav">-->
203
                  <!--<li class="uk-parent">-->
204
                    <!--<a class="" aria-expanded="false">-->
205
                      <!--{{ getUserName() }}-->
206
                      <!--<span class="uk-margin-small-left uk-icon">-->
207
                      <!--<svg height="20" ratio="1" viewBox="0 0 20 20" width="20" xmlns="http://www.w3.org/2000/svg">-->
208
                        <!--<circle cx="9.9" cy="6.4" fill="none" r="4.4" stroke="#000" stroke-width="1.1"></circle>-->
209
                        <!--<path d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2" fill="none" stroke="#000" stroke-width="1.1"></path>-->
210
                      <!--</svg>-->
211
                    <!--</span>-->
212
                    <!--</a>-->
213
                    <!--<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 106.55px;"-->
214
                         <!--id="userMenu" (click)="onClick('userMenu')">-->
215
                      <!--<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">-->
216
                        <!--<div class="uk-first-column">-->
217
                          <!--<ul class="uk-nav uk-navbar-dropdown-nav">-->
218
                            <!--&lt;!&ndash;<ul *ngIf="getIsUserAdmin()" class="uk-nav uk-navbar-dropdown-nav">&ndash;&gt;-->
219
                              <!--&lt;!&ndash;<li class="uk-nav-header" style="display: block;">Admin</li>&ndash;&gt;-->
220
                              <!--&lt;!&ndash;<li style="display: block"><a href="{{adminHomePage}}" target="_blank">Help Texts</a></li>&ndash;&gt;-->
221
                              <!--&lt;!&ndash;<li style="display: block"><a [routerLink]="['/admin/metrics']">Metrics</a></li>&ndash;&gt;-->
222
                              <!--&lt;!&ndash;<li style="display: block" class="uk-margin-small-bottom"><a [routerLink]="['/admin/registrations']">Registrations</a></li>&ndash;&gt;-->
223
                            <!--&lt;!&ndash;</ul>&ndash;&gt;-->
224
                            <!--<li><a class="" (click)="logout()">Log out</a></li>-->
225
                          <!--</ul>-->
226
                        <!--</div>-->
227
                      <!--</div>-->
228
                    <!--</div>-->
229
                  <!--</li>-->
230
                <!--</ul>-->
231

  
232
              <!--</div>-->
233

  
234

  
237 235
            </div>
238 236

  
239 237
          </nav>

Also available in: Unified diff