Skip to content

Commit f5c9429

Browse files
authored
Merge branch 'develop' into 4247-unused-dependencies
2 parents 5122012 + f3e5eba commit f5c9429

File tree

3 files changed

+8
-34
lines changed

3 files changed

+8
-34
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<button data-modal="add-to-collection" ng-click="toggleCollection()" class="button-survey">
1+
<a data-modal="add-to-collection" ng-click="toggleCollection()">
22
<svg class="iconic" role="img">
33
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#grid-three-up"></use>
44
</svg>
55
<span class="label"translate="set.add_to_collection">Add to collection</span>
6-
</button>
6+
</a>

app/main/posts/common/post-actions.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111

1212
<li ng-show="(post.allowed_privileges.indexOf('update') !== -1) && postIsUnlocked()">
13-
<button ng-click="openEditMode(post.id)" class="button-survey">
13+
<a ng-click="openEditMode(post.id)">
1414
<svg class="iconic" role="img">
1515
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#pencil"></use>
1616
</svg>
1717
<span class="label" translate="nav.edit">Edit</span>
18-
</button>
18+
</a>
1919
</li>
2020
<li>
2121
<!-- Collection toggle link -->
@@ -38,7 +38,7 @@
3838
<ul>
3939
<li ng-repeat="status in statuses"
4040
ng-show="post.allowed_privileges.indexOf('change_status') !== -1 && postIsUnlocked()">
41-
<button ng-click="updateStatus(status)" class="button-survey">
41+
<a ng-click="updateStatus(status)">
4242
<svg class="iconic" role="img">
4343
<use xlink:href="/img/iconic-sprite.svg#globe" ng-if="status=='published'"></use>
4444
<use xlink:href="/img/iconic-sprite.svg#box" ng-if="status=='archived'"></use>
@@ -47,16 +47,16 @@
4747
<span class="label" ng-if="status=='published'" translate="post.post_actions.publish">Publish</span>
4848
<span class="label" ng-if="status=='draft'" translate="post.post_actions.put_under_review">Put under </span>
4949
<span class="label" ng-if="status=='archived'" translate="post.post_actions.archive">Archive</span>
50-
</button>
50+
</a>
5151
</li>
5252

5353
<li ng-show="post.allowed_privileges.indexOf('update') !== -1 && postIsUnlocked()">
54-
<button ng-click="deletePost()" class="button-survey">
54+
<a ng-click="deletePost()">
5555
<svg class="iconic" role="img">
5656
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#trash"></use>
5757
</svg>
5858
<span class="label" translate="nav.delete">Delete</span>
59-
</button>
59+
</a>
6060
</li>
6161
</ul>
6262
</div>

app/settings/surveys/surveys.html

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -40,32 +40,6 @@ <h2 class="listing-item-title inline-block"><a ui-sref="settings.surveys.create"
4040
<div class="listing card">
4141
<div class="listing-item" ng-show="forms.length" ng-repeat="form in forms">
4242
<span class="post-band" ng-style="{backgroundColor: form.color}"></span>
43-
<div class="listing-item-secondary" dropdown>
44-
<button class="button-beta button-flat" data-toggle="dropdown-menu" dropdown-toggle>
45-
<svg class="iconic" role="img">
46-
<use xlink:href="/img/iconic-sprite.svg#ellipses"></use>
47-
</svg>
48-
<span class="hidden">More</span>
49-
</button>
50-
<ul class="dropdown-menu init" dropdown-menu>
51-
<li>
52-
<a href="/settings/surveys/duplicate/{{form.id}}">
53-
<svg class="iconic" role="img">
54-
<use xlink:href="/img/material/svg-sprite-content-symbol.svg#ic_content_copy_24px"></use>
55-
</svg>
56-
<span class="label" translate="survey.duplicate_survey">Duplicate</span>
57-
</a>
58-
</li>
59-
<li>
60-
<button class="button-survey" ng-click="deleteSurvey(form)">
61-
<svg class="iconic" role="img">
62-
<use xlink:href="/img/iconic-sprite.svg#trash"></use>
63-
</svg>
64-
<span class="label" translate="survey.delete">Delete</span>
65-
</button>
66-
</li>
67-
</ul>
68-
</div>
6943
<div class="listing-item-primary">
7044
<h2 class="listing-item-title">
7145
<a href="/settings/surveys/edit/{{form.id}}" ng-show="!form.targeted_survey || !targetedSurveysEnabled">{{form.name}}</a></h2>

0 commit comments

Comments
 (0)