diff --git a/portal/fetch_posts.php b/portal/fetch_posts.php index 53971889..4c7d2ee1 100644 --- a/portal/fetch_posts.php +++ b/portal/fetch_posts.php @@ -205,7 +205,7 @@ class fetch_posts t.topic_title, t.topic_attachment, t.topic_views, - t.poll_title, + t.poll_start, t.topic_posts_approved, t.topic_posts_unapproved, t.topic_posts_softdeleted, @@ -334,7 +334,7 @@ class fetch_posts 'user_id' => $row['user_id'], 'user_type' => $row['user_type'], 'user_colour' => $row['user_colour'], - 'poll' => $this->get_setting_based_data($row['poll_title'], true, false), + 'poll' => $this->get_setting_based_data($row['poll_start'], true, false), 'attachment' => $this->get_setting_based_data($row['topic_attachment'], true, false), 'topic_views' => $row['topic_views'], 'forum_name' => $row['forum_name'], diff --git a/styles/prosilver/template/portal/_block_config.html b/styles/prosilver/template/portal/_block_config.html index 1ded7d7f..069d6103 100644 --- a/styles/prosilver/template/portal/_block_config.html +++ b/styles/prosilver/template/portal/_block_config.html @@ -5,13 +5,13 @@ - + - + diff --git a/styles/prosilver/template/portal/modules/announcements_center.html b/styles/prosilver/template/portal/modules/announcements_center.html index ac8ae936..b36b384d 100644 --- a/styles/prosilver/template/portal/modules/announcements_center.html +++ b/styles/prosilver/template/portal/modules/announcements_center.html @@ -3,47 +3,57 @@ - -
-
- {L_NO_ANNOUNCEMENTS} - -
-
-

id="a_{$MODULE_ID}" name="a_{$MODULE_ID}_{announcements.center_row.A_ID}">{NEWEST_POST_IMG}{READ_POST_IMG} {announcements.center_row.ATTACH_ICON_IMG} {L_VIEW_TOPIC_POLL}{L_COLON} {announcements.center_row.TITLE}

- {announcements.center_row.PAGINATION} -
    -
  • {L_POSTED} {L_POST_BY_AUTHOR}{L_COLON} {announcements.center_row.POSTER_FULL} » {announcements.center_row.TIME}
    • -
  • {L_FORUM}{L_COLON} {announcements.center_row.FORUM_NAME}{L_GLOBAL_ANNOUNCEMENT}
    • -
-
-
-
{announcements.center_row.TEXT} -
- -
-
{L_ATTACHMENTS}
- -
{announcements.center_row.attachment.DISPLAY_ATTACHMENT}
- -
- -
- {L_TOPIC_VIEWS}{L_COLON} {announcements.center_row.TOPIC_VIEWS}  •  {L_COMMENTS}{L_COLON} {announcements.center_row.REPLIES}  •  {L_POST_REPLY} - {announcements.center_row.OPEN}{announcements.center_row.L_READ_FULL}{announcements.center_row.CLOSE} -
{L_BACK_TO_TOP}
-
- -
- - -
- -
-
+ +
+
+ {L_NO_ANNOUNCEMENTS} + +
+
+

+ id="a_{$MODULE_ID}" name="a_{$MODULE_ID}_{announcements.center_row.A_ID}"> + {postrow.MINI_POST} + + id="a_{$MODULE_ID}" name="a_{$MODULE_ID}_{announcements.center_row.A_ID}"> {announcements.center_row.TITLE} +

+ {announcements.center_row.PAGINATION} +
    +
  • {L_POSTED} {L_POST_BY_AUTHOR}{L_COLON} {announcements.center_row.POSTER_FULL} » {announcements.center_row.TIME}
    • +
  • {L_FORUM}{L_COLON} {announcements.center_row.FORUM_NAME}{L_GLOBAL_ANNOUNCEMENT}
    • +
