Skip to content

Commit 7e3228c

Browse files
christopherpickeringchristopherpickering
authored
Merge branch 'alpha' into dev
2 parents c6a4f44 + 07f7faf commit 7e3228c

2 files changed

Lines changed: 42 additions & 44 deletions

File tree

‎web/Pages/Users/Stars.cshtml‎

Lines changed: 41 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -108,27 +108,6 @@
108108
<div class="favorite-folder-controls button is-light is-rounded is-warning has-text-dark is-active">
109109
<span class="icon js-modal-trigger" data-target="favorite-folder-new"><i class="fas fa-plus"></i></span>
110110
</div>
111-
<script>
112-
(function(){
113-
document.querySelector('body').insertAdjacentHTML('beforeend', '<div class="modal" id="favorite-folder-new"> \
114-
<div class="modal-background"></div> \
115-
<div class="modal-content"> \
116-
<div class="box"> \
117-
<strong class="mb-5">New Folder</strong> \
118-
<form method="post" action="/Users/stars/?handler=NewFolder" class="favorite-folder-new"> \
119-
<div class="field"> \
120-
<div class="control"> \
121-
<input class="input" name="favorite-folder-name"/> \
122-
</div> \
123-
</div> \
124-
<button class="button pt-3">Save</button> \
125-
</form> \
126-
</div> \
127-
</div> \
128-
<button class="modal-close is-large" aria-label="close"></button> \
129-
</div>')
130-
})()
131-
</script>
132111
}
133112
</div>
134113

@@ -168,28 +147,7 @@
168147
<span class="icon js-modal-trigger" data-target="favorite-folder-@f.UserFavoriteFolderId"><i class="fas fa-pen-to-square"></i></span>
169148
<span class="icon favorite-folder-delete" data-folderid="@f.UserFavoriteFolderId"><i class="fas fa-trash"></i></span>
170149
<span class="icon drg-hdl"><i class="fas fa-up-down-left-right"></i></span>
171-
</div>
172-
<script>
173-
(function(){
174-
document.querySelector('body').insertAdjacentHTML('beforeend', '<div class="modal" id="favorite-folder-@f.UserFavoriteFolderId"> \
175-
<div class="modal-background"></div> \
176-
<div class="modal-content"> \
177-
<div class="box"> \
178-
<strong class="mb-5">Rename Folder</strong> \
179-
<form method="post" action="/Users/stars/?handler=EditFolder&id=@f.UserFavoriteFolderId" class="favorite-folder-rename" data-folderid="@f.UserFavoriteFolderId"> \
180-
<div class="field"> \
181-
<div class="control"> \
182-
<input class="input" name="favorite-folder-name" value="@f.FolderName" /> \
183-
</div> \
184-
</div> \
185-
<button class="button pt-3">Save</button> \
186-
</form> \
187-
</div> \
188-
</div> \
189-
<button class="modal-close is-large" aria-label="close"></button> \
190-
</div>')
191-
})()
192-
</script>
150+
</div>
193151
}
194152
</div>
195153
}
@@ -297,6 +255,46 @@
297255
</div>
298256
}
299257
</div>
258+
@if (ViewBag.IsMe || User.HasPermission("Edit Other Users"))
259+
{
260+
<div class="modal" id="favorite-folder-new">
261+
<div class="modal-background"></div>
262+
<div class="modal-content">
263+
<div class="box">
264+
<strong class="mb-5">New Folder</strong>
265+
<form method="post" action="/users/stars/?handler=NewFolder" class="favorite-folder-new">
266+
<div class="field">
267+
<div class="control">
268+
<input class="input" name="favorite-folder-name"/>
269+
</div>
270+
</div>
271+
<button class="button pt-3">Save</button>
272+
</form>
273+
</div>
274+
</div>
275+
<button class="modal-close is-large" aria-label="close"></button>
276+
</div>
277+
@foreach (var f in Model.Folders.OrderBy(x => x.FolderRank).ToList())
278+
{
279+
<div class="modal" id="favorite-folder-@f.UserFavoriteFolderId">
280+
<div class="modal-background"></div>
281+
<div class="modal-content">
282+
<div class="box">
283+
<strong class="mb-5">Rename Folder</strong>
284+
<form method="post" action="/users/stars/?handler=EditFolder&id=@f.UserFavoriteFolderId" class="favorite-folder-rename" data-folderid="@f.UserFavoriteFolderId">
285+
<div class="field">
286+
<div class="control">
287+
<input class="input" name="favorite-folder-name" value="@f.FolderName" />
288+
</div>
289+
</div>
290+
<button class="button pt-3">Save</button>
291+
</form>
292+
</div>
293+
</div>
294+
<button class="modal-close is-large" aria-label="close"></button>
295+
</div>
296+
}
297+
}
300298
<script>
301299
(function() {
302300

‎web/version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.15.0-alpha.1
1+
3.15.2-alpha.1

0 commit comments

Comments
 (0)