Fix some review requests

pull/7748/head
Karl Prieb 8 years ago
parent a0bc613a2b
commit 15b35ec1ec
  1. 8
      client/routes/router.js
  2. 24
      packages/rocketchat-emoji/client/emojiPicker.css
  3. 3
      packages/rocketchat-i18n/i18n/en.i18n.json
  4. 5
      packages/rocketchat-lib/client/MessageAction.js
  5. 2
      packages/rocketchat-lib/client/views/customFieldsForm.html
  6. 2
      packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html
  7. 2
      packages/rocketchat-theme/client/imports/components/message-box.css
  8. 2
      packages/rocketchat-ui-account/client/accountFlex.html
  9. 6
      packages/rocketchat-ui-account/client/accountProfile.html
  10. 2
      packages/rocketchat-ui-admin/client/adminFlex.html
  11. 8
      packages/rocketchat-ui-sidenav/client/roomList.html
  12. 8
      packages/rocketchat-ui-sidenav/client/roomList.js
  13. 1
      packages/rocketchat-ui/client/views/app/createChannel.html
  14. 1
      packages/rocketchat-ui/client/views/app/createChannel.js

@ -68,14 +68,6 @@ FlowRouter.route('/home', {
}
});
// FlowRouter.route('/changeavatar', {
// name: 'changeAvatar',
//
// action() {
// BlazeLayout.render('main', {center: 'avatarPrompt'});
// }
// });
FlowRouter.route('/account/:group?', {
name: 'account',

@ -102,8 +102,32 @@
align-items: center;
& .emoji-filter {
position: relative;
width: 90%;
margin-bottom: 0;
& .search {
position: relative;
width: 100%;
height: 35px;
padding: 2px 8px;
border-width: 1px;
border-style: solid;
border-radius: 5px;
outline: none;
line-height: normal;
appearance: none;
}
& .icon-search {
position: absolute;
top: 10px;
left: 7px;
}
}
& .change-tone {

@ -256,6 +256,7 @@
"Away_male": "Away",
"Back": "Back",
"Back_to_applications": "Back to applications",
"Back_to_chat": "Back to chat",
"Back_to_integrations": "Back to integrations",
"Back_to_integration_detail": "Back to the integration detail",
"Back_to_login": "Back to login",
@ -1380,6 +1381,8 @@
"Private_Groups": "Private Groups",
"Private_Groups_list": "List of Private Groups",
"Profile": "Profile",
"Profile_details": "Profile details",
"Profile_picture": "Profile picture",
"Profile_saved_successfully": "Profile saved successfully",
"Public": "Public",
"Public_Channel": "Public Channel",

@ -138,11 +138,6 @@ Meteor.startup(function() {
const message = $(e.currentTarget).closest('.message')[0];
chatMessages[Session.get('openedRoom')].edit(message);
RocketChat.MessageAction.hideDropDown();
// const input = instance.find('.input-message');
// Meteor.setTimeout(() => {
// input.focus();
// input.change();
// }, 200);
},
validation(message) {
if (RocketChat.models.Subscriptions.findOne({

@ -1,4 +1,5 @@
<template name="customFieldsForm">
{{#if customFields}}
<div class="rc-form-group rc-grid">
{{#each customFields}}
<div class="rc-input rc-w50 padded">
@ -50,4 +51,5 @@
</div>
{{/each}}
</div>
{{/if}}
</template>

@ -6,7 +6,7 @@
<svg class="sidebar-flex__back-icon">
<use xlink:href="#icon-arrow-back"></use>
</svg>
<span>Back to chat</span>
<span>{{_ "Back_to_chat"}}</span>
</button>
</header>
<div class="rooms-list">

@ -107,7 +107,7 @@
border-width: var(--message-box-container-border-width);
border-color: var(--message-box-container-border-color);
border-radius: var(--message-box-container-border-radius);
align-items: flex-end;
align-items: center;
&.editing {
background-color: var(--message-box-editing-color);

@ -6,7 +6,7 @@
<svg class="sidebar-flex__back-icon">
<use xlink:href="#icon-arrow-back"></use>
</svg>
<span>Back to chat</span>
<span>{{_ "Back_to_chat"}}</span>
</button>
</header>
<div class="rooms-list">

@ -18,17 +18,17 @@
{{> burger}}
<h2 style="flex: 1 1; white-space: nowrap;">{{_ "My Profile"}}</h2>
<div class="content" style="text-align: end; max-width: 649px; flex: 1 1 100%">
<button class="rc-button rc-button--primary" name="send" type="submit" data-button="create" form="profile" {{canSave 'disabled'}}>Save Changes</button>
<button class="rc-button rc-button--primary" name="send" type="submit" data-button="create" form="profile" {{canSave 'disabled'}}>{{_ "Save_changes"}}</button>
</div>
<div style="flex: 1 1;"></div>
</header>
<div class="preferences-page__content">
<form id="profile" autocomplete="off" class="container">
<fieldset class="rc-form-legend">
<legend style="margin-bottom: 2.5rem;">Profile Details</legend>
<legend style="margin-bottom: 2.5rem;">{{_ "Profile_details"}}</legend>
<div>
<div class="rc-form-group">
<label class="rc-form-label">{{_ "Profile Picture"}}</label>
<label class="rc-form-label">{{_ "Profile_picture"}}</label>
<div class="rc-select-avatar">
<div class="rc-select-avatar__preview">
{{# unless avatarPreview}}

@ -6,7 +6,7 @@
<svg class="sidebar-flex__back-icon">
<use xlink:href="#icon-arrow-back"></use>
</svg>
<span>Back to chat</span>
<span>{{_ "Back_to_chat"}}</span>
</button>
</header>
<div class="rooms-list" aria-label="{{_ "Administration"}}">

@ -19,14 +19,6 @@
<p class="rooms-list__empty-room">{{_ "No_channels_yet" }}</p>
{{/each}}
</ul>
{{#if hasMoreChannelsButton ..}}
{{!--<button class="rooms-list__more">{{_ "More_channels"}}...</button>--}}
{{/if}}
{{#if hasMoreGroupsButton ..}}
{{!--<button class="rooms-list__more">{{_ "More_groups"}}...</button>--}}
{{/if}}
{{/if}}
{{/with}}
{{/if}}

@ -61,14 +61,6 @@ Template.roomList.helpers({
return !['unread', 'f'].includes(group.identifier) || rooms.count();
},
hasMoreChannelsButton(room) {
return room.identifier === 'c' || room.anonymous;
},
hasMoreGroupsButton(room) {
return room.identifier === 'p';
},
roomType(room) {
if (room.header || room.identifier) {
return `type-${ room.header || room.identifier }`;

@ -28,7 +28,6 @@
{{_ "Read_only_channel"}}
</span>
</label>
{{!--<span class="rc-switch__description">Only admin can write new messages</span>--}}
</div>
</div>
<div class="create-channel__inputs">

@ -109,7 +109,6 @@ Template.createChannel.events({
t.type.set(e.target.checked ? e.target.value : 'p');
},
'input [name=users]'(e, t) {
console.log(this);
const input = e.target;
const position = input.selectionEnd || input.selectionStart;
const length = input.value.length;

Loading…
Cancel
Save