harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

Browse Source
This commit is contained in:
redmatrix 2016-08-16 19:01:20 -07:00
commit b2eede891a
4 changed files with 30 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/context/es-es/settings/features/help.html Normal file
View File

@ -0,0 +1,12 @@
<dl class="dl-horizontal">
<dt>General</dt>
<dd>Esta página le permite configurar los ajustes para muchas funcionalidades adicionales de Hubzilla.</dd>
<dt><a href='#' onclick='$("#general-settings-title h3 a").click(); setTimeout((function() {contextualHelpFocus("#general-settings-title", 0)}), 1000); return false;' title="Pulsar para resaltar el elemento...">Funcionalidades básicas</a></dt>
<dd>Las ajustes de las funcionalidades básicas incluyen opciones importantes para su canal, tales como el hospedaje de páginas web y wikis.</dd>
<dt><a href='#' onclick='$("#composition-settings-title h3 a").click(); setTimeout((function() {contextualHelpFocus("#composition-settings-title", 0)}), 1000); return false;' title="Pulsar para resaltar el elemento...">Opciones para la redacción de entradas</a></dt>
<dd>Los ajustes de la redacción de entradas incluyen opciones adicionales para la composición de nuevas publicaciones.</dd>
<dt><a href='#' onclick='$("#net_module-settings-title h3 a").click(); setTimeout((function() {contextualHelpFocus("#net_module-settings-title", 0)}), 1000); return false;' title="Pulsar para resaltar el elemento...">Filtrado del contenido</a></dt>
<dd>Estos ajustes modifican funcionalidades asociadas al filtrado del contenido y a cómo ver las publicaciones nuevas.</dd>
<dt><a href='#' onclick='$("#tools-settings-title h3 a").click(); setTimeout((function() {contextualHelpFocus("#tools-settings-title", 0)}), 1000); return false;' title="Pulsar para resaltar el elemento...">Gestión de entradas y comentarios</a></dt>
<dd>Estos ajustes proporcionan herramientas adicionales para establecer el tema de las entradas y permiten métodos adicionales para los comentarios, tales como los emojis y el etiquetado de la comunidad.</dd>
</dl>

2
include/acl_selectors.php
View File

@ -172,7 +172,7 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti
'$showallOrigin' => $showall_origin, '$showallOrigin' => $showall_origin,
'$showallIcon' => $showall_icon, '$showallIcon' => $showall_icon,
'$select_label' => t('Who can see this?'), '$select_label' => t('Who can see this?'),
'$showlimited' => t('Custom selection'), '$custom' => t('Custom selection'),
'$showlimitedDesc' => t('Select "Show" to allow viewing. "Don\'t show" lets you override and limit the scope of "Show".'), '$showlimitedDesc' => t('Select "Show" to allow viewing. "Don\'t show" lets you override and limit the scope of "Show".'),
'$show' => t("Show"), '$show' => t("Show"),
'$hide' => t("Don't show"), '$hide' => t("Don't show"),

57
view/js/acl.js
View File

