diff --git a/acp/portal_module.php b/acp/portal_module.php index 3f51761c..e3b0c4f0 100644 --- a/acp/portal_module.php +++ b/acp/portal_module.php @@ -140,7 +140,7 @@ class portal_module 'MODULE_IMAGE' => $module_data['module_image_src'], 'MODULE_IMAGE_WIDTH' => $module_data['module_image_width'], 'MODULE_IMAGE_HEIGHT' => $module_data['module_image_height'], - 'MODULE_IMAGE_SRC' => ($module_data['module_image_src']) ? $this->root_path . 'styles/' . $this->user->style['style_path'] . '/theme/images/portal/' . $module_data['module_image_src'] : '', + 'MODULE_IMAGE_SRC' => ($module_data['module_image_src']) ? $this->root_path . 'styles/all/theme/images/portal/' . $module_data['module_image_src'] : '', 'MODULE_ENABLED' => ($module_data['module_status']) ? true : false, 'MODULE_SHOW_IMAGE' => (in_array($this->portal_columns->number_to_string($module_data['module_column']), array('center', 'top', 'bottom'))) ? false : true, )); @@ -675,7 +675,7 @@ class portal_module $this->template->assign_block_vars('modules_' . $template_column, array( 'MODULE_NAME' => (isset($this->user->lang[$row['module_name']])) ? $this->user->lang[$row['module_name']] : $row['module_name'], - 'MODULE_IMAGE' => ($row['module_image_src']) ? '' . $row['module_name'] . '' : '', + 'MODULE_IMAGE' => ($row['module_image_src']) ? '' . $row['module_name'] . '' : '', 'MODULE_ENABLED' => ($row['module_status']) ? true : false, 'U_DELETE' => $this->modules_manager->get_module_link('modules', $row['module_id']) . '&action=delete&module_classname=' . $row['module_classname'], diff --git a/controller/helper.php b/controller/helper.php index ea7a1e33..a2ba9bc0 100644 --- a/controller/helper.php +++ b/controller/helper.php @@ -227,7 +227,7 @@ class helper { $this->template->assign_block_vars('modules_' . $this->portal_columns->number_to_string($row['module_column']), array( 'TEMPLATE_FILE' => $this->parse_template_file($template_module['template']), - 'IMAGE_SRC' => $this->path_helper->get_web_root_path() . ltrim($this->root_path . 'styles/' . $this->user->style['style_path'] . '/theme/images/portal/' . $template_module['image_src'], './'), + 'IMAGE_SRC' => $this->path_helper->get_web_root_path() . ltrim($this->root_path . 'styles/all/theme/images/portal/' . $template_module['image_src'], './'), 'TITLE' => $template_module['title'], 'CODE' => $template_module['code'], 'MODULE_ID' => $row['module_id'], @@ -239,7 +239,7 @@ class helper { $this->template->assign_block_vars('modules_' . $this->portal_columns->number_to_string($row['module_column']), array( 'TEMPLATE_FILE' => $this->parse_template_file($template_module), - 'IMAGE_SRC' => $this->path_helper->get_web_root_path() . ltrim($this->root_path . 'styles/' . $this->user->style['style_path'] . '/theme/images/portal/' . $row['module_image_src'], './'), + 'IMAGE_SRC' => $this->path_helper->get_web_root_path() . ltrim($this->root_path . 'styles/all/theme/images/portal/' . $row['module_image_src'], './'), 'IMAGE_WIDTH' => $row['module_image_width'], 'IMAGE_HEIGHT' => $row['module_image_height'], 'MODULE_ID' => $row['module_id'], diff --git a/styles/prosilver/theme/images/portal/portal_attach.png b/styles/all/theme/images/portal/portal_attach.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_attach.png rename to styles/all/theme/images/portal/portal_attach.png diff --git a/styles/prosilver/theme/images/portal/portal_birthday.png b/styles/all/theme/images/portal/portal_birthday.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_birthday.png rename to styles/all/theme/images/portal/portal_birthday.png diff --git a/styles/prosilver/theme/images/portal/portal_bots.png b/styles/all/theme/images/portal/portal_bots.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_bots.png rename to styles/all/theme/images/portal/portal_bots.png diff --git a/styles/prosilver/theme/images/portal/portal_calendar.png b/styles/all/theme/images/portal/portal_calendar.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_calendar.png rename to styles/all/theme/images/portal/portal_calendar.png diff --git a/styles/prosilver/theme/images/portal/portal_clock.png b/styles/all/theme/images/portal/portal_clock.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_clock.png rename to styles/all/theme/images/portal/portal_clock.png diff --git a/styles/prosilver/theme/images/portal/portal_clock_double.png b/styles/all/theme/images/portal/portal_clock_double.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_clock_double.png rename to styles/all/theme/images/portal/portal_clock_double.png diff --git a/styles/prosilver/theme/images/portal/portal_clock_single.png b/styles/all/theme/images/portal/portal_clock_single.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_clock_single.png rename to styles/all/theme/images/portal/portal_clock_single.png diff --git a/styles/prosilver/theme/images/portal/portal_custom.png b/styles/all/theme/images/portal/portal_custom.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_custom.png rename to styles/all/theme/images/portal/portal_custom.png diff --git a/styles/prosilver/theme/images/portal/portal_donation.png b/styles/all/theme/images/portal/portal_donation.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_donation.png rename to styles/all/theme/images/portal/portal_donation.png diff --git a/styles/prosilver/theme/images/portal/portal_friends.png b/styles/all/theme/images/portal/portal_friends.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_friends.png rename to styles/all/theme/images/portal/portal_friends.png diff --git a/styles/prosilver/theme/images/portal/portal_link_us.png b/styles/all/theme/images/portal/portal_link_us.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_link_us.png rename to styles/all/theme/images/portal/portal_link_us.png diff --git a/styles/prosilver/theme/images/portal/portal_links.png b/styles/all/theme/images/portal/portal_links.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_links.png rename to styles/all/theme/images/portal/portal_links.png diff --git a/styles/prosilver/theme/images/portal/portal_members.png b/styles/all/theme/images/portal/portal_members.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_members.png rename to styles/all/theme/images/portal/portal_members.png diff --git a/styles/prosilver/theme/images/portal/portal_menu.png b/styles/all/theme/images/portal/portal_menu.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_menu.png rename to styles/all/theme/images/portal/portal_menu.png diff --git a/styles/prosilver/theme/images/portal/portal_poll.png b/styles/all/theme/images/portal/portal_poll.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_poll.png rename to styles/all/theme/images/portal/portal_poll.png diff --git a/styles/prosilver/theme/images/portal/portal_random_member.png b/styles/all/theme/images/portal/portal_random_member.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_random_member.png rename to styles/all/theme/images/portal/portal_random_member.png diff --git a/styles/prosilver/theme/images/portal/portal_search.png b/styles/all/theme/images/portal/portal_search.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_search.png rename to styles/all/theme/images/portal/portal_search.png diff --git a/styles/prosilver/theme/images/portal/portal_statistics.png b/styles/all/theme/images/portal/portal_statistics.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_statistics.png rename to styles/all/theme/images/portal/portal_statistics.png diff --git a/styles/prosilver/theme/images/portal/portal_style.png b/styles/all/theme/images/portal/portal_style.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_style.png rename to styles/all/theme/images/portal/portal_style.png diff --git a/styles/prosilver/theme/images/portal/portal_team.png b/styles/all/theme/images/portal/portal_team.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_team.png rename to styles/all/theme/images/portal/portal_team.png diff --git a/styles/prosilver/theme/images/portal/portal_top_poster.png b/styles/all/theme/images/portal/portal_top_poster.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_top_poster.png rename to styles/all/theme/images/portal/portal_top_poster.png diff --git a/styles/prosilver/theme/images/portal/portal_user.png b/styles/all/theme/images/portal/portal_user.png similarity index 100% rename from styles/prosilver/theme/images/portal/portal_user.png rename to styles/all/theme/images/portal/portal_user.png diff --git a/styles/prosilver/theme/portal.css b/styles/prosilver/theme/portal.css index a4355308..5e70456d 100644 --- a/styles/prosilver/theme/portal.css +++ b/styles/prosilver/theme/portal.css @@ -54,7 +54,7 @@ } .portal-user-icon { - background-image: url("./images/portal/portal_user.png"); + background-image: url("../../all/theme/images/portal/portal_user.png"); padding-left: 16px; padding-top: 16px; float: left; @@ -469,7 +469,7 @@ a.portal-forumtitle { width: 21px; height: 21px; background-position: 0 0; - background: url(./images/portal/portal_clock_single.png) no-repeat; + background: url("../../all/theme/images/portal/portal_clock_single.png") no-repeat; } /* Minutes start @@ -561,7 +561,7 @@ a.portal-forumtitle { .portal-clock-back-hours-up, .portal-clock-front-hours-up { width: 42px; height: 21px; - background: url(./images/portal/portal_clock_double.png) no-repeat; + background: url("../../all/theme/images/portal/portal_clock_double.png") no-repeat; background-position: 0 0; vertical-align: bottom; display: inline-block; @@ -571,7 +571,7 @@ a.portal-forumtitle { .portal-clock-back-hours-down, .portal-clock-front-hours-down { width: 42px; height: 20px; - background: url(./images/portal/portal_clock_double.png) no-repeat; + background: url("../../all/theme/images/portal/portal_clock_double.png") no-repeat; background-position: 0 -44px; vertical-align: top; display: inline-block; diff --git a/styles/subsilver2/template/portal/modules/attachments_center.html b/styles/subsilver2/template/portal/modules/attachments_center.html index 80f5d909..8f9b34f1 100644 --- a/styles/subsilver2/template/portal/modules/attachments_center.html +++ b/styles/subsilver2/template/portal/modules/attachments_center.html @@ -5,7 +5,7 @@ {L_FILENAME}
-  {attach_center.FILENAME}
+  {attach_center.FILENAME}
{L_FILESIZE}{L_COLON}{attach_center.FILESIZE}
{L_DOWNLOADS}{L_COLON}{attach_center.DOWNLOAD_COUNT}

diff --git a/styles/subsilver2/template/portal/modules/attachments_side.html b/styles/subsilver2/template/portal/modules/attachments_side.html index d2b2bfc1..44861b71 100644 --- a/styles/subsilver2/template/portal/modules/attachments_side.html +++ b/styles/subsilver2/template/portal/modules/attachments_side.html @@ -5,7 +5,7 @@ {L_FILENAME}
-  {attach_side.FILENAME}
+  {attach_side.FILENAME}
{L_FILESIZE}{L_COLON}{attach_side.FILESIZE}
{L_DOWNLOADS}{L_COLON}{attach_side.DOWNLOAD_COUNT}

diff --git a/styles/subsilver2/theme/images/portal/portal_attach.png b/styles/subsilver2/theme/images/portal/portal_attach.png deleted file mode 100644 index 68307ecf..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_attach.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_birthday.png b/styles/subsilver2/theme/images/portal/portal_birthday.png deleted file mode 100644 index 5c1ca3c0..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_birthday.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_bots.png b/styles/subsilver2/theme/images/portal/portal_bots.png deleted file mode 100644 index 604c3d59..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_bots.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_calendar.png b/styles/subsilver2/theme/images/portal/portal_calendar.png deleted file mode 100644 index bd4b4c6c..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_calendar.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_clock.png b/styles/subsilver2/theme/images/portal/portal_clock.png deleted file mode 100644 index 7c622a09..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_clock.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_clock_double.png b/styles/subsilver2/theme/images/portal/portal_clock_double.png deleted file mode 100644 index 1e80bb93..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_clock_double.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_clock_single.png b/styles/subsilver2/theme/images/portal/portal_clock_single.png deleted file mode 100644 index d968d50b..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_clock_single.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_custom.png b/styles/subsilver2/theme/images/portal/portal_custom.png deleted file mode 100644 index f9c503e8..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_custom.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_donation.png b/styles/subsilver2/theme/images/portal/portal_donation.png deleted file mode 100644 index 42c52d05..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_donation.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_friends.png b/styles/subsilver2/theme/images/portal/portal_friends.png deleted file mode 100644 index 1635139f..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_friends.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_link_us.png b/styles/subsilver2/theme/images/portal/portal_link_us.png deleted file mode 100644 index c688d5f6..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_link_us.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_links.png b/styles/subsilver2/theme/images/portal/portal_links.png deleted file mode 100644 index 03ef9a57..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_links.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_login.png b/styles/subsilver2/theme/images/portal/portal_login.png deleted file mode 100644 index 6b4f311c..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_login.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_members.png b/styles/subsilver2/theme/images/portal/portal_members.png deleted file mode 100644 index 8e649a80..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_members.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_menu.png b/styles/subsilver2/theme/images/portal/portal_menu.png deleted file mode 100644 index a4da1c15..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_menu.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_poll.png b/styles/subsilver2/theme/images/portal/portal_poll.png deleted file mode 100644 index 616294d9..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_poll.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_random_member.png b/styles/subsilver2/theme/images/portal/portal_random_member.png deleted file mode 100644 index 35beef8a..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_random_member.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_search.png b/styles/subsilver2/theme/images/portal/portal_search.png deleted file mode 100644 index 6dd19315..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_search.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_statistics.png b/styles/subsilver2/theme/images/portal/portal_statistics.png deleted file mode 100644 index 82e15c17..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_statistics.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_style.png b/styles/subsilver2/theme/images/portal/portal_style.png deleted file mode 100644 index b2731f61..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_style.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_team.png b/styles/subsilver2/theme/images/portal/portal_team.png deleted file mode 100644 index d0e68864..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_team.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_top_poster.png b/styles/subsilver2/theme/images/portal/portal_top_poster.png deleted file mode 100644 index 4a52bb1c..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_top_poster.png and /dev/null differ diff --git a/styles/subsilver2/theme/images/portal/portal_user.png b/styles/subsilver2/theme/images/portal/portal_user.png deleted file mode 100644 index 4aeaa1d3..00000000 Binary files a/styles/subsilver2/theme/images/portal/portal_user.png and /dev/null differ diff --git a/styles/subsilver2/theme/portal.css b/styles/subsilver2/theme/portal.css index eecc85ad..b7e9b35c 100644 --- a/styles/subsilver2/theme/portal.css +++ b/styles/subsilver2/theme/portal.css @@ -61,7 +61,7 @@ width: 21px; height: 21px; background-position: 0 0; - background: url(./images/portal/portal_clock_single.png) no-repeat; + background: url("../../all/theme/images/portal/portal_clock_single.png") no-repeat; } /* Minutes start @@ -153,7 +153,7 @@ #portal-clock-back-hours-up, #portal-clock-front-hours-up { width: 42px; height: 21px; - background: url(./images/portal/portal_clock_double.png) no-repeat; + background: url("../../all/theme/images/portal/portal_clock_double.png") no-repeat; background-position: 0 0; vertical-align: bottom; display: inline-block; @@ -163,7 +163,7 @@ #portal-clock-back-hours-down, #portal-clock-front-hours-down { width: 42px; height: 20px; - background: url(./images/portal/portal_clock_double.png) no-repeat; + background: url("../../all/theme/images/portal/portal_clock_double.png") no-repeat; background-position: 0 -44px; vertical-align: top; display: inline-block; @@ -190,16 +190,16 @@ } .portal-arrow-bullet { - background: url(./images/portal/arrowbullet.gif) no-repeat; + background: url("./images/portal/arrowbullet.gif") no-repeat; padding-left: 12px; } .rtl .portal-arrow-bullet { - background: url(./images/portal/arrowbullet_rtl.gif) no-repeat; + background: url("./images/portal/arrowbullet_rtl.gif") no-repeat; } .portal-user-span { - background-image: url("./images/portal/portal_user.png"); + background-image: url("../../all/theme/images/portal/portal_user.png"); padding-left: 16px; padding-top: 16px; margin-bottom: 2px;