Skip to content
GitLab
Commit 2d7f28bb authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1825688: Add title tag for "More options" button on details page"

parents c8cbc224 c3fda580
Hide whitespace changes
Inline Side-by-side
htdocs/theme/raw/templates/artefact/artefact.tpl
View file @ 2d7f28bb
......@@ -49,9 +49,9 @@
<div class="btn-top-right btn-group btn-group-top float-right">
{if $LOGGEDIN && (!$userisowner || ($userisowner && $objectedpage))}
<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" title="{str tag='moreoptions'}" aria-expanded="false">
<span class="icon icon-ellipsis-h" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag="more..."}</span>
<span class="sr-only">{str tag="moreoptions"}</span>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
<li class="dropdown-item">
......
htdocs/theme/raw/templates/header/pageactions.tpl
View file @ 2d7f28bb
......@@ -16,7 +16,7 @@
<button type="button" class="btn btn-secondary dropdown-toggle" title="{str tag='moreoptions'}" data-toggle="dropdown" aria-expanded="false">
<span class="icon icon-ellipsis-h icon-lg" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag="more..."}</span>
<span class="sr-only">{str tag="moreoptions"}</span>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
......
htdocs/theme/raw/templates/styleguide.tpl
View file @ 2d7f28bb
......@@ -173,9 +173,9 @@ Switchboxes are used for Yes/No, On/Off or other true/false type fields. They ar
This button is used to show there are more options available. An example can be found on a regular portfolio page where the items of the "Watchlist" and "Objectionable content" are available via the "More options" button. Note: Styles are only added for layout here in the style guide.
```
<div class="btn-group" style="margin-left: 200px;">
<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" title="{str tag='moreoptions'}" aria-expanded="false">
<span class="icon icon-ellipsis-h icon-lg" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag=more...}</span>
<span class="sr-only">{str tag=moreoptions}</span>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
<li class="dropdown-item">
......@@ -740,7 +740,7 @@ This card is used to show a page.
<div class="card-footer">
<div class="page-access"></div>
<div class="page-controls">
<a href="#" class="dropdown-toggle moremenu btn btn-link" data-toggle="dropdown" aria-expanded="false" title="More...">
<a href="#" class="dropdown-toggle moremenu btn btn-link" data-toggle="dropdown" aria-expanded="false" title="{str tag='moreoptions'}">
<span class="icon icon-chevron-down open-indicator" role="presentation" aria-hidden="true"></span>
<span class="icon icon-ellipsis-v close-indicator" role="presentation" aria-hidden="true"></span>
<span class="sr-only">More options for "Dashboard page"</span>
......@@ -811,7 +811,7 @@ section .card-quarter:nth-child(4n) .page-access .dropdown-menu {
</ul>
</div>
<div class="page-controls">
<a href="#" class="dropdown-toggle moremenu btn btn-link" data-toggle="dropdown" aria-expanded="false" title="More...">
<a href="#" class="dropdown-toggle moremenu btn btn-link" data-toggle="dropdown" aria-expanded="false" title="{str tag='moreoptions'}">
<span class="icon icon-chevron-down open-indicator" role="presentation" aria-hidden="true"></span>
<span class="icon icon-ellipsis-v close-indicator" role="presentation" aria-hidden="true"></span>
<span class="sr-only">More options for "Dashboard page"</span>
......@@ -883,7 +883,7 @@ section .card-quarter:nth-child(4n) .page-access .dropdown-menu {
</ul>
</div>
<div class="page-controls">
<a href="#" class="dropdown-toggle moremenu btn btn-link" data-toggle="dropdown" aria-expanded="false" title="More...">
<a href="#" class="dropdown-toggle moremenu btn btn-link" data-toggle="dropdown" aria-expanded="false" title="{str tag='moreoptions'}">
<span class="icon icon-chevron-down open-indicator" role="presentation" aria-hidden="true"></span>
<span class="icon icon-ellipsis-v close-indicator" role="presentation" aria-hidden="true"></span>
<span class="sr-only">More options for "collection"</span>
......
htdocs/theme/raw/templates/view/indexresults.tpl
View file @ 2d7f28bb
......@@ -95,7 +95,7 @@
</div>
<div class="page-controls">
<a href="#" class="dropdown-toggle moremenu btn btn-link" data-toggle="dropdown" aria-expanded="false" title="{str tag='more...' section='mahara'}">
<a href="#" class="dropdown-toggle moremenu btn btn-link" data-toggle="dropdown" aria-expanded="false" title="{str tag='moreoptions' section='mahara'}">
<span class="icon icon-chevron-down open-indicator" role="presentation" aria-hidden="true"></span>
<span class="icon icon-ellipsis-v close-indicator" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag=moreoptionsfor section=mahara arg1="$view.vtitle"}</span>
......
test/behat/features/site_features/viewing_watchlist.feature
View file @ 2d7f28bb
......@@ -25,7 +25,7 @@ Scenario: Viewing a list of pages I watch from the dashboard (Bug 1444784)
And I should see "There are no pages on your watchlist."
# Viewing last updated time on watchlist items (Bug 1444784)
And I follow "Page UserA_01"
And I press "More..."
And I press "More options"
And I follow "Add page to watchlist"
And I should see "This page has been added to your watchlist."
# Check we can see watched page and not an un-watched page
......
test/behat/features/social/objectionable_content.feature
View file @ 2d7f28bb
......@@ -21,7 +21,7 @@ Scenario: User reports objectionable content on a page and admin responds
Given I log in as "UserB" with password "Kupuhipa1!"
And I wait "1" seconds
And I follow "Page UserA_01"
And I press "More..."
And I press "More options"
And I follow "Report objectionable material"
And I fill in "Complaint" with "Some complain text"
And I press "Notify administrator"
......
test/behat/features/social/threaded_comments.feature
View file @ 2d7f28bb
......@@ -71,7 +71,7 @@ Scenario: Private comment by commenter, private reply by page owner, private cou
And I fill in "Private comment by AdminB" in editor "Comment"
And I disable the switch "Make comment public"
And I press "Comment"
And I press "More..."
And I press "More options"
And I follow "Remove page from watchlist"
And I log out
And I log in as "AdminA" with password "Kupuh1pa!"
......
test/behat/features/user_content/create_delete_page.feature
View file @ 2d7f28bb
......@@ -86,13 +86,13 @@ Scenario: Creating a page with content in it (Bug 1426983)
Then I should see "This is the edited page title"
And I should see "This is the edited description"
# Create a timeline version
And I press "More..."
And I press "More options"
And I follow "Save to timeline"
# Check that the image is displayed on page and ensure the link is correct
Then I should see image "Image2.png" on the page
# The "..." button should only have the option to print and delete the page
And I should see "More..."
And I press "More..."
And I should see "More options"
And I press "More options"
Then I should see "Print"
And I should see "Delete this page"
# User share page with public and enable copy page functionality
......@@ -123,7 +123,7 @@ Scenario: Creating a page with content in it (Bug 1426983)
# Go to version page
And I choose "Pages and collections" in "Create" from main menu
And I follow "This is the edited page title"
And I press "More..."
And I press "More options"
And I follow "Timeline"
Then I should see "Timeline"
......
test/behat/features/user_content/versioning.feature
View file @ 2d7f28bb
......@@ -23,7 +23,7 @@ Scenario: Add blocks and create versions
And I set the field "Block content" to "Here is the first version of the block."
And I press "Save"
And I display the page
And I press "More..."
And I press "More options"
And I follow "Save to timeline"
And I should see "Saved to timeline"
And I follow "Edit"
......@@ -32,9 +32,9 @@ Scenario: Add blocks and create versions
And I set the field "Block content" to "Here is the second version of the block."
And I press "Save"
And I display the page
And I press "More..."
And I press "More options"
And I follow "Save to timeline"
And I press "More..."
And I press "More options"
And I follow "Timeline"
And I follow "Go to the next version"
And I wait "1" seconds
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment