Pull from master

2018-03-15 13:48:52 +06:30
parent 96f8640df7
commit 1188f6e8e9
29 changed files with 242 additions and 97 deletions
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -10,6 +10,7 @@
 </div> -->
 <!-- #END# Search Bar -->
 <!-- Top Bar -->
+<%if !request.path_info.include?('second_display') %>
 <nav class="navbar">
    <div class="container-fluid">
        <div class="navbar-header">
@@ -79,7 +80,7 @@
        </div>
    </div>
 </nav>
-
+<%end%>
 <script type="text/javascript">
    $(function(){
        $('.delete').click(function(){