fixed #476

akaunting · Sep 5, 2018 · 8058fad · 8058fad
1 parent 104451a
commit 8058fad
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/public/css/app.css b/public/css/app.css
@@ -356,7 +356,7 @@ div.required .control-label:not(span):after, td.required:after {
     width: 150px;
 }
 
-.ajax-search {
+.live-search {
     padding: 5px;
 }
 
@@ -369,16 +369,16 @@ div.required .control-label:not(span):after, td.required:after {
     background-color : #00A65A !important;
 }
 
-#result-search li a:hover .ajax-search .name {
+#result-search li a:hover .live-search .name {
     color: #FFFFFF !important;
 }
 
-.ajax-search .name {
+.live-search .name {
     font-size: 14px;
     font-weight: bold;
 }
 
-.ajax-search .type {
+.live-search .type {
     font-size: 12px;
 }
 

diff --git a/public/js/app.js b/public/js/app.js
@@ -23,11 +23,11 @@ $(document).ready(function () {
 
             // Show
             this.show = function () {
-                var pos = $('#search').position();
+                var pos = $('#live-search').position();
 
                 $(this).parent().parent().siblings('ul.dropdown-menu').css({
-                    top : pos.top + $('#search').height(),
-                    width: $('#search').width(),
+                    top : pos.top + $('#live-search').height(),
+                    width: $('#live-search').width(),
                     left: pos.left
                 });
 
@@ -62,7 +62,7 @@ $(document).ready(function () {
                     for (i = 0; i < count; i++) {
                         html += '<li data-value="' + json[i]['type'] + '-' + json[i]['id'] + '">';
                         html += '   <a href="' + json[i]['href'] + '">';
-                        html += '       <div class="ajax-search">';
+                        html += '       <div class="live-search">';
                         html += '           <div class="row">';
                         html += '               <div class="name" style="color: ' + json[i]['color'] + ';">' + json[i]['name'] + '</div>';
                         html += '               <span class="type">' + json[i]['type'] + '</span>';
@@ -87,7 +87,7 @@ $(document).ready(function () {
         });
     };
 
-    $('input[name=\'search\']').liveSearch({
+    $('input[name=\'live-search\']').liveSearch({
         'source': function (request, response) {
             if (request != '' && request.length > 2) {
                 $.ajax({
@@ -108,7 +108,7 @@ $(document).ready(function () {
                     }
                 });
             } else {
-                $('#search > .dropdown-menu').hide();
+                $('#live-search > .dropdown-menu').hide();
             }
         }
     });

diff --git a/resources/views/partials/admin/head.blade.php b/resources/views/partials/admin/head.blade.php
@@ -21,13 +21,13 @@
         <link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/dist/css/skins/skin-green-light.min.css') }}">
     @else
         <link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/dist/css/skins/skin-black.min.css') }}">
-        <link rel="stylesheet" href="{{ asset('public/css/skin-black.css?v=1.2') }}">
+        <link rel="stylesheet" href="{{ asset('public/css/skin-black.css?v=' . version('short')) }}">
     @endif
     <!-- Select2 -->
     <link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/select2/select2.min.css') }}">
     <!-- App style -->
-    <link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.2.12') }}">
-    <link rel="stylesheet" href="{{ asset('public/css/akaunting-green.css?v=1.2') }}">
+    <link rel="stylesheet" href="{{ asset('public/css/app.css?v=' . version('short')) }}">
+    <link rel="stylesheet" href="{{ asset('public/css/akaunting-green.css?v=' . version('short')) }}">
 
     <link rel="shortcut icon" href="{{ asset('public/img/favicon.ico') }}">
 
@@ -57,7 +57,7 @@
     <!-- Mask Money -->
     <script src="{{ asset('public/js/jquery/jquery.maskMoney.js') }}"></script>
 
-    <script src="{{ asset('public/js/app.js?v=1.0') }}"></script>
+    <script src="{{ asset('public/js/app.js?v=' . version('short')) }}"></script>
 
     <script type="text/javascript"><!--
         var url_search = '{{ url("common/search/search") }}';

diff --git a/resources/views/partials/admin/menu.blade.php b/resources/views/partials/admin/menu.blade.php
@@ -26,10 +26,10 @@
         </div>
         <!-- search form -->
         <form action="#" method="get" id="form-search" class="sidebar-form">
-            <div id="search" class="input-group">
-                <input type="text" name="search" value="<?php //echo $search; ?>" id="input-search" class="form-control" placeholder="Search...">
+            <div id="live-search" class="input-group">
+                <input type="text" name="live-search" value="<?php //echo $search; ?>" id="input-search" class="form-control" placeholder="Search...">
                 <span class="input-group-btn">
-                    <button type="submit" name="search" id="search-btn" class="btn btn-flat"><i class="fa fa-search"></i></button>
+                    <button type="submit" name="live-search" id="search-btn" class="btn btn-flat"><i class="fa fa-search"></i></button>
                 </span>
             </div>
         </form>