+
+
+
{announcements.center_row.TEXT} +
+ +
+
{L_ATTACHMENTS}
+ +
{announcements.center_row.attachment.DISPLAY_ATTACHMENT}
+ +
+ +
+ {L_TOPIC_VIEWS}{L_COLON} {announcements.center_row.TOPIC_VIEWS}  •  {L_COMMENTS}{L_COLON} {announcements.center_row.REPLIES}  •  {L_POST_REPLY} + {announcements.center_row.OPEN}{announcements.center_row.L_READ_FULL}{announcements.center_row.CLOSE} +
+ + + {L_BACK_TO_TOP} + +
+
+ +
+ + +
+ +
+
diff --git a/styles/prosilver/template/portal/modules/announcements_center_compact.html b/styles/prosilver/template/portal/modules/announcements_center_compact.html index 90136c8d..b98ecf4a 100644 --- a/styles/prosilver/template/portal/modules/announcements_center_compact.html +++ b/styles/prosilver/template/portal/modules/announcements_center_compact.html @@ -22,33 +22,38 @@
{$LR_BLOCK_F_L}{$LR_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 3af2d504..ed0efebb 100644 --- a/styles/prosilver/template/portal/modules/news_compact_center.html +++ b/styles/prosilver/template/portal/modules/news_compact_center.html @@ -22,31 +22,37 @@
  • -
    -
    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} - +
    + 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}"> +
    - {news.news_row.ATTACH_ICON_IMG} {news.news_row.TITLE} • {L_VIEW_UNREAD_POST} • -
    {L_POSTED} {L_POST_BY_AUTHOR} {news.news_row.POSTER_FULL} » {news.news_row.TIME} + + +
    + + + {L_POST_BY_AUTHOR} {news.news_row.POSTER_FULL} » {news.news_row.TIME} +
    -
    {L_FORUM}{L_COLON} {news.news_row.FORUM_NAME} + {L_FORUM}{L_COLON} {news.news_row.FORUM_NAME} • {L_REPLIES}{L_COLON} {news.news_row.REPLIES} • {L_VIEWS}{L_COLON} {news.news_row.TOPIC_VIEWS}
    @@ -55,7 +61,7 @@
    {news.news_row.REPLIES} {L_REPLIES}
    {news.news_row.TOPIC_VIEWS} {L_VIEWS}
    -
    {L_LAST_POST}{L_POST_BY_AUTHOR} {news.news_row.USERNAME_FULL_LAST} {NEWEST_POST_IMG}{READ_POST_IMG}
    +
    {L_LAST_POST}{L_POST_BY_AUTHOR} {news.news_row.USERNAME_FULL_LAST} {L_VIEW_LATEST_POST}{L_VIEW_LATEST_POST}
    {news.news_row.LAST_POST_TIME}
    @@ -65,6 +71,7 @@
  • diff --git a/styles/prosilver/template/portal/modules/recent_center.html b/styles/prosilver/template/portal/modules/recent_center.html index fe3abe55..1b1c5c84 100644 --- a/styles/prosilver/template/portal/modules/recent_center.html +++ b/styles/prosilver/template/portal/modules/recent_center.html @@ -1,52 +1,52 @@ {$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R}
    -
    -
    - -
    -
    +
    +
    + +
    +
    {$C_BLOCK_F_L}{$C_BLOCK_F_R} diff --git a/styles/prosilver/template/portal/modules/topposters_side.html b/styles/prosilver/template/portal/modules/topposters_side.html index 38ad9e1e..b80e5745 100644 --- a/styles/prosilver/template/portal/modules/topposters_side.html +++ b/styles/prosilver/template/portal/modules/topposters_side.html @@ -1,8 +1,8 @@ {$LR_BLOCK_H_L} {$TITLE}{$LR_BLOCK_H_R} - {L_USERNAME} - {L_POSTS}
    - - {topposters.USERNAME_FULL} - {topposters.POSTER_POSTS}
    - + {L_USERNAME} + {L_POSTS}
    + + {topposters.USERNAME_FULL} + {topposters.POSTER_POSTS}
    + {$LR_BLOCK_F_L}{$LR_BLOCK_F_R} diff --git a/styles/prosilver/template/portal/modules/user_menu_side.html b/styles/prosilver/template/portal/modules/user_menu_side.html index 504c0ad7..27124f50 100644 --- a/styles/prosilver/template/portal/modules/user_menu_side.html +++ b/styles/prosilver/template/portal/modules/user_menu_side.html @@ -1,45 +1,45 @@ {$LR_BLOCK_H_L} {$TITLE}{$LR_BLOCK_H_R} -
    - {USERNAME_FULL}
    - - {B3P_AVATAR_IMG} - - - -
    {B3P_RANK_TITLE} -
    {B3P_RANK_IMG} -
    -
    -
    -
    {L_M_MENU}
    - -
    -{$LR_BLOCK_F_L}{$LR_BLOCK_F_R} +
    + {USERNAME_FULL}
    + + {B3P_AVATAR_IMG} + + + +
    {B3P_RANK_TITLE} +
    {B3P_RANK_IMG} +
    +
    +
    +
    {L_M_MENU}
    + +
    +{$LR_BLOCK_F_L}{$LR_BLOCK_F_R} \ No newline at end of file diff --git a/styles/prosilver/theme/portal.css b/styles/prosilver/theme/portal.css index 646787c5..1d2d59f1 100644 --- a/styles/prosilver/theme/portal.css +++ b/styles/prosilver/theme/portal.css @@ -16,12 +16,8 @@ } .portal-navigation ul li a{ - background-image: url("./images/portal/arrowbullet.gif"); - background-repeat: no-repeat; - background-position: center left; /*custom bullet list image*/ display: block; padding: 2px 0; - padding-left: 19px; /*link text is indented 19px*/ font-weight: bold; font-size: 90%; } @@ -52,8 +48,6 @@ } .portal-user-icon { - background-image: url("../../all/theme/images/portal/portal_user.png"); - padding-left: 16px; padding-top: 16px; float: left; margin-bottom: 2px; @@ -63,22 +57,6 @@ float: right; } -.portal-arrow-left-icon { - background-image: url('../../all/theme/images/portal/cal_icon_left_arrow.png'); - padding-left: 16px; - padding-top: 16px; - float: left; - margin-bottom: 2px; -} - -.portal-arrow-right-icon { - background-image: url('../../all/theme/images/portal/cal_icon_right_arrow.png'); - padding-left: 16px; - padding-top: 16px; - float: right; - margin-bottom: 2px; -} - .portal-user-span { float: left; padding-left: 5px; @@ -144,6 +122,10 @@ min-height: 1em; } +.content li { + list-style-type: inherit !important; +} + .portal-stylechanger-select { width: 150px; } @@ -367,7 +349,7 @@ a.portal-forumtitle { } #portal-body .row .pagination { - padding: 1px 0 1px 12px; + margin: 1px 0 1px 12px; } #portal-body #viewpoll { @@ -406,9 +388,6 @@ a.portal-forumtitle { /* RTL language fixes */ .rtl .portal-navigation ul li a{ - background-image: url("./images/portal/arrowbullet_rtl.gif"); - background-position: center right; /* custom bullet list image */ - padding-right: 19px; /* link text is indented 19px */ text-align: right; } @@ -634,3 +613,8 @@ dd.responsive-portal-news:last-of-type, dd.responsive-portal-announcements:last- margin-left: -1px; } } + +.fa-backward, .fa-forward { + font-size: 1.4em; + margin-bottom: 4px; +} \ No newline at end of file diff --git a/styles/prosilver/theme/portal_all_responsive.css b/styles/prosilver/theme/portal_all_responsive.css index 34c15b01..a173a691 100644 --- a/styles/prosilver/theme/portal_all_responsive.css +++ b/styles/prosilver/theme/portal_all_responsive.css @@ -35,12 +35,6 @@ .portal-body-center dt { width: 100% !important; } } -@media only screen and (max-width: 550px), only screen and (max-device-width: 550px) { - .portal-body-center ul.topiclist dt .list-inner { - margin-right: 0; - } -} - @media only screen and (max-width: 540px), only screen and (max-device-width: 540px) { #portal-left, #portal-right { display: none;