diff --git a/classes/actions/ActionStream.class.php b/classes/actions/ActionStream.class.php index cf9b16ba..8a64dded 100644 --- a/classes/actions/ActionStream.class.php +++ b/classes/actions/ActionStream.class.php @@ -169,6 +169,7 @@ class ActionStream extends Action { $oViewer=$this->Viewer_GetLocalViewer(); $oViewer->Assign('aStreamEvents', $aEvents); + $oViewer->Assign('sDateLast', getRequest('date_last')); if (count($aEvents)) { $oEvenLast=end($aEvents); $this->Viewer_AssignAjax('iStreamLastId', $oEvenLast->getId()); @@ -209,6 +210,7 @@ class ActionStream extends Action { $oViewer=$this->Viewer_GetLocalViewer(); $oViewer->Assign('aStreamEvents', $aEvents); + $oViewer->Assign('sDateLast', getRequest('date_last')); if (count($aEvents)) { $oEvenLast=end($aEvents); $this->Viewer_AssignAjax('iStreamLastId', $oEvenLast->getId()); @@ -253,6 +255,7 @@ class ActionStream extends Action { $oViewer=$this->Viewer_GetLocalViewer(); $oViewer->Assign('aStreamEvents', $aEvents); + $oViewer->Assign('sDateLast', getRequest('date_last')); if (count($aEvents)) { $oEvenLast=end($aEvents); $this->Viewer_AssignAjax('iStreamLastId', $oEvenLast->getId()); diff --git a/engine/lib/internal/template/js/blog.js b/engine/lib/internal/template/js/blog.js index 4e8863b7..f2d011c1 100644 --- a/engine/lib/internal/template/js/blog.js +++ b/engine/lib/internal/template/js/blog.js @@ -59,6 +59,7 @@ ls.blog = (function ($) { } var listItem = $('
  • '+item.sUserLogin+'
    • '); $('#invited_list').append(listItem); + $('#blog-invite-empty').hide(); ls.hook.run('ls_blog_add_invite_user_after',[idBlog,item],listItem); } }); @@ -103,6 +104,7 @@ ls.blog = (function ($) { } else { $('#blog-invite-remove-item-'+idBlog+'-'+idUser).remove(); ls.msg.notice(null, result.sMsg); + if ($('#invited_list li').length == 0) $('#blog-invite-empty').show(); ls.hook.run('ls_blog_remove_invite_after',[idUser,idBlog,result]); } }); diff --git a/engine/lib/internal/template/js/stream.js b/engine/lib/internal/template/js/stream.js index 7f7b7edc..a4e15ab2 100644 --- a/engine/lib/internal/template/js/stream.js +++ b/engine/lib/internal/template/js/stream.js @@ -2,6 +2,7 @@ var ls = ls || {}; ls.stream =( function ($) { this.isBusy = false; + this.dateLast = null; this.subscribe = function (iTargetUserId) { var url = aRouter['stream']+'subscribe/'; @@ -85,7 +86,7 @@ ls.stream =( function ($) { this.isBusy = true; var url = aRouter['stream']+'get_more/'; - var params = {'last_id':lastId}; + var params = {'last_id':lastId,'date_last':this.dateLast}; ls.hook.marker('getMoreBefore'); ls.ajax(url, params, function(data) { @@ -112,7 +113,7 @@ ls.stream =( function ($) { this.isBusy = true; var url = aRouter['stream']+'get_more_all/'; - var params = {'last_id':lastId}; + var params = {'last_id':lastId,'date_last':this.dateLast}; ls.hook.marker('getMoreAllBefore'); ls.ajax(url, params, function(data) { @@ -139,7 +140,7 @@ ls.stream =( function ($) { this.isBusy = true; var url = aRouter['stream']+'get_more_user/'; - var params = {'last_id':lastId, user_id: iUserId}; + var params = {'last_id':lastId, user_id: iUserId,'date_last':this.dateLast}; ls.hook.marker('getMoreByUserBefore'); ls.ajax(url, params, function(data) { diff --git a/templates/language/english.php b/templates/language/english.php index aaf56302..be8db348 100644 --- a/templates/language/english.php +++ b/templates/language/english.php @@ -1143,5 +1143,6 @@ return array( 'date_minutes_back_less' => 'Less than a minute ago', 'date_hours_back' => '%%hours%% hours ago; %%hours%% hours ago; %%hours%% hours ago', 'date_hours_back_less' => 'Less than an hour ago', + 'today' => 'Today', ); ?> \ No newline at end of file diff --git a/templates/language/russian.php b/templates/language/russian.php index 404d713b..cb126bd7 100644 --- a/templates/language/russian.php +++ b/templates/language/russian.php @@ -1145,5 +1145,6 @@ return array( 'date_minutes_back_less' => 'Менее минуты назад', 'date_hours_back' => '%%hours%% час назад; %%hours%% часа назад; %%hours%% часов назад', 'date_hours_back_less' => 'Менее часа назад', + 'today' => 'Сегодня', ); ?> \ No newline at end of file diff --git a/templates/skin/developer/actions/ActionBlog/invited.tpl b/templates/skin/developer/actions/ActionBlog/invited.tpl index b13d9cff..fa680dc3 100644 --- a/templates/skin/developer/actions/ActionBlog/invited.tpl +++ b/templates/skin/developer/actions/ActionBlog/invited.tpl @@ -27,9 +27,9 @@ {/foreach} - {else} - {$aLang.blog_admin_user_add_empty} {/if} + + {$aLang.blog_admin_user_add_empty} \ No newline at end of file diff --git a/templates/skin/developer/actions/ActionStream/events.tpl b/templates/skin/developer/actions/ActionStream/events.tpl index d428bbd9..6b3b21c4 100644 --- a/templates/skin/developer/actions/ActionStream/events.tpl +++ b/templates/skin/developer/actions/ActionStream/events.tpl @@ -1,7 +1,26 @@ {if count($aStreamEvents)} {foreach from=$aStreamEvents item=oStreamEvent} {assign var=oTarget value=$oStreamEvent->getTarget()} -
  • + + {if {date_format date=$oStreamEvent->getDateAdded() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y"} != $sDateLast} + {assign var=sDateLast value={date_format date=$oStreamEvent->getDateAdded() format="j F Y"}} + +
  • + {if {date_format date=$smarty.now format="j F Y"} == $sDateLast} + {$aLang.today} + {else} + {date_format date=$oStreamEvent->getDateAdded() format="j F Y"} + {/if} +
    • + {/if} + + + +
  • avatar {date_format date=$oStreamEvent->getDateAdded() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"} diff --git a/templates/skin/developer/css/base.css b/templates/skin/developer/css/base.css index a713290b..2e195ccf 100644 --- a/templates/skin/developer/css/base.css +++ b/templates/skin/developer/css/base.css @@ -82,11 +82,12 @@ h2.header-table { margin-bottom: 0; border-bottom: 1px solid #eee; padding-botto .stream-comment-preview { padding: 5px 10px; background: #f3f3f3; margin-top: 5px; } .stream-list { margin: 0 0 20px; } -.stream-list li { margin-bottom: 5px; min-height: 48px; _height: 48px; background: #fafafa; padding: 10px 15px 10px 70px; position: relative; } -.stream-list li .avatar { position: absolute; top: 10px; left: 10px; } -.stream-list li .date { display: block; color: #999; } -.stream-list li a { text-decoration: none; } -.stream-list li a:hover { text-decoration: underline; } +.stream-list li.stream-item { margin-bottom: 5px; min-height: 48px; _height: 48px; background: #fafafa; padding: 10px 15px 10px 70px; position: relative; } +.stream-list li.stream-item .avatar { position: absolute; top: 10px; left: 10px; } +.stream-list li.stream-item .date { display: block; color: #999; } +.stream-list li.stream-item a { text-decoration: none; } +.stream-list li.stream-item a:hover { text-decoration: underline; } +.stream-list li.stream-header-date { font-size: 12px; color: #777; margin-top: 30px; padding-bottom: 5px; border-bottom: 1px solid #eee; } diff --git a/templates/skin/developer/css/common.css b/templates/skin/developer/css/common.css index 92439f30..fec00154 100644 --- a/templates/skin/developer/css/common.css +++ b/templates/skin/developer/css/common.css @@ -165,7 +165,6 @@ white-space: -o-pre-wrap; white-space: pre-wrap; word-wrap: break-word; - word-break: break-all; white-space: normal; } diff --git a/templates/skin/developer/css/forms.css b/templates/skin/developer/css/forms.css index ad874d6d..72cc1506 100644 --- a/templates/skin/developer/css/forms.css +++ b/templates/skin/developer/css/forms.css @@ -49,7 +49,7 @@ dl.form-item dd { float: left; width: 300px; } .form-profile .avatar-change { position: absolute; top: 40px; right: 0; padding: 10px; background: #f7f7f7; font-size: 11px; } /* Placeholder */ -input:-moz-placeholder { color: #aaa; } +:-moz-placeholder { color: #aaa; } .placeholder { color: #aaa; } .mceEditor { display: block; margin-bottom: 20px; } diff --git a/templates/skin/developer/themes/light/README b/templates/skin/developer/themes/light/README new file mode 100644 index 00000000..d514ccaf --- /dev/null +++ b/templates/skin/developer/themes/light/README @@ -0,0 +1,4 @@ +Light Theme +----------- + +Легковесная тема для шаблона, убирает закругления и тени. \ No newline at end of file diff --git a/templates/skin/developer/themes/light/style.css b/templates/skin/developer/themes/light/style.css new file mode 100644 index 00000000..ed4069fd --- /dev/null +++ b/templates/skin/developer/themes/light/style.css @@ -0,0 +1,4 @@ +* { + border-radius: 0 !important; + box-shadow: none !important; +} \ No newline at end of file diff --git a/templates/skin/synio/actions/ActionBlog/invited.tpl b/templates/skin/synio/actions/ActionBlog/invited.tpl index eb0e446a..76303d4b 100644 --- a/templates/skin/synio/actions/ActionBlog/invited.tpl +++ b/templates/skin/synio/actions/ActionBlog/invited.tpl @@ -21,15 +21,18 @@ {assign var='oUser' value=$oBlogUser->getUser()}
  • - {$oUser->getLogin()} - + + avatar + {$oUser->getLogin()} + - {$aLang.blog_user_invite_readd} {$aLang.blog_user_invite_remove}
    • {/foreach} - {else} - {$aLang.blog_admin_user_add_empty} {/if} + + {$aLang.blog_admin_user_add_empty} \ No newline at end of file diff --git a/templates/skin/synio/actions/ActionStream/events.tpl b/templates/skin/synio/actions/ActionStream/events.tpl index 078282a4..1be23928 100644 --- a/templates/skin/synio/actions/ActionStream/events.tpl +++ b/templates/skin/synio/actions/ActionStream/events.tpl @@ -1,7 +1,26 @@ {if count($aStreamEvents)} {foreach from=$aStreamEvents item=oStreamEvent} {assign var=oTarget value=$oStreamEvent->getTarget()} -
  • + + {if {date_format date=$oStreamEvent->getDateAdded() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y"} != $sDateLast} + {assign var=sDateLast value={date_format date=$oStreamEvent->getDateAdded() format="j F Y"}} + +
  • + {if {date_format date=$smarty.now format="j F Y"} == $sDateLast} + {$aLang.today} + {else} + {date_format date=$oStreamEvent->getDateAdded() format="j F Y"} + {/if} +
    • + {/if} + + + +
  • avatar

    {$oStreamEvent->getUser()->getLogin()} · diff --git a/templates/skin/synio/css/base.css b/templates/skin/synio/css/base.css index 91f30933..69e12f39 100644 --- a/templates/skin/synio/css/base.css +++ b/templates/skin/synio/css/base.css @@ -180,13 +180,14 @@ h2.header-table span { color: #949aa1; } .stream-comment-preview:after { display: block; content: ""; position: absolute; top: -12px; left: 15px; width: 0; height: 0; border-width: 6px; border-color: transparent transparent #e8e8c0 transparent; border-style: solid; } .stream-list { margin: 0 0 20px; } -.stream-list li { margin-bottom: 23px; min-height: 48px; _height: 48px; border-bottom: 1px solid #e7ebed; padding: 0 0 20px 60px; position: relative; } -.stream-list li:last-child { border: none; } -.stream-list li .info { color: #b9c2c2; font-size: 11px; line-height: 1em; margin-bottom: 8px; } -.stream-list li .info a { color: #275ec2; } -.stream-list li .info .date { color: #818189; } -.stream-list li .avatar { position: absolute; top: 0; left: 0; } -.stream-list li .user-avatar { margin-left: 3px; } +.stream-list li.stream-item { margin-bottom: 23px; min-height: 48px; _height: 48px; border-bottom: 1px solid #e7ebed; padding: 0 0 20px 60px; position: relative; } +.stream-list li.stream-item:last-child { border: none; } +.stream-list li.stream-item .info { color: #b9c2c2; font-size: 11px; line-height: 1em; margin-bottom: 8px; } +.stream-list li.stream-item .info a { color: #275ec2; } +.stream-list li.stream-item .info .date { color: #818189; } +.stream-list li.stream-item .avatar { position: absolute; top: 0; left: 0; } +.stream-list li.stream-item .user-avatar { margin-left: 3px; } +.stream-list li.stream-header-date { font-size: 16px; color: #999; font-family: 'PT Sans', sans-serif; margin-top: 50px; margin-bottom: 20px; padding-bottom: 5px; border-bottom: 1px solid #eee; } diff --git a/templates/skin/synio/css/blocks.css b/templates/skin/synio/css/blocks.css index da95ce0c..62e3d4d9 100644 --- a/templates/skin/synio/css/blocks.css +++ b/templates/skin/synio/css/blocks.css @@ -31,7 +31,8 @@ .block.block-type-stream .block-content .latest-list li { margin-bottom: 15px; color: #818189; } .block.block-type-stream .block-content .latest-list p { font-size: 11px; } .block.block-type-stream .block-content .latest-list .stream-topic { text-decoration: underline; } -.block.block-type-stream .block-content .latest-list .stream-blog { font-weight: bold; } +.block.block-type-stream .block-content .latest-list .stream-blog { color: #4128B1; } +.block.block-type-stream .block-content .latest-list .stream-blog:hover { color: #f00; } .block.block-type-stream .block-content .latest-list .author { color: #4c4c4c; text-decoration: underline; } .block.block-type-stream .block-content .latest-list .author:hover { color: #f00; } .block.block-type-stream .block-content .latest-list .block-item-comments { font-size: 11px; text-decoration: none; color: #818189; white-space: nowrap; } diff --git a/templates/skin/synio/css/comments.css b/templates/skin/synio/css/comments.css index 1f1c4585..631d5940 100644 --- a/templates/skin/synio/css/comments.css +++ b/templates/skin/synio/css/comments.css @@ -13,8 +13,7 @@ .comment-wrapper { position: relative; } .comment-wrapper .comment-wrapper { padding-left: 40px; } -.comment-preview { padding: 5px 10px 6px; margin-bottom: 10px; background: #fafafa; border: 1px solid #eee; border-radius: 3px; } -.comment-preview { font-size: 13px; line-height: 1.6em; } +.comment-preview { padding: 5px 10px 6px; margin-bottom: 10px; background: #fafafa; border: 1px solid #eee; border-radius: 3px; font-size: 13px; line-height: 1.6em; } /* Комментарий */ diff --git a/templates/skin/synio/css/forms.css b/templates/skin/synio/css/forms.css index 1a1bb18e..6be0a78f 100644 --- a/templates/skin/synio/css/forms.css +++ b/templates/skin/synio/css/forms.css @@ -62,7 +62,7 @@ dl.form-item dd { float: left; width: 250px; } .form-profile .avatar-change a { color: #727a90; border-color: #727a90; } /* Placeholder */ -input:-moz-placeholder { color: #aaa; } +:-moz-placeholder { color: #aaa; } .placeholder { color: #aaa; } diff --git a/templates/skin/synio/themes/light/README b/templates/skin/synio/themes/light/README new file mode 100644 index 00000000..d514ccaf --- /dev/null +++ b/templates/skin/synio/themes/light/README @@ -0,0 +1,4 @@ +Light Theme +----------- + +Легковесная тема для шаблона, убирает закругления и тени. \ No newline at end of file diff --git a/templates/skin/synio/themes/light/style.css b/templates/skin/synio/themes/light/style.css new file mode 100644 index 00000000..ed4069fd --- /dev/null +++ b/templates/skin/synio/themes/light/style.css @@ -0,0 +1,4 @@ +* { + border-radius: 0 !important; + box-shadow: none !important; +} \ No newline at end of file