Merge branch 'develop' into 4247-unused-dependencies

ushahidi · Jun 8, 2021 · f5c9429 · f5c9429
2 parents 5122012 + f3e5eba
commit f5c9429
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 34 deletions.
diff --git a/app/main/posts/common/collection-toggle/collection-toggle-link.html b/app/main/posts/common/collection-toggle/collection-toggle-link.html
@@ -1,6 +1,6 @@
-<button data-modal="add-to-collection" ng-click="toggleCollection()" class="button-survey">
+<a data-modal="add-to-collection" ng-click="toggleCollection()">
     <svg class="iconic" role="img">
         <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#grid-three-up"></use>
     </svg>
     <span class="label"translate="set.add_to_collection">Add to collection</span>
-</button>
+</a>
diff --git a/app/main/posts/common/post-actions.html b/app/main/posts/common/post-actions.html
@@ -10,12 +10,12 @@
 
 
         <li ng-show="(post.allowed_privileges.indexOf('update') !== -1) && postIsUnlocked()">
-          <button ng-click="openEditMode(post.id)" class="button-survey">
+          <a ng-click="openEditMode(post.id)">
               <svg class="iconic" role="img">
                   <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#pencil"></use>
               </svg>
               <span class="label" translate="nav.edit">Edit</span>
-            </button>
+          </a>
         </li>
         <li>
             <!-- Collection toggle link -->
@@ -38,7 +38,7 @@
     <ul>
       <li ng-repeat="status in statuses"
           ng-show="post.allowed_privileges.indexOf('change_status') !== -1 && postIsUnlocked()">
-        <button ng-click="updateStatus(status)" class="button-survey">
+        <a ng-click="updateStatus(status)">
           <svg class="iconic" role="img">
             <use xlink:href="/img/iconic-sprite.svg#globe" ng-if="status=='published'"></use>
             <use xlink:href="/img/iconic-sprite.svg#box" ng-if="status=='archived'"></use>
@@ -47,16 +47,16 @@
           <span class="label" ng-if="status=='published'" translate="post.post_actions.publish">Publish</span>
           <span class="label" ng-if="status=='draft'" translate="post.post_actions.put_under_review">Put under </span>
           <span class="label" ng-if="status=='archived'" translate="post.post_actions.archive">Archive</span>
-        </button>
+        </a>
       </li>
 
       <li ng-show="post.allowed_privileges.indexOf('update') !== -1 && postIsUnlocked()">
-        <button ng-click="deletePost()" class="button-survey">
+        <a ng-click="deletePost()">
           <svg class="iconic" role="img">
             <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#trash"></use>
           </svg>
           <span class="label" translate="nav.delete">Delete</span>
-        </button>
+        </a>
       </li>
     </ul>
   </div>

diff --git a/app/settings/surveys/surveys.html b/app/settings/surveys/surveys.html
@@ -40,32 +40,6 @@ <h2 class="listing-item-title inline-block"><a ui-sref="settings.surveys.create"
             <div class="listing card">
                 <div class="listing-item" ng-show="forms.length" ng-repeat="form in forms">
                     <span class="post-band" ng-style="{backgroundColor: form.color}"></span>
-                    <div class="listing-item-secondary" dropdown>
-                      <button class="button-beta button-flat" data-toggle="dropdown-menu" dropdown-toggle>
-                          <svg class="iconic" role="img">
-                              <use xlink:href="/img/iconic-sprite.svg#ellipses"></use>
-                          </svg>
-                          <span class="hidden">More</span>
-                      </button>
-                      <ul class="dropdown-menu init" dropdown-menu>
-                          <li>
-                              <a href="/settings/surveys/duplicate/{{form.id}}">
-                                  <svg class="iconic" role="img">
-                                      <use xlink:href="/img/material/svg-sprite-content-symbol.svg#ic_content_copy_24px"></use>
-                                  </svg>
-                                  <span class="label" translate="survey.duplicate_survey">Duplicate</span>
-                              </a>
-                          </li>
-                          <li>
-                            <button class="button-survey" ng-click="deleteSurvey(form)">
-                                  <svg class="iconic" role="img">
-                                      <use xlink:href="/img/iconic-sprite.svg#trash"></use>
-                                  </svg>
-                                  <span class="label" translate="survey.delete">Delete</span>
-                            </button>
-                          </li>
-                      </ul>
-                    </div>
                     <div class="listing-item-primary">
                         <h2 class="listing-item-title">
                             <a href="/settings/surveys/edit/{{form.id}}" ng-show="!form.targeted_survey || !targetedSurveysEnabled">{{form.name}}</a></h2>