diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-11-12 11:40:19 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-11-12 11:40:28 +0000 |
| commit | e7ccd26c707a9786a349a2d5a6ad1b87206c9a82 (patch) | |
| tree | 766993ab8a1122be7e10346e0e1cc1a681e30e17 | |
| parent | Fix pyflake warnings and add a FIXME comment to deal with auth_chains receive... (diff) | |
| download | synapse-e7ccd26c707a9786a349a2d5a6ad1b87206c9a82.tar.xz | |
SYWEB-140: Redact button layout.
| -rwxr-xr-x | syweb/webclient/app.css | 4 | ||||
| -rw-r--r-- | syweb/webclient/room/room-controller.js | 1 | ||||
| -rw-r--r-- | syweb/webclient/room/room.html | 8 |
3 files changed, 11 insertions, 2 deletions
diff --git a/syweb/webclient/app.css b/syweb/webclient/app.css index 23ec42f128..403d615bf1 100755 --- a/syweb/webclient/app.css +++ b/syweb/webclient/app.css @@ -458,6 +458,10 @@ textarea, input { font-family: monospace; } +.redact-button { + float: left +} + .room-info-textarea-content { height: auto; width: 100%; diff --git a/syweb/webclient/room/room-controller.js b/syweb/webclient/room/room-controller.js index 2a79fbfbbc..6928754c5d 100644 --- a/syweb/webclient/room/room-controller.js +++ b/syweb/webclient/room/room-controller.js @@ -1087,6 +1087,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput', 'a console.log("Redact event >> " + JSON.stringify($scope.event_selected)); $modalInstance.close("redact"); }; + $scope.dismiss = $modalInstance.dismiss; }) .controller('RoomInfoController', function($scope, $modalInstance, $filter, matrixService) { console.log("Displaying room info."); diff --git a/syweb/webclient/room/room.html b/syweb/webclient/room/room.html index 430a37afd4..1f1cd9baef 100644 --- a/syweb/webclient/room/room.html +++ b/syweb/webclient/room/room.html @@ -5,11 +5,15 @@ <pre> {{event_selected | json}} </pre> </div> <div class="modal-footer"> - <button ng-click="redact()" type="button" class="btn btn-danger" + <button ng-click="redact()" type="button" class="btn btn-danger redact-button" ng-disabled="!room.current_room_state.state('m.room.ops_levels').content.redact_level || !pow(room_id, state.user_id) || pow(room_id, state.user_id) < room.current_room_state.state('m.room.ops_levels').content.redact_level" title="Delete this event on all home servers. This cannot be undone."> Redact - </button> + </button> + + <button ng-click="dismiss()" type="button" class="btn"> + Close + </button> </div> </script> |