merge redmatrix fixes
This commit is contained in:
Mario Vavti
commit
b1f926ba89
@ -82,7 +82,7 @@ function get_directory_setting($observer, $setting) {
|
||||
if($ret === false)
|
||||
$ret = get_config('directory', $setting);
|
||||
|
||||
if($setting == 'safe_mode' && $ret === false)
|
||||
if($setting == 'safemode' && $ret === false)
|
||||
$ret = 1;
|
||||
|
||||
return $ret;
|
||||
|
||||
@ -807,7 +807,7 @@ function contact_block() {
|
||||
$shown = get_pconfig($a->profile['uid'],'system','display_friend_count');
|
||||
|
||||
if($shown === false)
|
||||
$shown = 24;
|
||||
$shown = 25;
|
||||
if($shown == 0)
|
||||
return;
|
||||
|
||||
|
||||
@ -52,6 +52,7 @@ function display_content(&$a, $update = 0, $load = false) {
|
||||
'deny_gid' => $channel['channel_deny_gid']
|
||||
);
|
||||
|
||||
|
||||
$x = array(
|
||||
'is_owner' => true,
|
||||
'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''),
|
||||
|
||||
@ -108,12 +108,6 @@ function editblock_content(&$a) {
|
||||
else
|
||||
$mimeselect = mimetype_select($itm[0]['uid'],$mimetype);
|
||||
|
||||
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
|
||||
'$title' => t('Edit Block'),
|
||||
'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
|
||||
'$id' => $itm[0]['id']
|
||||
));
|
||||
|
||||
$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
|
||||
'$baseurl' => $a->get_baseurl(),
|
||||
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
|
||||
@ -133,7 +127,7 @@ function editblock_content(&$a) {
|
||||
|
||||
$rp = 'blocks/' . $channel['channel_address'];
|
||||
|
||||
$o .= replace_macros($tpl,array(
|
||||
$editor = replace_macros($tpl,array(
|
||||
'$return_path' => $rp,
|
||||
'$action' => 'item',
|
||||
'$webpage' => ITEM_TYPE_BLOCK,
|
||||
@ -181,6 +175,13 @@ function editblock_content(&$a) {
|
||||
'$expires' => t('Set expiration date'),
|
||||
));
|
||||
|
||||
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
|
||||
'$title' => t('Edit Block'),
|
||||
'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
|
||||
'$id' => $itm[0]['id'],
|
||||
'$editor' => $editor
|
||||
));
|
||||
|
||||
return $o;
|
||||
|
||||
}
|
||||
|
||||
@ -102,12 +102,6 @@ function editlayout_content(&$a) {
|
||||
|
||||
$plaintext = true;
|
||||
|
||||
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
|
||||
'$title' => t('Edit Layout'),
|
||||
'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
|
||||
'$id' => $itm[0]['id']
|
||||
));
|
||||
|
||||
$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
|
||||
'$baseurl' => $a->get_baseurl(),
|
||||
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
|
||||
@ -132,7 +126,7 @@ function editlayout_content(&$a) {
|
||||
|
||||
$rp = 'layouts/' . $which;
|
||||
|
||||
$o .= replace_macros($tpl,array(
|
||||
$editor = replace_macros($tpl,array(
|
||||
'$return_path' => $rp,
|
||||
'$action' => 'item',
|
||||
'$webpage' => ITEM_TYPE_PDL,
|
||||
@ -178,6 +172,14 @@ function editlayout_content(&$a) {
|
||||
'$expires' => t('Set expiration date'),
|
||||
));
|
||||
|
||||
|
||||
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
|
||||
'$title' => t('Edit Layout'),
|
||||
'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
|
||||
'$id' => $itm[0]['id'],
|
||||
'$editor' => $editor
|
||||
));
|
||||
|
||||
return $o;
|
||||
|
||||
}
|
||||
|
||||
@ -38,11 +38,6 @@ function editpost_content(&$a) {
|
||||
|
||||
$channel = $a->get_channel();
|
||||
|
||||
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
|
||||
'$title' => t('Edit post')
|
||||
));
|
||||
|
||||
|
||||
$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
|
||||
'$baseurl' => $a->get_baseurl(),
|
||||
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
|
||||
@ -53,8 +48,6 @@ function editpost_content(&$a) {
|
||||
'$confirmdelete' => t('Delete item?'),
|
||||
));
|
||||
|
||||
|
||||
|
||||
if(intval($itm[0]['item_obscured'])) {
|
||||
$key = get_config('system','prvkey');
|
||||
if($itm[0]['title'])
|
||||
@ -107,7 +100,7 @@ function editpost_content(&$a) {
|
||||
$cipher = 'aes256';
|
||||
|
||||
|
||||
$o .= replace_macros($tpl,array(
|
||||
$editor = replace_macros($tpl,array(
|
||||
'$return_path' => $_SESSION['return_url'],
|
||||
'$action' => 'item',
|
||||
'$share' => t('Edit'),
|
||||
@ -161,6 +154,11 @@ function editpost_content(&$a) {
|
||||
'$expiryModalCANCEL' => t('Cancel'),
|
||||
));
|
||||
|
||||
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
|
||||
'$title' => t('Edit post'),
|
||||
'$editor' => $editor
|
||||
));
|
||||
|
||||
return $o;
|
||||
|
||||
}
|
||||
|
||||
@ -135,7 +135,7 @@ function profile_photo_post(&$a) {
|
||||
$im = photo_factory($base_image['data'], $base_image['type']);
|
||||
if($im->is_valid()) {
|
||||
|
||||
$im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
|
||||
$im->cropImage(300,$srcX,$srcY,$srcW,$srcH);
|
||||
|
||||
$aid = get_account_id();
|
||||
|
||||
@ -412,7 +412,7 @@ function profile_photo_crop_ui_head(&$a, $ph, $hash, $smallest){
|
||||
$width = $ph->getWidth();
|
||||
$height = $ph->getHeight();
|
||||
|
||||
if($width < 175 || $height < 175) {
|
||||
if($width < 300 || $height < 300) {
|
||||
$ph->scaleImageUp(200);
|
||||
$width = $ph->getWidth();
|
||||
$height = $ph->getHeight();
|
||||
|
||||
@ -17,12 +17,11 @@ main {
|
||||
aside {
|
||||
display: table-cell;
|
||||
vertical-align: top;
|
||||
padding: 65px 7px 0px 7px;
|
||||
|
||||
}
|
||||
|
||||
section {
|
||||
width: 100%;
|
||||
display: table-cell;
|
||||
vertical-align: top;
|
||||
padding: 65px 7px 200px 7px;
|
||||
}
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
padding: 5px;
|
||||
width: 100%;
|
||||
resize: vertical;
|
||||
height: 150px;
|
||||
height: 250px;
|
||||
}
|
||||
|
||||
/* saved searches */
|
||||
|
||||
@ -28,12 +28,17 @@ aside#region_1 {
|
||||
width: $aside_widthpx;
|
||||
min-width: $aside_widthpx;
|
||||
max-width: $aside_widthpx;
|
||||
padding: 80px 7px 0px 7px;
|
||||
}
|
||||
|
||||
main {
|
||||
max-width: $main_widthpx;
|
||||
}
|
||||
|
||||
section {
|
||||
padding: 80px 7px 200px 7px;
|
||||
}
|
||||
|
||||
h1, .h1, h2, .h2 {
|
||||
font-size: 1.667em;
|
||||
}
|
||||
@ -264,12 +269,20 @@ footer {
|
||||
}
|
||||
|
||||
/*TODO: we should use one class for all this. */
|
||||
/*
|
||||
.group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
|
||||
color: #444 !important;
|
||||
text-decoration: none !important;
|
||||
|
||||
.group-selected,
|
||||
.fileas-selected,
|
||||
.categories-selected,
|
||||
.search-selected,
|
||||
.active,
|
||||
.group-selected:hover,
|
||||
.fileas-selected:hover,
|
||||
.categories-selected:hover,
|
||||
.search-selected:hover,
|
||||
.active:hover {
|
||||
color: $font_colour;
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
.fileas-all {
|
||||
text-decoration: none !important;
|
||||
@ -347,7 +360,8 @@ footer {
|
||||
word-wrap: break-word;
|
||||
}
|
||||
|
||||
.vcard dl {
|
||||
.vcard dl,
|
||||
.vcard .title {
|
||||
margin-top: 10px;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
@ -406,13 +420,14 @@ footer {
|
||||
|
||||
|
||||
#profile-photo-wrapper img {
|
||||
padding: 10px;
|
||||
width: 197px;
|
||||
height: 197px;
|
||||
width: 100%;
|
||||
max-width: 300px;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
#profile-photo-wrapper {
|
||||
margin-top: 10px;
|
||||
margin-top: -10px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
|
||||
@ -571,7 +586,7 @@ footer {
|
||||
}
|
||||
|
||||
.photo {
|
||||
border: 1px solid #AAAAAA;
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
|
||||
.photo-top-photo, .photo-album-photo {
|
||||
@ -704,8 +719,8 @@ a.rateme, div.rateme {
|
||||
|
||||
.contact-block-div {
|
||||
float: left;
|
||||
width: 49px;
|
||||
height: 49px;
|
||||
width: 50px;
|
||||
height: 50px;
|
||||
}
|
||||
.contact-block-textdiv {
|
||||
float: left;
|
||||
@ -720,8 +735,8 @@ a.rateme, div.rateme {
|
||||
float: left;
|
||||
}
|
||||
.contact-block-img {
|
||||
width:47px;
|
||||
height:47px;
|
||||
width:48px;
|
||||
height:48px;
|
||||
}
|
||||
|
||||
#tag-remove {
|
||||
@ -1587,8 +1602,8 @@ img.mail-list-sender-photo {
|
||||
}
|
||||
|
||||
.jothidden > input {
|
||||
border: 1px solid $bgcolour;
|
||||
background-color: $bgcolour;
|
||||
border: 1px solid transparent;
|
||||
background-color: transparent;
|
||||
}
|
||||
.jothidden > input:hover,
|
||||
.jothidden > input:focus {
|
||||
@ -2109,9 +2124,15 @@ nav .badge.mail-update:hover {
|
||||
}
|
||||
|
||||
@media screen and (max-width: 767px) {
|
||||
|
||||
section {
|
||||
padding: 65px 7px 200px 7px;
|
||||
}
|
||||
|
||||
aside#region_1 {
|
||||
background: rgba(0, 0, 0, .1);
|
||||
border-right: 1px solid $nav_bd;
|
||||
padding: 65px 7px 0px 7px;
|
||||
}
|
||||
|
||||
main {
|
||||
|
||||
@ -7,7 +7,7 @@ $(document).ready(function() {
|
||||
if( $('#css3-calc').width() == 10) {
|
||||
$(window).resize(function() {
|
||||
if($(window).width() < 767) {
|
||||
$('main').css('width', $(window).width() + 231 );
|
||||
$('main').css('width', $(window).width() + 285 );
|
||||
} else {
|
||||
$('main').css('width', '100%' );
|
||||
}
|
||||
|
||||
@ -154,7 +154,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
|
||||
|
||||
$x = file_get_contents('view/theme/redbasic/css/style.css');
|
||||
|
||||
$aside_width = 231;
|
||||
$aside_width = 285;
|
||||
|
||||
// left aside and right aside are is 231px + converse width
|
||||
if($converse_center) {
|
||||
|
||||
@ -16,10 +16,6 @@
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
#redbasic_converse_center_container {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.wall-item-conv {
|
||||
padding-top: 10px;
|
||||
padding-left: 10px;
|
||||
|
||||
@ -46,7 +46,7 @@ if (! $radius)
|
||||
if (! $shadow)
|
||||
$shadow = "0";
|
||||
if (! $converse_width)
|
||||
$converse_width = "656";
|
||||
$converse_width = "790";
|
||||
if(! $top_photo)
|
||||
$top_photo = '48px';
|
||||
if(! $comment_indent)
|
||||
@ -61,5 +61,3 @@ else {
|
||||
$nav_float_min_opacity = (float) $nav_min_opacity;
|
||||
$nav_percent_min_opacity = (int) 100 * $nav_min_opacity;
|
||||
}
|
||||
|
||||
$converse_center = "1";
|
||||
|
||||
@ -25,8 +25,8 @@
|
||||
'croppa',
|
||||
{
|
||||
previewWrap: 'previewWrap',
|
||||
minWidth: 175,
|
||||
minHeight: 175,
|
||||
minWidth: 300,
|
||||
minHeight: 300,
|
||||
maxWidth: 640,
|
||||
maxHeight: 640,
|
||||
ratioDim: { x: 100, y:100 },
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
<div class="section-title-wrapper">
|
||||
<div class="generic-content-wrapper">
|
||||
<div class="section-title-wrapper">
|
||||
{{if $delete}}
|
||||
<div class="pull-right">
|
||||
<a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a>
|
||||
@ -6,7 +7,8 @@
|
||||
{{/if}}
|
||||
<h2>{{$title}}</h2>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
<div id="webpage-editor" class="section-content-tools-wrapper">
|
||||
</div>
|
||||
<div id="webpage-editor" class="section-content-tools-wrapper">
|
||||
{{$editor}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{{if $header}}
|
||||
<div class="generic-content-wrapper">
|
||||
<div class="section-title-wrapper">
|
||||
{{if $menu_id}}
|
||||
<div class="pull-right">
|
||||
@ -27,3 +28,6 @@
|
||||
<div class="clear"></div>
|
||||
</form>
|
||||
</div>
|
||||
{{if $header}}
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
{{if $header}}
|
||||
<div class="section-title-wrapper">
|
||||
<div class="generic-content-wrapper">
|
||||
<div class="section-title-wrapper">
|
||||
<h2>{{$header}}</h2>
|
||||
</div>
|
||||
</div>
|
||||
{{/if}}
|
||||
<div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
|
||||
<div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
|
||||
<form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}" method="post" >
|
||||
<input type="hidden" name="menu_id" value="{{$menu_id}}" />
|
||||
{{if $mitem_id}}
|
||||
@ -33,5 +34,9 @@
|
||||
</div>
|
||||
{{$aclselect}}
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
</form>
|
||||
</div>
|
||||
{{if $header}}
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
@ -1,15 +1,16 @@
|
||||
<div class="section-title-wrapper">
|
||||
<div class="generic-content-wrapper">
|
||||
<div class="section-title-wrapper">
|
||||
<div class="pull-right">
|
||||
<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="icon-edit"></i> {{$hintnew}}</button>
|
||||
</div>
|
||||
<h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{$create}}
|
||||
{{$create}}
|
||||
|
||||
{{if $mlist }}
|
||||
<div id="mitemlist-content-wrapper" class="section-content-wrapper-np">
|
||||
{{if $mlist }}
|
||||
<div id="mitemlist-content-wrapper" class="section-content-wrapper-np">
|
||||
<table id="mitem-list-table">
|
||||
<tr>
|
||||
<th width="1%">{{$nametitle}}</th>
|
||||
@ -28,8 +29,6 @@
|
||||
</tr>
|
||||
{{/foreach}}
|
||||
</table>
|
||||
</div>
|
||||
{{/if}}
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<div class="vcard">
|
||||
|
||||
<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
|
||||
{{if $profile.edit}}
|
||||
<div class="dropdown">
|
||||
<a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a>
|
||||
@ -18,7 +18,6 @@
|
||||
<div class="fn">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div>
|
||||
{{if $reddress}}<div class="reddress" oncopy="return false;">{{$profile.reddress}}</div>{{/if}}
|
||||
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
|
||||
<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<div class="vcard">
|
||||
<div class="fn">{{$name}}</div>
|
||||
<div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></a></div>
|
||||
<div class="fn">{{$name}}</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user