Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 08:26:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix active with anchor and settings dropdowns on non-settings pages

Browse source
This commit is contained in:
Stephen Birarda 2018-02-14 13:50:46 -08:00
parent dd5a705836
commit 2d9f2ebf81
5 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
domain-server/resources/web/base-settings-scripts.html
View file

@ -3,5 +3,4 @@
<script src='/js/bootbox.min.js'></script> <script src='/js/bootbox.min.js'></script>
<script src='/js/form2js.min.js'></script> <script src='/js/form2js.min.js'></script>
<script src='/js/bootstrap-switch.min.js'></script> <script src='/js/bootstrap-switch.min.js'></script>
<script src='/js/shared.js'></script>
<script src='/js/base-settings.js'></script> <script src='/js/base-settings.js'></script>

1
domain-server/resources/web/footer.html
View file

@ -1,4 +1,5 @@
</div> </div>
<script src='/js/jquery-2.1.4.min.js'></script> <script src='/js/jquery-2.1.4.min.js'></script>
<script src='/js/bootstrap.min.js'></script> <script src='/js/bootstrap.min.js'></script>
<script src='/js/shared.js'></script>
<script src='/js/domain-server.js'></script> <script src='/js/domain-server.js'></script>

6
domain-server/resources/web/js/domain-server.js
View file

@ -28,7 +28,7 @@ function settingsGroupAnchor(base, html_id) {
} }
$(document).ready(function(){ $(document).ready(function(){
var url = window.location; var url = location.protocol + '//' + location.host+location.pathname;
// Will only work if string in href matches with location // Will only work if string in href matches with location
$('ul.nav a[href="'+ url +'"]').parent().addClass('active'); $('ul.nav a[href="'+ url +'"]').parent().addClass('active');
@ -55,7 +55,7 @@ $(document).ready(function(){
var $contentDropdown = $('#content-settings-nav-dropdown'); var $contentDropdown = $('#content-settings-nav-dropdown');
var $settingsDropdown = $('#domain-settings-nav-dropdown'); var $settingsDropdown = $('#domain-settings-nav-dropdown');
// define extra groups to add to setting panels, with their splice index // define extra groups to add to setting panels, with their splice index
Settings.extraContentGroupsAtIndex = { Settings.extraContentGroupsAtIndex = {
0: { 0: {
html_id: Settings.CONTENT_ARCHIVES_PANEL_ID, html_id: Settings.CONTENT_ARCHIVES_PANEL_ID,
@ -99,7 +99,7 @@ $(document).ready(function(){
} }
for (var endIndex in Settings.extraContentGroupsAtEnd) { for (var endIndex in Settings.extraContentGroupsAtEnd) {
data.content_settings.push(Settings.extraContentGroupsAtIndex[spliceIndex]); data.content_settings.push(Settings.extraContentGroupsAtEnd[endIndex]);
} }
$.each(data.content_settings, function(index, group){ $.each(data.content_settings, function(index, group){

1
domain-server/resources/web/settings/js/settings.js
View file

@ -17,7 +17,6 @@ $(document).ready(function(){
Settings.extraGroupsAtEnd = Settings.extraDomainGroupsAtEnd; Settings.extraGroupsAtEnd = Settings.extraDomainGroupsAtEnd;
Settings.extraGroupsAtIndex = Settings.extraDomainGroupsAtIndex; Settings.extraGroupsAtIndex = Settings.extraDomainGroupsAtIndex;
Settings.afterReloadActions = function() { Settings.afterReloadActions = function() {
// append the domain selection modal // append the domain selection modal
appendDomainIDButtons(); appendDomainIDButtons();

1
domain-server/resources/web/wizard/index.shtml
View file

@ -261,6 +261,5 @@
<script src='/js/underscore-min.js'></script> <script src='/js/underscore-min.js'></script>
<script src='/js/bootbox.min.js'></script> <script src='/js/bootbox.min.js'></script>
<script src='/js/sha256.js'></script> <script src='/js/sha256.js'></script>
<script src='/js/shared.js'></script>
<script src='js/wizard.js'></script> <script src='js/wizard.js'></script>
<!--#include virtual="page-end.html"--> <!--#include virtual="page-end.html"-->