From e110d591a93b518edca00f01823d62c4d1a0ca91 Mon Sep 17 00:00:00 2001 From: Cesar G Date: Fri, 11 Oct 2013 18:48:09 -0700 Subject: [PATCH] [ticket/11241] Consolidate topic actions into "Topic tools" dropdown. PHPBB3-11241 --- phpBB/includes/functions_display.php | 2 + phpBB/language/en/viewtopic.php | 1 + .../prosilver/template/overall_footer.html | 3 -- .../prosilver/template/viewtopic_body.html | 51 +++++++++++++++---- phpBB/viewtopic.php | 9 ++-- 5 files changed, 49 insertions(+), 17 deletions(-) diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 5592aa89ba..0ff842ea6a 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1464,6 +1464,8 @@ function phpbb_gen_download_links($param_key, $param_val, $phpbb_root_path, $php } $methods = compress::methods(); + // Sort by preferred type. + $methods = array_intersect(array('.zip', '.tar.bz2', '.tar.gz', '.tar'), $methods); $links = array(); foreach ($methods as $method) diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php index 6f318c39f1..424cb9da3e 100644 --- a/phpBB/language/en/viewtopic.php +++ b/phpBB/language/en/viewtopic.php @@ -104,6 +104,7 @@ $lang = array_merge($lang, array( 'SUBMIT_VOTE' => 'Submit vote', + 'TOPIC_TOOLS' => 'Topic tools', 'TOTAL_VOTES' => 'Total votes', 'UNLOCK_TOPIC' => 'Unlock topic', diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 6f297660a2..bbffe8dc3d 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -12,9 +12,6 @@
  • {S_WATCH_FORUM_TITLE}
    • -
  • {S_WATCH_TOPIC_TITLE}
    • -
  • {S_BOOKMARK_TOPIC}
    • -
  • {L_BUMP_TOPIC}
  • {S_TIMEZONE}
  • {L_DELETE_COOKIES}
    • diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 46881d3b03..b4d6a67712 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -33,6 +33,46 @@ + {% block topic_tools %} + +
    + + +
    + + {% endblock %} +
    - -
    - {L_DOWNLOAD_ALL_ATTACHMENTS}{L_COLON} - -
    - + {{ block('topic_tools') }}