aboutsummaryrefslogtreecommitdiffstats
path: root/template/yoga
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--template/admin/yoga/about.tpl (renamed from template/yoga/about.tpl)0
-rw-r--r--template/admin/yoga/admin/cat_perm.tpl (renamed from template/yoga/admin/cat_perm.tpl)0
-rw-r--r--template/admin/yoga/admin/comments.tpl (renamed from template/yoga/admin/comments.tpl)0
-rw-r--r--template/admin/yoga/admin/double_select.tpl (renamed from template/yoga/admin/double_select.tpl)0
-rw-r--r--template/admin/yoga/admin/element_set_unit.tpl (renamed from template/yoga/admin/element_set_unit.tpl)0
-rw-r--r--template/admin/yoga/admin/group_perm.tpl (renamed from template/yoga/admin/group_perm.tpl)0
-rw-r--r--template/admin/yoga/admin/notification_by_mail.tpl (renamed from template/yoga/admin/notification_by_mail.tpl)0
-rw-r--r--template/admin/yoga/admin/rating.tpl (renamed from template/yoga/admin/rating.tpl)0
-rw-r--r--template/admin/yoga/admin/site_update.tpl (renamed from template/yoga/admin/site_update.tpl)0
-rw-r--r--template/admin/yoga/admin/tags.tpl (renamed from template/yoga/admin/tags.tpl)0
-rw-r--r--template/admin/yoga/admin/user_list.tpl (renamed from template/yoga/admin/user_list.tpl)0
-rw-r--r--template/admin/yoga/admin/user_perm.tpl (renamed from template/yoga/admin/user_perm.tpl)0
-rw-r--r--template/admin/yoga/dclear.css (renamed from template/yoga/dclear.css)0
-rw-r--r--template/admin/yoga/footer.tpl (renamed from template/yoga/footer.tpl)0
-rw-r--r--template/admin/yoga/header.tpl (renamed from template/yoga/header.tpl)12
-rw-r--r--template/admin/yoga/icon/add_tag.png (renamed from template/yoga/icon/add_tag.png)bin59 -> 59 bytes
-rw-r--r--template/admin/yoga/icon/admin/errors.png (renamed from template/yoga/icon/admin/errors.png)bin3249 -> 3249 bytes
-rw-r--r--template/admin/yoga/icon/admin/infos.png (renamed from template/yoga/icon/admin/infos.png)bin2250 -> 2250 bytes
-rw-r--r--template/admin/yoga/icon/caddie_add.png (renamed from template/yoga/icon/caddie_add.png)bin1186 -> 1186 bytes
-rw-r--r--template/admin/yoga/icon/calendar.png (renamed from template/yoga/icon/calendar.png)bin844 -> 844 bytes
-rw-r--r--template/admin/yoga/icon/calendar_created.png (renamed from template/yoga/icon/calendar_created.png)bin1230 -> 1230 bytes
-rw-r--r--template/admin/yoga/icon/category_children.png (renamed from template/yoga/icon/category_children.png)bin1554 -> 1554 bytes
-rw-r--r--template/admin/yoga/icon/category_delete.png (renamed from template/yoga/icon/category_delete.png)bin1752 -> 1752 bytes
-rw-r--r--template/admin/yoga/icon/category_edit.png (renamed from template/yoga/icon/category_edit.png)bin1606 -> 1606 bytes
-rw-r--r--template/admin/yoga/icon/category_elements.png (renamed from template/yoga/icon/category_elements.png)bin1681 -> 1681 bytes
-rw-r--r--template/admin/yoga/icon/category_jump-to.png (renamed from template/yoga/icon/category_jump-to.png)bin1604 -> 1604 bytes
-rw-r--r--template/admin/yoga/icon/category_permissions.png (renamed from template/yoga/icon/category_permissions.png)bin1839 -> 1839 bytes
-rw-r--r--template/admin/yoga/icon/category_representant_random.png (renamed from template/yoga/icon/category_representant_random.png)bin3171 -> 3171 bytes
-rw-r--r--template/admin/yoga/icon/del_favorite.png (renamed from template/yoga/icon/del_favorite.png)bin1424 -> 1424 bytes
-rw-r--r--template/admin/yoga/icon/delete.png (renamed from template/yoga/icon/delete.png)bin778 -> 778 bytes
-rw-r--r--template/admin/yoga/icon/exit.png (renamed from template/yoga/icon/exit.png)bin1432 -> 1432 bytes
-rw-r--r--template/admin/yoga/icon/favorite.png (renamed from template/yoga/icon/favorite.png)bin1457 -> 1457 bytes
-rw-r--r--template/admin/yoga/icon/first.png (renamed from template/yoga/icon/first.png)bin1645 -> 1645 bytes
-rw-r--r--template/admin/yoga/icon/help.png (renamed from template/yoga/icon/help.png)bin1994 -> 1994 bytes
-rw-r--r--template/admin/yoga/icon/home.png (renamed from template/yoga/icon/home.png)bin1591 -> 1591 bytes
-rw-r--r--template/admin/yoga/icon/last.png (renamed from template/yoga/icon/last.png)bin1642 -> 1642 bytes
-rw-r--r--template/admin/yoga/icon/left.png (renamed from template/yoga/icon/left.png)bin1644 -> 1644 bytes
-rw-r--r--template/admin/yoga/icon/lost_password.png (renamed from template/yoga/icon/lost_password.png)bin1717 -> 1717 bytes
-rw-r--r--template/admin/yoga/icon/metadata.png (renamed from template/yoga/icon/metadata.png)bin1520 -> 1520 bytes
-rw-r--r--template/admin/yoga/icon/mimetypes/avi.png (renamed from template/yoga/icon/mimetypes/avi.png)bin4284 -> 4284 bytes
-rw-r--r--template/admin/yoga/icon/mimetypes/mp3.png (renamed from template/yoga/icon/mimetypes/mp3.png)bin3902 -> 3902 bytes
-rw-r--r--template/admin/yoga/icon/mimetypes/mpg.png (renamed from template/yoga/icon/mimetypes/mpg.png)bin4271 -> 4271 bytes
-rw-r--r--template/admin/yoga/icon/mimetypes/ogg.png (renamed from template/yoga/icon/mimetypes/ogg.png)bin4063 -> 4063 bytes
-rw-r--r--template/admin/yoga/icon/mimetypes/zip.png (renamed from template/yoga/icon/mimetypes/zip.png)bin3721 -> 3721 bytes
-rw-r--r--template/admin/yoga/icon/normal_mode.png (renamed from template/yoga/icon/normal_mode.png)bin335 -> 335 bytes
-rw-r--r--template/admin/yoga/icon/permissions.png (renamed from template/yoga/icon/permissions.png)bin729 -> 729 bytes
-rw-r--r--template/admin/yoga/icon/preferences.png (renamed from template/yoga/icon/preferences.png)bin1606 -> 1606 bytes
-rw-r--r--template/admin/yoga/icon/recent.png (renamed from template/yoga/icon/recent.png)bin757 -> 757 bytes
-rw-r--r--template/admin/yoga/icon/register.png (renamed from template/yoga/icon/register.png)bin1445 -> 1445 bytes
-rw-r--r--template/admin/yoga/icon/representative.png (renamed from template/yoga/icon/representative.png)bin1556 -> 1556 bytes
-rw-r--r--template/admin/yoga/icon/right.png (renamed from template/yoga/icon/right.png)bin1661 -> 1661 bytes
-rw-r--r--template/admin/yoga/icon/save.png (renamed from template/yoga/icon/save.png)bin961 -> 961 bytes
-rw-r--r--template/admin/yoga/icon/search_rules.png (renamed from template/yoga/icon/search_rules.png)bin1509 -> 1509 bytes
-rw-r--r--template/admin/yoga/icon/slideshow.png (renamed from template/yoga/icon/slideshow.png)bin1229 -> 1229 bytes
-rw-r--r--template/admin/yoga/icon/sync_metadata.png (renamed from template/yoga/icon/sync_metadata.png)bin1797 -> 1797 bytes
-rw-r--r--template/admin/yoga/icon/up.png (renamed from template/yoga/icon/up.png)bin1641 -> 1641 bytes
-rw-r--r--template/admin/yoga/image.css (renamed from template/yoga/image.css)0
-rw-r--r--template/admin/yoga/install.tpl (renamed from template/yoga/install.tpl)0
-rw-r--r--template/admin/yoga/layout.css (renamed from template/yoga/layout.css)2
-rw-r--r--template/admin/yoga/menubar.css (renamed from template/yoga/menubar.css)0
-rw-r--r--template/admin/yoga/nbm.tpl (renamed from template/yoga/nbm.tpl)0
-rw-r--r--template/admin/yoga/notification.tpl (renamed from template/yoga/notification.tpl)0
-rw-r--r--template/admin/yoga/picture.tpl (renamed from template/yoga/picture.tpl)0
-rw-r--r--template/admin/yoga/popuphelp.css (renamed from template/yoga/popuphelp.css)0
-rw-r--r--template/admin/yoga/popuphelp.tpl (renamed from template/yoga/popuphelp.tpl)0
-rw-r--r--template/admin/yoga/print.css (renamed from template/yoga/print.css)0
-rw-r--r--template/admin/yoga/profile.tpl (renamed from template/yoga/profile.tpl)0
-rw-r--r--template/admin/yoga/redirect.tpl (renamed from template/yoga/redirect.tpl)0
-rw-r--r--template/admin/yoga/register.tpl (renamed from template/yoga/register.tpl)0
-rw-r--r--template/admin/yoga/search_rules.tpl (renamed from template/yoga/search_rules.tpl)0
-rw-r--r--template/admin/yoga/tags.tpl (renamed from template/yoga/tags.tpl)0
-rw-r--r--template/admin/yoga/theme/dark/images/tableh1_bg.png (renamed from template/yoga/theme/dark/images/tableh1_bg.png)bin271 -> 271 bytes
-rw-r--r--template/admin/yoga/theme/dark/images/tableh2_bg.png (renamed from template/yoga/theme/dark/images/tableh2_bg.png)bin307 -> 307 bytes
-rw-r--r--template/admin/yoga/upload.tpl (renamed from template/yoga/upload.tpl)0
-rw-r--r--template/public/yoga/admin.tpl (renamed from template/yoga/admin.tpl)0
-rw-r--r--template/public/yoga/admin/cat_list.tpl (renamed from template/yoga/admin/cat_list.tpl)0
-rw-r--r--template/public/yoga/admin/cat_modify.tpl (renamed from template/yoga/admin/cat_modify.tpl)0
-rw-r--r--template/public/yoga/admin/cat_move.tpl (renamed from template/yoga/admin/cat_move.tpl)0
-rw-r--r--template/public/yoga/admin/cat_options.tpl (renamed from template/yoga/admin/cat_options.tpl)0
-rw-r--r--template/public/yoga/admin/configuration.tpl (renamed from template/yoga/admin/configuration.tpl)0
-rw-r--r--template/public/yoga/admin/element_set_global.tpl (renamed from template/yoga/admin/element_set_global.tpl)0
-rw-r--r--template/public/yoga/admin/group_list.tpl (renamed from template/yoga/admin/group_list.tpl)0
-rw-r--r--template/public/yoga/admin/intro.tpl (renamed from template/yoga/admin/intro.tpl)0
-rw-r--r--template/public/yoga/admin/maintenance.tpl (renamed from template/yoga/admin/maintenance.tpl)0
-rw-r--r--template/public/yoga/admin/picture_modify.tpl (renamed from template/yoga/admin/picture_modify.tpl)0
-rw-r--r--template/public/yoga/admin/site_manager.tpl (renamed from template/yoga/admin/site_manager.tpl)0
-rw-r--r--template/public/yoga/admin/stats.tpl (renamed from template/yoga/admin/stats.tpl)0
-rw-r--r--template/public/yoga/admin/thumbnail.tpl (renamed from template/yoga/admin/thumbnail.tpl)0
-rw-r--r--template/public/yoga/admin/waiting.tpl (renamed from template/yoga/admin/waiting.tpl)0
-rw-r--r--template/public/yoga/comments.tpl (renamed from template/yoga/comments.tpl)0
-rw-r--r--template/public/yoga/content.css (renamed from template/yoga/content.css)0
-rw-r--r--template/public/yoga/default-colors.css (renamed from template/yoga/default-colors.css)0
-rw-r--r--template/public/yoga/default-layout.css (renamed from template/yoga/default-layout.css)0
-rw-r--r--template/public/yoga/fix-ie5-ie6.css (renamed from template/yoga/fix-ie5-ie6.css)0
-rw-r--r--template/public/yoga/fix-khtml.css (renamed from template/yoga/fix-khtml.css)0
-rw-r--r--template/public/yoga/identification.tpl (renamed from template/yoga/identification.tpl)0
-rw-r--r--template/public/yoga/index.tpl (renamed from template/yoga/index.tpl)0
-rw-r--r--template/public/yoga/mainpage_categories.tpl (renamed from template/yoga/mainpage_categories.tpl)0
-rw-r--r--template/public/yoga/month_calendar.tpl (renamed from template/yoga/month_calendar.tpl)0
-rw-r--r--template/public/yoga/password.tpl (renamed from template/yoga/password.tpl)0
-rw-r--r--template/public/yoga/search.tpl (renamed from template/yoga/search.tpl)0
-rw-r--r--template/public/yoga/theme/clear/theme.css (renamed from template/yoga/theme/clear/theme.css)0
-rw-r--r--template/public/yoga/theme/dark/theme.css (renamed from template/yoga/theme/dark/theme.css)0
-rw-r--r--template/yoga/theme/clear/themeconf.inc.php9
-rw-r--r--template/yoga/theme/dark/themeconf.inc.php9
105 files changed, 7 insertions, 25 deletions
diff --git a/template/yoga/about.tpl b/template/admin/yoga/about.tpl
index 6efa0e9ee..6efa0e9ee 100644
--- a/template/yoga/about.tpl
+++ b/template/admin/yoga/about.tpl
diff --git a/template/yoga/admin/cat_perm.tpl b/template/admin/yoga/admin/cat_perm.tpl
index 9c8fafa69..9c8fafa69 100644
--- a/template/yoga/admin/cat_perm.tpl
+++ b/template/admin/yoga/admin/cat_perm.tpl
diff --git a/template/yoga/admin/comments.tpl b/template/admin/yoga/admin/comments.tpl
index 065a1c8ee..065a1c8ee 100644
--- a/template/yoga/admin/comments.tpl
+++ b/template/admin/yoga/admin/comments.tpl
diff --git a/template/yoga/admin/double_select.tpl b/template/admin/yoga/admin/double_select.tpl
index 2bfa28072..2bfa28072 100644
--- a/template/yoga/admin/double_select.tpl
+++ b/template/admin/yoga/admin/double_select.tpl
diff --git a/template/yoga/admin/element_set_unit.tpl b/template/admin/yoga/admin/element_set_unit.tpl
index 5adce8833..5adce8833 100644
--- a/template/yoga/admin/element_set_unit.tpl
+++ b/template/admin/yoga/admin/element_set_unit.tpl
diff --git a/template/yoga/admin/group_perm.tpl b/template/admin/yoga/admin/group_perm.tpl
index 91c2f637a..91c2f637a 100644
--- a/template/yoga/admin/group_perm.tpl
+++ b/template/admin/yoga/admin/group_perm.tpl
diff --git a/template/yoga/admin/notification_by_mail.tpl b/template/admin/yoga/admin/notification_by_mail.tpl
index 22309e96d..22309e96d 100644
--- a/template/yoga/admin/notification_by_mail.tpl
+++ b/template/admin/yoga/admin/notification_by_mail.tpl
diff --git a/template/yoga/admin/rating.tpl b/template/admin/yoga/admin/rating.tpl
index ac78bf419..ac78bf419 100644
--- a/template/yoga/admin/rating.tpl
+++ b/template/admin/yoga/admin/rating.tpl
diff --git a/template/yoga/admin/site_update.tpl b/template/admin/yoga/admin/site_update.tpl
index d3d0221ca..d3d0221ca 100644
--- a/template/yoga/admin/site_update.tpl
+++ b/template/admin/yoga/admin/site_update.tpl
diff --git a/template/yoga/admin/tags.tpl b/template/admin/yoga/admin/tags.tpl
index 8fe666b59..8fe666b59 100644
--- a/template/yoga/admin/tags.tpl
+++ b/template/admin/yoga/admin/tags.tpl
diff --git a/template/yoga/admin/user_list.tpl b/template/admin/yoga/admin/user_list.tpl
index e6c1e81b6..e6c1e81b6 100644
--- a/template/yoga/admin/user_list.tpl
+++ b/template/admin/yoga/admin/user_list.tpl
diff --git a/template/yoga/admin/user_perm.tpl b/template/admin/yoga/admin/user_perm.tpl
index a24fd9096..a24fd9096 100644
--- a/template/yoga/admin/user_perm.tpl
+++ b/template/admin/yoga/admin/user_perm.tpl
diff --git a/template/yoga/dclear.css b/template/admin/yoga/dclear.css
index e69de29bb..e69de29bb 100644
--- a/template/yoga/dclear.css
+++ b/template/admin/yoga/dclear.css
diff --git a/template/yoga/footer.tpl b/template/admin/yoga/footer.tpl
index 44d905995..44d905995 100644
--- a/template/yoga/footer.tpl
+++ b/template/admin/yoga/footer.tpl
diff --git a/template/yoga/header.tpl b/template/admin/yoga/header.tpl
index d432d7b63..9776eabe8 100644
--- a/template/yoga/header.tpl
+++ b/template/admin/yoga/header.tpl
@@ -4,16 +4,16 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}">
<link rel="shortcut icon" type="image/x-icon" href="{pwg_root}template-common/favicon.ico">
-<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/layout.css">
+<link rel="stylesheet" type="text/css" href="{pwg_root}template/admin/{themeconf:template}/layout.css">
<!-- the next css is used to fix khtml (Konqueror/Safari) issue
the "text/nonsense" prevents gecko based browsers to load it -->
-<link rel="stylesheet" type="text/nonsense" href="{pwg_root}template/{themeconf:template}/fix-khtml.css">
+<link rel="stylesheet" type="text/nonsense" href="{pwg_root}template/admin/{themeconf:template}/fix-khtml.css">
<!--[if lt IE 7]>
-<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/fix-ie5-ie6.css">
+<link rel="stylesheet" type="text/css" href="{pwg_root}template/admin/{themeconf:template}/fix-ie5-ie6.css">
<![endif]-->
-<link rel="stylesheet" type="text/css" media="print" href="{pwg_root}template/{themeconf:template}/print.css">
-<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/default-colors.css">
-<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/theme/{themeconf:theme}/theme.css">
+<link rel="stylesheet" type="text/css" media="print" href="{pwg_root}template/admin/{themeconf:template}/print.css">
+<link rel="stylesheet" type="text/css" href="{pwg_root}template/admin/{themeconf:template}/default-colors.css">
+<link rel="stylesheet" type="text/css" href="{pwg_root}template/admin/{themeconf:template}/theme/{themeconf:theme}/theme.css">
<!-- BEGIN next -->
<link rel="prefetch" href="{next.U_IMG_SRC}">
<!-- END next -->
diff --git a/template/yoga/icon/add_tag.png b/template/admin/yoga/icon/add_tag.png
index 9051a1d26..9051a1d26 100644
--- a/template/yoga/icon/add_tag.png
+++ b/template/admin/yoga/icon/add_tag.png
Binary files differ
diff --git a/template/yoga/icon/admin/errors.png b/template/admin/yoga/icon/admin/errors.png
index 3c8a37df5..3c8a37df5 100644
--- a/template/yoga/icon/admin/errors.png
+++ b/template/admin/yoga/icon/admin/errors.png
Binary files differ
diff --git a/template/yoga/icon/admin/infos.png b/template/admin/yoga/icon/admin/infos.png
index dc8c8a457..dc8c8a457 100644
--- a/template/yoga/icon/admin/infos.png
+++ b/template/admin/yoga/icon/admin/infos.png
Binary files differ
diff --git a/template/yoga/icon/caddie_add.png b/template/admin/yoga/icon/caddie_add.png
index eb20f4e06..eb20f4e06 100644
--- a/template/yoga/icon/caddie_add.png
+++ b/template/admin/yoga/icon/caddie_add.png
Binary files differ
diff --git a/template/yoga/icon/calendar.png b/template/admin/yoga/icon/calendar.png
index e0a44a13d..e0a44a13d 100644
--- a/template/yoga/icon/calendar.png
+++ b/template/admin/yoga/icon/calendar.png
Binary files differ
diff --git a/template/yoga/icon/calendar_created.png b/template/admin/yoga/icon/calendar_created.png
index 14a84c43c..14a84c43c 100644
--- a/template/yoga/icon/calendar_created.png
+++ b/template/admin/yoga/icon/calendar_created.png
Binary files differ
diff --git a/template/yoga/icon/category_children.png b/template/admin/yoga/icon/category_children.png
index 7205c3f61..7205c3f61 100644
--- a/template/yoga/icon/category_children.png
+++ b/template/admin/yoga/icon/category_children.png
Binary files differ
diff --git a/template/yoga/icon/category_delete.png b/template/admin/yoga/icon/category_delete.png
index da796da11..da796da11 100644
--- a/template/yoga/icon/category_delete.png
+++ b/template/admin/yoga/icon/category_delete.png
Binary files differ
diff --git a/template/yoga/icon/category_edit.png b/template/admin/yoga/icon/category_edit.png
index 0f3b619ed..0f3b619ed 100644
--- a/template/yoga/icon/category_edit.png
+++ b/template/admin/yoga/icon/category_edit.png
Binary files differ
diff --git a/template/yoga/icon/category_elements.png b/template/admin/yoga/icon/category_elements.png
index 1d367b38f..1d367b38f 100644
--- a/template/yoga/icon/category_elements.png
+++ b/template/admin/yoga/icon/category_elements.png
Binary files differ
diff --git a/template/yoga/icon/category_jump-to.png b/template/admin/yoga/icon/category_jump-to.png
index 62db1f4ee..62db1f4ee 100644
--- a/template/yoga/icon/category_jump-to.png
+++ b/template/admin/yoga/icon/category_jump-to.png
Binary files differ
diff --git a/template/yoga/icon/category_permissions.png b/template/admin/yoga/icon/category_permissions.png
index 4780841ae..4780841ae 100644
--- a/template/yoga/icon/category_permissions.png
+++ b/template/admin/yoga/icon/category_permissions.png
Binary files differ
diff --git a/template/yoga/icon/category_representant_random.png b/template/admin/yoga/icon/category_representant_random.png
index dfa69846f..dfa69846f 100644
--- a/template/yoga/icon/category_representant_random.png
+++ b/template/admin/yoga/icon/category_representant_random.png
Binary files differ
diff --git a/template/yoga/icon/del_favorite.png b/template/admin/yoga/icon/del_favorite.png
index cfc609749..cfc609749 100644
--- a/template/yoga/icon/del_favorite.png
+++ b/template/admin/yoga/icon/del_favorite.png
Binary files differ
diff --git a/template/yoga/icon/delete.png b/template/admin/yoga/icon/delete.png
index af10be03e..af10be03e 100644
--- a/template/yoga/icon/delete.png
+++ b/template/admin/yoga/icon/delete.png
Binary files differ
diff --git a/template/yoga/icon/exit.png b/template/admin/yoga/icon/exit.png
index 2aafbb4cb..2aafbb4cb 100644
--- a/template/yoga/icon/exit.png
+++ b/template/admin/yoga/icon/exit.png
Binary files differ
diff --git a/template/yoga/icon/favorite.png b/template/admin/yoga/icon/favorite.png
index 58befd9e3..58befd9e3 100644
--- a/template/yoga/icon/favorite.png
+++ b/template/admin/yoga/icon/favorite.png
Binary files differ
diff --git a/template/yoga/icon/first.png b/template/admin/yoga/icon/first.png
index 2b8db1cff..2b8db1cff 100644
--- a/template/yoga/icon/first.png
+++ b/template/admin/yoga/icon/first.png
Binary files differ
diff --git a/template/yoga/icon/help.png b/template/admin/yoga/icon/help.png
index c76f68292..c76f68292 100644
--- a/template/yoga/icon/help.png
+++ b/template/admin/yoga/icon/help.png
Binary files differ
diff --git a/template/yoga/icon/home.png b/template/admin/yoga/icon/home.png
index cce450d85..cce450d85 100644
--- a/template/yoga/icon/home.png
+++ b/template/admin/yoga/icon/home.png
Binary files differ
diff --git a/template/yoga/icon/last.png b/template/admin/yoga/icon/last.png
index 12e1367a7..12e1367a7 100644
--- a/template/yoga/icon/last.png
+++ b/template/admin/yoga/icon/last.png
Binary files differ
diff --git a/template/yoga/icon/left.png b/template/admin/yoga/icon/left.png
index 63d306c9c..63d306c9c 100644
--- a/template/yoga/icon/left.png
+++ b/template/admin/yoga/icon/left.png
Binary files differ
diff --git a/template/yoga/icon/lost_password.png b/template/admin/yoga/icon/lost_password.png
index ad6d71422..ad6d71422 100644
--- a/template/yoga/icon/lost_password.png
+++ b/template/admin/yoga/icon/lost_password.png
Binary files differ
diff --git a/template/yoga/icon/metadata.png b/template/admin/yoga/icon/metadata.png
index d5d8fa6dc..d5d8fa6dc 100644
--- a/template/yoga/icon/metadata.png
+++ b/template/admin/yoga/icon/metadata.png
Binary files differ
diff --git a/template/yoga/icon/mimetypes/avi.png b/template/admin/yoga/icon/mimetypes/avi.png
index 065f0b282..065f0b282 100644
--- a/template/yoga/icon/mimetypes/avi.png
+++ b/template/admin/yoga/icon/mimetypes/avi.png
Binary files differ
diff --git a/template/yoga/icon/mimetypes/mp3.png b/template/admin/yoga/icon/mimetypes/mp3.png
index afb7e1b0a..afb7e1b0a 100644
--- a/template/yoga/icon/mimetypes/mp3.png
+++ b/template/admin/yoga/icon/mimetypes/mp3.png
Binary files differ
diff --git a/template/yoga/icon/mimetypes/mpg.png b/template/admin/yoga/icon/mimetypes/mpg.png
index f7dbd2388..f7dbd2388 100644
--- a/template/yoga/icon/mimetypes/mpg.png
+++ b/template/admin/yoga/icon/mimetypes/mpg.png
Binary files differ
diff --git a/template/yoga/icon/mimetypes/ogg.png b/template/admin/yoga/icon/mimetypes/ogg.png
index ead3f62c3..ead3f62c3 100644
--- a/template/yoga/icon/mimetypes/ogg.png
+++ b/template/admin/yoga/icon/mimetypes/ogg.png
Binary files differ
diff --git a/template/yoga/icon/mimetypes/zip.png b/template/admin/yoga/icon/mimetypes/zip.png
index 1f08fe1a3..1f08fe1a3 100644
--- a/template/yoga/icon/mimetypes/zip.png
+++ b/template/admin/yoga/icon/mimetypes/zip.png
Binary files differ
diff --git a/template/yoga/icon/normal_mode.png b/template/admin/yoga/icon/normal_mode.png
index 07318b568..07318b568 100644
--- a/template/yoga/icon/normal_mode.png
+++ b/template/admin/yoga/icon/normal_mode.png
Binary files differ
diff --git a/template/yoga/icon/permissions.png b/template/admin/yoga/icon/permissions.png
index 33091eb85..33091eb85 100644
--- a/template/yoga/icon/permissions.png
+++ b/template/admin/yoga/icon/permissions.png
Binary files differ
diff --git a/template/yoga/icon/preferences.png b/template/admin/yoga/icon/preferences.png
index 0f3b619ed..0f3b619ed 100644
--- a/template/yoga/icon/preferences.png
+++ b/template/admin/yoga/icon/preferences.png
Binary files differ
diff --git a/template/yoga/icon/recent.png b/template/admin/yoga/icon/recent.png
index 78c1428ca..78c1428ca 100644
--- a/template/yoga/icon/recent.png
+++ b/template/admin/yoga/icon/recent.png
Binary files differ
diff --git a/template/yoga/icon/register.png b/template/admin/yoga/icon/register.png
index d1dd3c834..d1dd3c834 100644
--- a/template/yoga/icon/register.png
+++ b/template/admin/yoga/icon/register.png
Binary files differ
diff --git a/template/yoga/icon/representative.png b/template/admin/yoga/icon/representative.png
index f1141d91b..f1141d91b 100644
--- a/template/yoga/icon/representative.png
+++ b/template/admin/yoga/icon/representative.png
Binary files differ
diff --git a/template/yoga/icon/right.png b/template/admin/yoga/icon/right.png
index f998098e4..f998098e4 100644
--- a/template/yoga/icon/right.png
+++ b/template/admin/yoga/icon/right.png
Binary files differ
diff --git a/template/yoga/icon/save.png b/template/admin/yoga/icon/save.png
index b4b9da08b..b4b9da08b 100644
--- a/template/yoga/icon/save.png
+++ b/template/admin/yoga/icon/save.png
Binary files differ
diff --git a/template/yoga/icon/search_rules.png b/template/admin/yoga/icon/search_rules.png
index 300186647..300186647 100644
--- a/template/yoga/icon/search_rules.png
+++ b/template/admin/yoga/icon/search_rules.png
Binary files differ
diff --git a/template/yoga/icon/slideshow.png b/template/admin/yoga/icon/slideshow.png
index 455d73fdf..455d73fdf 100644
--- a/template/yoga/icon/slideshow.png
+++ b/template/admin/yoga/icon/slideshow.png
Binary files differ
diff --git a/template/yoga/icon/sync_metadata.png b/template/admin/yoga/icon/sync_metadata.png
index 03570ead6..03570ead6 100644
--- a/template/yoga/icon/sync_metadata.png
+++ b/template/admin/yoga/icon/sync_metadata.png
Binary files differ
diff --git a/template/yoga/icon/up.png b/template/admin/yoga/icon/up.png
index 0c9cda5b1..0c9cda5b1 100644
--- a/template/yoga/icon/up.png
+++ b/template/admin/yoga/icon/up.png
Binary files differ
diff --git a/template/yoga/image.css b/template/admin/yoga/image.css
index 9ecbaea08..9ecbaea08 100644
--- a/template/yoga/image.css
+++ b/template/admin/yoga/image.css
diff --git a/template/yoga/install.tpl b/template/admin/yoga/install.tpl
index 2332910e2..2332910e2 100644
--- a/template/yoga/install.tpl
+++ b/template/admin/yoga/install.tpl
diff --git a/template/yoga/layout.css b/template/admin/yoga/layout.css
index 79cb2911f..1f6c6f4e3 100644
--- a/template/yoga/layout.css
+++ b/template/admin/yoga/layout.css
@@ -9,5 +9,5 @@
/* Override properties with import local file */
@import "local-layout.css";
/* common css */
-@import "../../template-common/layout.css";
+@import "../../../template-common/layout.css";
diff --git a/template/yoga/menubar.css b/template/admin/yoga/menubar.css
index f8fbdf914..f8fbdf914 100644
--- a/template/yoga/menubar.css
+++ b/template/admin/yoga/menubar.css
diff --git a/template/yoga/nbm.tpl b/template/admin/yoga/nbm.tpl
index a22744e5b..a22744e5b 100644
--- a/template/yoga/nbm.tpl
+++ b/template/admin/yoga/nbm.tpl
diff --git a/template/yoga/notification.tpl b/template/admin/yoga/notification.tpl
index d4b178b42..d4b178b42 100644
--- a/template/yoga/notification.tpl
+++ b/template/admin/yoga/notification.tpl
diff --git a/template/yoga/picture.tpl b/template/admin/yoga/picture.tpl
index cdeeaf4a8..cdeeaf4a8 100644
--- a/template/yoga/picture.tpl
+++ b/template/admin/yoga/picture.tpl
diff --git a/template/yoga/popuphelp.css b/template/admin/yoga/popuphelp.css
index b61b7952d..b61b7952d 100644
--- a/template/yoga/popuphelp.css
+++ b/template/admin/yoga/popuphelp.css
diff --git a/template/yoga/popuphelp.tpl b/template/admin/yoga/popuphelp.tpl
index 3b3e27328..3b3e27328 100644
--- a/template/yoga/popuphelp.tpl
+++ b/template/admin/yoga/popuphelp.tpl
diff --git a/template/yoga/print.css b/template/admin/yoga/print.css
index bb564378d..bb564378d 100644
--- a/template/yoga/print.css
+++ b/template/admin/yoga/print.css
diff --git a/template/yoga/profile.tpl b/template/admin/yoga/profile.tpl
index b3837f454..b3837f454 100644
--- a/template/yoga/profile.tpl
+++ b/template/admin/yoga/profile.tpl
diff --git a/template/yoga/redirect.tpl b/template/admin/yoga/redirect.tpl
index 446f187a3..446f187a3 100644
--- a/template/yoga/redirect.tpl
+++ b/template/admin/yoga/redirect.tpl
diff --git a/template/yoga/register.tpl b/template/admin/yoga/register.tpl
index be3fb4a79..be3fb4a79 100644
--- a/template/yoga/register.tpl
+++ b/template/admin/yoga/register.tpl
diff --git a/template/yoga/search_rules.tpl b/template/admin/yoga/search_rules.tpl
index 921df4a12..921df4a12 100644
--- a/template/yoga/search_rules.tpl
+++ b/template/admin/yoga/search_rules.tpl
diff --git a/template/yoga/tags.tpl b/template/admin/yoga/tags.tpl
index 33f69ca69..33f69ca69 100644
--- a/template/yoga/tags.tpl
+++ b/template/admin/yoga/tags.tpl
diff --git a/template/yoga/theme/dark/images/tableh1_bg.png b/template/admin/yoga/theme/dark/images/tableh1_bg.png
index c7785d0f6..c7785d0f6 100644
--- a/template/yoga/theme/dark/images/tableh1_bg.png
+++ b/template/admin/yoga/theme/dark/images/tableh1_bg.png
Binary files differ
diff --git a/template/yoga/theme/dark/images/tableh2_bg.png b/template/admin/yoga/theme/dark/images/tableh2_bg.png
index d8c29f93d..d8c29f93d 100644
--- a/template/yoga/theme/dark/images/tableh2_bg.png
+++ b/template/admin/yoga/theme/dark/images/tableh2_bg.png
Binary files differ
diff --git a/template/yoga/upload.tpl b/template/admin/yoga/upload.tpl
index fcf27b543..fcf27b543 100644
--- a/template/yoga/upload.tpl
+++ b/template/admin/yoga/upload.tpl
diff --git a/template/yoga/admin.tpl b/template/public/yoga/admin.tpl
index 24177e427..24177e427 100644
--- a/template/yoga/admin.tpl
+++ b/template/public/yoga/admin.tpl
diff --git a/template/yoga/admin/cat_list.tpl b/template/public/yoga/admin/cat_list.tpl
index ec4b66d43..ec4b66d43 100644
--- a/template/yoga/admin/cat_list.tpl
+++ b/template/public/yoga/admin/cat_list.tpl
diff --git a/template/yoga/admin/cat_modify.tpl b/template/public/yoga/admin/cat_modify.tpl
index ed8861d84..ed8861d84 100644
--- a/template/yoga/admin/cat_modify.tpl
+++ b/template/public/yoga/admin/cat_modify.tpl
diff --git a/template/yoga/admin/cat_move.tpl b/template/public/yoga/admin/cat_move.tpl
index 5d5247f2f..5d5247f2f 100644
--- a/template/yoga/admin/cat_move.tpl
+++ b/template/public/yoga/admin/cat_move.tpl
diff --git a/template/yoga/admin/cat_options.tpl b/template/public/yoga/admin/cat_options.tpl
index 891dc37d4..891dc37d4 100644
--- a/template/yoga/admin/cat_options.tpl
+++ b/template/public/yoga/admin/cat_options.tpl
diff --git a/template/yoga/admin/configuration.tpl b/template/public/yoga/admin/configuration.tpl
index a0578692d..a0578692d 100644
--- a/template/yoga/admin/configuration.tpl
+++ b/template/public/yoga/admin/configuration.tpl
diff --git a/template/yoga/admin/element_set_global.tpl b/template/public/yoga/admin/element_set_global.tpl
index 7bb9d7006..7bb9d7006 100644
--- a/template/yoga/admin/element_set_global.tpl
+++ b/template/public/yoga/admin/element_set_global.tpl
diff --git a/template/yoga/admin/group_list.tpl b/template/public/yoga/admin/group_list.tpl
index 7b7dd67eb..7b7dd67eb 100644
--- a/template/yoga/admin/group_list.tpl
+++ b/template/public/yoga/admin/group_list.tpl
diff --git a/template/yoga/admin/intro.tpl b/template/public/yoga/admin/intro.tpl
index 58c6b2510..58c6b2510 100644
--- a/template/yoga/admin/intro.tpl
+++ b/template/public/yoga/admin/intro.tpl
diff --git a/template/yoga/admin/maintenance.tpl b/template/public/yoga/admin/maintenance.tpl
index 697e0954b..697e0954b 100644
--- a/template/yoga/admin/maintenance.tpl
+++ b/template/public/yoga/admin/maintenance.tpl
diff --git a/template/yoga/admin/picture_modify.tpl b/template/public/yoga/admin/picture_modify.tpl
index c10e7744e..c10e7744e 100644
--- a/template/yoga/admin/picture_modify.tpl
+++ b/template/public/yoga/admin/picture_modify.tpl
diff --git a/template/yoga/admin/site_manager.tpl b/template/public/yoga/admin/site_manager.tpl
index 88b77a362..88b77a362 100644
--- a/template/yoga/admin/site_manager.tpl
+++ b/template/public/yoga/admin/site_manager.tpl
diff --git a/template/yoga/admin/stats.tpl b/template/public/yoga/admin/stats.tpl
index 75de81f79..75de81f79 100644
--- a/template/yoga/admin/stats.tpl
+++ b/template/public/yoga/admin/stats.tpl
diff --git a/template/yoga/admin/thumbnail.tpl b/template/public/yoga/admin/thumbnail.tpl
index cf5345d43..cf5345d43 100644
--- a/template/yoga/admin/thumbnail.tpl
+++ b/template/public/yoga/admin/thumbnail.tpl
diff --git a/template/yoga/admin/waiting.tpl b/template/public/yoga/admin/waiting.tpl
index b48aa314b..b48aa314b 100644
--- a/template/yoga/admin/waiting.tpl
+++ b/template/public/yoga/admin/waiting.tpl
diff --git a/template/yoga/comments.tpl b/template/public/yoga/comments.tpl
index 6bf28d33b..6bf28d33b 100644
--- a/template/yoga/comments.tpl
+++ b/template/public/yoga/comments.tpl
diff --git a/template/yoga/content.css b/template/public/yoga/content.css
index 7a8909856..7a8909856 100644
--- a/template/yoga/content.css
+++ b/template/public/yoga/content.css
diff --git a/template/yoga/default-colors.css b/template/public/yoga/default-colors.css
index 8b73f966b..8b73f966b 100644
--- a/template/yoga/default-colors.css
+++ b/template/public/yoga/default-colors.css
diff --git a/template/yoga/default-layout.css b/template/public/yoga/default-layout.css
index a9fc2da1c..a9fc2da1c 100644
--- a/template/yoga/default-layout.css
+++ b/template/public/yoga/default-layout.css
diff --git a/template/yoga/fix-ie5-ie6.css b/template/public/yoga/fix-ie5-ie6.css
index 8dad42298..8dad42298 100644
--- a/template/yoga/fix-ie5-ie6.css
+++ b/template/public/yoga/fix-ie5-ie6.css
diff --git a/template/yoga/fix-khtml.css b/template/public/yoga/fix-khtml.css
index 6853313e9..6853313e9 100644
--- a/template/yoga/fix-khtml.css
+++ b/template/public/yoga/fix-khtml.css
diff --git a/template/yoga/identification.tpl b/template/public/yoga/identification.tpl
index dd07d0135..dd07d0135 100644
--- a/template/yoga/identification.tpl
+++ b/template/public/yoga/identification.tpl
diff --git a/template/yoga/index.tpl b/template/public/yoga/index.tpl
index becf011ce..becf011ce 100644
--- a/template/yoga/index.tpl
+++ b/template/public/yoga/index.tpl
diff --git a/template/yoga/mainpage_categories.tpl b/template/public/yoga/mainpage_categories.tpl
index 8c00b433e..8c00b433e 100644
--- a/template/yoga/mainpage_categories.tpl
+++ b/template/public/yoga/mainpage_categories.tpl
diff --git a/template/yoga/month_calendar.tpl b/template/public/yoga/month_calendar.tpl
index 7e531e7c7..7e531e7c7 100644
--- a/template/yoga/month_calendar.tpl
+++ b/template/public/yoga/month_calendar.tpl
diff --git a/template/yoga/password.tpl b/template/public/yoga/password.tpl
index f581507e2..f581507e2 100644
--- a/template/yoga/password.tpl
+++ b/template/public/yoga/password.tpl
diff --git a/template/yoga/search.tpl b/template/public/yoga/search.tpl
index 1e3c9be2d..1e3c9be2d 100644
--- a/template/yoga/search.tpl
+++ b/template/public/yoga/search.tpl
diff --git a/template/yoga/theme/clear/theme.css b/template/public/yoga/theme/clear/theme.css
index 56da48326..56da48326 100644
--- a/template/yoga/theme/clear/theme.css
+++ b/template/public/yoga/theme/clear/theme.css
diff --git a/template/yoga/theme/dark/theme.css b/template/public/yoga/theme/dark/theme.css
index 854cc48dd..854cc48dd 100644
--- a/template/yoga/theme/dark/theme.css
+++ b/template/public/yoga/theme/dark/theme.css
diff --git a/template/yoga/theme/clear/themeconf.inc.php b/template/yoga/theme/clear/themeconf.inc.php
deleted file mode 100644
index 10b5d104b..000000000
--- a/template/yoga/theme/clear/themeconf.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$themeconf = array(
- 'template' => 'yoga',
- 'theme' => 'clear',
- 'icon_dir' => 'template/yoga/icon',
- 'admin_icon_dir' => 'template/yoga/icon/admin',
- 'mime_icon_dir' => 'template/yoga/icon/mimetypes/'
-);
-?>
diff --git a/template/yoga/theme/dark/themeconf.inc.php b/template/yoga/theme/dark/themeconf.inc.php
deleted file mode 100644
index 9785a2916..000000000
--- a/template/yoga/theme/dark/themeconf.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$themeconf = array(
- 'template' => 'yoga',
- 'theme' => 'dark',
- 'icon_dir' => 'template/yoga/icon',
- 'admin_icon_dir' => 'template/yoga/icon/admin',
- 'mime_icon_dir' => 'template/yoga/icon/mimetypes/'
-);
-?>