Skip to content

Commit

Permalink
Fix tailing whitespace.
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Howitz committed Aug 17, 2018
1 parent 260140a commit 8c116c4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions src/App/dtml/manage_navbar.dtml
@@ -1,9 +1,9 @@
<dtml-unless "'manage_menu' in REQUEST['URL']">

<header class="navbar navbar-nav navbar-expand navbar-dark flex-row bd-navbar">
<div id="toggle_tabs" class="collapsed"
data-toggle="collapse"
data-target="#tabs_items"
<div id="toggle_tabs" class="collapsed"
data-toggle="collapse"
data-target="#tabs_items"
aria-controls="tabs_items" aria-expanded="false" aria-label="Toggle Tab-Navigation">
<i class="fa fa-bars"></i>
</div>
Expand All @@ -23,7 +23,7 @@
</a>
</li>
<li class="form-inline zmi-cp">
<a title="Control Panel"
<a title="Control Panel"
href="/Control_Panel/manage_main" target="_self">
<i class="fa fa-cog"></i> <span class="zmi-label">Control&nbsp;Panel</span>
</a>
Expand All @@ -32,7 +32,7 @@
<li class="form-inline zmi-addItemSelect">
<form method="get" class="form-group">
<label for="addItemSelect" class="ml-2 sr-only">Select type to add</label>
<select id="addItemSelect" class="form-control-sm" name=":action"
<select id="addItemSelect" class="form-control-sm" name=":action"
data-title-active="Select type to add"
data-title-inactive="STATUS INACTIVE: New Object can only be Added in the List View"
title="Select type to add"
Expand Down Expand Up @@ -76,4 +76,4 @@
</div>
</div>

</dtml-unless>
</dtml-unless>
12 changes: 6 additions & 6 deletions src/OFS/zpt/main.zpt
Expand Up @@ -200,19 +200,19 @@
// +++++++++++++++++++++++++++
// Tablefilter/Search Element
// +++++++++++++++++++++++++++

function isModifierKeyPressed(event) {
return event.altKey
|| event.ctrlKey
|| event.metaKey;
}

$(document).keypress( function(event) {

if (isModifierKeyPressed(event)) {
return; // ignore
}

// Set Focus to Tablefilter only when Modal Dialog is not Shown
if ( !$('#zmi-modal').hasClass('show') ) {
$('#tablefilter').focus();
Expand All @@ -226,11 +226,11 @@
})

$('#tablefilter').keyup( function (e) {

if (isModifierKeyPressed(event)) {
return; // ignore
}

var tablefilter = $(this).val();
if( e.which==13 ) {
if (1 === $('tbody tr:visible').length) {
Expand Down

0 comments on commit 8c116c4

Please sign in to comment.