Merge branch 'cli' of github.com:loleg/dribdat into cli

dribdat · Nov 28, 2022 · aa016d2 · aa016d2
2 parents 7706e29 + 0df645e
commit aa016d2
Show file tree

Hide file tree

Showing 5 changed files with 110 additions and 598 deletions.
diff --git a/dribdat/static/css/style.css b/dribdat/static/css/style.css
@@ -1810,9 +1810,6 @@ Instruction page
   cursor: pointer;
   padding: 0 0 0 2em;
 }
-.form-project-confirm:hover {
-  background-color: lightyellow;
-}
 .projectpost alert {
   margin-top: 0.5em;
 }

diff --git a/dribdat/templates/includes/nav.html b/dribdat/templates/includes/nav.html
@@ -95,17 +95,34 @@
         </li>
       {% endif %}
 
-      <form class="form-inline nav-item" action="{{ url_for('public.about') }}" method="get">
-        <button class="btn my-2 my-sm-0 {% if active != 'about' %}text-secondary{% endif %}" type="submit">
+      <li class="nav-item">
+        <a class="nav-link" id="navSearchButton" href="{{ url_for('public.about') }}">
           <i class="fa fa-search" aria-hidden="true"></i>
-        </button>
-        <!-- <input class="form-control mr-sm-2" type="search" placeholder="" aria-label="Search" name="q" size=7> -->
-      </form>
+        </a>
+      </li>
 
     </ul>
 
-
+    
 
   </div><!-- /.navbar-collapse -->
 
 </nav>
+
+<!-- Popup search results -->
+<div class="fade container nav-search" id="navSearch" 
+     tabindex="-1" role="dialog" aria-labelledby="searchLabel" aria-hidden="true">
+  <div class="profile-projects container-fluid mt-5">
+    <h5 id="searchLabel">Search dribdat</h5>
+    <div action="/api/project/search.json" id="search">
+      <div class="content input-group">
+        <div class="input-group-prepend">
+          <span class="input-group-text">Search</span>
+        </div>
+        <input type="text" class="form-control" name="q" aria-label="Search term" placeholder="Start typing ..."  style="width:20em">
+      </div>
+    </div>
+    <div class="row flex-row flex-nowrap mt-2 mb-2" id="search-results"></div>
+    <div class="text-center" id="search-matches"><i>Start typing above ...</i></div>
+  </div>
+</div>
diff --git a/dribdat/templates/public/about.html b/dribdat/templates/public/about.html
@@ -6,23 +6,6 @@
 
 {% block content %}
 
-<div class="container home-search mb-3">
-  <div class="row" id="api-search">
-    <div class="profile-projects container-fluid">
-      <div action="/api/project/search.json" id="search">
-        <div class="content input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text">Search</span>
-          </div>
-          <input type="text" class="form-control" name="q" aria-label="Search term" placeholder="Start typing ..."  style="width:20em">
-        </div>
-      </div>
-      <div class="row flex-row flex-nowrap ml-0 mt-1 mb-1 pt-2 pb-2" id="search-results"></div>
-      <div class="text-center" id="search-matches"></div>
-    </div>
-  </div>
-</div>
-
 <div class="jumbotron bg-white">
   <div class="container">
     <div class="row">

diff --git a/dribdat/templates/public/projectpost.html b/dribdat/templates/public/projectpost.html
@@ -90,12 +90,6 @@ <h5 class="mb-3">
     {% endif %}
   </div>
 
-  <!-- Inline search results (REMOVED)
-  <div class="profile-projects container-fluid mt-5">
-    <div class="row flex-row flex-nowrap ml-0 mt-1 mb-1 pt-2 pb-2" id="search-results"></div>
-    <div class="text-center" id="search-matches"><i>Waiting to make a suggestion ...</i></div>
-  </div> -->
-
   <center class="mt-3">
     <a href="{{ url_for('project.project_view', project_id=project.id) }}"
        title="Cancel" class="btn btn-light"