backup

ruiqili2 · ruiqili2 · commit 5a37d5c1d966 · 2017-12-10T11:24:02.000-06:00
diff --git a/easyweb/static/des_components/des-pages/des-all-tables.html b/easyweb/static/des_components/des-pages/des-all-tables.html
@@ -43,8 +43,6 @@
                     Next
                 </paper-button>
             </div>
-
-            }
         </des-card>
 
     </paper-dialog>
diff --git a/easyweb/static/des_components/des-pages/des-my-jobs.html b/easyweb/static/des_components/des-pages/des-my-jobs.html
@@ -9,6 +9,8 @@
 <template>
 <style include="shared-styles">
 
+    /* carousel table design*/
+
     paper-icon-item {
         --paper-item-disabled-color: black;
     }
@@ -35,7 +37,6 @@
     .green {background: var(--paper-green-500);}
     .red {background: var(--paper-red-500);}
 
-
 </style>
     <iron-ajax id="getMyJobs"
     auto
@@ -148,6 +149,11 @@ <h2>Job id: {{jobid}}</h2>
                 <paper-carousel id="jobs-crs" items="1" dotText="false" controls="true">
                     <div class="carousel-item" >
                         <table class="crs-table" style="width:100%">
+
+                            <tr class="crs-tr">
+                                <th class="crs-th" colspan="2">General Instruction</th>
+                            </tr>
+
                             <tr class="crs-tr">
                                 <th class="crs-th">Button</th>
                                 <th class="crs-th">Description</th>
@@ -190,7 +196,7 @@ <h2>Job id: {{jobid}}</h2>
                             </tr>
 
                             <tr class="crs-tr">
-                                <th colspan="2">Query Job</th>
+                                <th class="crs-th" colspan="2">Query Job</th>
                             </tr>
 
                             <tr class="crs-tr">
@@ -217,44 +223,46 @@ <h2>Job id: {{jobid}}</h2>
 
                             <tr class="crs-tr">
                                 <td class="crs-td">
-                                    <paper-button class="SeeFilesButton" raised >cutouts</paper-button> to see the results.
+                                    <paper-button class="SeeFilesButton" raised >cutouts</paper-button>
                                 </td>
                                 <td class="crs-td">
                                     See the result on click
                                 </td>
                             </tr>
 
                             <tr class="crs-tr">
-                                <th class="crs-th" colspan="2">Legends</th>
+                                <th class="crs-th" colspan="2">Legend</th>
                             </tr>
 
                             <tr class="crs-tr">
-                                <th class="crs-th row" colspan="2">
-                                    <paper-icon-item disabled>
-                                        <div class="status green" item-icon></div>
-                                        <paper-item-body>
-                                            Completed
-                                        </paper-item-body>
-                                    </paper-icon-item>
-
-                                    <paper-icon-item disabled>
-                                        <div class="status" item-icon></div>
-                                        <paper-item-body>
-                                            Running
-                                        </paper-item-body>
-                                    </paper-icon-item>
-
-                                    <paper-icon-item disabled>
-                                        <div class="status red" item-icon></div>
-                                        <paper-item-body>
-                                            Canceled
-                                        </paper-item-body>
-                                    </paper-icon-item>
-                                </th>
+                                <td class="crs-td" colspan="2">
+                                    <div class="row">
+                                        <paper-icon-item disabled>
+                                            <div class="status green" item-icon></div>
+                                            <paper-item-body>
+                                                Completed
+                                            </paper-item-body>
+                                        </paper-icon-item>
+
+                                        <paper-icon-item disabled>
+                                            <div class="status" item-icon></div>
+                                            <paper-item-body>
+                                                Running
+                                            </paper-item-body>
+                                        </paper-icon-item>
+
+                                        <paper-icon-item disabled>
+                                            <div class="status red" item-icon></div>
+                                            <paper-item-body>
+                                                Canceled
+                                            </paper-item-body>
+                                        </paper-icon-item>
+                                    </div>
+                                </td>
                             </tr>
-
                         </table>
 
+
                         <div style="text-align: left;">
                             Select one or more jobs for deletion.
                         </div>
diff --git a/easyweb/static/styles/shared-styles.html b/easyweb/static/styles/shared-styles.html
@@ -441,15 +441,15 @@
         width: 100%;
     }
 
-    th.crs-table, td.crs-table {
+    th.crs-th, td.crs-td {
         border: 1px solid #dddddd;
         padding: 8px;
         /*text-align: center;*/
     }
 
-    tr.crs-table:nth-child(even) {
-        background-color: #dddddd;
-        /*background-color: #f2f2f2;*/
+    tr.crs-tr:nth-child(even) {
+        /*background-color: #dddddd;*/
+        background-color: #f2f2f2;
     }
 
     /*tr.crs-table:last-child {*/
diff --git a/setup.sh b/setup.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+ps -ef | grep redis-server | grep -v grep | awk {'print $2'} | xargs kill

Original file line number	Diff line number	Diff line change
`@@ -441,15 +441,15 @@`
`441`	`441`	`width: 100%;`
`442`	`442`	`}`
`443`	`443`
`444`		`- th.crs-table, td.crs-table {`
	`444`	`+ th.crs-th, td.crs-td {`
`445`	`445`	`border: 1px solid #dddddd;`
`446`	`446`	`padding: 8px;`
`447`	`447`	`/text-align: center;/`
`448`	`448`	`}`
`449`	`449`
`450`		`- tr.crs-table:nth-child(even) {`
`451`		`- background-color: #dddddd;`
`452`		`- /background-color: #f2f2f2;/`
	`450`	`+ tr.crs-tr:nth-child(even) {`
	`451`	`+ /background-color: #dddddd;/`
	`452`	`+ background-color: #f2f2f2;`
`453`	`453`	`}`
`454`	`454`
`455`	`455`	`/tr.crs-table:last-child {/`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#!/bin/bash`
	`2`	`+ps -ef \| grep redis-server \| grep -v grep \| awk {'print $2'} \| xargs kill`