aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPayBas <contact@paybas.com>2014-05-29 17:16:37 +0200
committerPayBas <contact@paybas.com>2014-06-15 10:02:10 +0200
commit976bda83dbfe207a29bf6c3a6fe72ceed75cd98f (patch)
tree66ea722fffa8368a70d72fe208f6dfdbb4071aee
parent49a1896a76f205b30f7daf41056dca445eecb1d7 (diff)
downloadforums-976bda83dbfe207a29bf6c3a6fe72ceed75cd98f.tar
forums-976bda83dbfe207a29bf6c3a6fe72ceed75cd98f.tar.gz
forums-976bda83dbfe207a29bf6c3a6fe72ceed75cd98f.tar.bz2
forums-976bda83dbfe207a29bf6c3a6fe72ceed75cd98f.tar.xz
forums-976bda83dbfe207a29bf6c3a6fe72ceed75cd98f.zip
[ticket/12608] Improved LTR and various bugfixes
PHPBB3-12608
Diffstat
-rw-r--r--phpBB/phpbb/notification/type/disapprove_post.php10
-rw-r--r--phpBB/phpbb/notification/type/disapprove_topic.php10
-rw-r--r--phpBB/styles/prosilver/template/notification_dropdown.html4
-rw-r--r--phpBB/styles/prosilver/template/ucp_notifications.html3
-rw-r--r--phpBB/styles/prosilver/theme/bidi.css26
-rw-r--r--phpBB/styles/prosilver/theme/common.css21
6 files changed, 59 insertions, 15 deletions
diff --git a/phpBB/phpbb/notification/type/disapprove_post.php b/phpBB/phpbb/notification/type/disapprove_post.php
index c3dbe4e91d..004c484409 100644
--- a/phpBB/phpbb/notification/type/disapprove_post.php
+++ b/phpBB/phpbb/notification/type/disapprove_post.php
@@ -31,6 +31,16 @@ class disapprove_post extends \phpbb\notification\type\approve_post
}
/**
+ * Get the styling of the notification
+ *
+ * @return string
+ */
+ public function get_styling()
+ {
+ return 'reported';
+ }
+
+ /**
* Language key used to output the text
*
* @var string
diff --git a/phpBB/phpbb/notification/type/disapprove_topic.php b/phpBB/phpbb/notification/type/disapprove_topic.php
index 2f29bb271e..42ca693f7a 100644
--- a/phpBB/phpbb/notification/type/disapprove_topic.php
+++ b/phpBB/phpbb/notification/type/disapprove_topic.php
@@ -31,6 +31,16 @@ class disapprove_topic extends \phpbb\notification\type\approve_topic
}
/**
+ * Get the styling of the notification
+ *
+ * @return string
+ */
+ public function get_styling()
+ {
+ return 'reported';
+ }
+
+ /**
* Language key used to output the text
*
* @var string
diff --git a/phpBB/styles/prosilver/template/notification_dropdown.html b/phpBB/styles/prosilver/template/notification_dropdown.html
index 4aebeb16a8..13d90a9d38 100644
--- a/phpBB/styles/prosilver/template/notification_dropdown.html
+++ b/phpBB/styles/prosilver/template/notification_dropdown.html
@@ -18,9 +18,9 @@
</li>
<!-- ENDIF -->
<!-- BEGIN notifications -->
- <li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF --><!-- IF notifications.STYLING --> {notifications.STYLING}<!-- ENDIF -->">
+ <li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF --><!-- IF notifications.STYLING --> {notifications.STYLING}<!-- ENDIF --><!-- IF not notifications.URL --> no-url<!-- ENDIF -->">
<!-- IF notifications.URL -->
- <a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}" class="notification-block" data-real-url="{notifications.URL}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->">
+ <a class="notification-block" href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}" data-real-url="{notifications.URL}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->">
<!-- ENDIF -->
<!-- IF notifications.AVATAR -->{notifications.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->
<div class="notification_text">
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index a7cf2f43aa..5d2af425e8 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -77,9 +77,6 @@
<!-- IF notification_list.FORUM --><p class="notifications_forum">{notification_list.FORUM}</p><!-- ENDIF -->
<!-- IF notification_list.REASON --><p class="notifications_reason">{notification_list.REASON}</p><!-- ENDIF -->
<p class="notifications_time">{notification_list.TIME}</p>
- <!-- IF not notification_list.URL and notification_list.U_MARK_READ -->
- <p><a href="{notification_list.U_MARK_READ}">{L_MARK_READ}</a></p>
- <!-- ENDIF -->
</div>
</div>
</dt>
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index f3902b363d..2e563a1edf 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -112,6 +112,32 @@
padding-right: 10px;
}
+.rtl .dropdown-extended .header .header_settings {
+ float: left;
+}
+
+/* Notifications
+----------------------------------------*/
+.rtl .notification_list ul li img {
+ float: right;
+ margin-left: 5px;
+ margin-right: 0;
+}
+
+.rtl .notification_list div.notifications {
+ margin-left: 0;
+ margin-right: 50px;
+}
+
+.rtl .notification_text {
+ margin-left: 0;
+ margin-right: 58px;
+}
+
+.rtl .notification_list p.notification-time {
+ text-align: left;
+}
+
/* Responsive breadcrumbs
----------------------------------------*/
.rtl .breadcrumbs .crumb {
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 75ae7ae59d..05eeee8849 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -1115,7 +1115,7 @@ form > p.post-notice strong {
.dropdown-extended ul li {
padding: 0;
- margin: 0;
+ margin: 0 !important;
float: none;
border-bottom: 1px solid;
list-style-type: none;
@@ -1160,8 +1160,8 @@ form > p.post-notice strong {
font-size: 1.1em;
}
-.dropdown-extended ul li a{
- padding: 10px;
+.dropdown-extended ul li a, .dropdown-extended ul li.no-url {
+ padding: 8px;
}
.dropdown-extended .footer > a {
@@ -1173,10 +1173,6 @@ form > p.post-notice strong {
text-decoration: none;
}
-.notification_list a.notification-block {
- padding: 8px;
-}
-
.notification_list ul li img {
float: left;
max-height: 50px;
@@ -1193,22 +1189,27 @@ form > p.post-notice strong {
.notification_list p.notification-reference,
.notification_list p.notification-location,
-.notification_list a.notification-block p.notification-reason {
+.notification_list li a p.notification-reason {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.notification_list p.notification-time {
- font-size: 0.9em;
+ font-size: 10px;
margin: 0;
text-align: right;
}
.notification_list div.notifications {
+ margin-left: 50px;
padding: 5px;
}
+.notification_list div.notifications a {
+ display: block;
+}
+
.notification_list p.notifications_title {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
font-size: 13px !important;
@@ -1219,7 +1220,7 @@ form > p.post-notice strong {
}
.notification_list p.notifications_time {
- font-size: 11px !important;
+ font-size: 10px !important;
}
.notification_text {
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-11 16:18:03 +0000