SYWEB-140: Redact button layout.

This commit is contained in:
Kegan Dougal 2014-11-12 11:40:19 +00:00
parent 3db0efa69f
commit e7ccd26c70
3 changed files with 11 additions and 2 deletions

View File

@ -458,6 +458,10 @@ textarea, input {
font-family: monospace; font-family: monospace;
} }
.redact-button {
float: left
}
.room-info-textarea-content { .room-info-textarea-content {
height: auto; height: auto;
width: 100%; width: 100%;

View File

@ -1087,6 +1087,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput', 'a
console.log("Redact event >> " + JSON.stringify($scope.event_selected)); console.log("Redact event >> " + JSON.stringify($scope.event_selected));
$modalInstance.close("redact"); $modalInstance.close("redact");
}; };
$scope.dismiss = $modalInstance.dismiss;
}) })
.controller('RoomInfoController', function($scope, $modalInstance, $filter, matrixService) { .controller('RoomInfoController', function($scope, $modalInstance, $filter, matrixService) {
console.log("Displaying room info."); console.log("Displaying room info.");

View File

@ -5,11 +5,15 @@
<pre> {{event_selected | json}} </pre> <pre> {{event_selected | json}} </pre>
</div> </div>
<div class="modal-footer"> <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" 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."> title="Delete this event on all home servers. This cannot be undone.">
Redact Redact
</button> </button>
<button ng-click="dismiss()" type="button" class="btn">
Close
</button>
</div> </div>
</script> </script>