Skip to content

Commit b6b07d3

Browse files
author
Marius Cramer
committed
- Layout fixes
- Responsive fixes
1 parent 8ceb082 commit b6b07d3

File tree

22 files changed

+148
-37
lines changed

22 files changed

+148
-37
lines changed

‎interface/web/dashboard/dashlets/templates/modules.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ <h2>{tmpl_var name='available_modules_txt'}</h2>
1010
</div>
1111
</div>
1212
<div class='btn btn-default button'>
13-
<a href='#' data-capp='{tmp_var name="modules_name"}'>Go to {tmpl_var name='modules_title'}</a>
13+
<a href='#' data-capp='{tmpl_var name="modules_name"}'>Go to {tmpl_var name='modules_title'}</a>
1414
</div>
1515
</li>
1616
</tmpl_loop>

‎interface/web/dns/templates/dns_a_edit.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ <h1><tmpl_var name="list_head_txt"></h1>
4646
fillSearchField: true,
4747
fillSearchFieldWith: 'fill_text',
4848
searchFieldWatermark: '',
49-
resultBoxPosition: 'e'
49+
resultBoxPosition: ''
5050
});
5151
</script>

‎interface/web/dns/templates/dns_aaaa_edit.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ <h1><tmpl_var name="list_head_txt"></h1>
4646
fillSearchField: true,
4747
fillSearchFieldWith: 'fill_text',
4848
searchFieldWatermark: '',
49-
resultBoxPosition: 'e'
49+
resultBoxPosition: ''
5050
});
5151
</script>

‎interface/web/dns/templates/dns_slave_edit.htm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
8686
fillSearchField: true,
8787
fillSearchFieldWith: 'fill_text',
8888
searchFieldWatermark: '',
89-
resultBoxPosition: 'e'
89+
resultBoxPosition: ''
9090
});
9191
jQuery('#xfer').ispconfigSearch({
9292
dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
@@ -99,6 +99,6 @@ <h1><tmpl_var name="list_head_txt"></h1>
9999
fillSearchField: true,
100100
fillSearchFieldWith: 'fill_text',
101101
searchFieldWatermark: '',
102-
resultBoxPosition: 'e'
102+
resultBoxPosition: ''
103103
});
104104
</script>

‎interface/web/dns/templates/dns_soa_edit.htm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
139139
fillSearchField: true,
140140
fillSearchFieldWith: 'fill_text',
141141
searchFieldWatermark: '',
142-
resultBoxPosition: 'e'
142+
resultBoxPosition: ''
143143
});
144144
jQuery('#also_notify').ispconfigSearch({
145145
dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
@@ -152,6 +152,6 @@ <h1><tmpl_var name="list_head_txt"></h1>
152152
fillSearchField: true,
153153
fillSearchFieldWith: 'fill_text',
154154
searchFieldWatermark: '',
155-
resultBoxPosition: 'e'
155+
resultBoxPosition: ''
156156
});
157157
</script>

‎interface/web/dns/templates/dns_wizard.htm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
119119
fillSearchField: true,
120120
fillSearchFieldWith: 'fill_text',
121121
searchFieldWatermark: '',
122-
resultBoxPosition: 'e'
122+
resultBoxPosition: ''
123123
});
124124
</script>
125125
<script language="JavaScript" type="text/javascript">
@@ -134,6 +134,6 @@ <h1><tmpl_var name="list_head_txt"></h1>
134134
fillSearchField: true,
135135
fillSearchFieldWith: 'fill_text',
136136
searchFieldWatermark: '',
137-
resultBoxPosition: 'e'
137+
resultBoxPosition: ''
138138
});
139139
</script>

