From 8258d70f07172a0661e4522cb4e4c5b26dfbdfab Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 6 Sep 2014 23:45:04 +0200 Subject: [PATCH 1/4] [ticket/365] Move inline CSS rules of portal user icon to portal.css B3P-365 --- .../template/portal/modules/birthdays_side.html | 4 ++-- .../prosilver/template/portal/modules/friends_side.html | 4 ++-- .../template/portal/modules/latest_members_side.html | 4 ++-- .../template/portal/modules/leaders_ext_side.html | 2 +- .../prosilver/template/portal/modules/leaders_side.html | 4 ++-- .../template/portal/modules/topposters_side.html | 4 ++-- styles/prosilver/theme/portal.css | 9 ++++++++- 7 files changed, 19 insertions(+), 12 deletions(-) diff --git a/styles/prosilver/template/portal/modules/birthdays_side.html b/styles/prosilver/template/portal/modules/birthdays_side.html index 303ff1b6..400ac73d 100644 --- a/styles/prosilver/template/portal/modules/birthdays_side.html +++ b/styles/prosilver/template/portal/modules/birthdays_side.html @@ -2,7 +2,7 @@ {L_CONGRATULATIONS}{L_COLON}
- + {board3_birthday_list.USER} @@ -19,7 +19,7 @@
- + {board3_birthday_ahead_list.USER} diff --git a/styles/prosilver/template/portal/modules/friends_side.html b/styles/prosilver/template/portal/modules/friends_side.html index 107d3096..7dd8cf7d 100644 --- a/styles/prosilver/template/portal/modules/friends_side.html +++ b/styles/prosilver/template/portal/modules/friends_side.html @@ -1,7 +1,7 @@ {$LR_BLOCK_H_L} {$TITLE}{$LR_BLOCK_H_R} {L_FRIENDS_ONLINE}
- {b3p_friends_online.USERNAME_FULL}
+ {b3p_friends_online.USERNAME_FULL}
{L_NO_FRIENDS_ONLINE}
@@ -9,7 +9,7 @@
{L_FRIENDS_OFFLINE}
- {b3p_friends_offline.USERNAME_FULL}
+ {b3p_friends_offline.USERNAME_FULL}
{L_NO_FRIENDS_OFFLINE} diff --git a/styles/prosilver/template/portal/modules/latest_members_side.html b/styles/prosilver/template/portal/modules/latest_members_side.html index e47a9b01..c85c4d46 100644 --- a/styles/prosilver/template/portal/modules/latest_members_side.html +++ b/styles/prosilver/template/portal/modules/latest_members_side.html @@ -9,9 +9,9 @@ {latest_members.JOINED} -  {latest_members.USERNAME_FULL}
+  {latest_members.USERNAME_FULL}
- {latest_members.USERNAME_FULL} + {latest_members.USERNAME_FULL} {latest_members.JOINED}
diff --git a/styles/prosilver/template/portal/modules/leaders_ext_side.html b/styles/prosilver/template/portal/modules/leaders_ext_side.html index 3c22cbe6..879c2056 100644 --- a/styles/prosilver/template/portal/modules/leaders_ext_side.html +++ b/styles/prosilver/template/portal/modules/leaders_ext_side.html @@ -2,7 +2,7 @@ style="float: right;">{group.GROUP_NAME}
- {group.member.USERNAME_FULL}
+ {group.member.USERNAME_FULL}

diff --git a/styles/prosilver/template/portal/modules/leaders_side.html b/styles/prosilver/template/portal/modules/leaders_side.html index 698c4005..5403e94e 100644 --- a/styles/prosilver/template/portal/modules/leaders_side.html +++ b/styles/prosilver/template/portal/modules/leaders_side.html @@ -1,14 +1,14 @@ {$LR_BLOCK_H_L} {$TITLE}{$LR_BLOCK_H_R} style="float: right;">{L_ADMINISTRATORS}
- {b3p_admins.USERNAME_FULL}
+ {b3p_admins.USERNAME_FULL}
{L_NO_ADMINISTRATORS_P}


