diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-06 18:10:11 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-06 18:18:19 -0500 |
commit | de576eaca1cb0adf6c7a0c691047193af3dc0eaa (patch) | |
tree | b0122591e4ea2f3f7cb28936c161754ed68c3f60 | |
parent | 451193a984c12ffbc1fcf2e9a20cbd91f036f06f (diff) | |
download | pki-de576eaca1cb0adf6c7a0c691047193af3dc0eaa.tar.gz pki-de576eaca1cb0adf6c7a0c691047193af3dc0eaa.tar.xz pki-de576eaca1cb0adf6c7a0c691047193af3dc0eaa.zip |
Moved admin/console/img in common-ui into images.
Ticket #328
-rw-r--r-- | base/deploy/src/scriptlets/instance_layout.py | 24 | ||||
-rwxr-xr-x | base/setup/pkicreate | 8 | ||||
-rw-r--r-- | dogtag/common-ui/shared/admin/console/img/favicon.ico | bin | 601 -> 0 bytes | |||
-rw-r--r-- | dogtag/common-ui/shared/admin/console/img/logo_header.gif | bin | 5833 -> 0 bytes | |||
-rw-r--r-- | dogtag/common-ui/shared/images/badge.png (renamed from dogtag/common-ui/shared/admin/console/img/badge.png) | bin | 1635 -> 1635 bytes | |||
-rw-r--r-- | dogtag/common-ui/shared/images/bigrotation2.gif (renamed from dogtag/common-ui/shared/admin/console/img/bigrotation2.gif) | bin | 1787 -> 1787 bytes | |||
-rw-r--r-- | dogtag/common-ui/shared/images/certificate.png (renamed from dogtag/common-ui/shared/admin/console/img/certificate.png) | bin | 4663 -> 4663 bytes | |||
-rw-r--r-- | dogtag/common-ui/shared/images/clearpixel.gif (renamed from dogtag/common-ui/shared/admin/console/img/clearpixel.gif) | bin | 43 -> 43 bytes | |||
-rw-r--r-- | dogtag/common-ui/shared/images/icon-software.gif (renamed from dogtag/common-ui/shared/admin/console/img/icon-software.gif) | bin | 1146 -> 1146 bytes | |||
-rw-r--r-- | dogtag/common-ui/shared/images/icon_crit_update.gif (renamed from dogtag/common-ui/shared/admin/console/img/icon_crit_update.gif) | bin | 337 -> 337 bytes | |||
-rw-r--r-- | dogtag/common-ui/shared/images/id.png (renamed from dogtag/common-ui/shared/admin/console/img/id.png) | bin | 1604 -> 1604 bytes | |||
-rw-r--r-- | dogtag/common-ui/shared/images/idkey.png (renamed from dogtag/common-ui/shared/admin/console/img/idkey.png) | bin | 1690 -> 1690 bytes | |||
-rw-r--r-- | dogtag/common-ui/shared/images/key.png (renamed from dogtag/common-ui/shared/admin/console/img/key.png) | bin | 1753 -> 1753 bytes | |||
-rw-r--r-- | dogtag/common-ui/shared/images/lock.png (renamed from dogtag/common-ui/shared/admin/console/img/lock.png) | bin | 1453 -> 1453 bytes | |||
-rw-r--r-- | dogtag/common-ui/shared/images/no-certificate.png (renamed from dogtag/common-ui/shared/admin/console/img/no-certificate.png) | bin | 2342 -> 2342 bytes | |||
-rw-r--r-- | dogtag/common-ui/shared/images/rootca.gif (renamed from dogtag/common-ui/shared/admin/console/img/rootca.gif) | bin | 692 -> 692 bytes | |||
-rw-r--r-- | dogtag/common-ui/shared/images/sub.gif (renamed from dogtag/common-ui/shared/admin/console/img/sub.gif) | bin | 705 -> 705 bytes |
17 files changed, 0 insertions, 32 deletions
diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py index f2673df29..02601e86a 100644 --- a/base/deploy/src/scriptlets/instance_layout.py +++ b/base/deploy/src/scriptlets/instance_layout.py @@ -76,18 +76,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): master['pki_tomcat_webapps_common_path'], "images") - # Copy /usr/share/pki/common-ui/admin/console/img - # to <instance>/webapp/pki/images - util.directory.copy( - os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - "common-ui", - "admin", - "console", - "img"), - common_images, - overwrite_flag=True) - # Copy /usr/share/pki/common-ui/css # to <instance>/webapp/pki/css util.directory.copy( @@ -263,18 +251,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): master['pki_tomcat_webapps_common_path'], "images") - # Copy /usr/share/pki/common-ui/admin/console/img - # to <instance>/webapp/pki/images - util.directory.copy( - os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - "common-ui", - "admin", - "console", - "img"), - common_images, - overwrite_flag=True) - # Copy /usr/share/pki/common-ui/css # to <instance>/webapp/pki/css util.directory.copy( diff --git a/base/setup/pkicreate b/base/setup/pkicreate index 5cb5e9478..0e2ebe2e2 100755 --- a/base/setup/pkicreate +++ b/base/setup/pkicreate @@ -2065,14 +2065,6 @@ sub process_pki_directories $default_dir_permissions, $default_file_permissions, $pki_user, $pki_group); - # Copy /usr/share/pki/common-ui/admin/console/img - # to <instance>/docroot/pki/images - return 0 if !copy_directory( - "$common_ui_subsystem_path/admin/console/img", - "$docroot_instance_path/pki/images", - $default_dir_permissions, $default_file_permissions, - $pki_user, $pki_group); - # Copy /usr/share/pki/common-ui/css # to <instance>/docroot/pki/css return 0 if !copy_directory( diff --git a/dogtag/common-ui/shared/admin/console/img/favicon.ico b/dogtag/common-ui/shared/admin/console/img/favicon.ico Binary files differdeleted file mode 100644 index efc1d33f4..000000000 --- a/dogtag/common-ui/shared/admin/console/img/favicon.ico +++ /dev/null diff --git a/dogtag/common-ui/shared/admin/console/img/logo_header.gif b/dogtag/common-ui/shared/admin/console/img/logo_header.gif Binary files differdeleted file mode 100644 index 573482227..000000000 --- a/dogtag/common-ui/shared/admin/console/img/logo_header.gif +++ /dev/null diff --git a/dogtag/common-ui/shared/admin/console/img/badge.png b/dogtag/common-ui/shared/images/badge.png Binary files differindex 5fe0223b5..5fe0223b5 100644 --- a/dogtag/common-ui/shared/admin/console/img/badge.png +++ b/dogtag/common-ui/shared/images/badge.png diff --git a/dogtag/common-ui/shared/admin/console/img/bigrotation2.gif b/dogtag/common-ui/shared/images/bigrotation2.gif Binary files differindex 5bb90fd6a..5bb90fd6a 100644 --- a/dogtag/common-ui/shared/admin/console/img/bigrotation2.gif +++ b/dogtag/common-ui/shared/images/bigrotation2.gif diff --git a/dogtag/common-ui/shared/admin/console/img/certificate.png b/dogtag/common-ui/shared/images/certificate.png Binary files differindex 2ea9f88bb..2ea9f88bb 100644 --- a/dogtag/common-ui/shared/admin/console/img/certificate.png +++ b/dogtag/common-ui/shared/images/certificate.png diff --git a/dogtag/common-ui/shared/admin/console/img/clearpixel.gif b/dogtag/common-ui/shared/images/clearpixel.gif Binary files differindex ae710460b..ae710460b 100644 --- a/dogtag/common-ui/shared/admin/console/img/clearpixel.gif +++ b/dogtag/common-ui/shared/images/clearpixel.gif diff --git a/dogtag/common-ui/shared/admin/console/img/icon-software.gif b/dogtag/common-ui/shared/images/icon-software.gif Binary files differindex dd64b485c..dd64b485c 100644 --- a/dogtag/common-ui/shared/admin/console/img/icon-software.gif +++ b/dogtag/common-ui/shared/images/icon-software.gif diff --git a/dogtag/common-ui/shared/admin/console/img/icon_crit_update.gif b/dogtag/common-ui/shared/images/icon_crit_update.gif Binary files differindex cf3c47907..cf3c47907 100644 --- a/dogtag/common-ui/shared/admin/console/img/icon_crit_update.gif +++ b/dogtag/common-ui/shared/images/icon_crit_update.gif diff --git a/dogtag/common-ui/shared/admin/console/img/id.png b/dogtag/common-ui/shared/images/id.png Binary files differindex 2c54191e1..2c54191e1 100644 --- a/dogtag/common-ui/shared/admin/console/img/id.png +++ b/dogtag/common-ui/shared/images/id.png diff --git a/dogtag/common-ui/shared/admin/console/img/idkey.png b/dogtag/common-ui/shared/images/idkey.png Binary files differindex 3e27d2d05..3e27d2d05 100644 --- a/dogtag/common-ui/shared/admin/console/img/idkey.png +++ b/dogtag/common-ui/shared/images/idkey.png diff --git a/dogtag/common-ui/shared/admin/console/img/key.png b/dogtag/common-ui/shared/images/key.png Binary files differindex db2896248..db2896248 100644 --- a/dogtag/common-ui/shared/admin/console/img/key.png +++ b/dogtag/common-ui/shared/images/key.png diff --git a/dogtag/common-ui/shared/admin/console/img/lock.png b/dogtag/common-ui/shared/images/lock.png Binary files differindex 56be3b755..56be3b755 100644 --- a/dogtag/common-ui/shared/admin/console/img/lock.png +++ b/dogtag/common-ui/shared/images/lock.png diff --git a/dogtag/common-ui/shared/admin/console/img/no-certificate.png b/dogtag/common-ui/shared/images/no-certificate.png Binary files differindex 7d93a41c3..7d93a41c3 100644 --- a/dogtag/common-ui/shared/admin/console/img/no-certificate.png +++ b/dogtag/common-ui/shared/images/no-certificate.png diff --git a/dogtag/common-ui/shared/admin/console/img/rootca.gif b/dogtag/common-ui/shared/images/rootca.gif Binary files differindex 303e25c10..303e25c10 100644 --- a/dogtag/common-ui/shared/admin/console/img/rootca.gif +++ b/dogtag/common-ui/shared/images/rootca.gif diff --git a/dogtag/common-ui/shared/admin/console/img/sub.gif b/dogtag/common-ui/shared/images/sub.gif Binary files differindex e4cca8384..e4cca8384 100644 --- a/dogtag/common-ui/shared/admin/console/img/sub.gif +++ b/dogtag/common-ui/shared/images/sub.gif |