Skip to content
GitLab
Commit a78c50e4 authored by Wolfgang Knopki's avatar Wolfgang Knopki
Browse files

Merge remote-tracking branch 'origin/devel' into testing 

URLs had to be adapted
parents a30e5e9c ea6a163d
master MLAB-677 devel devel_wolfgang patch-1 reset-jul13 reset-merge test_logoutbutton testing
1 merge request!2Mlab 56
Pipeline #411 passed with stage
in 8 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 6 deletions
+6 -6
views/profile.pug
+ 2
- 2
View file @ a78c50e4
...@@ -35,8 +35,8 @@ html(lang="en") ...@@ -35,8 +35,8 @@ html(lang="en")
span #{user.firstname} #{user.lastname} span #{user.firstname} #{user.lastname}
div(class="nav flex-column nav-pills", id="v-pills-tab", role="tablist", aria-orientation="vertical") div(class="nav flex-column nav-pills", id="v-pills-tab", role="tablist", aria-orientation="vertical")
a(class="nav-link" href="#" aria-selected="true") Profile a(class="nav-link" href="#" aria-selected="true") Profile
a(class="nav-link" href="/security" aria-selected="false") Security a(class="nav-link" href="/account/security" aria-selected="false") Security
a(class="nav-link" href="/services" aria-selected="false") Services a(class="nav-link" href="/account/services" aria-selected="false") Services
div(class="col-sm-9") div(class="col-sm-9")
if successes if successes
for success in successes for success in successes
......
views/security.pug
+ 2
- 2
View file @ a78c50e4
...@@ -37,9 +37,9 @@ html(lang="en") ...@@ -37,9 +37,9 @@ html(lang="en")
h5 h5
span #{user.firstName} #{user.lastName} span #{user.firstName} #{user.lastName}
div(class="nav flex-column nav-pills", id="v-pills-tab", role="tablist", aria-orientation="vertical") div(class="nav flex-column nav-pills", id="v-pills-tab", role="tablist", aria-orientation="vertical")
a(class="nav-link" href="/profile" aria-selected="true") Profile a(class="nav-link" href="/account/profile" aria-selected="true") Profile
a(class="nav-link" href="#" aria-selected="false") Security a(class="nav-link" href="#" aria-selected="false") Security
a(class="nav-link" href="/services" aria-selected="false") Services a(class="nav-link" href="/account/services" aria-selected="false") Services
div(class="col-sm-9") div(class="col-sm-9")
if successes if successes
for success in successes for success in successes
......
views/services.pug
+ 2
- 2
View file @ a78c50e4
...@@ -34,8 +34,8 @@ html(lang="en") ...@@ -34,8 +34,8 @@ html(lang="en")
h5 h5
span #{user.firstName} #{user.lastName} span #{user.firstName} #{user.lastName}
div(class="nav flex-column nav-pills", id="v-pills-tab", role="tablist", aria-orientation="vertical") div(class="nav flex-column nav-pills", id="v-pills-tab", role="tablist", aria-orientation="vertical")
a(class="nav-link" href="/profile" aria-selected="true") Profile a(class="nav-link" href="/account/profile" aria-selected="true") Profile
a(class="nav-link" href="/security" aria-selected="false") Security a(class="nav-link" href="/account/security" aria-selected="false") Security
a(class="nav-link" href="#" aria-selected="false") Services a(class="nav-link" href="#" aria-selected="false") Services
div(class="col-sm-9") div(class="col-sm-9")
if successes if successes
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal