Merge branch '2.1.x'

This commit is contained in:
Marc Alexander
2015-06-21 13:26:04 +02:00
3 changed files with 35 additions and 4 deletions

View File

@@ -23,6 +23,7 @@ class v210 extends \phpbb\db\migration\migration
array('config.remove', array('board3_version_check')),
array('custom', array(array($this, 'add_donation_setting'))),
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);
}
/**
* 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
*

View File

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

View File

@@ -13,3 +13,19 @@
float: left;
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;
}