style="float: right;">{L_MODERATORS}
- {b3p_moderator.USERNAME_FULL}
+ {b3p_moderator.USERNAME_FULL}
{L_NO_MODERATORS_P} diff --git a/styles/prosilver/template/portal/modules/topposters_side.html b/styles/prosilver/template/portal/modules/topposters_side.html index 26d41706..13395af7 100644 --- a/styles/prosilver/template/portal/modules/topposters_side.html +++ b/styles/prosilver/template/portal/modules/topposters_side.html @@ -8,10 +8,10 @@ - {topposters.USERNAME_FULL} + {topposters.USERNAME_FULL} {topposters.POSTER_POSTS}
- {topposters.USERNAME_FULL} + {topposters.USERNAME_FULL} {topposters.POSTER_POSTS}
diff --git a/styles/prosilver/theme/portal.css b/styles/prosilver/theme/portal.css index 65e1990d..827fab0d 100644 --- a/styles/prosilver/theme/portal.css +++ b/styles/prosilver/theme/portal.css @@ -49,10 +49,17 @@ list-style-type: none; } -.portal-user-span { +.portal-user-icon { background-image: url("./images/portal/portal_user.png"); padding-left: 16px; padding-top: 16px; + float: left; +} + +.rtl .portal-user-icon { + float: right; + padding-right: 10px; + padding-top: 2px; } .portal-paypal-icon { From 7fc27b34839ec98d85f64129de4868751c889e69 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 7 Sep 2014 00:35:37 +0200 Subject: [PATCH 2/4] [ticket/365] Move CSS of lines related to portal users icons to portal.css B3P-365 --- .../portal/modules/birthdays_side.html | 12 +++++----- .../template/portal/modules/friends_side.html | 14 +++++------ .../portal/modules/latest_members_side.html | 18 ++++----------- .../portal/modules/leaders_ext_side.html | 8 +++---- .../template/portal/modules/leaders_side.html | 8 +++---- .../portal/modules/topposters_side.html | 20 ++++------------ styles/prosilver/theme/portal.css | 23 ++++++++++++++++++- 7 files changed, 52 insertions(+), 51 deletions(-) diff --git a/styles/prosilver/template/portal/modules/birthdays_side.html b/styles/prosilver/template/portal/modules/birthdays_side.html index 400ac73d..87e7f871 100644 --- a/styles/prosilver/template/portal/modules/birthdays_side.html +++ b/styles/prosilver/template/portal/modules/birthdays_side.html @@ -3,12 +3,12 @@ {L_CONGRATULATIONS}{L_COLON}
- + {board3_birthday_list.USER} - + {board3_birthday_list.AGE} -
+
{L_NO_BIRTHDAYS} @@ -20,12 +20,12 @@ - + {board3_birthday_ahead_list.USER} - + {board3_birthday_ahead_list.AGE} -
+
{L_NO_BIRTHDAYS_AHEAD} diff --git a/styles/prosilver/template/portal/modules/friends_side.html b/styles/prosilver/template/portal/modules/friends_side.html index 7dd8cf7d..ea1e6740 100644 --- a/styles/prosilver/template/portal/modules/friends_side.html +++ b/styles/prosilver/template/portal/modules/friends_side.html @@ -1,17 +1,17 @@ {$LR_BLOCK_H_L} {$TITLE}{$LR_BLOCK_H_R} {L_FRIENDS_ONLINE}
- {b3p_friends_online.USERNAME_FULL}
+ {b3p_friends_online.USERNAME_FULL}
- {L_NO_FRIENDS_ONLINE} -
+ {L_NO_FRIENDS_ONLINE} +
-
+
{L_FRIENDS_OFFLINE}
- {b3p_friends_offline.USERNAME_FULL}
+ {b3p_friends_offline.USERNAME_FULL}
- {L_NO_FRIENDS_OFFLINE} + {L_NO_FRIENDS_OFFLINE}
-{$LR_BLOCK_F_L}{$LR_BLOCK_F_R} \ No newline at end of file +{$LR_BLOCK_F_L}{$LR_BLOCK_F_R} diff --git a/styles/prosilver/template/portal/modules/latest_members_side.html b/styles/prosilver/template/portal/modules/latest_members_side.html index c85c4d46..3d4a9a56 100644 --- a/styles/prosilver/template/portal/modules/latest_members_side.html +++ b/styles/prosilver/template/portal/modules/latest_members_side.html @@ -1,18 +1,8 @@ {$LR_BLOCK_H_L} {$TITLE}{$LR_BLOCK_H_R} - - {L_JOINED} - {L_USERNAME}
- - {L_USERNAME} - {L_JOINED}
- + {L_USERNAME} + {L_JOINED}
- - {latest_members.JOINED} -  {latest_members.USERNAME_FULL}
- - {latest_members.USERNAME_FULL} - {latest_members.JOINED}
- + {latest_members.USERNAME_FULL} + {latest_members.JOINED}
{$LR_BLOCK_F_L}{$LR_BLOCK_F_R} \ No newline at end of file diff --git a/styles/prosilver/template/portal/modules/leaders_ext_side.html b/styles/prosilver/template/portal/modules/leaders_ext_side.html index 879c2056..9503a586 100644 --- a/styles/prosilver/template/portal/modules/leaders_ext_side.html +++ b/styles/prosilver/template/portal/modules/leaders_ext_side.html @@ -1,11 +1,11 @@ {$LR_BLOCK_H_L} {$TITLE}{$LR_BLOCK_H_R} - style="float: right;">{group.GROUP_NAME}
+ {group.GROUP_NAME}
- {group.member.USERNAME_FULL}
+ {group.member.USERNAME_FULL}
-
+
{L_NO_GROUPS_P} -{$LR_BLOCK_F_L}{$LR_BLOCK_F_R} \ No newline at end of file +{$LR_BLOCK_F_L}{$LR_BLOCK_F_R} diff --git a/styles/prosilver/template/portal/modules/leaders_side.html b/styles/prosilver/template/portal/modules/leaders_side.html index 5403e94e..539e9856 100644 --- a/styles/prosilver/template/portal/modules/leaders_side.html +++ b/styles/prosilver/template/portal/modules/leaders_side.html @@ -1,14 +1,14 @@ {$LR_BLOCK_H_L} {$TITLE}{$LR_BLOCK_H_R} - style="float: right;">{L_ADMINISTRATORS}
+ {L_ADMINISTRATORS}
- {b3p_admins.USERNAME_FULL}
+ {b3p_admins.USERNAME_FULL}
{L_NO_ADMINISTRATORS_P}


- style="float: right;">{L_MODERATORS}
+ {L_MODERATORS}
- {b3p_moderator.USERNAME_FULL}
+ {b3p_moderator.USERNAME_FULL}
{L_NO_MODERATORS_P} diff --git a/styles/prosilver/template/portal/modules/topposters_side.html b/styles/prosilver/template/portal/modules/topposters_side.html index 13395af7..38ad9e1e 100644 --- a/styles/prosilver/template/portal/modules/topposters_side.html +++ b/styles/prosilver/template/portal/modules/topposters_side.html @@ -1,18 +1,8 @@ {$LR_BLOCK_H_L} {$TITLE}{$LR_BLOCK_H_R} - - {L_USERNAME} - {L_POSTS}
- - {L_USERNAME} - {L_POSTS}
- + {L_USERNAME} + {L_POSTS}
- - {topposters.USERNAME_FULL} - {topposters.POSTER_POSTS}
- - {topposters.USERNAME_FULL} - {topposters.POSTER_POSTS}
- + {topposters.USERNAME_FULL} + {topposters.POSTER_POSTS}
-{$LR_BLOCK_F_L}{$LR_BLOCK_F_R} \ No newline at end of file +{$LR_BLOCK_F_L}{$LR_BLOCK_F_R} diff --git a/styles/prosilver/theme/portal.css b/styles/prosilver/theme/portal.css index 827fab0d..18aa09fb 100644 --- a/styles/prosilver/theme/portal.css +++ b/styles/prosilver/theme/portal.css @@ -54,14 +54,35 @@ padding-left: 16px; padding-top: 16px; float: left; + margin-bottom: 2px; } .rtl .portal-user-icon { float: right; - padding-right: 10px; +} + +.portal-user-span { + float: left; + padding-left: 5px; padding-top: 2px; } +.rtl .portal-user-span { + float: right; + padding: 2px 5px 0 0; +} + +.portal-user-annotation { + float: right; + padding-top: 2px; + padding-right: 10px; +} + +.rtl .portal-user-annotation { + float: left; + padding-right: 0px; +} + .portal-paypal-icon { background-image: url("./images/portal/paypal.gif"); background-repeat: no-repeat; From d7343e2b3dc77ddc1623105b7b9dbc155627f188 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 7 Sep 2014 14:53:01 +0200 Subject: [PATCH 3/4] [ticket/365] Use css classes in attachments module B3P-365 --- .../portal/modules/attachments_center.html | 10 +++--- .../portal/modules/attachments_side.html | 10 +++--- styles/prosilver/theme/portal.css | 35 +++++++++++++++++++ 3 files changed, 45 insertions(+), 10 deletions(-) diff --git a/styles/prosilver/template/portal/modules/attachments_center.html b/styles/prosilver/template/portal/modules/attachments_center.html index 94187a2e..053fdd72 100644 --- a/styles/prosilver/template/portal/modules/attachments_center.html +++ b/styles/prosilver/template/portal/modules/attachments_center.html @@ -2,15 +2,15 @@
- {L_FILENAME}
+ {L_FILENAME}
-   {attach_center.FILENAME}
- {L_FILESIZE}{L_COLON}{attach_center.FILESIZE}
- {L_DOWNLOADS}{L_COLON}{attach_center.DOWNLOAD_COUNT}
+   {attach_center.FILENAME}
+ {L_FILESIZE}{L_COLON}{attach_center.FILESIZE}
+ {L_DOWNLOADS}{L_COLON}{attach_center.DOWNLOAD_COUNT}
- {L_NO_ATTACHMENTS}
+ {L_NO_ATTACHMENTS}
diff --git a/styles/prosilver/template/portal/modules/attachments_side.html b/styles/prosilver/template/portal/modules/attachments_side.html index ccaa082d..9cf9c910 100644 --- a/styles/prosilver/template/portal/modules/attachments_side.html +++ b/styles/prosilver/template/portal/modules/attachments_side.html @@ -1,13 +1,13 @@ {$LR_BLOCK_H_L} {$TITLE}{$LR_BLOCK_H_R} - {L_FILENAME}
+ {L_FILENAME}
-   {attach_side.FILENAME}
- {L_FILESIZE}{L_COLON}{attach_side.FILESIZE}
- {L_DOWNLOADS}{L_COLON}{attach_side.DOWNLOAD_COUNT}
+   {attach_side.FILENAME}
+ {L_FILESIZE}{L_COLON}{attach_side.FILESIZE}
+ {L_DOWNLOADS}{L_COLON}{attach_side.DOWNLOAD_COUNT}
- {L_NO_ATTACHMENTS}
+ {L_NO_ATTACHMENTS}
{$LR_BLOCK_F_L}{$LR_BLOCK_F_R} diff --git a/styles/prosilver/theme/portal.css b/styles/prosilver/theme/portal.css index 18aa09fb..4b2258ec 100644 --- a/styles/prosilver/theme/portal.css +++ b/styles/prosilver/theme/portal.css @@ -83,6 +83,41 @@ padding-right: 0px; } +.portal-title-span { + float: left; +} + +.rtl .portal-title-span { + float: right; +} + +.rtl .portal-title-link { + float: right; + padding-right: 2px; +} + +.portal-text-span { + float: left; + padding-right: 10px; +} + +.rtl .portal-text-span { + float: right; + padding-right: 0px; + padding-left: 10px; +} + +.portal-data-span { + float: right; + padding-right: 10px; +} + +.rtl .portal-data-span { + float: left; + padding-right: 0px; + padding-left: 10px; +} + .portal-paypal-icon { background-image: url("./images/portal/paypal.gif"); background-repeat: no-repeat; From 8fb01f997d71489902ff45a0e8439940a6a289ed Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 7 Sep 2014 15:03:17 +0200 Subject: [PATCH 4/4] [ticket/365] Add missing removal of inline css in edited files B3P-365 --- .../prosilver/template/portal/modules/latest_members_side.html | 2 +- styles/prosilver/template/portal/modules/leaders_side.html | 2 +- styles/prosilver/template/portal/portal_body.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/styles/prosilver/template/portal/modules/latest_members_side.html b/styles/prosilver/template/portal/modules/latest_members_side.html index 3d4a9a56..efbc07d8 100644 --- a/styles/prosilver/template/portal/modules/latest_members_side.html +++ b/styles/prosilver/template/portal/modules/latest_members_side.html @@ -1,6 +1,6 @@ {$LR_BLOCK_H_L} {$TITLE}{$LR_BLOCK_H_R} {L_USERNAME} - {L_JOINED}
+ {L_JOINED}
{latest_members.USERNAME_FULL} {latest_members.JOINED}
diff --git a/styles/prosilver/template/portal/modules/leaders_side.html b/styles/prosilver/template/portal/modules/leaders_side.html index 539e9856..38bc318f 100644 --- a/styles/prosilver/template/portal/modules/leaders_side.html +++ b/styles/prosilver/template/portal/modules/leaders_side.html @@ -5,7 +5,7 @@ {L_NO_ADMINISTRATORS_P}

-
+
{L_MODERATORS}
{b3p_moderator.USERNAME_FULL}
diff --git a/styles/prosilver/template/portal/portal_body.html b/styles/prosilver/template/portal/portal_body.html index cc505e0a..c065ec9f 100644 --- a/styles/prosilver/template/portal/portal_body.html +++ b/styles/prosilver/template/portal/portal_body.html @@ -86,7 +86,7 @@ -
+