Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Marc Alexander
2015-06-21 13:26:04 +02:00
parent ba64d8aef6 6a5c79787d
commit 1ce0d2d535
3 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
migrations/v210.php
View File

@@ -23,6 +23,7 @@ class v210 extends \phpbb\db\migration\migration
array('config.remove', array('board3_version_check')), array('config.remove', array('board3_version_check')),
array('custom', array(array($this, 'add_donation_setting'))), array('custom', array(array($this, 'add_donation_setting'))),
array('custom', array(array($this, 'convert_serialize_to_json'))), array('custom', array(array($this, 'convert_serialize_to_json'))),
array('custom', array(array($this, 'add_module_permissions'))),
); );
} }
@@ -89,6 +90,18 @@ class v210 extends \phpbb\db\migration\migration
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
} }
/**
* Add correct module permissions to ACP modules
*/
public function add_module_permissions()
{
$sql = 'UPDATE ' . $this->table_prefix . "modules
SET module_auth = 'ext_board3/portal && acl_a_manage_portal'
WHERE module_basename = '\\\\board3\\\\portal\\\\acp\\\\portal_module'
AND module_auth = 'acl_a_manage_portal'";
$this->db->sql_query($sql);
}
/** /**
* Unserialize links array * Unserialize links array
* *

10
styles/prosilver/theme/portal.css
View File

@@ -420,7 +420,8 @@ ul.topiclist dt {
margin-right: -60%; margin-right: -60%;
} }
ul.responsive-portal-news dd:last-of-type, ul.responsive-portal-announcements dd:last-of-type { ul.responsive-portal-news dd:last-of-type, ul.responsive-portal-announcements dd:last-of-type,
#portal-forumlist ul dd:last-of-type {
width: 25%; width: 25%;
} }
@@ -436,12 +437,13 @@ dd.responsive-portal-news:last-of-type, dd.responsive-portal-announcements:last-
margin-left: -60%; margin-left: -60%;
} }
.rtl ul.responsive-portal-news dd:last-of-type, ul.responsive-portal-announcements dd:last-of-type { .rtl ul.responsive-portal-news dd:last-of-type, ul.responsive-portal-announcements dd:last-of-type,
width: 30%; .rtl #portal-forumlist ul dd:last-of-type {
width: 25%;
} }
.rtl dd.responsive-portal-news:last-of-type, dd.responsive-portal-announcements:last-of-type { .rtl dd.responsive-portal-news:last-of-type, dd.responsive-portal-announcements:last-of-type {
width: 30%; width: 25%;
} }
/* Portal clock /* Portal clock

16
styles/prosilver/theme/portal_all.css
View File

@@ -13,3 +13,19 @@
float: left; float: left;
width: 100%; width: 100%;
} }
ul.topiclist dt .list-inner {
margin-right: 440px;
}
ul.topiclist dt {
margin-right: -440px;
}
.rtl ul.topiclist dt .list-inner {
margin-left: 440px;
}
.rtl ul.topiclist dt {
margin-left: -440px;
}