Skip to content

Commit f8958e9

Browse files
veronika-tseleva-cleantalkveronika-tseleva-cleantalk
authored
Merge pull request #96 from CleanTalk/interface-layout-edits
Interface layout edits
2 parents 4b0657e + eb694fb commit f8958e9

9 files changed

Lines changed: 335 additions & 212 deletions

‎dist/doboard-widget-bundle.js‎

Lines changed: 73 additions & 47 deletions
Large diffs are not rendered by default.

‎dist/doboard-widget-bundle.min.js‎

Lines changed: 47 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/doboard-widget-bundle.min.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/src/handlers.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,9 @@ function registerUser(taskDetails) {
209209
.then((response) => {
210210
if (response.accountExists) {
211211
document.querySelector('.doboard_task_widget-accordion .doboard_task_widget-input-container').innerText = ksesFilter('Account already exists. Please, login using your password.');
212-
document.querySelector('.doboard_task_widget-accordion .doboard_task_widget-input-container.hidden').classList.remove('hidden');
212+
document.querySelector('.doboard_task_widget-accordion .doboard_task_widget-input-container.hidden')?.classList?.remove('hidden');
213+
document.getElementById('doboard_task_widget-user_name')
214+
.closest('.doboard_task_widget-input-container').classList.add('hidden-container');
213215
document.getElementById('doboard_task_widget-user_password').focus();
214216
return response;
215217
} else if (response.sessionId) {

‎js/src/iframe/DescriptionEditorIframe.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ class DescriptionEditorIframe {
178178
#editor-container { min-height: 190px; background: #fff; border-radius: 4px; }
179179
.tox-tinymce { border: none !important; position: absolute !important; height: 100% !important;}
180180
.tox-editor-header { border-bottom: none !important; }
181+
.tox-toolbar__group {display: inline-flex !important; width: 90% !important; justify-content: space-around}
181182
</style>
182183
</head>
183184
<body>

‎js/src/loaders/SpotFixSVGLoader.js‎

Lines changed: 20 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/src/loaders/SpotFixTemplatesLoader.js‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class SpotFixTemplatesLoader {
2424
<img src="{{iconPlus}}" alt="" class="doboard_task_widget_cursor-pointer">
2525
</span>
2626
<span id="maximizeWidgetContainer">
27-
<img src="{{iconMaximize}}" alt="" class="doboard_task_widget_cursor-pointer">
27+
<img src="{{iconMaximize}}" alt="" class="doboard_task_widget_cursor-pointer">
2828
</span>
2929
<span id="openUserMenuButton">
3030
<img src="{{iconEllipsesMore}}" alt="" class="doboard_task_widget_cursor-pointer">
@@ -154,12 +154,12 @@ class SpotFixTemplatesLoader {
154154
155155
<div class="doboard_task_widget-input-container">
156156
<input id="doboard_task_widget-title" class="doboard_task_widget-field" name="title" value="{{selectedText}}" required>
157-
<label class="spotfix_placeholder_title" for="doboard_task_widget-title">Report about</label>
157+
<label class="spotfix_placeholder_title" for="doboard_task_widget-title">Report name</label>
158158
</div>
159159
160160
<div id="doboard_task_widget-description-container" class="doboard_task_widget-input-container doboard_task_widget-input-container-textarea" style="flex-grow: 1; min-height: 200px">
161161
<textarea id="doboard_task_widget-description" class="doboard_task_widget-field" name="description" placeholder=" " required></textarea>
162-
<label for="doboard_task_widget-description" class="doboard_task_widget-field-textarea-label" >Description</label>
162+
<label for="doboard_task_widget-description" style="top:1px" class="doboard_task_widget-field-textarea-label" >Description</label>
163163
</div>
164164
165165
<div class="doboard_task_widget-login">
@@ -169,31 +169,32 @@ class SpotFixTemplatesLoader {
169169
<div class="doboard_task_widget-accordion">
170170
171171
<div class="doboard_task_widget-input-container-phantom">
172-
<div class="doboard_task_widget-input-container">
173-
<input id="doboard_task_widget-user_name" class="doboard_task_widget-field" type="text" name="user_name">
174-
<label for="doboard_task_widget-user_name">Nickname</label>
175-
</div>
176-
177-
<div class="doboard_task_widget-input-container">
178-
<input id="doboard_task_widget-user_email" class="doboard_task_widget-field" type="email" name="user_email">
179-
<label for="doboard_task_widget-user_email">Email</label>
180-
</div>
181-
182-
<div class="doboard_task_widget-input-container hidden">
183-
<input id="doboard_task_widget-user_password" class="doboard_task_widget-field" type="password" name="user_password">
184-
<label for="doboard_task_widget-user_password">Password</label>
172+
<div class="doboard_task_widget-input-container"></div>
173+
<div class="doboard_task_widget-auth-inputs-container">
174+
<div class="doboard_task_widget-input-container">
175+
<input id="doboard_task_widget-user_name" class="doboard_task_widget-field" type="text" name="user_name">
176+
<label for="doboard_task_widget-user_name">Nickname</label>
177+
</div>
178+
179+
<div class="doboard_task_widget-input-container">
180+
<input id="doboard_task_widget-user_email" class="doboard_task_widget-field" type="email" name="user_email">
181+
<label for="doboard_task_widget-user_email">Email</label>
182+
</div>
183+
<div class="doboard_task_widget-input-container hidden">
184+
<input id="doboard_task_widget-user_password" class="doboard_task_widget-field" type="password" name="user_password">
185+
<label for="doboard_task_widget-user_password">Password</label>
186+
</div>
185187
</div>
186-
187188
<button id="doboard_task_widget-register_only_button" class="doboard_task_widget-submit_button doboard_task_widget-hidden" style="margin-top: 8px; width: 100%;">Sign up</button>
188-
189+
<br/>
189190
<i>Note about DoBoard register and accepting email notifications about tasks have to be here.</i>
190-
</br>
191+
191192
<i>If you are a doBoard user, use same Email and password as at <a href="https://doboard.com" target="_blank" rel="nofollow">doboard.com</a>
192193
on the <span id="doboard_task_widget-show_login_form" class="doboard_task_widget-show_login_form">login page</span>
193194
</i>
194195
</div>
195196
196-
<div id="doboard_task_widget-input-container-login" class="doboard_task_widget-input-container-login doboard_task_widget-hidden">
197+
<div id="doboard_task_widget-input-container-login" style="margin-top: 16px" class="doboard_task_widget-input-container-login doboard_task_widget-hidden">
197198
<div class="doboard_task_widget-input-container">
198199
<input id="doboard_task_widget-login_email" class="doboard_task_widget-field" type="email" name="login_email">
199200
<label for="doboard_task_widget-login_email">Email</label>
@@ -228,7 +229,7 @@ class SpotFixTemplatesLoader {
228229
229230
</div>
230231
231-
<div class="doboard_task_widget-field" style="margin-top: 8px">
232+
<div class="doboard_task_widget-field">
232233
<div class="doboard_task_widget-visibility-toggle">
233234
<div style="display: flex; align-items: center">
234235
<img src="{{iconPublic}}" alt="">
@@ -241,7 +242,7 @@ class SpotFixTemplatesLoader {
241242
<span class="slider"></span>
242243
</label>
243244
</div>
244-
<button id="doboard_task_widget-submit_button" style="min-width: 270px" class="doboard_task_widget-submit_button">Send report</button>
245+
<button id="doboard_task_widget-submit_button" style="min-width: 270px; margin-top: 0px" class="doboard_task_widget-submit_button">Send report</button>
245246
</div>
246247
247248
<div class="doboard_task_widget-message-wrapper hidden">
@@ -259,7 +260,7 @@ class SpotFixTemplatesLoader {
259260
<div class="{{avatarCSSClass}}" style="{{avatarStyle}}">
260261
<span class="doboard_task_widget-avatar-initials {{initialsClass}}">{{taskAuthorInitials}}</span>
261262
</div>
262-
<div class="doboard_task_widget-description_container" style="cursor: default">
263+
<div class="doboard_task_widget-description_container">
263264
<div class="doboard_task_widget-task_title" style="cursor: pointer">
264265
<div class="doboard_task_widget-task_title-details">
265266
<span class="doboard_task_widget-task_title-text">{{taskTitle}}</span>

0 commit comments

Comments
 (0)