Merge remote-tracking branch 'upstream/master'
This commit is contained in:
zottel
commit
99c5c7ab28
@ -4,7 +4,7 @@ We need much more than this, but here are areas where developers can help. Pleas
|
||||
|
||||
[li]Documentation - see Red Documentation Project To-Do List[/li]
|
||||
[li]Include TOS link in registration/verification email[/li]
|
||||
[li](done) forum widget with unread counts (requires the DB schema changes from v3/hubzilla to be viable)[/li]
|
||||
[li]Auto preview posts/comments (configurable timer kicks in the preview if not 0)[/li]
|
||||
[li]Create bug tracker module[/li]
|
||||
[li]translation plugins - moses or apertium[/li]
|
||||
[li]plugins - provide 'disable' which is softer than 'uninstall' for those plugins which create additional DB tables[/li]
|
||||
|
||||
@ -762,6 +762,43 @@ function sync_menus($channel,$menus) {
|
||||
|
||||
|
||||
|
||||
function import_likes($channel,$likes) {
|
||||
if($channel && $likes) {
|
||||
foreach($likes as $like) {
|
||||
if($like['deleted']) {
|
||||
q("delete from likes where liker = '%s' and likee = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s'",
|
||||
dbesc($like['liker']),
|
||||
dbesc($like['likee']),
|
||||
dbesc($like['verb']),
|
||||
dbesc($like['target_type']),
|
||||
dbesc($like['target_id'])
|
||||
);
|
||||
continue;
|
||||
}
|
||||
|
||||
unset($like['id']);
|
||||
unset($like['iid']);
|
||||
$like['channel_id'] = $channel['channel_id'];
|
||||
$r = q("select * from likes where liker = '%s' and likee = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' and i_mid = '%s'",
|
||||
dbesc($like['liker']),
|
||||
dbesc($like['likee']),
|
||||
dbesc($like['verb']),
|
||||
dbesc($like['target_type']),
|
||||
dbesc($like['target_id']),
|
||||
dbesc($like['i_mid'])
|
||||
);
|
||||
if($r)
|
||||
continue;
|
||||
|
||||
dbesc_array($config);
|
||||
$r = dbq("INSERT INTO likes (`"
|
||||
. implode("`, `", array_keys($like))
|
||||
. "`) VALUES ('"
|
||||
. implode("', '", array_values($like))
|
||||
. "')" );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1137,6 +1137,8 @@ function discover_by_webbie($webbie) {
|
||||
if($hcard) {
|
||||
$vcard = scrape_vcard($hcard);
|
||||
$vcard['nick'] = substr($webbie,0,strpos($webbie,'@'));
|
||||
if(! $vcard['fn'])
|
||||
$vcard['fn'] = $webbie;
|
||||
}
|
||||
|
||||
$r = q("select * from xchan where xchan_hash = '%s' limit 1",
|
||||
|
||||
@ -294,9 +294,19 @@ function zot_refresh($them, $channel = null, $force = false) {
|
||||
if ($them['hubloc_url']) {
|
||||
$url = $them['hubloc_url'];
|
||||
} else {
|
||||
$r = q("select hubloc_url, hubloc_primary from hubloc where hubloc_hash = '%s'",
|
||||
dbesc($them['xchan_hash'])
|
||||
);
|
||||
$r = null;
|
||||
|
||||
if(array_key_exists('xchan_addr',$them) && $them['xchan_addr']) {
|
||||
$r = q("select hubloc_url, hubloc_primary from hubloc where hubloc_addr = '%s'",
|
||||
dbesc($them['xchan_addr'])
|
||||
);
|
||||
}
|
||||
if(! $r) {
|
||||
$r = q("select hubloc_url, hubloc_primary from hubloc where hubloc_hash = '%s'",
|
||||
dbesc($them['xchan_hash'])
|
||||
);
|
||||
}
|
||||
|
||||
if ($r) {
|
||||
foreach ($r as $rr) {
|
||||
if (intval($rr['hubloc_primary'])) {
|
||||
@ -962,7 +972,7 @@ function zot_process_response($hub, $arr, $outq) {
|
||||
);
|
||||
}
|
||||
|
||||
logger('zot_process_response: ' . print_r($x,true), LOGGER_DATA);
|
||||
logger('zot_process_response: ' . print_r($x,true), LOGGER_DEBUG);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -2226,7 +2236,7 @@ function sync_locations($sender, $arr, $absolute = false) {
|
||||
// Absolute sync - make sure the current primary is correctly reflected in the xchan
|
||||
$pr = hubloc_change_primary($r[0]);
|
||||
if($pr) {
|
||||
$what .= 'xchan_primary';
|
||||
$what .= 'xchan_primary ';
|
||||
$changed = true;
|
||||
}
|
||||
}
|
||||
@ -2878,6 +2888,9 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
|
||||
if(array_key_exists('obj',$arr) && $arr['obj'])
|
||||
sync_objs($channel,$arr['obj']);
|
||||
|
||||
if(array_key_exists('likes',$arr) && $arr['likes'])
|
||||
import_likes($channel,$arr['likes']);
|
||||
|
||||
if(array_key_exists('app',$arr) && $arr['app'])
|
||||
sync_apps($channel,$arr['app']);
|
||||
|
||||
|
||||
@ -432,6 +432,9 @@ function import_post(&$a) {
|
||||
if(is_array($data['obj']))
|
||||
import_objs($channel,$data['obj']);
|
||||
|
||||
if(is_array($data['likes']))
|
||||
import_likes($channel,$data['likes']);
|
||||
|
||||
if(is_array($data['app']))
|
||||
import_apps($channel,$data['app']);
|
||||
|
||||
|
||||
16
mod/like.php
16
mod/like.php
@ -219,6 +219,9 @@ function like_content(&$a) {
|
||||
);
|
||||
|
||||
if($z) {
|
||||
$z[0]['deleted'] = 1;
|
||||
build_sync_packet($ch[0]['channel_id'],array('likes' => $z));
|
||||
|
||||
q("delete from likes where id = %d limit 1",
|
||||
intval($z[0]['id'])
|
||||
);
|
||||
@ -497,7 +500,18 @@ function like_content(&$a) {
|
||||
dbesc($obj_id),
|
||||
dbesc(($target) ? $target : $object)
|
||||
);
|
||||
};
|
||||
$r = q("select * from likes where liker = '%s' and likee = '%s' and i_mid = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' ",
|
||||
dbesc($observer['xchan_hash']),
|
||||
dbesc($ch[0]['channel_hash']),
|
||||
dbesc($mid),
|
||||
dbesc($activity),
|
||||
dbesc(($tgttype)? $tgttype : $objtype),
|
||||
dbesc($obj_id)
|
||||
);
|
||||
if($r)
|
||||
build_sync_packet($ch[0]['channel_id'],array('likes' => $r));
|
||||
|
||||
}
|
||||
|
||||
|
||||
proc_run('php',"include/notifier.php","like","$post_id");
|
||||
|
||||
@ -232,7 +232,7 @@ function network_content(&$a, $update = 0, $load = false) {
|
||||
if($r) {
|
||||
$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($r[0]['abook_xchan']) . "' or owner_xchan = '" . dbesc($r[0]['abook_xchan']) . "' ) $item_normal ) ";
|
||||
$title = replace_macros(get_markup_template("section_title.tpl"),array(
|
||||
'$title' => (($_GET['pf'] === '1') ? t('Forum: ') : t('Connection: ')) . $r[0]['xchan_name']
|
||||
'$title' => '<a href="' . zid($r[0]['xchan_url']) . '" ><img src="' . zid($r[0]['xchan_photo_s']) . '" alt="' . urlencode($r[0]['xchan_name']) . '" /></a> <a href="' . zid($r[0]['xchan_url']) . '" >' . $r[0]['xchan_name'] . '</a>'
|
||||
));
|
||||
$o = $tabs;
|
||||
$o .= $title;
|
||||
|
||||
@ -1 +1 @@
|
||||
2015-09-08.1149
|
||||
2015-09-10.1151
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -96,7 +96,7 @@ $a->strings["Public Timeline"] = "Cronología pública";
|
||||
$a->strings["Default"] = "Predeterminado";
|
||||
$a->strings["Delete this item?"] = "¿Borrar este elemento?";
|
||||
$a->strings["Comment"] = "Comentar";
|
||||
$a->strings["[+] show all"] = "[+] mostrar todo";
|
||||
$a->strings["[+] show all"] = "[+] mostrar todo:";
|
||||
$a->strings["[-] show less"] = "[-] mostrar menos";
|
||||
$a->strings["[+] expand"] = "[+] expandir";
|
||||
$a->strings["[-] collapse"] = "[-] contraer";
|
||||
@ -202,7 +202,7 @@ $a->strings["bytes"] = "bytes";
|
||||
$a->strings["remove category"] = "eliminar categoría";
|
||||
$a->strings["remove from file"] = "eliminar del fichero";
|
||||
$a->strings["Click to open/close"] = "Pulsar para abrir/cerrar";
|
||||
$a->strings["Link to Source"] = "Ir al mensaje original";
|
||||
$a->strings["Link to Source"] = "Enlazar con la entrada en su ubicación original";
|
||||
$a->strings["default"] = "por defecto";
|
||||
$a->strings["Page layout"] = "Formato de la página";
|
||||
$a->strings["You can create your own with the layouts tool"] = "Puede crear su propio formato gráfico con las herramientas de diseño";
|
||||
@ -351,7 +351,7 @@ $a->strings["Bookmarked Chatrooms"] = "Salas de chat preferidas";
|
||||
$a->strings["Suggested Chatrooms"] = "Salas de chat sugeridas";
|
||||
$a->strings["photo/image"] = "foto/imagen";
|
||||
$a->strings["Rate Me"] = "Valorar este canal";
|
||||
$a->strings["View Ratings"] = "Ver valoraciones";
|
||||
$a->strings["View Ratings"] = "Mostrar las valoraciones";
|
||||
$a->strings["Public Hubs"] = "Servidores públicos";
|
||||
$a->strings["l F d, Y \\@ g:i A"] = "l d de F, Y \\@ G:i";
|
||||
$a->strings["Starts:"] = "Comienza:";
|
||||
@ -364,9 +364,9 @@ $a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %
|
||||
$a->strings["%1\$s sent you %2\$s."] = "%1\$s le envió %2\$s.";
|
||||
$a->strings["a private message"] = "un mensaje privado";
|
||||
$a->strings["Please visit %s to view and/or reply to your private messages."] = "Por favor visite %s para ver y/o responder a su mensaje privado.";
|
||||
$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s comentó [zrl=%3\$s]a %4\$s[/zrl]";
|
||||
$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s comentó [zrl=%3\$s]%4\$s de %5\$s[/zrl]";
|
||||
$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s comentó [zrl=%3\$s]su %4\$s[/zrl]";
|
||||
$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s comentó en [zrl=%3\$s]a %4\$s[/zrl]";
|
||||
$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s comentó en [zrl=%3\$s]%4\$s de %5\$s[/zrl]";
|
||||
$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s comentó en [zrl=%3\$s]su %4\$s[/zrl]";
|
||||
$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Red:Aviso] Nuevo comentario de %2\$s en la conversación #%1\$d";
|
||||
$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s comentó un elemento/conversación que ha estado siguiendo.";
|
||||
$a->strings["Please visit %s to view and/or reply to the conversation."] = "Para ver o comentar la conversación, visite %s";
|
||||
@ -398,7 +398,7 @@ $a->strings["No recipient provided."] = "No se ha especificado ningún destinata
|
||||
$a->strings["[no subject]"] = "[sin asunto]";
|
||||
$a->strings["Unable to determine sender."] = "No ha sido posible determinar el remitente. ";
|
||||
$a->strings["Stored post could not be verified."] = "No se han podido verificar las entradas guardadas.";
|
||||
$a->strings["%1\$s likes %2\$s's %3\$s"] = "a %1\$s le gusta %3\$s de %2\$s";
|
||||
$a->strings["%1\$s likes %2\$s's %3\$s"] = "a %1\$s le gusta el %3\$s de %2\$s";
|
||||
$a->strings["Please choose"] = "Por favor, elija";
|
||||
$a->strings["Agree"] = "De acuerdo";
|
||||
$a->strings["Disagree"] = "En desacuerdo";
|
||||
@ -432,8 +432,8 @@ $a->strings["__ctx:noun__ Dislike"] = array(
|
||||
);
|
||||
$a->strings["Add Star"] = "Destacar añadiendo una estrella";
|
||||
$a->strings["Remove Star"] = "Eliminar estrella";
|
||||
$a->strings["Toggle Star Status"] = "Activar o desactivar el estado de preferido";
|
||||
$a->strings["starred"] = "preferidos";
|
||||
$a->strings["Toggle Star Status"] = "Activar o desactivar el estado de entrada preferida";
|
||||
$a->strings["starred"] = "preferidas";
|
||||
$a->strings["Message signature validated"] = "Firma de mensaje validada";
|
||||
$a->strings["Message signature incorrect"] = "Firma de mensaje incorrecta";
|
||||
$a->strings["Add Tag"] = "Añadir etiqueta";
|
||||
@ -605,7 +605,7 @@ $a->strings["Filed under:"] = "Archivado bajo:";
|
||||
$a->strings["View in context"] = "Mostrar en su contexto";
|
||||
$a->strings["remove"] = "eliminar";
|
||||
$a->strings["Delete Selected Items"] = "Eliminar elementos seleccionados";
|
||||
$a->strings["View Source"] = "Ver la fuente original de esta entrada";
|
||||
$a->strings["View Source"] = "Ver la fuente original de la entrada";
|
||||
$a->strings["Follow Thread"] = "Seguir el hilo";
|
||||
$a->strings["View Status"] = "Ver estado";
|
||||
$a->strings["View Photos"] = "Ver fotos";
|
||||
@ -672,9 +672,9 @@ $a->strings["Sort by Comment Date"] = "Ordenar por fecha de comentario";
|
||||
$a->strings["Posted Order"] = "Publicaciones recientes";
|
||||
$a->strings["Sort by Post Date"] = "Ordenar por fecha de publicación";
|
||||
$a->strings["Posts that mention or involve you"] = "Publicaciones que le mencionan o involucran";
|
||||
$a->strings["New"] = "Novedades";
|
||||
$a->strings["New"] = "Nuevas";
|
||||
$a->strings["Activity Stream - by date"] = "Flujo de actividad - por fecha";
|
||||
$a->strings["Starred"] = "Preferidos";
|
||||
$a->strings["Starred"] = "Preferidas";
|
||||
$a->strings["Favourite Posts"] = "Publicaciones favoritas";
|
||||
$a->strings["Spam"] = "Correo basura";
|
||||
$a->strings["Posts flagged as SPAM"] = "Publicaciones marcadas como basura";
|
||||
@ -1061,7 +1061,7 @@ $a->strings["Title:"] = "Título:";
|
||||
$a->strings["Share this event"] = "Compartir este evento";
|
||||
$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s está siguiendo %2\$s de %3\$s";
|
||||
$a->strings["Public Sites"] = "Sitios públicos";
|
||||
$a->strings["The listed sites allow public registration for the \$Projectname network. All sites in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "Los sitios listados permiten el registro público de la red \$Projectname. Todos los sitios de la red están vinculados entre sí por lo que sus miembros, en ninguna de ellas, indican la pertenencia a la red en su conjunto. Algunos sitios pueden requerir suscripción o proporcionar planes de servicio por niveles. Los enlaces de los proveedores de <strong> pueden </strong> proporcionar detalles adicionales.";
|
||||
$a->strings["The listed sites allow public registration for the \$Projectname network. All sites in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "Los sitios listados permiten el registro público de la red \$Projectname. Todos los sitios de la red están vinculados entre sí por lo que sus miembros, en ninguna de ellos, indican la pertenencia a la red en su conjunto. Algunos sitios pueden requerir suscripción o proporcionar planes de servicio por niveles. Los enlaces de los proveedores <strong> pueden </strong> proporcionar detalles adicionales.";
|
||||
$a->strings["Rate this hub"] = "Valorar este sitio";
|
||||
$a->strings["Site URL"] = "Dirección del sitio";
|
||||
$a->strings["Access Type"] = "Tipo de Acceso";
|
||||
@ -1115,10 +1115,6 @@ $a->strings["No channel."] = "Ningún canal.";
|
||||
$a->strings["Common connections"] = "Conexiones comunes";
|
||||
$a->strings["No connections in common."] = "Ninguna conexión en común.";
|
||||
$a->strings["This site is not a directory server"] = "Este sitio no es un servidor de directorio";
|
||||
$a->strings["Could not access contact record."] = "No se ha podido acceder al registro de contacto.";
|
||||
$a->strings["Could not locate selected profile."] = "No se ha podido localizar el perfil seleccionado.";
|
||||
$a->strings["Connection updated."] = "Conexión actualizada.";
|
||||
$a->strings["Failed to update connection record."] = "Error al actualizar el registro de la conexión.";
|
||||
$a->strings["Blocked"] = "Bloqueadas";
|
||||
$a->strings["Ignored"] = "Ignoradas";
|
||||
$a->strings["Hidden"] = "Ocultas";
|
||||
@ -1945,6 +1941,10 @@ $a->strings["Remove This Channel"] = "Eliminar este canal";
|
||||
$a->strings["This channel will be completely removed from the network. "] = "Este canal va a ser completamente eliminado de la red.";
|
||||
$a->strings["Remove this channel and all its clones from the network"] = "Eliminar este canal y todos sus clones de la red";
|
||||
$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Por defecto, solo la instancia del canal alojado en este servidor será eliminado de la red";
|
||||
$a->strings["Could not access contact record."] = "No se ha podido acceder al registro de contacto.";
|
||||
$a->strings["Could not locate selected profile."] = "No se ha podido localizar el perfil seleccionado.";
|
||||
$a->strings["Connection updated."] = "Conexión actualizada.";
|
||||
$a->strings["Failed to update connection record."] = "Error al actualizar el registro de la conexión.";
|
||||
$a->strings["is now connected to"] = "ahora está conectado a";
|
||||
$a->strings["Could not access address book record."] = "No se pudo acceder a la entrada en su libreta de direcciones.";
|
||||
$a->strings["Refresh failed - channel is currently unavailable."] = "Recarga fallida - no se puede encontrar actualmente el canal";
|
||||
@ -2020,7 +2020,7 @@ $a->strings["Recall message"] = "Recuperar el mensaje";
|
||||
$a->strings["Message has been recalled."] = "El mensaje ha sido recuperado.";
|
||||
$a->strings["Private Conversation"] = "Conversación privada";
|
||||
$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página de perfil del remitente.";
|
||||
$a->strings["Send Reply"] = "Envía respuesta";
|
||||
$a->strings["Send Reply"] = "Responder";
|
||||
$a->strings["Invalid request identifier."] = "Petición inválida del identificador.";
|
||||
$a->strings["Discard"] = "Descartar";
|
||||
$a->strings["Please login."] = "Por favor, inicie sesión.";
|
||||
@ -2047,7 +2047,7 @@ $a->strings["Version ID"] = "Versión";
|
||||
$a->strings["Price of app"] = "Precio de la aplicación";
|
||||
$a->strings["Location (URL) to purchase app"] = "Ubicación (URL) donde adquirir la aplicación";
|
||||
$a->strings["sent you a private message"] = "enviarle un mensaje privado";
|
||||
$a->strings["added your channel"] = "se añadió su canal";
|
||||
$a->strings["added your channel"] = "añadió este canal a sus conexiones";
|
||||
$a->strings["posted an event"] = "publicó un evento";
|
||||
$a->strings["Comanche page description language help"] = "Página de ayuda del lenguaje de descripción de páginas (PDL) Comanche";
|
||||
$a->strings["Layout Description"] = "Descripción del formato";
|
||||
|
||||
@ -347,7 +347,7 @@ footer {
|
||||
.vcard {
|
||||
margin-bottom: 10px;
|
||||
padding: 10px;
|
||||
background-color: $comment_item_colour;
|
||||
background-color: rgba(254,254,254,0.5);
|
||||
border-bottom: 1px solid rgba(238,238,238,0.8);
|
||||
-moz-border-radius: $radiuspx;
|
||||
-webkit-border-radius: $radiuspx;
|
||||
@ -698,7 +698,7 @@ a.rateme, div.rateme {
|
||||
#contact-block {
|
||||
width: 100%;
|
||||
float: left;
|
||||
background-color: $comment_item_colour;
|
||||
background-color: rgba(254,254,254,0.5);
|
||||
border-bottom: 1px solid rgba(238,238,238,0.8);
|
||||
-moz-border-radius: $radiuspx;
|
||||
-webkit-border-radius: $radiuspx;
|
||||
@ -751,8 +751,8 @@ a.rateme, div.rateme {
|
||||
}
|
||||
|
||||
.wall-item-conv {
|
||||
padding-top: 5px;
|
||||
padding-bottom: 10px;
|
||||
padding-top: 10px;
|
||||
padding-left: 10px;
|
||||
}
|
||||
|
||||
|
||||
@ -1655,12 +1655,6 @@ img.mail-list-sender-photo {
|
||||
border-top-left-radius: $radiuspx;
|
||||
}
|
||||
|
||||
.generic-content-wrapper-styled {
|
||||
background-color: $comment_item_colour;
|
||||
padding: 10px;
|
||||
border-radius: $radiuspx;
|
||||
}
|
||||
|
||||
.wall-item-content-wrapper.comment {
|
||||
background-color: $comment_item_colour;
|
||||
border-color: $comment_border_colour;
|
||||
@ -1786,7 +1780,7 @@ img.mail-list-sender-photo {
|
||||
/* widgets */
|
||||
|
||||
.widget {
|
||||
background-color: $comment_item_colour;
|
||||
background-color: rgba(254,254,254,0.5);
|
||||
border-bottom: 1px solid rgba(238,238,238,0.8);
|
||||
-moz-border-radius: $radiuspx;
|
||||
-webkit-border-radius: $radiuspx;
|
||||
@ -1867,6 +1861,19 @@ nav .dropdown-menu {
|
||||
margin: 7px 0px;
|
||||
}
|
||||
|
||||
.generic-content-wrapper-styled {
|
||||
background-color: $bgcolour;
|
||||
padding: 10px;
|
||||
border-radius: $radiuspx;
|
||||
}
|
||||
|
||||
.generic-content-wrapper {
|
||||
border: 1px solid #ccc;
|
||||
box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2);
|
||||
border-radius: $radiuspx;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
.section-title-wrapper {
|
||||
padding: 7px 10px;
|
||||
background-color: $item_colour;
|
||||
|
||||
@ -107,15 +107,15 @@ if (! $link_colour)
|
||||
if (! $banner_colour)
|
||||
$banner_colour = "#fff";
|
||||
if (! $bgcolour)
|
||||
$bgcolour = "#fdfdfd";
|
||||
$bgcolour = "rgb(254,254,254)";
|
||||
if (! $background_image)
|
||||
$background_image ='';
|
||||
if (! $item_colour)
|
||||
$item_colour = "rgba(238,238,238,0.8)";
|
||||
$item_colour = "rgb(238,238,238)";
|
||||
if (! $comment_item_colour)
|
||||
$comment_item_colour = "rgba(254,254,254,0.4)";
|
||||
$comment_item_colour = "rgb(255,255,255)";
|
||||
if (! $comment_border_colour)
|
||||
$comment_border_colour = "rgba(238,238,238,0.8)";
|
||||
$comment_border_colour = "rgb(255,255,255)";
|
||||
if (! $toolicon_colour)
|
||||
$toolicon_colour = '#777';
|
||||
if (! $toolicon_activecolour)
|
||||
@ -133,7 +133,7 @@ if (! $radius)
|
||||
if (! $shadow)
|
||||
$shadow = "0";
|
||||
if (! $converse_width)
|
||||
$converse_width = "1024";
|
||||
$converse_width = "790";
|
||||
if(! $top_photo)
|
||||
$top_photo = '48px';
|
||||
if(! $comment_indent)
|
||||
|
||||
@ -3,9 +3,9 @@
|
||||
}
|
||||
|
||||
.wall-item-content-wrapper.comment {
|
||||
border-width: 0px 1px 1px 1px;
|
||||
border-width: 0px 0px 1px 0px;
|
||||
}
|
||||
|
||||
.hide-comments-outer {
|
||||
border-width: 1px 1px 1px 1px;
|
||||
border-width: 1px 0px 1px 0px;
|
||||
}
|
||||
|
||||
@ -2,3 +2,5 @@
|
||||
|
||||
if (! $radiuspx)
|
||||
$radiuspx = "4";
|
||||
if (! $comment_border_colour)
|
||||
$comment_border_colour = "rgb(238,238,238)";
|
||||
|
||||
@ -1,4 +1,10 @@
|
||||
.generic-content-wrapper {
|
||||
border: 1px solid #111;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
.vcard, #contact-block, .widget {
|
||||
background-color: transparent;
|
||||
border-bottom: 1px solid #fff;
|
||||
}
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
.generic-content-wrapper {
|
||||
border: 1px solid #ccc;
|
||||
box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2);
|
||||
border-radius: 4px;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
.wall-item-content-wrapper.comment {
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
.section-content-tools-wrapper,
|
||||
.section-content-wrapper,
|
||||
.section-content-wrapper-np,
|
||||
.hide-comments-outer {
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
.wall-item-conv {
|
||||
padding-top: 10px;
|
||||
padding-left: 10px;
|
||||
}
|
||||
@ -1,63 +0,0 @@
|
||||
<?php
|
||||
if (! $nav_bg)
|
||||
$nav_bg = "#222";
|
||||
if (! $nav_gradient_top)
|
||||
$nav_gradient_top = "#3c3c3c";
|
||||
if (! $nav_gradient_bottom)
|
||||
$nav_gradient_bottom = "#222";
|
||||
if (! $nav_active_gradient_top)
|
||||
$nav_active_gradient_top = "#222";
|
||||
if (! $nav_active_gradient_bottom)
|
||||
$nav_active_gradient_bottom = "#282828";
|
||||
if (! $nav_bd)
|
||||
$nav_bd = "#222";
|
||||
if (! $nav_icon_colour)
|
||||
$nav_icon_colour = "#999";
|
||||
if (! $nav_active_icon_colour)
|
||||
$nav_active_icon_colour = "#fff";
|
||||
if (! $link_colour)
|
||||
$link_colour = "#337AB7";
|
||||
if (! $banner_colour)
|
||||
$banner_colour = "#fff";
|
||||
if (! $bgcolour)
|
||||
$bgcolour = "#fdfdfd";
|
||||
if (! $background_image)
|
||||
$background_image ='';
|
||||
if (! $item_colour)
|
||||
$item_colour = "rgb(238,238,238)";
|
||||
if (! $comment_item_colour)
|
||||
$comment_item_colour = "rgba(254,254,254,0.4)";
|
||||
if (! $comment_border_colour)
|
||||
$comment_border_colour = "transparent";
|
||||
if (! $toolicon_colour)
|
||||
$toolicon_colour = '#777';
|
||||
if (! $toolicon_activecolour)
|
||||
$toolicon_activecolour = '#000';
|
||||
if (! $item_opacity)
|
||||
$item_opacity = "1";
|
||||
if (! $font_size)
|
||||
$font_size = "0.9rem";
|
||||
if (! $body_font_size)
|
||||
$body_font_size = "0.75rem";
|
||||
if (! $font_colour)
|
||||
$font_colour = "#4d4d4d";
|
||||
if (! $radius)
|
||||
$radius = "4";
|
||||
if (! $shadow)
|
||||
$shadow = "0";
|
||||
if (! $converse_width)
|
||||
$converse_width = "790";
|
||||
if(! $top_photo)
|
||||
$top_photo = '48px';
|
||||
if(! $comment_indent)
|
||||
$comment_indent = '0px';
|
||||
if(! $reply_photo)
|
||||
$reply_photo = '32px';
|
||||
if($nav_min_opacity === false || $nav_min_opacity === '') {
|
||||
$nav_float_min_opacity = 1.0;
|
||||
$nav_percent_min_opacity = 100;
|
||||
}
|
||||
else {
|
||||
$nav_float_min_opacity = (float) $nav_min_opacity;
|
||||
$nav_percent_min_opacity = (int) 100 * $nav_min_opacity;
|
||||
}
|
||||
@ -1,4 +1,10 @@
|
||||
.generic-content-wrapper {
|
||||
border: 1px solid #fff;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
.vcard, #contact-block, .widget {
|
||||
background-color: transparent;
|
||||
border-bottom: 1px solid #fff;
|
||||
}
|
||||
|
||||
|
||||
@ -1,4 +1,10 @@
|
||||
.generic-content-wrapper {
|
||||
border: 1px solid #000;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
.vcard, #contact-block, .widget {
|
||||
background-color: transparent;
|
||||
border-bottom: 1px solid #fff;
|
||||
}
|
||||
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
.vcard, #contact-block, .widget {
|
||||
border-bottom: 1px solid #fff;
|
||||
.generic-content-wrapper {
|
||||
border: 1px solid #000;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
.abook-pending-contact, .abook-permschange {
|
||||
background: #000;
|
||||
.vcard, #contact-block, .widget {
|
||||
background-color: transparent;
|
||||
border-bottom: 1px solid #fff;
|
||||
}
|
||||
|
||||
#cboxContent a {
|
||||
|
||||
Reference in New Issue
Block a user