Browse Source

Update statistics view

Kristan Kenney 6 years ago
parent
commit
5ff35b0ffc
2 changed files with 10 additions and 23 deletions
  1. 1 1
      web/templates/admin/list_stats.html
  2. 9 22
      web/templates/user/list_stats.html

+ 1 - 1
web/templates/admin/list_stats.html

@@ -62,7 +62,7 @@
       ?>
       ?>
         <div class="l-unit <? if($_COOKIE['stats-'.sha1($key)] == 1) echo ' l-unit--starred';?>" uniq-id="stats-<?=sha1($key)?>">
         <div class="l-unit <? if($_COOKIE['stats-'.sha1($key)] == 1) echo ' l-unit--starred';?>" uniq-id="stats-<?=sha1($key)?>">
           <div class="l-unit__col l-unit__col--right">
           <div class="l-unit__col l-unit__col--right">
-            <div class="clearfix l-unit__stat-col--left super-compact"><i class="fas fa-calendar-alt"></i></div>
+            <div class="clearfix l-unit__stat-col--left super-compact"><i class="fas fa-calendar-alt status-icon dim"></i></div>
             <div class="clearfix l-unit__stat-col--left wide-2"><b><?=__(strftime("%b", strtotime($key))).strftime(" %Y", strtotime($key))?></b></div>
             <div class="clearfix l-unit__stat-col--left wide-2"><b><?=__(strftime("%b", strtotime($key))).strftime(" %Y", strtotime($key))?></b></div>
             <div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
             <div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
             <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><?=$data[$key]['IP_OWNED']?></b></div>
             <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><?=$data[$key]['IP_OWNED']?></b></div>

+ 9 - 22
web/templates/user/list_stats.html

@@ -1,31 +1,18 @@
     <div class="l-center">
     <div class="l-center">
       <div class="l-sort clearfix noselect">
       <div class="l-sort clearfix noselect">
           <div class="l-unit-toolbar__buttonstrip">
           <div class="l-unit-toolbar__buttonstrip">
-              <a class="ui-button cancel" href='/list/stats/'><i class="fas fa-info-circle status-icon lightblue"></i> <?=__('Overall Statistics')?></a>
+              <a class="ui-button cancel" href='/list/stats/'><i class="fas fa-redo status-icon green"></i> <?=__('Refresh')?></a>
           </div>
           </div>
         <div class="l-sort-toolbar clearfix">
         <div class="l-sort-toolbar clearfix">
           <table>
           <table>
             <tr>
             <tr>
-              <td>
-                <form action="/list/stats/" method="get" id="objects">
-                  <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
-                  <div class="l-select">
-                    <select class="" name="user">
-                      <option value=""><?=__('show per user')?></option>
-                        <?
-                          foreach ($users as $key => $value) {
-                            echo "\t\t\t\t<option value=\"".$value."\"";
-                            if ((!empty($v_user)) && ( $value == $_GET['user'])){
-                              echo ' selected';
-                            }
-                              echo ">".$value."</option>\n";
-                            }
-                          ?>
-                    </select>
-                  </div>
-                  <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
-                </form>
-              </td>
+                <td class="l-sort-toolbar__search-box">
+                    <form action="/search/" method="get">
+                      <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
+                      <input type="text" name="q" class="search-input" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" />
+                      <button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value=""><i class="fas fa-search"></i></button>
+                    </form>
+                  </td>
             </tr>
             </tr>
           </table>
           </table>
         </div>
         </div>
@@ -62,7 +49,7 @@
       ?>
       ?>
         <div class="l-unit <? if($_COOKIE['stats-'.sha1($key)] == 1) echo ' l-unit--starred';?>" uniq-id="stats-<?=sha1($key)?>">
         <div class="l-unit <? if($_COOKIE['stats-'.sha1($key)] == 1) echo ' l-unit--starred';?>" uniq-id="stats-<?=sha1($key)?>">
           <div class="l-unit__col l-unit__col--right">
           <div class="l-unit__col l-unit__col--right">
-            <div class="clearfix l-unit__stat-col--left super-compact"><i class="fas fa-calendar-alt"></i></div>
+            <div class="clearfix l-unit__stat-col--left super-compact"><i class="fas fa-calendar-alt status-icon dim"></i></div>
             <div class="clearfix l-unit__stat-col--left wide-2"><b><?=__(strftime("%b", strtotime($key))).strftime(" %Y", strtotime($key))?></b></div>
             <div class="clearfix l-unit__stat-col--left wide-2"><b><?=__(strftime("%b", strtotime($key))).strftime(" %Y", strtotime($key))?></b></div>
             <div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
             <div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
             <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><?=$data[$key]['IP_OWNED']?></b></div>
             <div class="clearfix l-unit__stat-col--left text-center super-compact"><b><?=$data[$key]['IP_OWNED']?></b></div>