From mboxrd@z Thu Jan 1 00:00:00 1970 From: kupcevic@sourceware.org Date: 18 Jul 2006 20:33:07 -0000 Subject: [Cluster-devel] conga/luci ChangeLog TODO site/luci/Extensions ... Message-ID: <20060718203307.32075.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: conga Changes by: kupcevic at 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 + * storage: add icons to property dialogs + 2006-07-17 Stanko Kupcevic * 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 @@ - Creating New + + + + + + +
+ + + Creating New + +   +
@@ -1282,19 +1297,34 @@ - - '' - - - - - - - - - Creating - + + + + + + +
+ + + + '' - + + + + + - + + Creating + + +   +
@@ -1316,26 +1346,41 @@ tal:condition="conts"> - Content - - - - - + + + + + + +
+ + + Content + + + + + + +   +
@@ -1467,7 +1512,22 @@ - '' + + + + + + +
+ + + '' + +   +
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