diff --git a/application/frontend/components/admin/toolbar.admin.tpl b/application/frontend/components/admin/toolbar.admin.tpl
index d3c83f3b..6d4b6283 100644
--- a/application/frontend/components/admin/toolbar.admin.tpl
+++ b/application/frontend/components/admin/toolbar.admin.tpl
@@ -4,11 +4,9 @@
*}
{if $oUserCurrent && $oUserCurrent->isAdministrator()}
- {component 'toolbar' template='item'
- buttons = [[
- url => {router 'admin'},
- attributes => [ 'title' => {lang 'admin.title'} ],
- icon => 'cog'
- ]]
- mods = 'admin'}
+ {component 'toolbar.item'
+ icon='cog'
+ url={router 'admin'}
+ attributes=[ 'title' => {lang 'admin.title'} ]
+ mods='admin'}
{/if}
\ No newline at end of file
diff --git a/application/frontend/components/toolbar-scrollnav/toolbar.scrollnav.tpl b/application/frontend/components/toolbar-scrollnav/toolbar.scrollnav.tpl
index 700ec355..b58a0241 100644
--- a/application/frontend/components/toolbar-scrollnav/toolbar.scrollnav.tpl
+++ b/application/frontend/components/toolbar-scrollnav/toolbar.scrollnav.tpl
@@ -3,18 +3,14 @@
* Кнопка прокручивания к следующему/предыдущему топику
*}
-{component 'toolbar' template='item'
- classes = 'js-toolbar-topics'
- mods = 'topic'
- buttons = [
- [
- classes => 'toolbar-topic-prev js-toolbar-topics-prev',
- attributes => [ 'title' => {lang 'toolbar.topic_nav.prev'} ],
- icon => 'arrow-up'
- ],
- [
- classes => 'toolbar-topic-next js-toolbar-topics-next',
- attributes => [ 'title' => {lang 'toolbar.topic_nav.next'} ],
- icon => 'arrow-down'
- ]
- ]}
\ No newline at end of file
+
+ {component 'toolbar.item'
+ icon='arrow-up'
+ classes='js-toolbar-topics-prev'
+ attributes=[ 'title' => {lang 'toolbar.topic_nav.prev'} ]}
+
+ {component 'toolbar.item'
+ icon='arrow-down'
+ classes='js-toolbar-topics-next'
+ attributes=[ 'title' => {lang 'toolbar.topic_nav.next'} ]}
+
\ No newline at end of file
diff --git a/application/frontend/components/toolbar-scrollup/toolbar.scrollup.tpl b/application/frontend/components/toolbar-scrollup/toolbar.scrollup.tpl
index 04b533c6..c1bb585e 100644
--- a/application/frontend/components/toolbar-scrollup/toolbar.scrollup.tpl
+++ b/application/frontend/components/toolbar-scrollup/toolbar.scrollup.tpl
@@ -3,10 +3,8 @@
* Кнопка прокрутки страницы вверх
*}
-{component 'toolbar' template='item'
- classes='ls-toolbar-item--scrollup js-toolbar-scrollup'
- attributes=[ 'style' => 'display: none' ]
- buttons=[[
- 'icon' => 'chevron-up',
- 'attributes' => [ 'title' => {lang 'toolbar.scrollup.title'}, 'id' => 'toolbar_scrollup' ]
- ]]}
\ No newline at end of file
+{component 'toolbar.item'
+ icon='chevron-up'
+ classes='js-toolbar-scrollup'
+ mods='scrollup'
+ attributes=[ 'title' => {lang 'toolbar.scrollup.title'} ]}
\ No newline at end of file
diff --git a/application/frontend/skin/synio/components/admin/css/admin.css b/application/frontend/skin/synio/components/admin/css/admin.css
new file mode 100644
index 00000000..e8ee715b
--- /dev/null
+++ b/application/frontend/skin/synio/components/admin/css/admin.css
@@ -0,0 +1,46 @@
+/**
+ * Админка
+ *
+ * @license GNU General Public License, version 2
+ * @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
+ * @author Denis Shakhov
+ */
+
+/**
+ * Управление плагинами
+ *
+ * @template plugins.tpl
+ */
+.admin-plugins h3 {
+ font-weight: bold;
+ font-size: 17px;
+ line-height: 20px;
+ margin-bottom: 7px;
+}
+.admin-plugins p {
+ margin-bottom: 15px;
+}
+.admin-plugins td {
+ vertical-align: top;
+}
+.admin-plugins-actions li {
+ margin-bottom: 5px;
+ text-align: right;
+}
+.admin-plugins-actions li:last-child {
+ margin-bottom: 0;
+}
+
+.ls-toolbar-item--admin .ls-toolbar-icon {
+ display: block;
+ width: 19px;
+ height: 18px;
+ background: url(../images/cog.png) no-repeat;
+ transition: background .2s;
+}
+.ls-toolbar-item--admin .ls-toolbar-icon:hover {
+ background-image: url(../images/cog-hover.png);
+}
+.ls-toolbar-item--admin .ls-toolbar-icon:active {
+ background-image: url(../images/cog-active.png);
+}
\ No newline at end of file
diff --git a/application/frontend/skin/synio/components/admin/images/cog-active.png b/application/frontend/skin/synio/components/admin/images/cog-active.png
new file mode 100644
index 00000000..9fb200b8
Binary files /dev/null and b/application/frontend/skin/synio/components/admin/images/cog-active.png differ
diff --git a/application/frontend/skin/synio/components/admin/images/cog-hover.png b/application/frontend/skin/synio/components/admin/images/cog-hover.png
new file mode 100644
index 00000000..94a141f8
Binary files /dev/null and b/application/frontend/skin/synio/components/admin/images/cog-hover.png differ
diff --git a/application/frontend/skin/synio/components/admin/images/cog.png b/application/frontend/skin/synio/components/admin/images/cog.png
new file mode 100644
index 00000000..88137c47
Binary files /dev/null and b/application/frontend/skin/synio/components/admin/images/cog.png differ
diff --git a/application/frontend/skin/synio/components/admin/toolbar.admin.tpl b/application/frontend/skin/synio/components/admin/toolbar.admin.tpl
new file mode 100644
index 00000000..6cdee0d2
--- /dev/null
+++ b/application/frontend/skin/synio/components/admin/toolbar.admin.tpl
@@ -0,0 +1,12 @@
+{**
+ * Тулбар
+ * Кнопка перехода в админку
+ *}
+
+{if $oUserCurrent && $oUserCurrent->isAdministrator()}
+ {component 'toolbar.item'
+ html=''
+ url={router 'admin'}
+ attributes=[ 'title' => {lang 'admin.title'} ]
+ mods='admin'}
+{/if}
\ No newline at end of file
diff --git a/application/frontend/skin/synio/components/toolbar-scrollnav/css/toolbar-scrollnav.css b/application/frontend/skin/synio/components/toolbar-scrollnav/css/toolbar-scrollnav.css
new file mode 100644
index 00000000..622791c1
--- /dev/null
+++ b/application/frontend/skin/synio/components/toolbar-scrollnav/css/toolbar-scrollnav.css
@@ -0,0 +1,36 @@
+/**
+ * Кнопка навигации по топикам
+ */
+
+.ls-toolbar-item--topic a.ls-toolbar-topic-prev {
+ border-bottom: 1px solid #eee;
+}
+
+.ls-toolbar-item--topic i {
+ display: block;
+ width: 19px;
+ height: 32px;
+ transition: background .2s;
+ background-repeat: no-repeat;
+ cursor: pointer;
+}
+
+.ls-toolbar-item--topic .ls-toolbar-icon-prev {
+ background-image: url(../images/prev.png);
+}
+.ls-toolbar-item--topic .ls-toolbar-icon-prev:hover {
+ background-image: url(../images/prev-hover.png);
+}
+.ls-toolbar-item--topic .ls-toolbar-icon-prev:active {
+ background-image: url(../images/prev-active.png);
+}
+
+.ls-toolbar-item--topic .ls-toolbar-icon-next {
+ background-image: url(../images/next.png);
+}
+.ls-toolbar-item--topic .ls-toolbar-icon-next:hover {
+ background-image: url(../images/next-hover.png);
+}
+.ls-toolbar-item--topic .ls-toolbar-icon-next:active {
+ background-image: url(../images/next-active.png);
+}
\ No newline at end of file
diff --git a/application/frontend/skin/synio/components/toolbar-scrollnav/images/next-active.png b/application/frontend/skin/synio/components/toolbar-scrollnav/images/next-active.png
new file mode 100644
index 00000000..d391b900
Binary files /dev/null and b/application/frontend/skin/synio/components/toolbar-scrollnav/images/next-active.png differ
diff --git a/application/frontend/skin/synio/components/toolbar-scrollnav/images/next-hover.png b/application/frontend/skin/synio/components/toolbar-scrollnav/images/next-hover.png
new file mode 100644
index 00000000..3e923404
Binary files /dev/null and b/application/frontend/skin/synio/components/toolbar-scrollnav/images/next-hover.png differ
diff --git a/application/frontend/skin/synio/components/toolbar-scrollnav/images/next.png b/application/frontend/skin/synio/components/toolbar-scrollnav/images/next.png
new file mode 100644
index 00000000..7d00b390
Binary files /dev/null and b/application/frontend/skin/synio/components/toolbar-scrollnav/images/next.png differ
diff --git a/application/frontend/skin/synio/components/toolbar-scrollnav/images/prev-active.png b/application/frontend/skin/synio/components/toolbar-scrollnav/images/prev-active.png
new file mode 100644
index 00000000..5a085312
Binary files /dev/null and b/application/frontend/skin/synio/components/toolbar-scrollnav/images/prev-active.png differ
diff --git a/application/frontend/skin/synio/components/toolbar-scrollnav/images/prev-hover.png b/application/frontend/skin/synio/components/toolbar-scrollnav/images/prev-hover.png
new file mode 100644
index 00000000..6d4ae3c1
Binary files /dev/null and b/application/frontend/skin/synio/components/toolbar-scrollnav/images/prev-hover.png differ
diff --git a/application/frontend/skin/synio/components/toolbar-scrollnav/images/prev.png b/application/frontend/skin/synio/components/toolbar-scrollnav/images/prev.png
new file mode 100644
index 00000000..0bc6bf89
Binary files /dev/null and b/application/frontend/skin/synio/components/toolbar-scrollnav/images/prev.png differ
diff --git a/application/frontend/skin/synio/components/toolbar-scrollnav/toolbar.scrollnav.tpl b/application/frontend/skin/synio/components/toolbar-scrollnav/toolbar.scrollnav.tpl
new file mode 100644
index 00000000..b5647b99
--- /dev/null
+++ b/application/frontend/skin/synio/components/toolbar-scrollnav/toolbar.scrollnav.tpl
@@ -0,0 +1,14 @@
+{**
+ * Тулбар
+ * Кнопка прокручивания к следующему/предыдущему топику
+ *}
+
+{capture toolbar_scroll_nav}
+
+
+{/capture}
+
+{component 'toolbar.item'
+ html=$smarty.capture.toolbar_scroll_nav
+ classes='js-toolbar-topics'
+ mods='topic'}
\ No newline at end of file
diff --git a/application/frontend/skin/synio/components/toolbar-scrollup/css/toolbar-scrollup.css b/application/frontend/skin/synio/components/toolbar-scrollup/css/toolbar-scrollup.css
new file mode 100644
index 00000000..7c168a21
--- /dev/null
+++ b/application/frontend/skin/synio/components/toolbar-scrollup/css/toolbar-scrollup.css
@@ -0,0 +1,29 @@
+/**
+ * Кнопка прокрутки вверх
+ */
+
+.ls-toolbar-item.ls-toolbar-item--scrollup {
+ display: none;
+ padding: 8px;
+ width: 25px;
+}
+
+.ls-toolbar-item--scrollup.active .ls-toolbar-icon {
+ -webkit-transform: rotate(180deg);
+ transform: rotate(180deg);
+}
+
+.ls-toolbar-item--scrollup .ls-toolbar-icon {
+ display: block;
+ width: 25px;
+ height: 25px;
+ background: url(../images/scroll.png) no-repeat;
+ transition: background .2s;
+ cursor: pointer;
+}
+.ls-toolbar-item--scrollup .ls-toolbar-icon:hover {
+ background-image: url(../images/scroll-hover.png);
+}
+.ls-toolbar-item--scrollup .ls-toolbar-icon:active {
+ background-image: url(../images/scroll-active.png);
+}
\ No newline at end of file
diff --git a/application/frontend/skin/synio/components/toolbar-scrollup/images/scroll-active.png b/application/frontend/skin/synio/components/toolbar-scrollup/images/scroll-active.png
new file mode 100644
index 00000000..11b7483a
Binary files /dev/null and b/application/frontend/skin/synio/components/toolbar-scrollup/images/scroll-active.png differ
diff --git a/application/frontend/skin/synio/components/toolbar-scrollup/images/scroll-hover.png b/application/frontend/skin/synio/components/toolbar-scrollup/images/scroll-hover.png
new file mode 100644
index 00000000..192ab2d2
Binary files /dev/null and b/application/frontend/skin/synio/components/toolbar-scrollup/images/scroll-hover.png differ
diff --git a/application/frontend/skin/synio/components/toolbar-scrollup/images/scroll.png b/application/frontend/skin/synio/components/toolbar-scrollup/images/scroll.png
new file mode 100644
index 00000000..cdefdd76
Binary files /dev/null and b/application/frontend/skin/synio/components/toolbar-scrollup/images/scroll.png differ
diff --git a/application/frontend/skin/synio/components/toolbar-scrollup/toolbar.scrollup.tpl b/application/frontend/skin/synio/components/toolbar-scrollup/toolbar.scrollup.tpl
new file mode 100644
index 00000000..86b31fa9
--- /dev/null
+++ b/application/frontend/skin/synio/components/toolbar-scrollup/toolbar.scrollup.tpl
@@ -0,0 +1,9 @@
+{**
+ * Тулбар
+ * Кнопка прокрутки страницы вверх
+ *}
+
+{component 'toolbar.item'
+ html=''
+ classes='js-toolbar-scrollup'
+ mods='scrollup'}
\ No newline at end of file
diff --git a/application/frontend/skin/synio/components/toolbar/css/toolbar.css b/application/frontend/skin/synio/components/toolbar/css/toolbar.css
new file mode 100644
index 00000000..2053617a
--- /dev/null
+++ b/application/frontend/skin/synio/components/toolbar/css/toolbar.css
@@ -0,0 +1,25 @@
+/**
+ * Toolbar
+ *
+ * @license GNU General Public License, version 2
+ * @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
+ * @author Denis Shakhov
+ */
+
+.ls-toolbar {
+ position: fixed;
+ z-index: 100;
+ display: inline-block;
+}
+.ls-toolbar-item {
+ display: block;
+ background: #fff;
+ color: #222;
+ padding: 11px;
+ width: 19px;
+ font-size: 19px;
+ text-align: center;
+ box-shadow: 0 1px 5px rgba(0,0,0,.07);
+ margin-bottom: 10px;
+ border-radius: 10px;
+}
\ No newline at end of file
diff --git a/framework b/framework
index 8a4d3efa..188e3589 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 8a4d3efa29f006390c9d068d3590e4e9c26a98d2
+Subproject commit 188e358959c3afba177f29ccd670d3624b6e3bde