[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] conga/luci ChangeLog TODO site/luci/Extensions ...



CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic sourceware org	2006-07-18 20:33:05

Modified files:
	luci           : ChangeLog TODO 
	luci/site/luci/Extensions: StorageReport.py 
	luci/storage   : form-macros icon_bd_LV.png icon_bd_ide.png 
	                 icon_bd_net.png icon_bd_scsi.png 
	                 icon_mapper_VG.png icon_mapper_raid.png 
Added files:
	luci/storage   : icon_content_FS.png icon_content_PV.png 

Log message:
	luci: storage: add icons to property dialogs

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/ChangeLog.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/TODO.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/StorageReport.py.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/icon_content_FS.png.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/icon_content_PV.png.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/form-macros.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/icon_bd_LV.png.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/icon_bd_ide.png.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/icon_bd_net.png.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/icon_bd_scsi.png.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/icon_mapper_VG.png.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/icon_mapper_raid.png.diff?cvsroot=cluster&r1=1.1&r2=1.2

--- conga/luci/ChangeLog	2006/07/17 20:59:43	1.3
+++ conga/luci/ChangeLog	2006/07/18 20:33:04	1.4
@@ -1,5 +1,8 @@
 
 
+2006-07-18  Stanko Kupcevic <kupcevic redhat com> 
+   * storage: add icons to property dialogs
+
 2006-07-17  Stanko Kupcevic <kupcevic redhat com> 
    * storage: styling of property dialogs
 
--- conga/luci/TODO	2006/07/12 23:12:00	1.2
+++ conga/luci/TODO	2006/07/18 20:33:04	1.3
@@ -3,7 +3,6 @@
  - commit and commit errors
  - add sources
  - SIZE
- - properties styling
  - cylinder labels
 
 
--- conga/luci/site/luci/Extensions/StorageReport.py	2006/07/17 20:59:43	1.3
+++ conga/luci/site/luci/Extensions/StorageReport.py	2006/07/18 20:33:04	1.4
@@ -1617,16 +1617,17 @@
         
         # content's color and icon
         color = 'black'
-        icon_name = 'none'
+        icon_name = ''
         type = d['xml'].getAttribute('type')
         if type == 'filesystem':
-            pass
+            icon_name = 'icon_content_FS.png'
         elif type == 'mapper_source':
             mapper_type = d['xml'].getAttribute('mapper_type')
             if mapper_type == MAPPER_SYS_TYPE:
                 pass
             elif mapper_type == MAPPER_VG_TYPE:
                 color = '#a43737'
+                icon_name = 'icon_content_PV.png'
             elif mapper_type == MAPPER_PT_TYPE:
                 pass
             elif mapper_type == MAPPER_MDRAID_TYPE or mapper_type == MAPPER_ATARAID_TYPE:
/cvs/cluster/conga/luci/storage/icon_content_FS.png,v  -->  standard output
revision 1.1
Binary files /cvs/cluster/conga/luci/storage/icon_content_FS.png and - differ
/cvs/cluster/conga/luci/storage/icon_content_PV.png,v  -->  standard output
revision 1.1
Binary files /cvs/cluster/conga/luci/storage/icon_content_PV.png and - differ
--- conga/luci/storage/form-macros	2006/07/17 20:59:43	1.2
+++ conga/luci/storage/form-macros	2006/07/18 20:33:05	1.3
@@ -619,7 +619,22 @@
      <tr class="props-form-header">
       <th colspan="2"
           tal:attributes="style python:here.add_commas('font-size: large', 'color: ' + mapper['color'])">
-       Creating New <span tal:replace="mapper/pretty_type"/>
+       <table>
+        <tr>
+         <td style="min-width: 30px;">
+          <img tal:condition="mapper/icon"
+               tal:attributes="src mapper/icon"
+               height="29px"
+               width="29px"/>
+         </td>
+         <td style="width: 100%;">
+          Creating New <span tal:replace="mapper/pretty_type"/>
+         </td>
+         <td style="min-width: 30px;">
+          &nbsp;
+         </td>
+        </tr>
+       </table>
       </th>
      </tr>
      <tr class="props-form-body">
@@ -1282,19 +1297,34 @@
       <tr class="props-form-header">
        <th colspan="2"
            tal:attributes="style python:here.add_commas('font-size: large', 'color: ' + bd_data['color'])">
-        <span tal:omit-tag=""
-              tal:condition="not: bd_data/new">
-         <span tal:replace="bd_data/pretty_type"/> '<span tal:replace="bd_data/pretty_name"/>' - <span tal:replace="bd_data/path"/>
-        </span>
-        <span tal:omit-tag=""
-              tal:condition="bd_data/new">
-         <span tal:omit-tag=""
-               tal:condition="bd_data/pretty_name">
-          <span tal:replace="bd_data/pretty_name"/>
-          -
-         </span>
-         Creating <span tal:replace="bd_data/pretty_type"/>
-        </span>
+        <table>
+         <tr>
+          <td style="min-width: 30px;">
+           <img tal:condition="bd_data/icon"
+                tal:attributes="src bd_data/icon"
+                height="29px"
+                width="29px"/>
+          </td>
+          <td style="width: 100%;">
+           <span tal:omit-tag=""
+                 tal:condition="not: bd_data/new">
+            <span tal:replace="bd_data/pretty_type"/> '<span tal:replace="bd_data/pretty_name"/>' - <span tal:replace="bd_data/path"/>
+           </span>
+           <span tal:omit-tag=""
+                 tal:condition="bd_data/new">
+            <span tal:omit-tag=""
+                  tal:condition="bd_data/pretty_name">
+             <span tal:replace="bd_data/pretty_name"/>
+             -
+            </span>
+            Creating <span tal:replace="bd_data/pretty_type"/>
+           </span>
+          </td>
+          <td style="min-width: 30px;">
+           &nbsp;
+          </td>
+         </tr>
+        </table>
        </th>
       </tr>
       <tr class="props-form-body">
