diff --git a/Web/Presenters/templates/Wall/Feed.xml b/Web/Presenters/templates/Wall/Feed.xml index 8e8b0cca..82aeeb2c 100644 --- a/Web/Presenters/templates/Wall/Feed.xml +++ b/Web/Presenters/templates/Wall/Feed.xml @@ -3,53 +3,54 @@ {block header} {_"feed"} - -
- - - {if !isset($globalFeed)} - {_"all_news"} - {else} - {_"my_feed"} - {/if} - - -
{/block} {block content} -
+
+ + +
+ +
{include "../components/textArea.xml", route => "/wall" . $thisUser->getId() . "/makePost"}
-
-
- {foreach $posts as $post} - - - {include "../components/post.xml", post => $post, onWallOf => true, commentSection => true} - {/foreach} - {include "../components/paginator.xml", conf => $paginatorConf} -
- {_"posts_per_page"}: - - -
+ {foreach $posts as $post} + + {include "../components/post.xml", post => $post, onWallOf => true, commentSection => true} + {/foreach} + +
+
+ {include "../components/paginator.xml", conf => $paginatorConf} +
+
+ {_"posts_per_page"}: +
+ +
+
+ + {if isset($thisUser) && $thisUser->hasMicroblogEnabled()} {script "js/al_comments.js"} diff --git a/Web/static/css/style.css b/Web/static/css/style.css index 0a7ee69b..b0e42915 100644 --- a/Web/static/css/style.css +++ b/Web/static/css/style.css @@ -1611,6 +1611,26 @@ body.scrolled .toTop:hover { background-color: rgb(240, 240, 240); border-bottom: 1px solid #ccc; border-top: 1px solid #ccc; + margin-left: -10px; + margin-bottom: 10px; + width: 611px; +} + +.postFeedWrapperMicroblog { + margin-bottom: 5px; +} + +.postFeedBottom .postFeedPaginator { + float: right; +} + +.postFeedBottom .postFeedPageSelect { + float: left; + padding-top: 8px; +} + +#pageSelect { + width: 200px; } .user-alert { diff --git a/locales/en.strings b/locales/en.strings index 09c33443..745c47e7 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -168,6 +168,7 @@ "no_comments" = "No comments"; +"my_news" = "My news"; "all_news" = "All news"; "posts_per_page" = "Number of posts per page"; diff --git a/locales/ru.strings b/locales/ru.strings index b834900f..98d6da56 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -176,6 +176,7 @@ "no_comments" = "Комментарии отсутствуют"; +"my_news" = "Мои новости"; "all_news" = "Все новости"; "posts_per_page" = "Количество записей на странице";