chore: change row colors (#42)

- update bindata 
- change near row colors

There's no need to do "pagination" cause we don't have a "filter" function, and it's easy to use Ctrl+F to find the container you need. Besides, the list page is generated by the server with raw HTML code, no js needed, so the loading speed is fast.

Author: wrfly

Makefile

@@ -68,7 +68,7 @@ proto:
 asset: clear static/js static/css static/html
 	bindata \
 		-pkg $(PKG)/route/asset \
-		-resource static/
+		-src static/
 
 clear:
 	rm -rf static
@@ -94,7 +94,7 @@ js/node_modules/xterm/dist/xterm.css:
 	cd js && \
 	npm install
 
-.PHONY: js/dist/gotty-bundle.js
+# .PHONY: js/dist/gotty-bundle.js
 js/dist/gotty-bundle.js: js/node_modules/webpack
 	cd js && \
 	`npm bin`/webpack

go.mod

@@ -9,7 +9,6 @@ require (
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.3.3 // indirect
 	github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
-	github.com/elazarl/go-bindata-assetfs v1.0.0
 	github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a
 	github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3 // indirect
 	github.com/gin-gonic/gin v1.3.0
@@ -31,8 +30,7 @@ require (
 	github.com/sirupsen/logrus v1.4.0
 	github.com/spf13/pflag v1.0.3 // indirect
 	github.com/ugorji/go/codec v0.0.0-20190320090025-2dc34c0b8780 // indirect
-	github.com/wrfly/bindata v0.0.0-20190403163452-84af32a30f60 // indirect
-	github.com/wrfly/ecp v0.1.0
+	github.com/wrfly/ecp v0.1.1-0.20190725160759-97269b9e95f0
 	github.com/yudai/gotty v2.0.0-alpha.3+incompatible
 	golang.org/x/net v0.0.0-20190326090315-15845e8f865b
 	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect

go.sum

@@ -15,8 +15,6 @@ github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk
 github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c h1:ZfSZ3P3BedhKGUhzj7BQlPSU4OvT6tfOKe3DVHzOA7s=
 github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
-github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk=
-github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
 github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a h1:A4wNiqeKqU56ZhtnzJCTyPZ1+cyu8jKtIchQ3TtxHgw=
 github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3 h1:t8FVkw33L+wilf2QiWkw0UV77qRpcH/JHPKGpKa2E8g=
@@ -74,12 +72,8 @@ github.com/ugorji/go v1.1.2 h1:JON3E2/GPW2iDNGoSAusl1KDf5TRQ8k8q7Tp097pZGs=
 github.com/ugorji/go v1.1.2/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
 github.com/ugorji/go/codec v0.0.0-20190320090025-2dc34c0b8780 h1:vG/gY/PxA3v3l04qxe3tDjXyu3bozii8ulSlIPOYKhI=
 github.com/ugorji/go/codec v0.0.0-20190320090025-2dc34c0b8780/go.mod h1:iT03XoTwV7xq/+UGwKO3UbC1nNNlopQiY61beSdrtOA=
-github.com/wrfly/bindata v0.0.0-20190329131907-372088142650 h1:RcrlTAimjpy8WqvYEJmRr3weVCzT8VkHXCqQQgQ8rdo=
-github.com/wrfly/bindata v0.0.0-20190329131907-372088142650/go.mod h1:PJWDAiT81Z8k5Wx4c1hl3aKFIxokgycbdNBlMtF/yaA=
-github.com/wrfly/bindata v0.0.0-20190403163452-84af32a30f60 h1:iEapbDpEpM74EUNs2VHchs0BmJwT0C+VRbvN+tz5nhQ=
-github.com/wrfly/bindata v0.0.0-20190403163452-84af32a30f60/go.mod h1:PJWDAiT81Z8k5Wx4c1hl3aKFIxokgycbdNBlMtF/yaA=
-github.com/wrfly/ecp v0.1.0 h1:btwZO5LGlM5SNykaUXGkJIjwckpjPU2MjFatehSCmY8=
-github.com/wrfly/ecp v0.1.0/go.mod h1:cmmFTD+MLlrDa3/EO3gjeKLKUhHiYP3cgaaJamIS1NU=
+github.com/wrfly/ecp v0.1.1-0.20190725160759-97269b9e95f0 h1:Zy3Chk4CvwAqJ6YgQym6hJQEk4JE7iPbHRfxkru6Zn0=
+github.com/wrfly/ecp v0.1.1-0.20190725160759-97269b9e95f0/go.mod h1:cmmFTD+MLlrDa3/EO3gjeKLKUhHiYP3cgaaJamIS1NU=
 github.com/yudai/gotty v2.0.0-alpha.3+incompatible h1:eUFSuV4B2g+Rj+PS3HxhvOGEu2klWRzsl/7z7T/NUJQ=
 github.com/yudai/gotty v2.0.0-alpha.3+incompatible/go.mod h1:QBg0hL6VTVdqQk0qoBYk631EHLRH+XtR4wtbVi64UJ4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I=

resources/list.css

@@ -189,10 +189,14 @@ th, td {
     background-color: #393939;
 }
 
+.t.c.ver2 td {
+    background-color: #171717;
+}
+
 .table.ver3 td {
     font-family: Lato-Regular;
     font-size: 15px;
-    color: #808080;
+    color: #717171;
     line-height: 1.4;
-    background-color: #222222;
+    background-color: #00000082;
 }

resources/list.html

@@ -14,18 +14,18 @@
     <div class="table-head">
       <table>
         <thead>
-          <tr class="row100 head">
-            <th class="cell100 column1">Container ID</th>
-            <th class="cell100 column2">Image</th>
-            <th class="cell100 column3">Command</th>
-            <th class="cell100 column4">Name</th>
-            <th class="cell100 column5">IP</th>
+          <tr>
+            <th class="column1">Container ID</th>
+            <th class="column2">Image</th>
+            <th class="column3">Command</th>
+            <th class="column4">Name</th>
+            <th class="column5">IP</th>
             {{- if $showLocation }}
-            <th class="cell100 column6">Location</th>
+            <th class="column6">Location</th>
             {{- end }}
-            <th class="cell100 column7">Status</th>
+            <th class="column7">Status</th>
             {{- if $ctl.Enable }}
-            <th class="cell100 column8">Actions</th>
+            <th class="column8">Actions</th>
             {{- end -}}
           </tr>
         </thead>
@@ -35,31 +35,31 @@
     <div class="table-body">
       <table>
         <tbody>
-          {{ range .containers }}
-          <tr class="row100 body">
-            <td class="cell100 column1" title="exec into container">
+          {{ range $i, $e := .containers }}
+          <tr {{ if (eq (mod $i 2) 1) -}}class="t c ver2"{{- end }}>
+            <td class="column1" title="exec into container">
               <a href="/exec/{{ printf "%.12s" .ID }}" value="{{ .ID }}" target="_blank">{{ printf "%.12s" .ID }}</a>
             </td>
             {{- if $share -}}
-            <td class="cell100 column2" title="{{ .Image }} | share tty">
+            <td class="column2" title="{{ .Image }} | share tty">
               <a href="#" class="copy" data-clipboard-text="/share/{{ printf "%.12s" .ID }}">{{ printf .Image }}</a>
             </td>
             {{- else -}}
-            <td class="cell100 column2" title="{{ .Image }}">
+            <td class="column2" title="{{ .Image }}">
               {{ printf .Image }}
             </td>
             {{- end -}}
-            <td class="cell100 column3" title="{{ .Command }}">{{ printf .Command }}</td>
-            <td class="cell100 column4" title="{{ .Name }}">
+            <td class="column3" title="{{ .Command }}">{{ printf .Command }}</td>
+            <td class="column4" title="{{ .Name }}">
               <a href="/logs/{{ printf "%.12s" .ID }}?follow=1&tail=10" target="_blank" title="get logs">{{ printf .Name }}</a>
             </td>
-            <td class="cell100 column5" title="{{ .IPs }}">{{ index .IPs 0 }}</td>
+            <td class="column5" title="{{ .IPs }}">{{ index .IPs 0 }}</td>
             {{- if $showLocation -}}
-            <td class="cell100 column6" title="{{ .LocServer }}">{{ printf .LocServer }}</td>
+            <td class="column6" title="{{ .LocServer }}">{{ printf .LocServer }}</td>
             {{- end -}}
-            <td class="cell100 column7" title="{{ .Status }}">{{ .State }}</td>
+            <td class="column7" title="{{ .State }}">{{ .Status }}</td>
             {{ if $ctl.Enable -}}
-            <td class="cell100 column8">
+            <td class="column8">
               {{ if or $ctl.Start $ctl.All }}
               <button title="start">Start</button>{{ end }} {{ if or $ctl.Stop $ctl.All }}
               <button title="stop">Stop</button>{{ end }} {{ if or $ctl.Restart $ctl.All}}