diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-06 18:03:14 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-06 18:03:14 -0500 |
| commit | 451193a984c12ffbc1fcf2e9a20cbd91f036f06f (patch) | |
| tree | d90ff426b6f325243f7b0ce97c47ba0fae6f8e56 | |
| parent | d14d8c345afd188bd27d9d07f3e092a5519e1295 (diff) | |
| download | pki-451193a984c12ffbc1fcf2e9a20cbd91f036f06f.tar.gz pki-451193a984c12ffbc1fcf2e9a20cbd91f036f06f.tar.xz pki-451193a984c12ffbc1fcf2e9a20cbd91f036f06f.zip | |
Renamed img folder in common-ui.
The img folder in common-ui has been renamed to images to match
the deployment folder name.
Ticket #328
| -rw-r--r-- | base/deploy/src/scriptlets/instance_layout.py | 8 | ||||
| -rwxr-xr-x | base/setup/pkicreate | 4 | ||||
| -rw-r--r-- | dogtag/common-ui/shared/images/favicon.ico (renamed from dogtag/common-ui/shared/img/favicon.ico) | bin | 601 -> 601 bytes | |||
| -rw-r--r-- | dogtag/common-ui/shared/images/logo_header.gif (renamed from dogtag/common-ui/shared/img/logo_header.gif) | bin | 5833 -> 5833 bytes |
4 files changed, 6 insertions, 6 deletions
diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py index b4d1a5068..f2673df29 100644 --- a/base/deploy/src/scriptlets/instance_layout.py +++ b/base/deploy/src/scriptlets/instance_layout.py @@ -100,13 +100,13 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): "css"), overwrite_flag=True) - # Copy /usr/share/pki/common-ui/img + # Copy /usr/share/pki/common-ui/images # to <instance>/webapp/pki/images util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, "common-ui", - "img"), + "images"), common_images, overwrite_flag=True) @@ -287,13 +287,13 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): "css"), overwrite_flag=True) - # Copy /usr/share/pki/common-ui/img + # Copy /usr/share/pki/common-ui/images # to <instance>/webapp/pki/images util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, "common-ui", - "img"), + "images"), common_images, overwrite_flag=True) diff --git a/base/setup/pkicreate b/base/setup/pkicreate index b5a904775..5cb5e9478 100755 --- a/base/setup/pkicreate +++ b/base/setup/pkicreate @@ -2081,10 +2081,10 @@ sub process_pki_directories $default_dir_permissions, $default_file_permissions, $pki_user, $pki_group); - # Copy /usr/share/pki/common-ui/img + # Copy /usr/share/pki/common-ui/images # to <instance>/docroot/pki/images return 0 if !copy_directory( - "$common_ui_subsystem_path/img", + "$common_ui_subsystem_path/images", "$docroot_instance_path/pki/images", $default_dir_permissions, $default_file_permissions, $pki_user, $pki_group); diff --git a/dogtag/common-ui/shared/img/favicon.ico b/dogtag/common-ui/shared/images/favicon.ico Binary files differindex efc1d33f4..efc1d33f4 100644 --- a/dogtag/common-ui/shared/img/favicon.ico +++ b/dogtag/common-ui/shared/images/favicon.ico diff --git a/dogtag/common-ui/shared/img/logo_header.gif b/dogtag/common-ui/shared/images/logo_header.gif Binary files differindex 573482227..573482227 100644 --- a/dogtag/common-ui/shared/img/logo_header.gif +++ b/dogtag/common-ui/shared/images/logo_header.gif |
