mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

revise opt-in tags

Browse source
This commit is contained in:
Luke Pulverenti 2015-02-09 01:56:45 -05:00
parent aafa359c52
commit 7e3d1bd15b
2 changed files with 147 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

148
dashboard-ui/scripts/userparentalcontrol.js
View file

@ -81,7 +81,8 @@
Dashboard.setPageTitle(user.Name); Dashboard.setPageTitle(user.Name);
loadUnratedItems(page, user); loadUnratedItems(page, user);
loadTags(page, user.Policy.TagFilters); loadBlockedTags(page, user.Policy.BlockedTags);
loadAllowedTags(page, user.Policy.AllowedTags);
populateRatings(allParentalRatings, page); populateRatings(allParentalRatings, page);
@ -112,7 +113,7 @@
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
} }
function loadTags(page, tags) { function loadBlockedTags(page, tags) {
var html = '<ul data-role="listview" data-inset="true" data-split-icon="delete">' + tags.map(function (h) { var html = '<ul data-role="listview" data-inset="true" data-split-icon="delete">' + tags.map(function (h) {
@ -120,17 +121,11 @@
li += '<a href="#">'; li += '<a href="#">';
li += '<h3>' + h.Tag + '</h3>'; li += '<div style="font-weight:normal;">' + h + '</div>';
if (h.Mode == 'Allow') {
li += '<p style="color:green;">' + Globalize.translate('MessageAllowContentWithThisTag') + '</p>';
} else if (h.Mode == 'Block') {
li += '<p style="color:red;">' + Globalize.translate('MessageBlockContentWithThisTag') + '</p>';
}
li += '</a>'; li += '</a>';
li += '<a class="tagFilter btnDeleteTag" href="#" data-tag="' + h.Tag + '" data-mode="' + h.Mode + '"></a>'; li += '<a class="blockedTag btnDeleteTag" href="#" data-tag="' + h + '"></a>';
li += '</li>'; li += '</li>';
@ -138,18 +133,51 @@
}).join('') + '</ul>'; }).join('') + '</ul>';
var elem = $('.tagFilters', page).html(html).trigger('create'); var elem = $('.blockedTags', page).html(html).trigger('create');
$('.btnDeleteTag', elem).on('click', function () { $('.btnDeleteTag', elem).on('click', function () {
var tag = this.getAttribute('data-tag'); var tag = this.getAttribute('data-tag');
var mode = this.getAttribute('data-mode');
var newTags = tags.filter(function (t) { var newTags = tags.filter(function (t) {
return t.Tag != tag || t.Mode != mode; return t != tag;
}); });
loadTags(page, newTags); loadBlockedTags(page, newTags);
});
}
function loadAllowedTags(page, tags) {
var html = '<ul data-role="listview" data-inset="true" data-split-icon="delete">' + tags.map(function (h) {
var li = '<li>';
li += '<a href="#">';
li += '<div style="font-weight:normal;">' + h + '</div>';
li += '</a>';
li += '<a class="allowedTag btnDeleteTag" href="#" data-tag="' + h + '"></a>';
li += '</li>';
return li;
}).join('') + '</ul>';
var elem = $('.allowedTags', page).html(html).trigger('create');
$('.btnDeleteTag', elem).on('click', function () {
var tag = this.getAttribute('data-tag');
var newTags = tags.filter(function (t) {
return t != tag;
});
loadAllowedTags(page, newTags);
}); });
} }
@ -216,7 +244,8 @@
user.Policy.AccessSchedules = getSchedulesFromPage(page); user.Policy.AccessSchedules = getSchedulesFromPage(page);
user.Policy.TagFilters = getTagsFromPage(page); user.Policy.BlockedTags = getBlockedTagsFromPage(page);
user.Policy.AllowedTags = getAllowedTagsFromPage(page);
ApiClient.updateUserPolicy(user.Id, user.Policy).done(function () { ApiClient.updateUserPolicy(user.Id, user.Policy).done(function () {
onSaveComplete(page); onSaveComplete(page);
@ -251,11 +280,21 @@
return false; return false;
}, },
onTagFormSubmit: function () { onBlockedTagFormSubmit: function () {
var page = $(this).parents('.page'); var page = $(this).parents('.page');
saveTag(page); saveBlockedTag(page);
// Disable default form submission
return false;
},
onAllowedTagFormSubmit: function () {
var page = $(this).parents('.page');
saveAllowedTag(page);
// Disable default form submission // Disable default form submission
return false; return false;
@ -333,20 +372,30 @@
$('#popupSchedule', page).popup('close'); $('#popupSchedule', page).popup('close');
} }
function saveTag(page) { function saveBlockedTag(page) {
var tag = $('#txtTag', page).val(); var tag = $('#txtBlockedTag', page).val();
var mode = $('#selectTagMode', page).val(); var tags = getBlockedTagsFromPage(page);
var tags = getTagsFromPage(page);
tags.push({ if (tags.indexOf(tag) == -1) {
Tag: tag, tags.push(tag);
Mode: mode loadBlockedTags(page, tags);
}); }
loadTags(page, tags); $('#popupBlockedTag', page).popup('close');
}
$('#popupTag', page).popup('close'); function saveAllowedTag(page) {
var tag = $('#txtAllowedTag', page).val();
var tags = getAllowedTagsFromPage(page);
if (tags.indexOf(tag) == -1) {
tags.push(tag);
loadAllowedTags(page, tags);
}
$('#popupAllowedTag', page).popup('close');
} }
function getSchedulesFromPage(page) { function getSchedulesFromPage(page) {
@ -362,23 +411,34 @@
}).get(); }).get();
} }
function getTagsFromPage(page) { function getBlockedTagsFromPage(page) {
return $('.tagFilter', page).map(function () { return $('.blockedTag', page).map(function () {
return { return this.getAttribute('data-tag');
Tag: this.getAttribute('data-tag'),
Mode: this.getAttribute('data-mode')
};
}).get(); }).get();
} }
function showTagPopup(page) { function getAllowedTagsFromPage(page) {
$('#popupTag', page).popup('open'); return $('.allowedTag', page).map(function () {
$('#txtTag', page).val('').focus();
$('#selectTagMode', page).val('Block').selectmenu('refresh').trigger('change'); return this.getAttribute('data-tag');
}).get();
}
function showBlockedTagPopup(page) {
$('#popupBlockedTag', page).popup('open');
$('#txtBlockedTag', page).val('').focus();
}
function showAllowedTagPopup(page) {
$('#popupAllowedTag', page).popup('open');
$('#txtAllowedTag', page).val('').focus();
} }
$(document).on('pageinit', "#userParentalControlPage", function () { $(document).on('pageinit', "#userParentalControlPage", function () {
@ -391,19 +451,15 @@
showSchedulePopup(page, {}, -1); showSchedulePopup(page, {}, -1);
}); });
$('.btnAddBlockedTag', page).on('click', function () {
$('.btnAddTag', page).on('click', function () { showBlockedTagPopup(page);
showTagPopup(page);
}); });
$('#selectTagMode', page).on('change', function () {
if (this.value == 'Allow') { $('.btnAddAllowedTag', page).on('click', function () {
$('.allowModeHelp', page).show();
} else { showAllowedTagPopup(page);
$('.allowModeHelp', page).hide();
}
}); });
populateHours(page); populateHours(page);

