Commit a296d318 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1758226: Showing correct message in view edit button"

parents 4d3bd3a5 5deb0a54
<div id="toolbar-buttons" class="btn-group btn-toolbar btn-group-top"> <div id="toolbar-buttons" class="btn-group btn-toolbar btn-group-top">
<a class="btn btn-default editviews editlayout {if $selected == 'layout' or $selected == 'editlayout'}active{/if}" <a class="btn btn-default editviews editlayout {if $selected == 'layout' or $selected == 'editlayout'}active{/if}"
href="{$WWWROOT}view/editlayout.php?id={$viewid}" href="{$WWWROOT}view/editlayout.php?id={$viewid}"
title="{if $edittitle}{str tag=settings section=view}{else}{str tag=editlayout section=view}{/if}"> title="{if $edittitle || $canuseskins}{str tag=settings section=view}{else}{str tag=editlayout section=view}{/if}">
<span class="icon icon-lg icon-cogs"></span> <span class="icon icon-lg icon-cogs"></span>
<span class="btn-title">{if ($edittitle || $canuseskins) }{str tag=settings section=view}{else}{str tag=editlayout section=view}{/if}</span> <span class="btn-title">{if ($edittitle || $canuseskins) }{str tag=settings section=view}{else}{str tag=editlayout section=view}{/if}</span>
</a> </a>
......
...@@ -73,7 +73,7 @@ Scenario: Clicking ID's (Bug 1428456) ...@@ -73,7 +73,7 @@ Scenario: Clicking ID's (Bug 1428456)
And I scroll to the top And I scroll to the top
# Checking if we can change page layout # Checking if we can change page layout
When I follow "Edit layout" And I follow "Settings" in the "Toolbar buttons" property
And I expand all fieldsets And I expand all fieldsets
And I scroll to the base of id "addrow" And I scroll to the base of id "addrow"
And I press "Add a row" And I press "Add a row"
...@@ -98,7 +98,7 @@ Scenario: Profile and dashboard pages basic settings and skins can't be edited - ...@@ -98,7 +98,7 @@ Scenario: Profile and dashboard pages basic settings and skins can't be edited -
And I follow "Profile page" And I follow "Profile page"
And I scroll to the base of id "viewh1" And I scroll to the base of id "viewh1"
And I follow "Edit" And I follow "Edit"
When I follow "Edit layout" And I follow "Settings" in the "Toolbar buttons" property
And I should see "Layout" And I should see "Layout"
And I should not see "Basics" And I should not see "Basics"
And I should see "Skin" And I should see "Skin"
...@@ -108,7 +108,7 @@ Scenario: Profile and dashboard pages basic settings and skins can't be edited - ...@@ -108,7 +108,7 @@ Scenario: Profile and dashboard pages basic settings and skins can't be edited -
# Dashboard page # Dashboard page
And I choose "Dashboard" from main menu And I choose "Dashboard" from main menu
And I follow "Edit dashboard" And I follow "Edit dashboard"
When I follow "Edit layout" And I follow "Settings" in the "Toolbar buttons" property
And I should see "Layout" And I should see "Layout"
And I should not see "Basics" And I should not see "Basics"
And I should see "Skin" And I should see "Skin"
......
Markdown is supported
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