[ticket/365] Move CSS of lines related to portal users icons to portal.css

B3P-365
2014-09-07 00:35:37 +02:00
parent 8258d70f07
commit 7fc27b3483
7 changed files with 52 additions and 51 deletions
--- a/styles/prosilver/template/portal/modules/birthdays_side.html
+++ b/styles/prosilver/template/portal/modules/birthdays_side.html
@@ -3,12 +3,12 @@
 			<strong>{L_CONGRATULATIONS}{L_COLON}</strong><br />
 			<!-- BEGIN board3_birthday_list -->
 			<span class="portal-user-icon"></span>
-			<span style="float:left; padding-left:5px; padding-top:2px;">
+			<span class="portal-user-span">
 				{board3_birthday_list.USER}
 			</span>
-			<span style="float: right;">
+			<span class="portal-user-annotation">
 				<!-- IF board3_birthday_list.AGE -->{board3_birthday_list.AGE}<!-- ENDIF -->
-			</span><br style="clear: both" />
+			</span><br class="portal-clear" />
 			<!-- END board3_birthday_list -->
 			<!-- ELSE -->
 			{L_NO_BIRTHDAYS}
@@ -20,12 +20,12 @@
 				<!-- IF BIRTHDAYS_AHEAD_LIST -->
 				<!-- BEGIN board3_birthday_ahead_list -->
 				<span class="portal-user-icon"></span>
-				<span style="float:left; padding-left: 5px; padding-top: 3px;">
+				<span class="portal-user-span">
 					<span title="{board3_birthday_ahead_list.DATE}">{board3_birthday_ahead_list.USER}</span>
 				</span>
-				<span style="float: right; padding-top:3px;">
+				<span class="portal-user-annotation">
 					<!-- IF board3_birthday_ahead_list.AGE -->{board3_birthday_ahead_list.AGE}<!-- ENDIF -->
-				</span><br style="clear: both" />
+				</span><br class="portal-clear" />
 				<!-- END board3_birthday_ahead_list -->
 				<!-- ELSE -->
 				{L_NO_BIRTHDAYS_AHEAD}
--- 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}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
 	<strong style="color:green<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->; float: right;<!-- ENDIF -->">{L_FRIENDS_ONLINE}</strong><br />
 	<!-- BEGIN b3p_friends_online -->
-        <span class="portal-user-icon"></span><span style="<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->float:right; padding-right:5px;<!-- ELSE -->float:left; padding-left:5px;<!-- ENDIF --> padding-top:2px;">{b3p_friends_online.USERNAME_FULL}</span><br style="clear:both" />
+        <span class="portal-user-icon"></span><span class="portal-user-span">{b3p_friends_online.USERNAME_FULL}</span><br class="portal-clear" />
    <!-- BEGINELSE -->
-        <span style="<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->float:right; padding-right:5px;<!-- ELSE -->float:left; padding-left:5px;<!-- ENDIF --> padding-top:2px;">{L_NO_FRIENDS_ONLINE}</span>
-        <br style="clear:both" />
+        <span class="portal-user-span">{L_NO_FRIENDS_ONLINE}</span>
+        <br class="portal-clear" />
    <!-- END b3p_friends_online -->
-		<br style="clear:both" />
+		<br class="portal-clear" />
 		<strong style="color:red<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->; float: right;<!-- ENDIF -->">{L_FRIENDS_OFFLINE}</strong><br />
 	<!-- BEGIN b3p_friends_offline -->
-        <span class="portal-user-icon"></span><span style="<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->float:right; padding-right:5px;<!-- ELSE -->float:left; padding-left:5px;<!-- ENDIF --> padding-top:2px;">{b3p_friends_offline.USERNAME_FULL}</span><br style="clear:both" />
+        <span class="portal-user-icon"></span><span class="portal-user-span">{b3p_friends_offline.USERNAME_FULL}</span><br class="portal-clear" />
    <!-- BEGINELSE -->
-        <span style="<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->float:right; padding-right:5px;<!-- ELSE -->float:left; padding-left:5px;<!-- ENDIF --> padding-top:2px;">{L_NO_FRIENDS_OFFLINE}</span>
+        <span class="portal-user-span">{L_NO_FRIENDS_OFFLINE}</span>
    <!-- END b3p_friends_offline -->
 	<br />
-{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
+{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
--- 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}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
-	<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-	<span style="float:left;"><strong>{L_JOINED}</strong></span>
-	<span style="float:right;padding-right:10px;"><strong>{L_USERNAME}</strong></span><br style="clear:both" />
-	<!-- ELSE -->
-	<span style="float:left;"><strong>{L_USERNAME}</strong></span>
-	<span style="float:right;padding-right:10px;"><strong>{L_JOINED}</strong></span><br style="clear:both" />
-	<!-- ENDIF -->
+	<span class="portal-user-span"><strong>{L_USERNAME}</strong></span>
+	<span class="portal-user-annotation"><strong>{L_JOINED}</strong></span><br style="clear:both" />
 	<!-- BEGIN latest_members -->
-		<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-		<span style="float:left;">{latest_members.JOINED}</span>
-		<span class="portal-user-icon">&nbsp;</span><span style="float:right; padding-right:5px; padding-top:2px;">{latest_members.USERNAME_FULL}</span><br style="clear:both" />
-		<!-- ELSE -->
-		<span class="portal-user-icon"></span><span style="float:left; padding-left:5px; padding-top:2px;">{latest_members.USERNAME_FULL}</span>
-		<span style="float:right;padding-right:10px; padding-top:2px;">{latest_members.JOINED}</span><br style="clear:both" />
-		<!-- ENDIF -->
+		<span class="portal-user-icon"></span><span class="portal-user-span">{latest_members.USERNAME_FULL}</span>
+		<span class="portal-user-annotation">{latest_members.JOINED}</span><br class="portal-clear" />
 	<!-- END latest_members -->
 {$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
--- 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}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
 	<!-- BEGIN group -->
-		<strong<!-- IF S_CONTENT_DIRECTION eq 'rtl' --> style="float: right;"<!-- ENDIF -->><a href="{group.U_GROUP}" style="color: #{group.GROUP_COLOUR};" class="username-coloured">{group.GROUP_NAME}</a></strong><br />
+		<strong class="portal-user-span"><a href="{group.U_GROUP}" style="color: #{group.GROUP_COLOUR};" class="username-coloured">{group.GROUP_NAME}</a></strong><br class="portal-clear" />
 	<!-- BEGIN member -->
-		<span class="portal-user-icon"></span><span style="<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->float:right; padding-right:5px;<!-- ELSE -->float:left; padding-left:5px;<!-- ENDIF --> padding-top:2px;"><strong>{group.member.USERNAME_FULL}</strong></span><br style="clear:both" />
+		<span class="portal-user-icon"></span><span class="portal-user-span"><strong>{group.member.USERNAME_FULL}</strong></span><br class="portal-clear" />
 	<!-- END member -->
-	<br style="clear:both" />
+	<br class="portal-clear" />
 	<!-- BEGINELSE -->
 		{L_NO_GROUPS_P}
 	<!-- END group -->
-{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
+{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
--- 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}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
-	<strong<!-- IF S_CONTENT_DIRECTION eq 'rtl' --> style="float: right;"<!-- ENDIF -->>{L_ADMINISTRATORS}</strong><br />
+	<strong class="portal-user-span">{L_ADMINISTRATORS}</strong><br class="portal-clear" />
 	<!-- BEGIN b3p_admins -->
-		<span class="portal-user-icon"></span><span style="<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->float:right; padding-right:5px;<!-- ELSE -->float:left; padding-left:5px;<!-- ENDIF --> padding-top:2px;"><strong>{b3p_admins.USERNAME_FULL}</strong></span><br style="clear:both" />
+		<span class="portal-user-icon"></span><span class="portal-user-span"><strong>{b3p_admins.USERNAME_FULL}</strong></span><br class="portal-clear" />
 	<!-- BEGINELSE -->
 		{L_NO_ADMINISTRATORS_P}<br /><br />
 	<!-- END b3p_admins -->
 	<br style="clear:both" />
-	<strong<!-- IF S_CONTENT_DIRECTION eq 'rtl' --> style="float: right;"<!-- ENDIF -->>{L_MODERATORS}</strong><br />
+	<strong class="portal-user-span">{L_MODERATORS}</strong><br class="portal-clear" />
 	<!-- BEGIN b3p_moderator -->
-		<span class="portal-user-icon"></span><span style="<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->float:right; padding-right:5px;<!-- ELSE -->float:left; padding-left:5px;<!-- ENDIF --> padding-top:2px;"><strong>{b3p_moderator.USERNAME_FULL}</strong></span><br style="clear:both" />
+		<span class="portal-user-icon"></span><span class="portal-user-span"><strong>{b3p_moderator.USERNAME_FULL}</strong></span><br class="portal-clear" />
 	<!-- BEGINELSE -->
 		{L_NO_MODERATORS_P}
 	<!-- END b3p_moderator -->
--- 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}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
-	<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-	<span style="float:right;padding-right:10px;"><strong>{L_USERNAME}</strong></span>
-	<span style="float:left;"><strong>{L_POSTS}</strong></span><br style="clear:both" />
-	<!-- ELSE -->
-	<span style="float:left;"><strong>{L_USERNAME}</strong></span>
-	<span style="float:right;padding-right:10px;"><strong>{L_POSTS}</strong></span><br style="clear:both" />
-	<!-- ENDIF -->
+	<span class="portal-user-span"><strong>{L_USERNAME}</strong></span>
+	<span class="portal-user-annotation"><strong>{L_POSTS}</strong></span><br class="portal-clear" />
 	<!-- BEGIN topposters -->
-		<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-		<span class="portal-user-icon"></span><span style="float:right; padding-right:5px; padding-top:2px;">{topposters.USERNAME_FULL}</span>
-		<span style="float:left;"><a href="{topposters.S_SEARCH_ACTION}">{topposters.POSTER_POSTS}</a></span><br style="clear:both" />
-		<!-- ELSE -->
-		<span class="portal-user-icon"></span><span style="float:left; padding-left:5px; padding-top:2px;">{topposters.USERNAME_FULL}</span>
-		<span style="float:right; padding-right:10px; padding-top:2px;"><a href="{topposters.S_SEARCH_ACTION}">{topposters.POSTER_POSTS}</a></span><br style="clear:both" />
-		<!-- ENDIF -->
+		<span class="portal-user-icon"></span><span class="portal-user-span">{topposters.USERNAME_FULL}</span>
+		<span class="portal-user-annotation"><a href="{topposters.S_SEARCH_ACTION}">{topposters.POSTER_POSTS}</a></span><br class="portal-clear" />
 	<!-- END topposters -->
-{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
+{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
--- 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;