ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-17 07:10:48 +03:00
Code Issues Releases Wiki Activity

Доработка компонентов

Browse source
This commit is contained in:
Denis Shakhov 2014-10-24 20:30:31 +07:00
parent 399affd7a2
commit e8a774918e
30 changed files with 237 additions and 397 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

143
application/config/config.php
View file

@ -492,51 +492,47 @@ $config['block']['rule_blog'] = array(
$config['head']['default']['js'] = array(
/* Vendor libs */
"___path.framework.frontend.web___/js/vendor/html5shiv.js" => array('browser' => 'lt IE 9'),
"___path.framework.frontend.web___/js/vendor/jquery-1.9.1.min.js",
"___path.framework.frontend.web___/js/vendor/jquery-ui/js/jquery-ui-1.10.2.custom.min.js",
"___path.framework.frontend.web___/js/vendor/jquery-ui/js/localization/jquery-ui-datepicker-ru.js",
"___path.framework.frontend.web___/js/vendor/jquery.browser.js",
"___path.framework.frontend.web___/js/vendor/jquery.scrollto.js",
"___path.framework.frontend.web___/js/vendor/jquery.rich-array.min.js",
"___path.framework.frontend.web___/js/vendor/jquery.form.js",
"___path.framework.frontend.web___/js/vendor/jquery.jqplugin.js",
"___path.framework.frontend.web___/js/vendor/jquery.cookie.js",
"___path.framework.frontend.web___/js/vendor/jquery.serializejson.js",
"___path.framework.frontend.web___/js/vendor/jquery.file.js",
"___path.framework.frontend.web___/js/vendor/jquery.hotkeys.js",
"___path.framework.frontend.web___/js/vendor/jcrop/jquery.Jcrop.js",
"___path.framework.frontend.web___/js/vendor/jquery.placeholder.min.js",
"___path.framework.frontend.web___/js/vendor/jquery.charcount.js",
"___path.framework.frontend.web___/js/vendor/jquery.imagesloaded.js",
"___path.framework.frontend.web___/js/vendor/jquery.fileupload.js",
"___path.framework.frontend.web___/js/vendor/jquery.timers.js",
"___path.framework.frontend.web___/js/vendor/notifier/jquery.notifier.js",
"___path.framework.frontend.web___/js/vendor/prettify/prettify.js",
"___path.framework.frontend.web___/js/vendor/parsley/parsley.js",
"___path.framework.frontend.web___/js/vendor/parsley/i18n/messages.ru.js",
"___path.framework.frontend.web___/js/vendor/jquery.livequery.js",
"___path.framework.frontend.web___/js/vendor/fotorama/fotorama.js",
"___path.framework.frontend.web___/js/vendor/nprogress/nprogress.js",
"___path.framework.frontend.web___/js/vendor/colorbox/jquery.colorbox.js",
/* Core */
"___path.framework.frontend.web___/js/core/polyfills.js",
"___path.framework.frontend.web___/js/core/main.js",
"___path.framework.frontend.web___/js/core/dev.js",
"___path.framework.frontend.web___/js/core/hook.js",
"___path.framework.frontend.web___/js/core/i18n.js",
"___path.framework.frontend.web___/js/core/ie.js",
"___path.framework.frontend.web___/js/core/ajax.js",
"___path.framework.frontend.web___/js/core/registry.js",
"___path.framework.frontend.web___/js/core/utils.js",
"___path.framework.frontend.web___/js/core/timer.js",
/* User Interface */
"___path.framework.frontend.web___/js/ui/tooltip.js",
"___path.framework.frontend.web___/js/ui/autocomplete.js",
"___path.framework.frontend.web___/js/ui/notification.js",
/* LiveStreet */
"___path.skin.web___/components/ls-vendor/html5shiv.js" => array('browser' => 'lt IE 9'),
"___path.skin.web___/components/ls-vendor/jquery-1.9.1.min.js",
"___path.skin.web___/components/ls-vendor/jquery-ui/js/jquery-ui-1.10.2.custom.min.js",
"___path.skin.web___/components/ls-vendor/jquery-ui/js/localization/jquery-ui-datepicker-ru.js",
"___path.skin.web___/components/ls-vendor/jquery.browser.js",
"___path.skin.web___/components/ls-vendor/jquery.scrollto.js",
"___path.skin.web___/components/ls-vendor/jquery.rich-array.min.js",
"___path.skin.web___/components/ls-vendor/jquery.form.js",
"___path.skin.web___/components/ls-vendor/jquery.jqplugin.js",
"___path.skin.web___/components/ls-vendor/jquery.cookie.js",
"___path.skin.web___/components/ls-vendor/jquery.serializejson.js",
"___path.skin.web___/components/ls-vendor/jquery.file.js",
"___path.skin.web___/components/ls-vendor/jquery.hotkeys.js",
"___path.skin.web___/components/ls-vendor/jcrop/jquery.Jcrop.js",
"___path.skin.web___/components/ls-vendor/jquery.placeholder.min.js",
"___path.skin.web___/components/ls-vendor/jquery.charcount.js",
"___path.skin.web___/components/ls-vendor/jquery.imagesloaded.js",
"___path.skin.web___/components/ls-vendor/jquery.fileupload.js",
"___path.skin.web___/components/ls-vendor/jquery.timers.js",
"___path.skin.web___/components/ls-vendor/prettify/prettify.js",
"___path.skin.web___/components/ls-vendor/parsley/parsley.js",
"___path.skin.web___/components/ls-vendor/parsley/i18n/messages.ru.js",
"___path.skin.web___/components/ls-vendor/jquery.livequery.js",
"___path.skin.web___/components/ls-vendor/fotorama/fotorama.js",
"___path.skin.web___/components/ls-vendor/nprogress/nprogress.js",
"___path.skin.web___/components/ls-vendor/colorbox/jquery.colorbox.js",
"___path.skin.web___/components/ls-vendor/timepicker/jquery-ui-timepicker-addon.js",
"___path.skin.web___/components/ls-vendor/notifier/jquery.notifier.js",
"___path.skin.web___/components/ls-core/polyfills.js",
"___path.skin.web___/components/ls-core/main.js",
"___path.skin.web___/components/ls-core/dev.js",
"___path.skin.web___/components/ls-core/hook.js",
"___path.skin.web___/components/ls-core/i18n.js",
"___path.skin.web___/components/ls-core/ie.js",
"___path.skin.web___/components/ls-core/ajax.js",
"___path.skin.web___/components/ls-core/registry.js",
"___path.skin.web___/components/ls-core/utils.js",
"___path.skin.web___/components/ls-core/timer.js",
"___path.skin.web___/components/tooltip/js/tooltip.js",
"___path.skin.web___/components/notification/js/notification.js",
"___path.skin.web___/components/autocomplete/js/autocomplete.js",
"___path.skin.web___/components/tabs/js/tab.js",
"___path.skin.web___/components/tabs/js/tabs.js",
"___path.skin.web___/components/modal/js/modal.js",
@ -593,26 +589,75 @@ $config['head']['default']['js'] = array(
);
$config['head']['default']['css'] = array(
// Framework styles
"___path.framework.frontend.web___/css/reset.css",
"___path.framework.frontend.web___/css/helpers.css",
"___path.framework.frontend.web___/css/text.css",
"___path.framework.frontend.web___/css/forms.css",
"___path.framework.frontend.web___/css/typography.css",
"___path.framework.frontend.web___/css/grid.css",
"___path.skin.web___/components/ls-vendor/jquery-ui/css/smoothness/jquery-ui-1.10.2.custom.css",
"___path.skin.web___/components/ls-vendor/jcrop/jquery.Jcrop.css",
"___path.skin.web___/components/ls-vendor/prettify/prettify.css",
"___path.skin.web___/components/ls-vendor/fotorama/fotorama.css",
"___path.skin.web___/components/ls-vendor/nprogress/nprogress.css",
"___path.skin.web___/components/ls-vendor/colorbox/colorbox.css",
"___path.skin.web___/components/ls-vendor/timepicker/jquery-ui-timepicker-addon.css",
"___path.skin.web___/components/ls-vendor/notifier/jquery.notifier.css",
"___path.skin.web___/components/admin/css/admin.css",
"___path.skin.web___/components/tabs/css/tabs.css",
"___path.skin.web___/components/perfomance/css/perfomance.css",
"___path.skin.web___/components/tooltip/css/tooltip.css",
"___path.skin.web___/components/alert/css/alert.css",
"___path.skin.web___/components/dropdown/css/dropdown.css",
"___path.skin.web___/components/button/css/button.css",
"___path.skin.web___/components/modal/css/modal.css",
"___path.skin.web___/components/search/css/search.css",
"___path.skin.web___/components/toolbar/css/toolbar.css",
"___path.skin.web___/components/nav/css/nav.css",
"___path.skin.web___/components/property/css/property.css",
"___path.skin.web___/components/tags-favourite/css/tags-favourite.css",
"___path.framework.frontend.web___/css/forms.css",
"___path.framework.frontend.web___/css/tooltip.css",
"___path.framework.frontend.web___/css/typography.css",
"___path.framework.frontend.web___/css/grid.css"
"___path.skin.web___/components/icons/css/icons.css",
"___path.skin.web___/components/icons-contact/css/icons-contact.css",
"___path.skin.web___/components/vote/css/vote.css",
"___path.skin.web___/components/actionbar/css/actionbar.css",
"___path.skin.web___/components/favourite/css/favourite.css",
"___path.skin.web___/components/comment/css/comment.css",
"___path.skin.web___/components/topic/css/topic.css",
"___path.skin.web___/components/wall/css/wall.css",
"___path.skin.web___/components/blog/css/blog.css",
"___path.skin.web___/components/poll/css/poll.css",
"___path.skin.web___/components/more/css/more.css",
"___path.skin.web___/components/sort/css/sort.css",
"___path.skin.web___/components/alphanumeric/css/alphanumeric.css",
"___path.skin.web___/components/media/css/media.css",
"___path.skin.web___/components/pagination/css/pagination.css",
"___path.skin.web___/components/field/css/field.css",
"___path.skin.web___/components/search-form/css/search-form.css",
"___path.skin.web___/components/note/css/note.css",
"___path.skin.web___/components/info-list/css/info-list.css",
"___path.skin.web___/components/uploader/css/uploader.css",
"___path.skin.web___/components/activity/css/activity.css",
"___path.skin.web___/components/block/css/block.css",
"___path.skin.web___/components/tags/css/tags.css",
"___path.skin.web___/components/user/css/user.css",
"___path.skin.web___/components/user/css/user-item.css",
"___path.skin.web___/components/user/css/user-list-small.css",
"___path.skin.web___/components/user/css/user-list-avatar.css",
"___path.skin.web___/components/user-list-add/css/user-list-add.css",
"___path.skin.web___/components/talk/css/talk.css",
"___path.skin.web___/components/userbar/css/userbar.css"
);
// Стили для RTL языков
if ( Config::Get('view.rtl') ) {
$aCss[] = "___path.skin.web___/components/vote/css/vote-rtl.css";
}
// Подключение темы
if ( Config::Get('view.theme') ) {
$aCss[] = "___path.skin.web___/themes/___view.theme___/style.css";
}
/**
* Установка локали
*/

6
application/frontend/common/js/media.js
View file

@ -155,7 +155,7 @@ ls.media = (function ($) {
}
this.insertTextToEditor(sTextInsert);
this.elements.modal.modal('hide');
this.elements.modal.lsModal('hide');
}.bind(this));
// Загрузка медиа файлы по ссылке
@ -165,7 +165,7 @@ ls.media = (function ($) {
ls.msg.error(data.sMsgTitle,data.sMsg);
} else {
this.insertTextToEditor(data.sText);
this.elements.modal.modal('hide');
this.elements.modal.lsModal('hide');
this.elements.uploader.lsUploader( 'getElement', 'list' ).lsUploaderFileList( 'load' );
}
}.bind(this), {
@ -400,7 +400,7 @@ ls.media = (function ($) {
ls.msg.error( response.sMsgTitle, response.sMsg );
} else {
this.insertTextToEditor( response.sTextResult );
this.elements.modal.modal( 'hide' );
this.elements.modal.lsModal( 'hide' );
}
}.bind( this ));
};