@ -22,7 +22,7 @@ function ACL(backend_url) {
that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html()); that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html());
that.showall = $("#acl-showall"); that.showall = $("#acl-showall");
that.onlyme = $("#acl-onlyme"); that.onlyme = $("#acl-onlyme");
that.showlimited = $("#acl-showlimited"); that.custom = $("#acl-custom");
that.acl_select = $("#acl-select"); that.acl_select = $("#acl-select");
// set the initial ACL lists in case the enclosing form gets submitted before the ajax loader completes. // set the initial ACL lists in case the enclosing form gets submitted before the ajax loader completes.
@ -35,7 +35,7 @@ function ACL(backend_url) {
that.acl_select.change(function(event) { that.acl_select.change(function(event) {
var option = that.acl_select.val(); var option = that.acl_select.val();
if(option != 'public' && option != 'onlyme' && option != 'limited') { // selected group if(option != 'public' && option != 'onlyme' && option != 'custom') { // limited to one selected group
that.on_showgroup(event); that.on_showgroup(event);
} }
@ -47,8 +47,8 @@ function ACL(backend_url) {
that.on_onlyme(event); that.on_onlyme(event);
} }
if(option == 'limited') { // limited to custom selection if(option == 'custom') { // limited to custom selection
that.on_showlimited(event); that.on_custom(event);
} }
}); });
@ -171,7 +171,7 @@ ACL.prototype.on_showgroup = function(event) {
}; };
ACL.prototype.on_showlimited = function(event) { ACL.prototype.on_custom = function(event) {
// preventDefault() isn't called here as we want state changes from update_view() to be applied to the radiobutton // preventDefault() isn't called here as we want state changes from update_view() to be applied to the radiobutton
event.stopPropagation(); event.stopPropagation();
@ -180,38 +180,12 @@ ACL.prototype.on_showlimited = function(event) {
that.deny_cid = []; that.deny_cid = [];
that.deny_gid = []; that.deny_gid = [];
that.update_view('limited'); that.update_view('custom');
that.on_submit(); that.on_submit();
return true; // return true so that state changes from update_view() will be applied return true; // return true so that state changes from update_view() will be applied
} }
ACL.prototype.on_selectall = function(event) {
event.preventDefault();
event.stopPropagation();
/* This function has not yet been completed. */
/* The goal is to select all ACL "show" entries with one action. */
$('.acl-button-show').each(function(){});
if (that.showall.hasClass("btn-warning")) {
return false;
}
that.showall.removeClass("btn-default").addClass("btn-warning");
that.allow_cid = [];
that.allow_gid = [];
that.deny_cid = [];
that.deny_gid = [];
that.update_view();
that.on_submit();
return false;
};
ACL.prototype.on_button_show = function(event) { ACL.prototype.on_button_show = function(event) {
event.preventDefault(); event.preventDefault();
event.stopImmediatePropagation(); event.stopImmediatePropagation();
@ -257,7 +231,7 @@ ACL.prototype.set_allow = function(itemid) {
if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id); if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id);
break; break;
} }
that.update_view('limited'); that.update_view('custom');
}; };
ACL.prototype.set_deny = function(itemid) { ACL.prototype.set_deny = function(itemid) {
@ -281,16 +255,16 @@ ACL.prototype.set_deny = function(itemid) {
if (that.allow_cid.indexOf(id)>=0) that.allow_cid.remove(id); if (that.allow_cid.indexOf(id)>=0) that.allow_cid.remove(id);
break; break;
} }
that.update_view('limited'); that.update_view('custom');
}; };
ACL.prototype.update_select = function(set) { ACL.prototype.update_select = function(set) {
if(set != 'public' && set != 'onlyme' && set != 'limited') { if(set != 'public' && set != 'onlyme' && set != 'custom') {
$('#' + set).prop('selected', true ); $('#' + set).prop('selected', true );
} }
that.showall.prop('selected', set === 'public'); that.showall.prop('selected', set === 'public');
that.onlyme.prop('selected', set === 'onlyme'); that.onlyme.prop('selected', set === 'onlyme');
that.showlimited.prop('selected', set === 'limited'); that.custom.prop('selected', set === 'custom');
}; };
ACL.prototype.update_view = function(value) { ACL.prototype.update_view = function(value) {
@ -302,7 +276,7 @@ ACL.prototype.update_view = function(value) {
that.form_id.data('deny_gid', that.deny_gid); that.form_id.data('deny_gid', that.deny_gid);
} }
if (that.allow_gid.length === 0 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value !== 'limited') { if (that.allow_gid.length === 0 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value !== 'custom') {
that.list.hide(); //hide acl-list that.list.hide(); //hide acl-list
that.info.show(); //show acl-info that.info.show(); //show acl-info
that.update_select('public'); that.update_select('public');
@ -313,7 +287,7 @@ ACL.prototype.update_view = function(value) {
} }
else if (that.allow_gid.length === 1 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value !== 'limited') { else if (that.allow_gid.length === 1 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value !== 'custom') {
that.list.hide(); //hide acl-list that.list.hide(); //hide acl-list
that.info.hide(); //show acl-info that.info.hide(); //show acl-info
that.selected_id = that.group_ids[that.allow_gid[0]]; that.selected_id = that.group_ids[that.allow_gid[0]];
@ -325,7 +299,7 @@ ACL.prototype.update_view = function(value) {
} }
// if value != 'onlyme' we should fall through this one // if value != 'onlyme' we should fall through this one
else if (that.allow_gid.length === 0 && that.allow_cid.length === 1 && that.allow_cid[0] === that.self[0] && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value !== 'limited') { else if (that.allow_gid.length === 0 && that.allow_cid.length === 1 && that.allow_cid[0] === that.self[0] && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value !== 'custom') {
that.list.hide(); //hide acl-list that.list.hide(); //hide acl-list
that.info.hide(); //show acl-info that.info.hide(); //show acl-info
that.update_select('onlyme'); that.update_select('onlyme');
@ -338,10 +312,10 @@ ACL.prototype.update_view = function(value) {
else { else {
that.list.show(); //show acl-list that.list.show(); //show acl-list
that.info.hide(); //hide acl-info that.info.hide(); //hide acl-info
that.update_select('limited'); that.update_select('custom');
/* jot acl */ /* jot acl */
if(that.allow_gid.length === 0 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value === 'limited') { if(that.allow_gid.length === 0 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value === 'custom') {
$('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-lock').addClass('fa-unlock'); $('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
$('.profile-jot-net input').attr('disabled', false); $('.profile-jot-net input').attr('disabled', false);
} }
@ -354,6 +328,7 @@ ACL.prototype.update_view = function(value) {
$("#acl-list-content .acl-list-item").each(function() { $("#acl-list-content .acl-list-item").each(function() {
$(this).removeClass("groupshow grouphide"); $(this).removeClass("groupshow grouphide");
}); });
$("#acl-list-content .acl-list-item").each(function() { $("#acl-list-content .acl-list-item").each(function() {
itemid = $(this).attr('id'); itemid = $(this).attr('id');
type = itemid[0]; type = itemid[0];

2
view/tpl/acl_selector.tpl
View File

@ -18,7 +18,7 @@
<option id="acl-showall" value="public" selected>{{$showall}}</option> <option id="acl-showall" value="public" selected>{{$showall}}</option>
{{$groups}} {{$groups}}
<option id="acl-onlyme" value="onlyme">{{$onlyme}}</option> <option id="acl-onlyme" value="onlyme">{{$onlyme}}</option>
<option id="acl-showlimited" value="limited">{{$showlimited}}</option> <option id="acl-custom" value="custom">{{$custom}}</option>
</select> </select>
{{if $showallOrigin}} {{if $showallOrigin}}