‎interface/web/js/jquery.ispconfigsearch.js‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,14 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
131131
//resultBox.html(output).css({'position' : 'absolute', 'top' : searchField.position().top+searchField.outerHeight(), 'right' : '0'}).fadeIn();
132132
if(settings.resultBoxPosition == 'n'){
133133
resultBox.html(output).css({'position' : 'absolute', 'top' : searchField.position().top-resultBox.outerHeight(), 'left' : searchField.position().left+searchField.outerWidth()-resultBox.outerWidth()}).fadeIn();
134-
}
135-
if(settings.resultBoxPosition == 'e'){
134+
} else if(settings.resultBoxPosition == 'e'){
136135
resultBox.html(output).css({'position' : 'absolute', 'top' : searchField.position().top, 'left' : searchField.position().left+searchField.outerWidth()}).fadeIn();
137-
}
138-
if(settings.resultBoxPosition == 's'){
136+
} else if(settings.resultBoxPosition == 's'){
139137
resultBox.html(output).css({'position' : 'absolute', 'top' : searchField.position().top+searchField.outerHeight(), 'left' : searchField.position().left+searchField.outerWidth()-resultBox.outerWidth()}).fadeIn();
140-
}
141-
if(settings.resultBoxPosition == 'w'){
138+
} else if(settings.resultBoxPosition == 'w'){
142139
resultBox.html(output).css({'position' : 'absolute', 'top' : searchField.position().top, 'left' : searchField.position().left-resultBox.outerWidth()}).fadeIn();
140+
} else {
141+
resultBox.html(output).fadeIn();
143142
}
144143

145144
searchField.removeClass(settings.cssPrefix+'loading');

‎interface/web/js/scrigo.js.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,7 @@ function loadMenus() {
423423
success: function(data, textStatus, jqXHR) {
424424
hideLoadIndicator();
425425
jQuery('#sidebar').html(jqXHR.responseText);
426+
loadPushyMenu();
426427
},
427428
error: function() {
428429
hideLoadIndicator();
@@ -440,6 +441,7 @@ function loadMenus() {
440441
success: function(data, textStatus, jqXHR) {
441442
hideLoadIndicator();
442443
jQuery('#topnav-container').html(jqXHR.responseText);
444+
loadPushyMenu();
443445
},
444446
error: function(o) {
445447
hideLoadIndicator();

‎interface/web/sites/templates/database_edit.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,6 @@ <h1><tmpl_var name="list_head_txt"></h1>
148148
fillSearchField: true,
149149
fillSearchFieldWith: 'fill_text',
150150
searchFieldWatermark: '',
151-
resultBoxPosition: 'e'
151+
resultBoxPosition: ''
152152
});
153153
</script>

‎interface/web/themes/default/assets/javascripts/responsive.js‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
1-
$(document).on('ready', function () {
1+
function loadPushyMenu() {
22
// Off-Canvas Menü
33
var $mainNavigation = $('#main-navigation');
4-
var $subNavigation = $('.subnavigation');
4+
var $subNavigation = $('#sidebar');
55
var $responsiveNavigation = $('nav.pushy');
66

7+
$responsiveNavigation.html('');
8+
79
// Hauptnavigation
810
$('<ul />').appendTo($responsiveNavigation);
911

1012
$($mainNavigation).find('a').each(function () {
1113
var $item = $(this);
1214
var $activeClass = $item.hasClass('active') ? ' class="active"' : '';
15+
16+
var capp = $item.attr('data-capp');
17+
if(capp) $activeClass += ' data-capp="' + capp + '"';
18+
19+
capp = $item.attr('data-load-content');
20+
if(capp) $activeClass += ' data-load-content="' + capp + '"';
1321

1422
$responsiveNavigation.find('ul').append($('<li><a href="' + $item.attr('href') + '"' + $activeClass + '><i class="icon ' + $item.data('icon-class') + '"></i>' + $item.text() + '</a></li>'));
1523
});
@@ -19,6 +27,14 @@ $(document).on('ready', function () {
1927

2028
$($subNavigation).find('a').each(function () {
2129
var $item = $(this);
22-
$responsiveNavigation.find('ul.subnavi').append($('<li><a href="' + $item.attr('href') + '">' + $item.text() + '</a></li>'));
30+
31+
var addattr = '';
32+
var capp = $item.attr('data-capp');
33+
if(capp) addattr += ' data-capp="' + capp + '"';
34+
35+
capp = $item.attr('data-load-content');
36+
if(capp) addattr += ' data-load-content="' + capp + '"';
37+
38+
$responsiveNavigation.find('ul.subnavi').append($('<li><a href="' + $item.attr('href') + '"' + addattr + '>' + $item.text() + '</a></li>'));
2339
});
24-
});
40+
};

0 commit comments

Comments
 (0)