dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moving controls to top of content

Browse Source
This commit is contained in:
Jason White
2017-02-16 14:56:08 -05:00
parent 0763eac26b
commit af8f8c27a6
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webgoat-container/src/main/resources/static/js/goatApp/view/LessonContentView.js
View File

@ -174,7 +174,7 @@ define(['jquery',
pagingControlsDiv = $('<div>',{class:'panel-body', id:'lesson-page-controls'}); pagingControlsDiv = $('<div>',{class:'panel-body', id:'lesson-page-controls'});
pagingControlsDiv.append(prevPageButton); pagingControlsDiv.append(prevPageButton);
pagingControlsDiv.append(nextPageButton); pagingControlsDiv.append(nextPageButton);
this.$el.append(pagingControlsDiv); this.$el.find('.lesson-page-controls').append(pagingControlsDiv);
} }
}, },

21
webgoat-container/src/main/resources/templates/main_new.html
View File

@ -62,7 +62,8 @@
<i class="fa fa-user"></i> <span class="caret"></span> <i class="fa fa-user"></i> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu dropdown-menu-left"> <ul class="dropdown-menu dropdown-menu-left">
<li role="presentation"><a role="menuitem" tabindex="-1" th:href="@{/login(logout)}" th:text="#{logout}">Logout</a></li> <li role="presentation"><a role="menuitem" tabindex="-1" th:href="@{/login(logout)}"
th:text="#{logout}">Logout</a></li>
<li role="presentation" class="divider"></li> <li role="presentation" class="divider"></li>
<li role="presentation" class="disabled"><a role="menuitem" tabindex="-1" href="#">User: <span <li role="presentation" class="disabled"><a role="menuitem" tabindex="-1" href="#">User: <span
th:text="${#authentication.name}"></span></a> th:text="${#authentication.name}"></span></a>
@ -73,10 +74,12 @@
</a> </a>
</li> </li>
<li role="presentation" class="divider"></li> <li role="presentation" class="divider"></li>
<li role="presentation" class="disabled"><a role="menuitem" tabindex="-1" href="#" th:text="#{version}">Version: <span <li role="presentation" class="disabled"><a role="menuitem" tabindex="-1" href="#"
th:text="#{version}">Version: <span
th:text="${@environment.getProperty('webgoat.build.version')}"></span></a> th:text="${@environment.getProperty('webgoat.build.version')}"></span></a>
</li> </li>
<li role="presentation" class="disabled"><a role="menuitem" tabindex="-1" href="#" th:text="#{build}">Build: <li role="presentation" class="disabled"><a role="menuitem" tabindex="-1" href="#"
th:text="#{build}">Build:
<span th:text="${@environment.getProperty('webgoat.build.number')}"></span></a></li> <span th:text="${@environment.getProperty('webgoat.build.number')}"></span></a></li>
</ul> </ul>
@ -99,7 +102,8 @@
<i class="fa fa-info"></i> <i class="fa fa-info"></i>
</button> </button>
<a href="mailto:${contactEmail}?Subject=Webgoat%20feedback" target="_top"> <a href="mailto:${contactEmail}?Subject=Webgoat%20feedback" target="_top">
<button type="button" class="btn btn-default right_nav_button" data-toggle="tooltip" th:title="#{contact}"> <button type="button" class="btn btn-default right_nav_button" data-toggle="tooltip"
th:title="#{contact}">
<i class="fa fa-envelope"></i> <i class="fa fa-envelope"></i>
</button> </button>
</a> </a>
@ -140,9 +144,11 @@
id="show-hints-button" th:text="#{show.hints}">Show hints id="show-hints-button" th:text="#{show.hints}">Show hints
</button> </button>
<button class="btn btn-primary btn-xs btn-danger help-button" <button class="btn btn-primary btn-xs btn-danger help-button"
id="show-lesson-overview-button" th:text="#{lesson.overview}">Lesson overview id="show-lesson-overview-button" th:text="#{lesson.overview}">Lesson
overview
</button> </button>
<button class="btn btn-xs help-button" id="restart-lesson-button" th:text="#{reset.lesson}">Reset Lesson <button class="btn btn-xs help-button" id="restart-lesson-button"
th:text="#{reset.lesson}">Reset Lesson
</button> </button>
</div> </div>
@ -166,6 +172,9 @@
<div class="panel-body" id="lesson-overview"></div> <div class="panel-body" id="lesson-overview"></div>
</div> </div>
</div> </div>
<div class="lesson-page-controls">
</div>
<div class="lesson-content"> <div class="lesson-content">