@@ -1316,26 +1346,41 @@
                tal:condition="conts">
          <tr class="props-form-header">
           <th tal:attributes="style python:'color: ' + conts[0]['color']">
-           Content<span tal:condition="python:len(conts) == 1"
-                        tal:replace="string::"/>
-           <select tal:define="funct python:'change_content(\'' + select_content_id + '\', \'' + content_span_id + '\')'"
-                   tal:condition="python:len(conts) > 1" 
-                   tal:attributes="id       select_content_id; 
-                                   name     string:content_id; 
-                                   onchange funct">
-            <span tal:omit-tag="" 
-                  tal:repeat="cont conts">
-             <option tal:attributes="value cont/id"/><span tal:replace="cont/name"/>
-            </span>
-           </select>
-           <span tal:define="cont python:conts[0]"
-                 tal:condition="python:len(conts) == 1">
-            <input tal:attributes="id    select_content_id; 
-                                   type  string:hidden; 
-                                   name  string:content_id; 
-                                   value cont/id"/>
-            <span tal:replace="cont/name"/>
-           </span>
+           <table style="width: 100%;">
+            <tr>
+             <th style="min-width: 30px;">
+              <img tal:condition="python:conts[0]['icon']"
+                   tal:attributes="src python:conts[0]['icon']"
+                   height="29px"
+                   width="29px"/>
+             </th>
+             <td style="width: 100%;">
+              Content<span tal:condition="python:len(conts) == 1"
+                           tal:replace="string::"/>
+              <select tal:define="funct python:'change_content(\'' + select_content_id + '\', \'' + content_span_id + '\')'"
+                      tal:condition="python:len(conts) > 1" 
+                      tal:attributes="id       select_content_id; 
+                                      name     string:content_id; 
+                                      onchange funct">
+               <span tal:omit-tag="" 
+                     tal:repeat="cont conts">
+                <option tal:attributes="value cont/id"/><span tal:replace="cont/name"/>
+               </span>
+              </select>
+              <span tal:define="cont python:conts[0]"
+                    tal:condition="python:len(conts) == 1">
+               <input tal:attributes="id    select_content_id; 
+                                      type  string:hidden; 
+                                      name  string:content_id; 
+                                      value cont/id"/>
+               <span tal:replace="cont/name"/>
+              </span>
+             </td>
+             <td style="min-width: 30px;">
+              &nbsp;
+             </td>
+            </tr>
+           </table>
           </th>
          </tr>
          <tr class="props-form-body">
@@ -1467,7 +1512,22 @@
      <tr class="props-form-header">
       <th colspan="2"
           tal:attributes="style python:here.add_commas('font-size: large', 'color: ' + mapper['color'])">
-       <span tal:replace="mapper/pretty_type"/> '<span tal:replace="mapper/pretty_name"/>'
+       <table>
+        <tr>
+         <td style="min-width: 30px;">
+          <img tal:condition="mapper/icon"
+               tal:attributes="src mapper/icon"
+               height="29px"
+               width="29px"/>
+         </td>
+         <td style="width: 100%;">
+          <span tal:replace="mapper/pretty_type"/> '<span tal:replace="mapper/pretty_name"/>'
+         </td>
+         <td style="min-width: 30px;">
+          &nbsp;
+         </td>
+        </tr>
+       </table>
       </th>
      </tr>
      <tr class="props-form-body">
Binary files /cvs/cluster/conga/luci/storage/icon_bd_LV.png	2006/06/30 17:00:02	1.1 and /cvs/cluster/conga/luci/storage/icon_bd_LV.png	2006/07/18 20:33:05	1.2 differ
rcsdiff: /cvs/cluster/conga/luci/storage/icon_bd_LV.png: diff failed
Binary files /cvs/cluster/conga/luci/storage/icon_bd_ide.png	2006/06/30 17:00:02	1.1 and /cvs/cluster/conga/luci/storage/icon_bd_ide.png	2006/07/18 20:33:05	1.2 differ
rcsdiff: /cvs/cluster/conga/luci/storage/icon_bd_ide.png: diff failed
Binary files /cvs/cluster/conga/luci/storage/icon_bd_net.png	2006/06/30 17:00:02	1.1 and /cvs/cluster/conga/luci/storage/icon_bd_net.png	2006/07/18 20:33:05	1.2 differ
rcsdiff: /cvs/cluster/conga/luci/storage/icon_bd_net.png: diff failed
Binary files /cvs/cluster/conga/luci/storage/icon_bd_scsi.png	2006/06/30 17:00:02	1.1 and /cvs/cluster/conga/luci/storage/icon_bd_scsi.png	2006/07/18 20:33:05	1.2 differ
rcsdiff: /cvs/cluster/conga/luci/storage/icon_bd_scsi.png: diff failed
Binary files /cvs/cluster/conga/luci/storage/icon_mapper_VG.png	2006/06/30 17:00:02	1.1 and /cvs/cluster/conga/luci/storage/icon_mapper_VG.png	2006/07/18 20:33:05	1.2 differ
rcsdiff: /cvs/cluster/conga/luci/storage/icon_mapper_VG.png: diff failed
Binary files /cvs/cluster/conga/luci/storage/icon_mapper_raid.png	2006/06/30 17:00:02	1.1 and /cvs/cluster/conga/luci/storage/icon_mapper_raid.png	2006/07/18 20:33:05	1.2 differ
rcsdiff: /cvs/cluster/conga/luci/storage/icon_mapper_raid.png: diff failed


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]