From ced68fc73b17738a782d253e36a4fb96267aec54 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 9 Nov 2014 19:43:42 +0100 Subject: [PATCH] [ticket/416] Fix news modules variables for independent news modules B3P-416 --- .../template/portal/modules/news_center.html | 41 ++++++------ .../portal/modules/news_compact_center.html | 64 ++++++++++--------- 2 files changed, 57 insertions(+), 48 deletions(-) diff --git a/styles/prosilver/template/portal/modules/news_center.html b/styles/prosilver/template/portal/modules/news_center.html index ded9e502..fed71797 100644 --- a/styles/prosilver/template/portal/modules/news_center.html +++ b/styles/prosilver/template/portal/modules/news_center.html @@ -1,45 +1,48 @@ {$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R}
+ + - + +
{L_NO_NEWS}
-
+
-

{NEWEST_POST_IMG}{READ_POST_IMG} {news_row.ATTACH_ICON_IMG} {L_VIEW_TOPIC_POLL} {news_row.TITLE}

- {news_row.PAGINATION} +

{NEWEST_POST_IMG}{READ_POST_IMG} {news.news_row.ATTACH_ICON_IMG} {L_VIEW_TOPIC_POLL} {news.news_row.TITLE}

+ {news.news_row.PAGINATION}
    -
  • {POSTED_BY_TEXT} {L_POST_BY_AUTHOR}{L_COLON} {news_row.POSTER_FULL} » {news_row.TIME}
    • -
  • {L_FORUM}{L_COLON} {news_row.FORUM_NAME}
    • +
  • {news.POSTED_BY_TEXT} {L_POST_BY_AUTHOR}{L_COLON} {news.news_row.POSTER_FULL} » {news.news_row.TIME}
    • +
  • {L_FORUM}{L_COLON} {news.news_row.FORUM_NAME}
-
{news_row.TEXT} +
{news.news_row.TEXT}
- +
{L_ATTACHMENTS}
-
{news_row.attachment.DISPLAY_ATTACHMENT}
+
{news.news_row.attachment.DISPLAY_ATTACHMENT}

- {L_TOPIC_VIEWS}{L_COLON} {news_row.TOPIC_VIEWS}  •  {L_COMMENTS}{L_COLON} {news_row.REPLIES}  •  {L_PORTAL_POST_REPLY} - {news_row.OPEN}{news_row.L_READ_FULL}{news_row.CLOSE} + {L_TOPIC_VIEWS}{L_COLON} {news.news_row.TOPIC_VIEWS}  •  {L_COMMENTS}{L_COLON} {news.news_row.REPLIES}  •  {L_PORTAL_POST_REPLY} + {news.news_row.OPEN}{news.news_row.L_READ_FULL}{news.news_row.CLOSE}
{L_BACK_TO_TOP}
-
- - - +
+ + +
@@ -49,5 +52,7 @@
+ +
-{$C_BLOCK_F_L}{$C_BLOCK_F_R} \ No newline at end of file +{$C_BLOCK_F_L}{$C_BLOCK_F_R} diff --git a/styles/prosilver/template/portal/modules/news_compact_center.html b/styles/prosilver/template/portal/modules/news_compact_center.html index b89d37af..ca666176 100644 --- a/styles/prosilver/template/portal/modules/news_compact_center.html +++ b/styles/prosilver/template/portal/modules/news_compact_center.html @@ -1,5 +1,7 @@ + + - + {$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R}
@@ -8,10 +10,10 @@
{$C_BLOCK_F_L}{$C_BLOCK_F_R} - + {$CC_BLOCK_H_L} -
{$TITLE}
- +
{$TITLE}
+
{L_REPLIES}
{L_VIEWS}
@@ -19,51 +21,51 @@ {$CC_BLOCK_H_R}
    -
  • -
    -
    style="background-image: url({T_ICONS_PATH}{news_row.TOPIC_ICON_IMG}); background-repeat: no-repeat;" title="{news_row.TOPIC_FOLDER_IMG_ALT}"> - - {NEWEST_POST_IMG} +
  • +
    +
    style="background-image: url({T_ICONS_PATH}{news.news_row.TOPIC_ICON_IMG}); background-repeat: no-repeat;" title="{news.news_row.TOPIC_FOLDER_IMG_ALT}"> + + {NEWEST_POST_IMG}
    - {news_row.ATTACH_ICON_IMG} - {news_row.TITLE} • {L_VIEW_UNREAD_POST} • - + {news.news_row.ATTACH_ICON_IMG} + {news.news_row.TITLE} • {L_VIEW_UNREAD_POST} • + -
    {L_POSTED} {L_POST_BY_AUTHOR} {news_row.POSTER_FULL} » {news_row.TIME} - -
    {L_FORUM}{L_COLON} {news_row.FORUM_NAME} +
    {L_POSTED} {L_POST_BY_AUTHOR} {news.news_row.POSTER_FULL} » {news.news_row.TIME} + +
    {L_FORUM}{L_COLON} {news.news_row.FORUM_NAME} - • {L_REPLIES}{L_COLON} {news_row.REPLIES} • {L_VIEWS}{L_COLON} {news_row.TOPIC_VIEWS} + • {L_REPLIES}{L_COLON} {news.news_row.REPLIES} • {L_VIEWS}{L_COLON} {news.news_row.TOPIC_VIEWS}
    -
    {news_row.REPLIES} {L_REPLIES}
    -
    {news_row.TOPIC_VIEWS} {L_VIEWS}
    +
    {news.news_row.REPLIES} {L_REPLIES}
    +
    {news.news_row.TOPIC_VIEWS} {L_VIEWS}
    -
    {L_LAST_POST}{L_POST_BY_AUTHOR} {news_row.USERNAME_FULL_LAST} {NEWEST_POST_IMG}{READ_POST_IMG}
    - {news_row.LAST_POST_TIME}     +
    {L_LAST_POST}{L_POST_BY_AUTHOR} {news.news_row.USERNAME_FULL_LAST} {NEWEST_POST_IMG}{READ_POST_IMG}
    + {news.news_row.LAST_POST_TIME}
    • - - -
  • + + +
    • @@ -73,3 +75,5 @@ + +