Эх сурвалжийг харах

HUE-1015 [beeswax] Remove Type column in Queries table

Romain Rigaux 12 жил өмнө
parent
commit
72dd230ccd

+ 3 - 8
apps/beeswax/src/beeswax/templates/list_designs.mako

@@ -51,7 +51,6 @@ ${layout.menubar(section='saved queries')}
         <th>${_('Name')}</th>
         <th>${_('Description')}</th>
         <th>${_('Owner')}</th>
-        <th>${_('Type')}</th>
         <th>${_('Last Modified')}</th>
       </tr>
     </thead>
@@ -77,18 +76,15 @@ ${layout.menubar(section='saved queries')}
         % if may_edit:
           <a href="${ url(app_name + ':execute_query', design_id=design.id) }" data-row-selector="true">${design.name}</a>
         % else:
-          ${design.name}
+          ${ design.name }
         % endif
         </td>
         <td>
         % if design.desc:
-          ${design.desc}
+          ${ design.desc }
         % endif
         </td>
-        <td>${design.owner.username}</td>
-        <td>
-          ${_('Query')}
-        </td>
+        <td>${ design.owner.username }</td>
         <td data-sort-value="${time.mktime(design.mtime.timetuple())}">${ timesince(design.mtime) } ${_('ago')}</td>
       </tr>
       % endfor
@@ -137,7 +133,6 @@ ${layout.menubar(section='saved queries')}
         null,
         null,
         null,
-        null,
         { "sSortDataType":"dom-sort-value", "sType":"numeric" }
       ],
       "oLanguage":{

+ 1 - 6
apps/beeswax/src/beeswax/templates/my_queries.mako

@@ -65,7 +65,6 @@ ${layout.menubar(section='my queries')}
             <th width="1%"><div class="hueCheckbox selectAll" data-selectables="savedCheck"></div></th>
             <th>${_('Name')}</th>
             <th>${_('Desc')}</th>
-            <th>${_('Type')}</th>
             <th>${_('Last Modified')}</th>
           </tr>
         </thead>
@@ -88,9 +87,6 @@ ${layout.menubar(section='my queries')}
               ${design.desc}
               % endif
             </td>
-            <td>
-              ${_('Query')}
-            </td>
             <td data-sort-value="${time.mktime(design.mtime.timetuple())}">${ timesince(design.mtime) } ${_('ago')}</td>
           </tr>
         % endfor
@@ -187,8 +183,7 @@ ${layout.menubar(section='my queries')}
       "aoColumns":[
         {"bSortable":false, "sWidth":"1%" },
         {"sWidth":"30%"},
-        {"sWidth":"40%"},
-        {"sWidth":"9%"},
+        {"sWidth":"49%"},
         { "sSortDataType":"dom-sort-value", "sType":"numeric", "sWidth":"20%" }
       ],
       "oLanguage":{