Merge pull request #293 from annando/1508-basepath

Installation in a subdirectory made problems with this addon

diff --git a/buglink/buglink.php b/buglink/buglink.php
index 6404307f56ce0dee082f692b52bda44e37d99fee..06eaddbb6a939032b66252759b23877449d3c1b2 100755 (executable)
--- a/buglink/buglink.php
+++ b/buglink/buglink.php
@@ -12,4 +12,4 @@ function buglink_install() { register_hook('page_end', 'addon/buglink/buglink.ph
 
 function buglink_uninstall() { unregister_hook('page_end', 'addon/buglink/buglink.php', 'buglink_active'); }
 
-function buglink_active(&$a,&$b) { $b .= '<div style="position: fixed; bottom: 5px; left: 5px;"><a href="https://github.com/friendica/friendica/issues" target="_blank" title="' . t('Report Bug') . '"><img src="addon/buglink/bug-x.gif" alt="' . t('Report Bug') . '" /></a></div>'; } 
+function buglink_active(&$a,&$b) { $b .= '<div id="buglink_wrapper" style="position: fixed; bottom: 5px; left: 5px;"><a href="https://github.com/friendica/friendica/issues" target="_blank" title="' . t('Report Bug') . '"><img src="addon/buglink/bug-x.gif" alt="' . t('Report Bug') . '" /></a></div>'; } 

diff --git a/forumlist/forumlist.php b/forumlist/forumlist.php
index 61a20c71bd475217d8b69a4ec10876693184551d..6dd283f7086bf664db00b432b194581b975d8658 100644 (file)
--- a/forumlist/forumlist.php
+++ b/forumlist/forumlist.php
@@ -65,7 +65,7 @@ function forumlist_network_mod_init($a,$b) {
 
        $forumlist .= '<div id="hide-forum-list" class="fakelink" onclick="openClose(\'forum-list\');" >' 
                                . t('show/hide') . '</div>'
-                               . '<div id="forum-list" style="display: none;">';
+                               . '<div role="menu" id="forum-list" style="display: none;">';
 
 
        $randomise = intval(get_pconfig(local_user(),'forumlist','randomise'));
@@ -74,13 +74,13 @@ function forumlist_network_mod_init($a,$b) {
 
        if(count($contacts)) {
                foreach($contacts as $contact) {
-                       $forumlist .= '<div><a href="' . $a->get_baseurl() . '/redir/' . $contact["id"] . '" title="' . $contact['url'] . '" class="label sparkle" target="_blank"><img class="forumlist-img" height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /></a> <a href="' . $a->get_baseurl() . '/network?f=&cid=' . $contact['id'] . '" >' . $contact["name"]."</a></div>";
+                       $forumlist .= '<div role="menuitem"><a href="' . $a->get_baseurl() . '/redir/' . $contact["id"] . '" title="'.t('External link to forum').'" class="label sparkle" target="_blank"><img class="forumlist-img" height="20" width="20" src="' . $contact['micro'] .'" alt="'.t('External link to forum').'" /></a> <a href="' . $a->get_baseurl() . '/network?f=&cid=' . $contact['id'] . '" >' . $contact["name"]."</a></div>";
                }
        }
        else {
                $forumlist .= t('No forum subscriptions');
        }
-               
+
        $forumlist .= "</div></div>";
        if (sizeof($contacts) > 0)
                $a->page['aside'] = $forumlist . $a->page['aside'];

diff --git a/impressum/impressum.css b/impressum/impressum.css
index ec0b5e57608af699e92729d8b2d9cd348bcc8942..8db5f16da9039b449803f05d30c319d1435b8bb8 100644 (file)
--- a/impressum/impressum.css
+++ b/impressum/impressum.css
@@ -2,3 +2,4 @@
     padding-top: 15px;
     font-size: 0.8em;
 }
+.minimal #impressum_footer { display: none; }