diff --git a/Web/Presenters/OpenVKPresenter.php b/Web/Presenters/OpenVKPresenter.php index ef7a8799..c706b825 100644 --- a/Web/Presenters/OpenVKPresenter.php +++ b/Web/Presenters/OpenVKPresenter.php @@ -147,6 +147,7 @@ abstract class OpenVKPresenter extends SimplePresenter $this->user->id = $this->user->identity->getId(); $this->template->thisUser = $this->user->identity; $this->template->userTainted = $user->isTainted(); + $this->template->isXmas = intval(date('d')) >= 15 && date('m') == 12 || intval(date('d')) <= 15 && date('m') == 1 ? true : false; if($this->user->identity->isBanned() && !$this->banTolerant) { header("HTTP/1.1 403 Forbidden"); diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml index 74716efc..916a4909 100644 --- a/Web/Presenters/templates/@layout.xml +++ b/Web/Presenters/templates/@layout.xml @@ -17,12 +17,21 @@ {if $theme->inheritDefault()} {css "css/style.css"} {css "css/dialog.css"} + {if $isXmas} + {css "css/xmas.css"} + {/if} {/if} + {if $isXmas} + + {/if} {else} {css "css/style.css"} {css "css/dialog.css"} + {if $isXmas} + {css "css/xmas.css"} + {/if} {/if} {if $thisUser->getStyleAvatar() == 1} @@ -34,6 +43,9 @@ {else} {css "css/style.css"} {css "css/dialog.css"} + {if $isXmas} + {css "css/xmas.css"} + {/if} {/ifset} {ifset headIncludes}{include headIncludes}{/ifset} diff --git a/Web/Presenters/templates/components/wall.xml b/Web/Presenters/templates/components/wall.xml index 248f63fa..ddf0ae3e 100644 --- a/Web/Presenters/templates/components/wall.xml +++ b/Web/Presenters/templates/components/wall.xml @@ -4,7 +4,7 @@
- {l18n_number("wall", $count)} + {tr("wall", $count)}
{_'write'}
diff --git a/Web/static/css/xmas.css b/Web/static/css/xmas.css new file mode 100644 index 00000000..769c0292 --- /dev/null +++ b/Web/static/css/xmas.css @@ -0,0 +1,5 @@ +/* mxas header */ + +.page_header { + background: url('../img/xheader.png'); +} \ No newline at end of file diff --git a/Web/static/img/xhead.png b/Web/static/img/xhead.png deleted file mode 100644 index 32842b17..00000000 Binary files a/Web/static/img/xhead.png and /dev/null differ diff --git a/Web/static/img/xhead2.gif b/Web/static/img/xhead2.gif deleted file mode 100644 index 3824ddac..00000000 Binary files a/Web/static/img/xhead2.gif and /dev/null differ diff --git a/Web/static/img/xhead2006.gif b/Web/static/img/xhead2006.gif deleted file mode 100644 index d770c76a..00000000 Binary files a/Web/static/img/xhead2006.gif and /dev/null differ diff --git a/Web/static/img/xhead2006early.gif b/Web/static/img/xhead2006early.gif deleted file mode 100644 index bf4b92f3..00000000 Binary files a/Web/static/img/xhead2006early.gif and /dev/null differ diff --git a/Web/static/img/xhead4.png b/Web/static/img/xhead4.png deleted file mode 100644 index bb5c5d65..00000000 Binary files a/Web/static/img/xhead4.png and /dev/null differ diff --git a/Web/static/img/xhead6.png b/Web/static/img/xhead6.png deleted file mode 100644 index 4ebfb61e..00000000 Binary files a/Web/static/img/xhead6.png and /dev/null differ diff --git a/Web/static/img/xheader.png b/Web/static/img/xheader.png new file mode 100644 index 00000000..6ba71236 Binary files /dev/null and b/Web/static/img/xheader.png differ