28
application/frontend/skin/developer/assets/css/admin.css
View file

@ -1,28 +0,0 @@
/**
* Админка
*
* @template actions/ActionAdmin/*.tpl
*
* @license GNU General Public License, version 2
* @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
* @author Denis Shakhov <denis.shakhov@gmail.com>
*/
/**
* Информация о производительности
*
* @template stat_performance.tpl
*/
.stat-performance { margin: 20px; padding: 20px; }
.stat-performance table { width: 100%; }
.stat-performance td { vertical-align: top; }
.stat-performance h4 { font-weight: bold; font-size: 14px; }
/**
* Управление плагинами
*
* @template actions/ActionAdmin/plugins.tpl
*/
.table.table-plugins .cell-checkbox { width: 20px; padding: 12px 0 10px 10px; }
.table.table-plugins h3 { font-weight: bold; font-size: 17px; line-height: 20px; margin-bottom: 5px; }

2
application/frontend/skin/developer/assets/css/blocks.css
View file

@ -77,7 +77,7 @@
/**
* Навигация по профилю пользователя
* Теги
*
* @modifier tags
*/

5
application/frontend/skin/developer/assets/css/common.css
View file

@ -92,7 +92,6 @@
background: url(../images/icons.png) -168px 0 no-repeat;
vertical-align: middle;
}
.user.inactive { color: #aaa; cursor: help; }
.user.inactive { color: #aaa; cursor: help; }
.hide { display: none; }
.searched-item { background: #fff999; border-bottom: 1px dotted #999; }
.hide { display: none; }

33
application/frontend/skin/developer/assets/css/forms.css
View file

@ -1,33 +0,0 @@
/**
* Формы
*
* @license GNU General Public License, version 2
* @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
* @author Denis Shakhov <denis.shakhov@gmail.com>
*/
/**
* Блок редактирования аватара
*
* @template actions/ActionSettings/profile.tpl
*/
.avatar-edit { margin-bottom: 15px; }
.avatar-edit img { vertical-align: bottom; }
.avatar-edit label { margin-top: 10px; }
/**
* Форма авторизации
*
* @template forms/form.auth.*.tpl
*/
.form-auth-captcha {
width: 80px;
height: 60px;
display: inline-block;
vertical-align: top;
cursor: pointer;
background-repeat: no-repeat;
background-color: #eee;
}

163
application/frontend/skin/developer/assets/css/icons.css
View file

@ -1,163 +0,0 @@
/**
* Иконки
*
* Иконки Glyphicons
* http://glyphicons.com/
*
* @license GNU General Public License, version 2
* @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
* @author Denis Shakhov <denis.shakhov@gmail.com>
*/
[class^="icon-"],
[class*=" icon-"] {
display: inline-block;
vertical-align: text-top;
width: 14px;
height: 14px;
line-height: 14px;
background: url(../images/icons.png) no-repeat;
}
.icon-white { background-image: url(../images/icons-white.png); }
.icon-glass { background-position: 0 0; }
.icon-music { background-position: -24px 0; }
.icon-search { background-position: -48px 0; }
.icon-envelope { background-position: -72px 0; }
.icon-heart { background-position: -96px 0; }
.icon-star { background-position: -120px 0; }
.icon-star-empty { background-position: -144px 0; }
.icon-user { background-position: -168px 0; }
.icon-film { background-position: -192px 0; }
.icon-th-large { background-position: -216px 0; }
.icon-th { background-position: -240px 0; }
.icon-th-list { background-position: -264px 0; }
.icon-ok { background-position: -288px 0; }
.icon-remove { background-position: -312px 0; }
.icon-zoom-in { background-position: -336px 0; }
.icon-zoom-out { background-position: -360px 0; }
.icon-off { background-position: -384px 0; }
.icon-signal { background-position: -408px 0; }
.icon-cog { background-position: -432px 0; }
.icon-trash { background-position: -456px 0; }
.icon-home { background-position: 0 -24px; }
.icon-file { background-position: -24px -24px; }
.icon-time { background-position: -48px -24px; }
.icon-road { background-position: -72px -24px; }
.icon-download-alt { background-position: -96px -24px; }
.icon-download { background-position: -120px -24px; }
.icon-upload { background-position: -144px -24px; }
.icon-inbox { background-position: -168px -24px; }
.icon-play-circle { background-position: -192px -24px; }
.icon-repeat { background-position: -216px -24px; }
.icon-refresh { background-position: -240px -24px; }
.icon-list-alt { background-position: -264px -24px; }
.icon-lock { background-position: -287px -24px; }
.icon-flag { background-position: -312px -24px; }
.icon-headphones { background-position: -336px -24px; }
.icon-volume-off { background-position: -360px -24px; }
.icon-volume-down { background-position: -384px -24px; }
.icon-volume-up { background-position: -408px -24px; }
.icon-qrcode { background-position: -432px -24px; }
.icon-barcode { background-position: -456px -24px; }
.icon-tag { background-position: 0 -48px; }
.icon-tags { background-position: -25px -48px; }
.icon-book { background-position: -48px -48px; }
.icon-bookmark { background-position: -72px -48px; }
.icon-print { background-position: -96px -48px; }
.icon-camera { background-position: -120px -48px; }
.icon-font { background-position: -144px -48px; }
.icon-bold { background-position: -167px -48px; }
.icon-italic { background-position: -192px -48px; }
.icon-text-height { background-position: -216px -48px; }
.icon-text-width { background-position: -240px -48px; }
.icon-align-left { background-position: -264px -48px; }
.icon-align-center { background-position: -288px -48px; }
.icon-align-right { background-position: -312px -48px; }
.icon-align-justify { background-position: -336px -48px; }
.icon-list { background-position: -360px -48px; }
.icon-indent-left { background-position: -384px -48px; }
.icon-indent-right { background-position: -408px -48px; }
.icon-facetime-video { background-position: -432px -48px; }
.icon-picture { background-position: -456px -48px; }
.icon-pencil { background-position: 0 -72px; }
.icon-map-marker { background-position: -24px -72px; }
.icon-adjust { background-position: -48px -72px; }
.icon-tint { background-position: -72px -72px; }
.icon-edit { background-position: -96px -72px; }
.icon-share { background-position: -120px -72px; }
.icon-check { background-position: -144px -72px; }
.icon-move { background-position: -168px -72px; }
.icon-step-backward { background-position: -192px -72px; }
.icon-fast-backward { background-position: -216px -72px; }
.icon-backward { background-position: -240px -72px; }
.icon-play { background-position: -264px -72px; }
.icon-pause { background-position: -288px -72px; }
.icon-stop { background-position: -312px -72px; }
.icon-forward { background-position: -336px -72px; }
.icon-fast-forward { background-position: -360px -72px; }
.icon-step-forward { background-position: -384px -72px; }
.icon-eject { background-position: -408px -72px; }
.icon-chevron-left { background-position: -432px -72px; }
.icon-chevron-right { background-position: -456px -72px; }
.icon-plus-sign { background-position: 0 -96px; }
.icon-minus-sign { background-position: -24px -96px; }
.icon-remove-sign { background-position: -48px -96px; }
.icon-ok-sign { background-position: -72px -96px; }
.icon-question-sign { background-position: -96px -96px; }
.icon-info-sign { background-position: -120px -96px; }
.icon-screenshot { background-position: -144px -96px; }
.icon-remove-circle { background-position: -168px -96px; }
.icon-ok-circle { background-position: -192px -96px; }
.icon-ban-circle { background-position: -216px -96px; }
.icon-arrow-left { background-position: -240px -96px; }
.icon-arrow-right { background-position: -264px -96px; }
.icon-arrow-up { background-position: -289px -96px; }
.icon-arrow-down { background-position: -312px -96px; }
.icon-share-alt { background-position: -336px -96px; }
.icon-resize-full { background-position: -360px -96px; }
.icon-resize-small { background-position: -384px -96px; }
.icon-plus { background-position: -408px -96px; }
.icon-minus { background-position: -433px -96px; }
.icon-asterisk { background-position: -456px -96px; }
.icon-exclamation-sign { background-position: 0 -120px; }
.icon-gift { background-position: -24px -120px; }
.icon-leaf { background-position: -48px -120px; }
.icon-fire { background-position: -72px -120px; }
.icon-eye-open { background-position: -96px -120px; }
.icon-eye-close { background-position: -120px -120px; }
.icon-warning-sign { background-position: -144px -120px; }
.icon-plane { background-position: -168px -120px; }
.icon-calendar { background-position: -192px -120px; }
.icon-random { background-position: -216px -120px; }
.icon-comment { background-position: -240px -120px; }
.icon-magnet { background-position: -264px -120px; }
.icon-chevron-up { background-position: -288px -120px; }
.icon-chevron-down { background-position: -313px -119px; }
.icon-retweet { background-position: -336px -120px; }
.icon-shopping-cart { background-position: -360px -120px; }
.icon-folder-close { background-position: -384px -120px; }
.icon-folder-open { background-position: -408px -120px; }
.icon-resize-vertical { background-position: -432px -119px; }
.icon-resize-horizontal { background-position: -456px -118px; }
.icon-contact { width: 16px; height: 16px; background: url(../images/icons-contact.png) no-repeat; }
.icon-contact-default { background-position: 0 0; }
.icon-contact-mail { background-position: -20px 0; }
.icon-contact-icq { background-position: -40px 0; }
.icon-contact-jabber { background-position: -60px 0; }
.icon-contact-phone { background-position: -80px 0; }
.icon-contact-skype { background-position: -100px 0; }
.icon-contact-vkontakte { background-position: -120px 0; }
.icon-contact-twitter { background-position: -140px 0; }
.icon-contact-facebook { background-position: -160px 0; }
.icon-contact-odnoklassniki { background-position: -180px 0; }
.icon-contact-www { background-position: -200px 0; }
.icon-validation-success { width: 14px; height: 14px; background: url(../images/validation-success.png) no-repeat; }

11
application/frontend/skin/developer/assets/css/modals.css
View file

@ -39,13 +39,4 @@
.crop-image-holder { margin-right: 10px; }
.crop-image-holder,
.crop-previews { display: inline-block; vertical-align: top; }
.crop-preview { overflow: hidden; margin-bottom: 15px; }
/**
* Add media
*
* @template modals/modal.upload_image.tpl
*/
.modal-upload-image { max-width: 1130px; border: none; }
.crop-preview { overflow: hidden; margin-bottom: 15px; }

BIN
application/frontend/skin/developer/assets/images/icons-contact.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6 KiB

BIN
application/frontend/skin/developer/assets/images/icons-white.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.3 KiB

BIN
application/frontend/skin/developer/assets/images/icons.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.3 KiB

BIN
application/frontend/skin/developer/assets/images/icons/validation-success.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.2 KiB

35
application/frontend/skin/developer/assets/js/init.js
View file

@ -41,7 +41,8 @@ jQuery(document).ready(function($){
/**
* Modals
*/
$('.js-modal-default').modal();
$('.js-modal-default').lsModal();
/**
* Dropdowns
@ -104,10 +105,33 @@ jQuery(document).ready(function($){
/**
* Autocomplete
*/
ls.autocomplete.add($(".autocomplete-tags-sep"), aRouter['ajax']+'autocompleter/tag/', true);
ls.autocomplete.add($(".autocomplete-tags"), aRouter['ajax']+'autocompleter/tag/', false);
ls.autocomplete.add($(".autocomplete-users-sep"), aRouter['ajax']+'autocompleter/user/', true);
ls.autocomplete.add($(".autocomplete-users"), aRouter['ajax']+'autocompleter/user/', false);
$( '.autocomplete-tags' ).lsAutocomplete({
multiple: false,
urls: {
load: aRouter.ajax + 'autocompleter/tag/'
}
});
$( '.autocomplete-tags-sep' ).lsAutocomplete({
multiple: true,
urls: {
load: aRouter.ajax + 'autocompleter/tag/'
}
});
$( '.autocomplete-users' ).lsAutocomplete({
multiple: false,
urls: {
load: aRouter.ajax + 'autocompleter/user/'
}
});
$( '.autocomplete-users-sep' ).lsAutocomplete({
multiple: true,
urls: {
load: aRouter.ajax + 'autocompleter/user/'
}
});
/**
@ -198,7 +222,6 @@ jQuery(document).ready(function($){
/**
* Toolbar
*/
$(window)._scrollable();
$('.js-toolbar').toolbar({
target: '.grid-role-wrapper',
offsetX: 20

2
application/frontend/skin/developer/blocks/block.userNote.tpl
View file

@ -15,5 +15,5 @@
{/block}
{block 'block_content_after'}
{include 'components/note/note.tpl' classes='js-user-note' oObject=$oUserProfile->getUserNote() iUserId=$oUserProfile->getId()}
{include 'components/note/note.tpl' classes='js-user-note' note=$oUserProfile->getUserNote() targetId=$oUserProfile->getId()}
{/block}

23
application/frontend/skin/developer/components/admin/css/admin.css Normal file
View file

@ -0,0 +1,23 @@
/**
* Админка
*
* @license GNU General Public License, version 2
* @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
* @author Denis Shakhov <denis.shakhov@gmail.com>
*/
/**
* Управление плагинами
*
* @template plugins.tpl
*/
.table.table-plugins .cell-checkbox {
width: 20px;
padding: 12px 0 10px 10px;
}
.table.table-plugins h3 {
font-weight: bold;
font-size: 17px;
line-height: 20px;
margin-bottom: 5px;
}

13
application/frontend/skin/developer/components/field/css/field.css
View file

@ -73,3 +73,16 @@
top: -999px;
left: -999px;
}
/**
* Captcha
*/
.field--captcha-image {
width: 80px;
height: 60px;
display: inline-block;
vertical-align: top;
cursor: pointer;
background-repeat: no-repeat;
background-color: #eee;
}

2
application/frontend/skin/developer/components/field/field.captcha.tpl
View file

@ -7,7 +7,7 @@
{extends './field.text.tpl'}
{block 'field_input' prepend}
<span data-type="captcha" data-captcha-name="{$smarty.local.captchaName}" class="form-auth-captcha"></span>
<span data-type="captcha" data-captcha-name="{$smarty.local.captchaName}" class="field--captcha-image"></span>
{$_rules = [
'required' => true,

5
application/frontend/skin/developer/components/media/css/media.css
View file

@ -2,6 +2,11 @@
* Media
*/
.modal--media {
max-width: 1130px;
border: none;
}
.media {
background: #222;
}

10
application/frontend/skin/developer/components/media/js/media.js
View file

@ -90,7 +90,7 @@
this.elements.url.blocks = this.elements.url.block_container.find( this.option( 'selectors.block' ) );
// Иниц-ия модального окна
this.element.modal({
this.element.lsModal({
aftershow: function () {
var list = _this.elements.uploader.lsUploader( 'getElement', 'list' );
@ -160,14 +160,14 @@
*
*/
show: function() {
this.element.modal( 'show' );
this.element.lsModal( 'show' );
},
/**
*
*/
hide: function() {
this.element.modal( 'hide' );
this.element.lsModal( 'hide' );
},
/**
@ -196,7 +196,7 @@
ls.msg.error( response.sMsgTitle, response.sMsg );
} else {
this.option( 'editor' ).lsEditor( 'insert', response.sTextResult );
this.element.modal( 'hide' );
this.element.lsModal( 'hide' );
}
}.bind( this ));
},
@ -268,7 +268,7 @@
ls.msg.error( response.sMsgTitle, response.sMsg );
} else {
this.option( 'editor' ).lsEditor( 'insert', response.sText );
this.element.modal( 'hide' );
this.element.lsModal( 'hide' );
this.elements.uploader.lsUploader( 'getElement', 'list' ).lsUploaderFileList( 'load' );
}
}.bind( this ), {

2
application/frontend/skin/developer/components/media/media.tpl
View file

@ -5,7 +5,7 @@
{extends 'components/modal/modal.tpl'}
{block 'modal_id'}{$smarty.local.id}{/block}
{block 'modal_class'}modal-upload-image js-modal-media{/block}
{block 'modal_class'}modal--media js-modal-media{/block}
{block 'modal_title'}{lang name='media.title'}{/block}
{block 'modal_attributes'}data-modal-center="false"{/block}

12
application/frontend/skin/developer/components/modal/js/modal.js
View file

@ -143,7 +143,7 @@ var ls = ls || {};
// Plugin
// ----------
$.widget( "livestreet.modal", {
$.widget( "livestreet.lsModal", {
/**
* Дефолтные опции
*/
@ -217,7 +217,7 @@ var ls = ls || {};
show: function () {
var isOverlayVisible = _overlay.isVisible();
_overlay.getActiveModal().modal('hide', false);
_overlay.getActiveModal().lsModal('hide', false);
if ( ! isOverlayVisible ) _overlay.element.css({ 'display' : 'block', 'visibility' : 'hidden' });
this.element.css({ 'display' : 'block', 'visibility' : 'hidden' });
@ -286,7 +286,7 @@ var ls = ls || {};
*/
this.load = function (url, params, options) {
if ( ! _overlay.isVisible() ) _overlay.show();
_overlay.getActiveModal().modal('hide', false);
_overlay.getActiveModal().lsModal('hide', false);
_loader.show();
options.url = url;
@ -299,7 +299,7 @@ var ls = ls || {};
ls.msg.error('Error', result.sMsg);
} else {
_loader.hide();
$( $.trim( result['sText'] ) ).modal( options ).modal('show');
$( $.trim( result['sText'] ) ).lsModal( options ).lsModal('show');
}
}, {
error: function () {
@ -335,7 +335,7 @@ var ls = ls || {};
// Клик по оверлею
_overlay.element.on('click', function (e) {
if ( e.target == this ) {
_overlay.getActiveModal().modal('hide');
_overlay.getActiveModal().lsModal('hide');
_loader.hide();
}
});
@ -344,7 +344,7 @@ var ls = ls || {};
$(document).on('keyup.modal', function (e) {
var modal = _overlay.getActiveModal();
if ( e.keyCode === 27 && modal.length ) modal.modal('hide');
if ( e.keyCode === 27 && modal.length ) modal.lsModal('hide');
});

29
application/frontend/skin/developer/components/note/note.tpl
View file

@ -1,45 +1,42 @@
{**
* Заметка
*
* @param object $oObject Заметка
* @param integer $iUserId ID сущности
* @param boolean $bIsEditable Можно редактировать заметку или нет
*
* @styles assets/css/common.css
* @scripts <common>/js/usernote.js
* @param object $note Заметка
* @param integer $targetId ID сущности
* @param boolean $isEditable Можно редактировать заметку или нет
*}
{* Название компонента *}
{$component = 'user-note'}
{* Установка дефолтных значений *}
{$_oNote = $smarty.local.oObject}
{$_bIsEditable = $smarty.local.bIsEditable|default:true}
{$note = $smarty.local.target}
{$isEditable = $smarty.local.isEditable|default:true}
<div class="{$component} {mod name=$component mods=$mods} {$smarty.local.classes}" data-param-i-user-id="{$smarty.local.iUserId}" {$smarty.local.attributes}>
<div class="{$component} {mod name=$component mods=$mods} {$smarty.local.classes}" data-param-i-user-id="{$smarty.local.targetId}" {$smarty.local.attributes}>
{* Заметка *}
<div class="{$component}-body js-{$component}-body">
{* Текст *}
<p class="{$component}-text js-{$component}-text" {if ! $_oNote}style="display: none"{/if}>
{if $_oNote}
{$_oNote->getText()}
<p class="{$component}-text js-{$component}-text" {if ! $note}style="display: none"{/if}>
{if $note}
{$note->getText()}
{/if}
</p>
{* Действия *}
{if $_bIsEditable}
<ul class="{$component}-actions js-{$component}-actions" {if ! $_oNote}style="display: none;"{/if}>
{if $isEditable}
<ul class="{$component}-actions js-{$component}-actions" {if ! $note}style="display: none;"{/if}>
<li><a href="#" class="link-dotted js-{$component}-actions-edit">{$aLang.common.edit}</a></li>
<li><a href="#" class="link-dotted js-{$component}-actions-remove">{$aLang.common.remove}</a></li>
</ul>
{* Добавить *}
<a href="#" class="link-dotted {$component}-add js-{$component}-add" {if $_oNote}style="display:none;"{/if}>{$aLang.user_note.add}</a>
<a href="#" class="link-dotted {$component}-add js-{$component}-add" {if $note}style="display:none;"{/if}>{$aLang.usernote.add}</a>
{/if}
</div>
{* Форма редактирования *}
{if $_bIsEditable}
{if $isEditable}
<form class="{$component}-form js-{$component}-form" style="display: none;">
{include 'components/field/field.textarea.tpl' inputClasses="$component-form-text js-$component-form-text"}

18
application/frontend/skin/developer/components/perfomance/css/perfomance.css Normal file
View file

@ -0,0 +1,18 @@
/**
* Информация о производительности
*/
.performance {
margin: 20px;
padding: 20px;
}
.performance table {
width: 100%;
}
.performance td {
vertical-align: top;
}
.performance h4 {
font-weight: bold;
font-size: 14px;
}

2
application/frontend/skin/developer/components/perfomance/performance.tpl
View file

@ -5,7 +5,7 @@
{if $bIsShowStatsPerformance and $oUserCurrent and $oUserCurrent->isAdministrator()}
{$stats = $smarty.local.stats}
<div class="alert alert--info stat-performance">
<div class="alert alert--info performance">
{hook run='statistics_performance_begin'}
<table>

4
application/frontend/skin/developer/components/search/css/search.css Normal file
View file

@ -0,0 +1,4 @@
.searched-item {
background: #fff999;
border-bottom: 1px dotted #999;
}

4
application/frontend/skin/developer/components/tags-favourite/js/tags-favourite.js
View file

@ -142,7 +142,7 @@ ls.tags = (function ($) {
});
this.oSubmitInputList.val( aTags.join(', ') );
this.oForm.modal('show');
this.oForm.lsModal('show');
return false;
};
@ -151,7 +151,7 @@ ls.tags = (function ($) {
* Скрывает форму редактирования тегов
*/
this.hideForm = function() {
this.oForm.modal('hide');
this.oForm.lsModal('hide');
};
/**

1
application/frontend/skin/developer/components/toolbar/js/toolbar.js
View file

@ -35,6 +35,7 @@ $.widget( "livestreet.toolbar", {
_create: function() {
this.target = $(this.options.target);
this.window._scrollable();
this.window.on('ready resize scroll', this.reposition.bind(this));
},

8
application/frontend/skin/developer/components/user/js/user.js
View file

@ -72,13 +72,13 @@ ls.user = (function ($) {
$('.js-modal-toggle-registration').on('click', function (e) {
$('.js-auth-tab-reg').lsTab('activate');
$('#modal-login').modal('show');
$('#modal-login').lsModal('show');
e.preventDefault();
});
$('.js-modal-toggle-login').on('click', function (e) {
$('.js-auth-tab-login').lsTab('activate');
$('#modal-login').modal('show');
$('#modal-login').lsModal('show');
e.preventDefault();
});
@ -119,7 +119,7 @@ ls.user = (function ($) {
// Мержим логины
oInput.val( $.richArray.unique($.merge(aLoginsOld, aLoginsAdd)).join(', ') );
$('#modal-users-select').modal('hide');
$('#modal-users-select').lsModal('hide');
});
// Загрузка фотографии в профиль
@ -150,7 +150,7 @@ ls.user = (function ($) {
*/
this.addComplaint = function(oForm) {
ls.ajax.submit(aRouter.profile + 'ajax-complaint-add/', oForm, function(result) {
$('#modal-complaint-user').modal('hide');
$('#modal-complaint-user').lsModal('hide');
});
};

2
application/frontend/skin/developer/components/user/user-list-loop.tpl
View file

@ -26,7 +26,7 @@
{* Заметка *}
{if $usernote}
{include 'components/note/note.tpl' classes='js-user-note' oObject=$usernote iUserId=$user->getId()}
{include 'components/note/note.tpl' classes='js-user-note' note=$usernote targetId=$user->getId()}
{/if}
{* Информация *}

71
application/frontend/skin/developer/settings/config/config.php
View file

@ -17,76 +17,21 @@ $config['view']['grid']['fluid_max_width'] = '1200px';
/* Fixed settings */
$config['view']['grid']['fixed_width'] = '1000px';
$config['head']['default']['js'] = Config::Get('head.default.js');
$config['head']['default']['js'][] = '___path.skin.assets.web___/js/init.js';
// Подключение скриптов шаблона
$config['head']['default']['js'] = array_merge(Config::Get('head.default.js'), array(
'___path.skin.assets.web___/js/init.js'
));
$aCss = array(
// Base styles
// Подключение стилей шаблона
$config['head']['default']['css'] = array_merge(Config::Get('head.default.css'), array(
"___path.skin.assets.web___/css/base.css",
"___path.framework.frontend.web___/js/vendor/jquery-ui/css/smoothness/jquery-ui-1.10.2.custom.css",
"___path.framework.frontend.web___/js/vendor/jcrop/jquery.Jcrop.css",
"___path.framework.frontend.web___/js/vendor/prettify/prettify.css",
"___path.framework.frontend.web___/js/vendor/notifier/jquery.notifier.css",
"___path.framework.frontend.web___/js/vendor/fotorama/fotorama.css",
"___path.framework.frontend.web___/js/vendor/nprogress/nprogress.css",
"___path.framework.frontend.web___/js/vendor/colorbox/colorbox.css",
"___path.skin.assets.web___/css/grid.css",
"___path.skin.assets.web___/css/forms.css",
"___path.skin.assets.web___/css/common.css",
// Components
"___path.skin.web___/components/vote/css/vote.css",
"___path.skin.web___/components/actionbar/css/actionbar.css",
"___path.skin.web___/components/favourite/css/favourite.css",
"___path.skin.web___/components/comment/css/comment.css",
"___path.skin.web___/components/topic/css/topic.css",
"___path.skin.web___/components/wall/css/wall.css",
"___path.skin.web___/components/blog/css/blog.css",
"___path.skin.web___/components/poll/css/poll.css",
"___path.skin.web___/components/more/css/more.css",
"___path.skin.web___/components/sort/css/sort.css",
"___path.skin.web___/components/alphanumeric/css/alphanumeric.css",
"___path.skin.web___/components/media/css/media.css",
"___path.skin.web___/components/pagination/css/pagination.css",
"___path.skin.web___/components/field/css/field.css",
"___path.skin.web___/components/search-form/css/search-form.css",
"___path.skin.web___/components/note/css/note.css",
"___path.skin.web___/components/info-list/css/info-list.css",
"___path.skin.web___/components/uploader/css/uploader.css",
"___path.skin.web___/components/activity/css/activity.css",
"___path.skin.web___/components/block/css/block.css",
"___path.skin.web___/components/tags/css/tags.css",
"___path.skin.web___/components/user/css/user.css",
"___path.skin.web___/components/user/css/user-item.css",
"___path.skin.web___/components/user/css/user-list-small.css",
"___path.skin.web___/components/user/css/user-list-avatar.css",
"___path.skin.web___/components/user-list-add/css/user-list-add.css",
"___path.skin.web___/components/talk/css/talk.css",
"___path.skin.web___/components/userbar/css/userbar.css",
// Template's styles
"___path.skin.assets.web___/css/icons.css",
"___path.skin.assets.web___/css/tables.css",
"___path.skin.assets.web___/css/blocks.css",
"___path.skin.assets.web___/css/modals.css",
"___path.skin.assets.web___/css/admin.css",
"___path.skin.assets.web___/css/toolbar.css",
"___path.skin.assets.web___/css/print.css",
);
// Подключение темы
if ( Config::Get('view.theme') ) {
$aCss[] = "___path.skin.web___/themes/___view.theme___/style.css";
}
// Стили для RTL языков
if ( Config::Get('view.rtl') ) {
$aCss[] = "___path.skin.web___/components/vote/css/vote-rtl.css";
}
// Подключение фронтенд фреймворка
$config['head']['default']['css'] = array_merge(Config::Get('head.default.css'), $aCss);
"___path.skin.assets.web___/css/print.css"
));
return $config;