Skip to content
This repository was archived by the owner on May 16, 2019. It is now read-only.

Commit 7507c41

Browse files
Dekker3DDekker3D
committed
Fixed a bad merge, added translation entries to en-US.json.
1 parent c8dbce4 commit 7507c41

File tree

2 files changed

+23
-122
lines changed

2 files changed

+23
-122
lines changed

‎js/languages/en-US.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
"ViewListing": "View Listing",
4949
"Unfollow": "Unfollow",
5050
"ConfirmUnfollow": "Confirm Unfollow",
51+
"AddModerator": "Add as Moderator",
52+
"RemoveModerator": "Remove as Moderator",
5153
"About": "About",
5254
"Version": "Version %{version}",
5355
"NoDescriptionAdded": "No description added",

‎js/templates/userPage.html‎

Lines changed: 21 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,26 @@ <h1 class="page-userNameLarge floatLeft fancy-heading fontSize20 colorWhiteForce
137137
</span>
138138
</a>
139139
</div>
140+
<div class="ctrlGroup hide js-notOwnPageButtons js-userPageControls">
141+
<a class="btn btn-txt custCol-primary hide js-addmoderator">
142+
<span class="ion-person-add fontSize11 marginRight2 textOpacity1"></span>
143+
<%= polyglot.t('AddModerator') %>
144+
</a>
145+
<a class="btn btn-txt custCol-primary hide confirmable js-removemoderator">
146+
<span class="preSpacer">
147+
<span class="ion-eye-disabled fontSize11 marginRight2 textOpacity1"></span>
148+
<%= polyglot.t('RemoveModerator') %>
149+
</span>
150+
<span class="preConfirm">
151+
<span class="ion-trash-b fontSize11 marginRight2 textOpacity1"></span>
152+
<%= polyglot.t('RemoveModerator') %>
153+
</span>
154+
<span class="postConfirm">
155+
<span class="ion-trash-b fontSize11 marginRight2 textOpacity1"></span>
156+
<%= polyglot.t('ConfirmRemoveModerator') %>
157+
</span>
158+
</a>
159+
</div>
140160
<div class="ctrlGroup hide js-notOwnPageButtons js-userPageControls">
141161
<a class="btn btn-txt custCol-primary js-message">
142162
<span class="ion-email fontSize11 marginRight2 textOpacity1"></span>
@@ -213,127 +233,6 @@ <h1 class="page-userNameLarge floatLeft fancy-heading fontSize20 colorWhiteForce
213233
</a>
214234
</div>
215235
</div>
216-
<div class="ctrlGroup hide js-pageButtons js-userPageControls">
217-
<a class="btn btn-txt custCol-primary js-customize">
218-
<span class="ion-paintbucket fontSize11 marginRight2 textOpacity1"></span>
219-
<%= polyglot.t('Customize') %>
220-
</a>
221-
</div>
222-
<div class="ctrlGroup hide js-notOwnPageButtons js-userPageControls">
223-
<a class="btn btn-txt custCol-primary hide js-follow">
224-
<span class="ion-person-add fontSize11 marginRight2 textOpacity1"></span>
225-
<%= polyglot.t('Follow') %>
226-
</a>
227-
<a class="btn btn-txt custCol-primary hide confirmable js-unfollow">
228-
<span class="preSpacer">
229-
<span class="ion-eye-disabled fontSize11 marginRight2 textOpacity1"></span>
230-
<%= polyglot.t('Unfollow') %>
231-
</span>
232-
<span class="preConfirm">
233-
<span class="ion-trash-b fontSize11 marginRight2 textOpacity1"></span>
234-
<%= polyglot.t('Unfollow') %>
235-
</span>
236-
<span class="postConfirm">
237-
<span class="ion-trash-b fontSize11 marginRight2 textOpacity1"></span>
238-
<%= polyglot.t('ConfirmUnfollow') %>
239-
</span>
240-
</a>
241-
</div>
242-
<div class="ctrlGroup hide js-notOwnPageButtons js-userPageControls">
243-
<a class="btn btn-txt custCol-primary hide js-addmoderator">
244-
<span class="ion-person-add fontSize11 marginRight2 textOpacity1"></span>
245-
<%= polyglot.t('AddModerator') %>
246-
</a>
247-
<a class="btn btn-txt custCol-primary hide confirmable js-removemoderator">
248-
<span class="preSpacer">
249-
<span class="ion-eye-disabled fontSize11 marginRight2 textOpacity1"></span>
250-
<%= polyglot.t('RemoveModerator') %>
251-
</span>
252-
<span class="preConfirm">
253-
<span class="ion-trash-b fontSize11 marginRight2 textOpacity1"></span>
254-
<%= polyglot.t('RemoveModerator') %>
255-
</span>
256-
<span class="postConfirm">
257-
<span class="ion-trash-b fontSize11 marginRight2 textOpacity1"></span>
258-
<%= polyglot.t('ConfirmRemoveModerator') %>
259-
</span>
260-
</a>
261-
</div>
262-
<div class="ctrlGroup hide js-notOwnPageButtons js-userPageControls">
263-
<a class="btn btn-txt custCol-primary js-message">
264-
<span class="ion-email fontSize11 marginRight2 textOpacity1"></span>
265-
<%= polyglot.t('Message') %>
266-
</a>
267-
</div>
268-
<div class="ctrlGroup hide js-itemButtons js-userPageControls hide">
269-
<a class="btn btn-txt custCol-primary js-editItem">
270-
<span class="ion-compose fontSize11 marginRight2 textOpacity1"></span>
271-
<%= polyglot.t('Edit') %>
272-
</a>
273-
</div>
274-
<div class="ctrlGroup hide js-itemButtons js-userPageControls hide">
275-
<a class="btn btn-txt custCol-primary js-cloneItem">
276-
<span class="ion-compose fontSize11 marginRight2 textOpacity1"></span>
277-
<%= polyglot.t('Clone') %>
278-
</a>
279-
</div>
280-
<div class="ctrlGroup hide js-extraButtonsNotOwnPage js-userPageControls zIndex4">
281-
<a class="btn btn-txt custCol-primary js-block <% if(ob.isBlocked){ %>hide<% } %>">
282-
<span class="ion-sad fontSize11 marginRight2 textOpacity1"></span>
283-
<%= polyglot.t('Block') %>
284-
</a>
285-
<a class="btn btn-txt custCol-primary js-unblock <% if(!ob.isBlocked){ %>hide<% } %>">
286-
<span class="ion-sad fontSize11 marginRight2 textOpacity1"></span>
287-
<%= polyglot.t('Unblock') %>
288-
</a>
289-
</div>
290-
<div class="ctrlGroup hide js-extraButtonsOwnPage js-userPageControls zIndex4">
291-
<a class="btn btn-txt custCol-primary js-moderatorSettings">
292-
<span class="ion-ios-pricetag fontSize11 marginRight2 textOpacity1"></span>
293-
<span class="js-userPageEditModerator <% if(!ob.page.profile.moderator){ %> hide <% } %>"><%= polyglot.t('EditModerator') %></span>
294-
<span class="js-userPageBecomeModerator <% if(ob.page.profile.moderator){ %> hide <% } %>"><%= polyglot.t('BecomeModerator') %></span>
295-
</a>
296-
</div>
297-
<div class="ctrlGroup hide js-pageButtons js-userPageControls">
298-
<a class="btn btn-txt custCol-primary js-moreButtonsOwnPage width34 lineHeight32 padding0">...</a>
299-
</div>
300-
<div class="ctrlGroup hide js-notOwnPageButtons js-userPageControls">
301-
<a class="btn btn-txt custCol-primary js-moreButtonsNotOwnPage width34 lineHeight32 padding0">...</a>
302-
</div>
303-
<div class="ctrlGroup hide js-itemButtons js-userPageControls hide">
304-
<a class="btn btn-txt custCol-primary confirmable js-deleteItem">
305-
<span class="preSpacer">
306-
<span class="ion-trash-b fontSize11 marginRight2 textOpacity1"></span>
307-
<%= polyglot.t('Delete') %>
308-
</span>
309-
<span class="preConfirm">
310-
<span class="ion-trash-b fontSize11 marginRight2 textOpacity1"></span>
311-
<%= polyglot.t('Delete') %>
312-
</span>
313-
<span class="postConfirm">
314-
<span class="ion-trash-b fontSize11 marginRight2 textOpacity1"></span>
315-
<%= polyglot.t('ConfirmDelete') %>
316-
</span>
317-
</a>
318-
</div>
319-
<div class="ctrlGroup hide js-itemEditButtons js-userPageControls hide textOpacity1">
320-
<a class="btn btn-txt custCol-primary js-cancelItem"><%= polyglot.t('Cancel') %></a>
321-
</div>
322-
<div class="ctrlGroup hide js-itemCustomizationButtons js-userPageControls hide textOpacity1">
323-
<a class="btn btn-txt custCol-primary js-cancelCustomization"><%= polyglot.t('Cancel') %></a>
324-
</div>
325-
<div class="ctrlGroup hide js-itemEditButtons js-userPageControls hide">
326-
<a class="btn btn-txt custCol-primary js-saveItem">
327-
<span class="ion-checkmark fontSize11 marginRight2 textOpacity1"></span>
328-
<%= polyglot.t('SaveChanges') %>
329-
</a>
330-
</div>
331-
<div class="ctrlGroup hide js-itemCustomizationButtons js-userPageControls hide">
332-
<a class="btn btn-txt custCol-primary js-saveCustomization">
333-
<span class="ion-checkmark fontSize11 marginRight2 textOpacity1"></span>
334-
<%= polyglot.t('SaveChanges') %>
335-
</a>
336-
</div>
337236
</div>
338237
</div>
339238
</div>
@@ -704,4 +603,4 @@ <h3 class="rowTop30 custCol-text">
704603
</div>
705604
</div>
706605
</div>
707-
</div>
606+
</div>

0 commit comments

Comments
 (0)