Merge "Bug 1843002: Allowing skins menu to have less needed items in '...' menu"

htdocs/lang/en.utf8/skin.php

@@ -25,13 +25,14 @@ $string['deleteskinusedinpages'] = array(
     0 => 'The skin you are about to delete is used in %d page.',
     1 => 'The skin you are about to delete is used in %d pages.');
 $string['importskins'] = 'Import skin(s)';
+$string['importskinsmenu'] = 'Import';
 $string['importskinsnotice'] = 'Please select a valid XML file to import, which contains the definition(s) of the skin(s).';
 $string['validxmlfile'] = 'Valid XML file';
 $string['notvalidxmlfile'] = 'The uploaded file is not a valid XML file.';
 $string['import'] = 'Import';
 $string['exportthisskin'] = 'Export this skin';
 $string['exportspecific'] = 'Export "%s"';
-$string['exportskins'] = 'Export skin(s)';
+$string['exportskinsmenu'] = 'Export';
 $string['createskin'] = 'Create skin';
 $string['editthisskin'] = 'Edit this skin';
 $string['editsiteskin?'] = 'This is a site skin. Do you want to edit it?';

htdocs/theme/raw/templates/skin/index.tpl

@@ -5,14 +5,24 @@
         <span class="icon icon-plus icon-lg left" role="presentation" aria-hidden="true"></span>
         {str tag=createskin section=skin}
     </a>
-    <a href="{$WWWROOT}skin/import.php{if $siteskins}?site=1{/if}" class="btn btn-secondary button" type="submit">
-        <span class="icon icon-code icon-lg left" role="presentation" aria-hidden="true"></span>
-        {str tag=importskins section=skin}
-    </a>
-    <a href="{$WWWROOT}skin/export.php{if $siteskins}?site=1{/if}" class="btn btn-secondary button" type="submit">
-        <span class="icon icon-download icon-lg left" role="presentation" aria-hidden="true"></span>
-        {str tag=exportskins section=skin}
-    </a>
+    <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+        <span class="icon icon-ellipsis-h icon-xs" role="presentation" aria-hidden="true"></span>
+        <span class="btn-title sr-only">{str tag="edit"}</span>
+    </button>
+    <ul class="dropdown-menu dropdown-menu-right" role="menu">
+        <li>
+            <a href="{$WWWROOT}skin/import.php{if $siteskins}?site=1{/if}" class="btn btn-link" type="submit">
+                <span class="icon icon-upload icon-lg left" role="presentation" aria-hidden="true"></span>
+                {str tag=importskinsmenu section=skin}
+            </a>
+        </li>
+        <li>
+            <a href="{$WWWROOT}skin/export.php{if $siteskins}?site=1{/if}" class="btn btn-link" type="submit">
+                <span class="icon icon-download icon-lg left" role="presentation" aria-hidden="true"></span>
+                {str tag=exportskinsmenu section=skin}
+            </a>
+        </li>
+    </ul>
 </div>
 
 {if !$siteskins}

test/behat/features/site_content/help_icon.feature

@@ -73,7 +73,8 @@ Scenario: Showing contextual help for pages under menu "Portfolio" (Bug 809297).
   Then I should see "You can design your own skin"
   # Import skin
   And I choose "Skins" in "Create" from main menu
-  And I follow "Import skin(s)"
+  And I press "Edit"
+  And I follow "Import" in the ".btn-top-right" "css_element"
   And I click on "Help"
   And I should see "You can import skins from other Mahara sites."
   # Export