59
dashboard-ui/userparentalcontrol.html
View file

@ -32,10 +32,21 @@
<div> <div>
<div> <div>
<div class="ui-controlgroup-label" style="display:inline-block;">${LabelBlockOrAllowItemsWithTags}</div> <div class="ui-controlgroup-label" style="display:inline-block;">${LabelBlockContentWithTags}</div>
<button type="button" class="btnAddTag" data-inline="true" data-mini="true" data-iconpos="notext" data-icon="plus" style="vertical-align:middle;margin: -5px 0 0 1em;">${ButtonAdd}</button> <button type="button" class="btnAddBlockedTag" data-inline="true" data-mini="true" data-iconpos="notext" data-icon="plus" style="vertical-align:middle;margin: -5px 0 0 1em;">${ButtonAdd}</button>
</div> </div>
<div class="tagFilters" style="margin-top:.5em;"> <div class="blockedTags" style="margin-top:.5em;">
</div>
</div>
<br />
<div>
<div>
<div class="ui-controlgroup-label" style="display:inline-block;">${LabelAllowContentWithTags}</div>
<button type="button" class="btnAddAllowedTag" data-inline="true" data-mini="true" data-iconpos="notext" data-icon="plus" style="vertical-align:middle;margin: -5px 0 0 1em;">${ButtonAdd}</button>
</div>
<div class="allowedTags" style="margin-top:.5em;">
</div> </div>
</div> </div>
@ -66,7 +77,7 @@
</form> </form>
<div data-role="popup" id="popupTag" class="popup" data-theme="a"> <div data-role="popup" id="popupBlockedTag" class="popup" data-theme="a">
<div class="ui-bar-a" style="text-align: center; padding: 5px 20px;"> <div class="ui-bar-a" style="text-align: center; padding: 5px 20px;">
<h3 style="margin: .5em;">${HeaderAddTag}</h3> <h3 style="margin: .5em;">${HeaderAddTag}</h3>
@ -74,19 +85,38 @@
<div style="padding:10px 5px 0;"> <div style="padding:10px 5px 0;">
<form class="tagForm" style="min-width:210px;"> <form class="blockedTagForm" style="min-width:210px;">
<ul data-role="listview" class="ulForm" style="margin-bottom:10px!important;"> <ul data-role="listview" class="ulForm" style="margin-bottom:10px!important;">
<li> <li>
<label for="txtTag">${LabelTag}</label> <label for="txtBlockedTag">${LabelTag}</label>
<input id="txtTag" type="text" required="required" /> <input id="txtBlockedTag" type="text" required="required" />
</li> </li>
<li> <li>
<label for="selectTagMode">${LabelTagFilterMode}</label> <button type="submit" data-icon="plus" data-theme="b" data-mini="true">${ButtonAdd}</button>
<select id="selectTagMode" data-mini="true"> <button type="button" data-icon="delete" data-mini="true" onclick="$(this).parents('.popup').popup('close');">${ButtonCancel}</button>
<option value="Block">${OptionBlockItemWithTag}</option> </li>
<option value="Allow">${OptionAllowItemWithTag}</option> </ul>
</select> </form>
</div>
</div>
<div data-role="popup" id="popupAllowedTag" class="popup" data-theme="a">
<div class="ui-bar-a" style="text-align: center; padding: 5px 20px;">
<h3 style="margin: .5em;">${HeaderAddTag}</h3>
</div>
<div style="padding:10px 5px 0;">
<form class="allowedTagForm" style="min-width:210px;">
<ul data-role="listview" class="ulForm" style="margin-bottom:10px!important;">
<li>
<label for="txtAllowedTag">${LabelTag}</label>
<input id="txtAllowedTag" type="text" required="required" />
<div class="fieldDescription allowModeHelp">${LabelTagFilterAllowModeHelp}</div> <div class="fieldDescription allowModeHelp">${LabelTagFilterAllowModeHelp}</div>
</li> </li>
<li> <li>
@ -148,10 +178,11 @@
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$('.tagForm').off('submit', UserParentalControlPage.onTagFormSubmit).on('submit', UserParentalControlPage.onTagFormSubmit); $('.blockedTagForm').off('submit', UserParentalControlPage.onBlockedTagFormSubmit).on('submit', UserParentalControlPage.onBlockedTagFormSubmit);
$('.allowedTagForm').off('submit', UserParentalControlPage.onAllowedTagFormSubmit).on('submit', UserParentalControlPage.onAllowedTagFormSubmit);
$('.scheduleForm').off('submit', UserParentalControlPage.onScheduleFormSubmit).on('submit', UserParentalControlPage.onScheduleFormSubmit); $('.scheduleForm').off('submit', UserParentalControlPage.onScheduleFormSubmit).on('submit', UserParentalControlPage.onScheduleFormSubmit);
$('.userParentalControlForm').off('submit', UserParentalControlPage.onSubmit).on('submit', UserParentalControlPage.onSubmit); $('.userParentalControlForm').off('submit', UserParentalControlPage.onSubmit).on('submit', UserParentalControlPage.onSubmit);
</script> </script>
</div> </div>
</body> </body>
</html> </html>