aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/dir_fns.php2
-rw-r--r--include/text.php2
-rw-r--r--mod/display.php6
-rw-r--r--mod/editblock.php15
-rw-r--r--mod/editlayout.php16
-rw-r--r--mod/editpost.php13
-rw-r--r--mod/profile_photo.php4
-rw-r--r--version.inc2
-rw-r--r--view/css/default.css3
-rw-r--r--view/css/widgets.css2
-rw-r--r--view/theme/redbasic/css/style.css55
-rw-r--r--view/theme/redbasic/js/redbasic.js2
-rw-r--r--view/theme/redbasic/php/style.php2
-rw-r--r--view/theme/redbasic/schema/focus.css4
-rw-r--r--view/theme/redbasic/schema/focus.php4
-rwxr-xr-xview/tpl/cropbody.tpl4
-rwxr-xr-xview/tpl/edpost_head.tpl22
-rw-r--r--view/tpl/menuedit.tpl4
-rw-r--r--view/tpl/mitemedit.tpl71
-rw-r--r--view/tpl/mitemlist.tpl61
-rwxr-xr-xview/tpl/profile_vcard.tpl3
-rwxr-xr-xview/tpl/xchan_vcard.tpl2
22 files changed, 164 insertions, 135 deletions
diff --git a/include/dir_fns.php b/include/dir_fns.php
index 29c05fcaa..38c92dd94 100644
--- a/include/dir_fns.php
+++ b/include/dir_fns.php
@@ -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;
diff --git a/include/text.php b/include/text.php
index be465d0f4..a02484855 100644
--- a/include/text.php
+++ b/include/text.php
@@ -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;
diff --git a/mod/display.php b/mod/display.php
index 2f61e688a..b2d9ba34b 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -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' : ''),
@@ -63,10 +64,13 @@ function display_content(&$a, $update = 0, $load = false) {
'bang' => '',
'visitor' => true,
'profile_uid' => local_channel(),
- 'return_path' => 'channel/' . $channel['channel_address']
+ 'return_path' => 'channel/' . $channel['channel_address'],
+ 'expanded' => true
);
+ $o = '<div id="jot-popup">';
$o .= status_editor($a,$x);
+ $o .= '</div>';
}
diff --git a/mod/editblock.php b/mod/editblock.php
index 21d7cc537..818dc5ec7 100644
--- a/mod/editblock.php
+++ b/mod/editblock.php
@@ -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;
}
diff --git a/mod/editlayout.php b/mod/editlayout.php
index d61a14a48..6ea7f4100 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -101,12 +101,6 @@ function editlayout_content(&$a) {
$layout_title = $item_id[0]['sid'];
$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(),
@@ -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;
}
diff --git a/mod/editpost.php b/mod/editpost.php
index 8e4b37103..b5e9b6e94 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -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)/'),
@@ -54,7 +49,6 @@ function editpost_content(&$a) {
));
-
if(intval($itm[0]['item_obscured'])) {
$key = get_config('system','prvkey');
if($itm[0]['title'])
@@ -107,7 +101,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 +155,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;
}
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index de2a538f1..13923a655 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -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();
diff --git a/version.inc b/version.inc
index fe5a631ad..3310f4f5f 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-07-06.1085
+2015-07-10.1089
diff --git a/view/css/default.css b/view/css/default.css
index fb6705894..e1edc2cbf 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -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;
}
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 63c380c75..5b6e8aeb9 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -39,7 +39,7 @@
padding: 5px;
width: 100%;
resize: vertical;
- height: 150px;
+ height: 250px;
}
/* saved searches */
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 716298845..a44cf331c 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -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 {
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 68190778c..302efc365 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -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%' );
}
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 6e68d38d5..96dba59e5 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -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) {
diff --git a/view/theme/redbasic/schema/focus.css b/view/theme/redbasic/schema/focus.css
index 3d64b8a7d..ea983ffc8 100644
--- a/view/theme/redbasic/schema/focus.css
+++ b/view/theme/redbasic/schema/focus.css
@@ -16,10 +16,6 @@
background-color: #fff;
}
-#redbasic_converse_center_container {
- display: none;
-}
-
.wall-item-conv {
padding-top: 10px;
padding-left: 10px;
diff --git a/view/theme/redbasic/schema/focus.php b/view/theme/redbasic/schema/focus.php
index 4186c9f64..1f1963764 100644
--- a/view/theme/redbasic/schema/focus.php
+++ b/view/theme/redbasic/schema/focus.php
@@ -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";
diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl
index da5b1e859..4794c0b83 100755
--- a/view/tpl/cropbody.tpl
+++ b/view/tpl/cropbody.tpl
@@ -25,8 +25,8 @@
'croppa',
{
previewWrap: 'previewWrap',
- minWidth: 175,
- minHeight: 175,
+ minWidth: 300,
+ minHeight: 300,
maxWidth: 640,
maxHeight: 640,
ratioDim: { x: 100, y:100 },
diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl
index 20e597909..3be40e978 100755
--- a/view/tpl/edpost_head.tpl
+++ b/view/tpl/edpost_head.tpl
@@ -1,12 +1,14 @@
-<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>&nbsp;{{$delete}}</a>
+<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>&nbsp;{{$delete}}</a>
+ </div>
+ {{/if}}
+ <h2>{{$title}}</h2>
+ <div class="clear"></div>
+ </div>
+ <div id="webpage-editor" class="section-content-tools-wrapper">
+ {{$editor}}
</div>
- {{/if}}
- <h2>{{$title}}</h2>
- <div class="clear"></div>
-</div>
-<div id="webpage-editor" class="section-content-tools-wrapper">
- {{$editor}}
</div>
diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl
index 7fc17471c..0e5df2c47 100644
--- a/view/tpl/menuedit.tpl
+++ b/view/tpl/menuedit.tpl
@@ -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}}
diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl
index cdc022c5c..8715d6391 100644
--- a/view/tpl/mitemedit.tpl
+++ b/view/tpl/mitemedit.tpl
@@ -1,37 +1,42 @@
{{if $header}}
-<div class="section-title-wrapper">
- <h2>{{$header}}</h2>
-</div>
+<div class="generic-content-wrapper">
+ <div class="section-title-wrapper">
+ <h2>{{$header}}</h2>
+ </div>
{{/if}}
-<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}}
- <input type="hidden" name="mitem_id" value="{{$mitem_id}}" />
- {{/if}}
- {{include file="field_input.tpl" field=$mitem_desc}}
- {{include file="field_input.tpl" field=$mitem_link}}
- {{if $menu_names}}
- <datalist id="menu-names">
- {{foreach $menu_names as $menu_name}}
- <option value="{{$menu_name}}">
- {{/foreach}}
- </datalist>
- {{/if}}
- {{include file="field_input.tpl" field=$mitem_order}}
- {{include file="field_checkbox.tpl" field=$usezid}}
- {{include file="field_checkbox.tpl" field=$newwin}}
- <div class="pull-right form-group">
- <div class="btn-group">
- <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
- <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
- </button>
- {{if $submit_more}}
- <button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}}&nbsp;<i class="icon-caret-right"></i></button>
- {{/if}}
- <button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+ <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}}
+ <input type="hidden" name="mitem_id" value="{{$mitem_id}}" />
+ {{/if}}
+ {{include file="field_input.tpl" field=$mitem_desc}}
+ {{include file="field_input.tpl" field=$mitem_link}}
+ {{if $menu_names}}
+ <datalist id="menu-names">
+ {{foreach $menu_names as $menu_name}}
+ <option value="{{$menu_name}}">
+ {{/foreach}}
+ </datalist>
+ {{/if}}
+ {{include file="field_input.tpl" field=$mitem_order}}
+ {{include file="field_checkbox.tpl" field=$usezid}}
+ {{include file="field_checkbox.tpl" field=$newwin}}
+ <div class="pull-right form-group">
+ <div class="btn-group">
+ <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+ <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
+ </button>
+ {{if $submit_more}}
+ <button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}}&nbsp;<i class="icon-caret-right"></i></button>
+ {{/if}}
+ <button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+ </div>
+ {{$aclselect}}
</div>
- {{$aclselect}}
- </div>
- </form>
+ <div class="clear"></div>
+ </form>
+ </div>
+{{if $header}}
</div>
+{{/if}}
diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl
index 4e606654f..8686d4204 100644
--- a/view/tpl/mitemlist.tpl
+++ b/view/tpl/mitemlist.tpl
@@ -1,35 +1,34 @@
-<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>&nbsp;{{$hintnew}}</button>
+<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>&nbsp;{{$hintnew}}</button>
+ </div>
+ <h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2>
+ <div class="clear"></div>
</div>
- <h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2>
- <div class="clear"></div>
-</div>
-{{$create}}
+ {{$create}}
-{{if $mlist }}
-<div id="mitemlist-content-wrapper" class="section-content-wrapper-np">
- <table id="mitem-list-table">
- <tr>
- <th width="1%">{{$nametitle}}</th>
- <th width="96%">{{$targettitle}}</th>
- <th width="1%"></th>
- <th width="1%"></th>
- <th width="1%"></th>
- </tr>
- {{foreach $mlist as $m }}
- <tr id="mitem-list-item-{{$m.mitem_id}}">
- <td width="1%">{{$m.mitem_desc}}</td>
- <td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td>
- <td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td>
- <td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td>
- <td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
- </tr>
- {{/foreach}}
- </table>
+ {{if $mlist }}
+ <div id="mitemlist-content-wrapper" class="section-content-wrapper-np">
+ <table id="mitem-list-table">
+ <tr>
+ <th width="1%">{{$nametitle}}</th>
+ <th width="96%">{{$targettitle}}</th>
+ <th width="1%"></th>
+ <th width="1%"></th>
+ <th width="1%"></th>
+ </tr>
+ {{foreach $mlist as $m }}
+ <tr id="mitem-list-item-{{$m.mitem_id}}">
+ <td width="1%">{{$m.mitem_desc}}</td>
+ <td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td>
+ <td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td>
+ <td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td>
+ <td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
+ </tr>
+ {{/foreach}}
+ </table>
+ </div>
+ {{/if}}
</div>
-{{/if}}
-
-
-
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 2964d9c4b..9eac48c6d 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -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>
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
index ca0fe76be..2acbb24e4 100755
--- a/view/tpl/xchan_vcard.tpl
+++ b/view/tpl/xchan_vcard.tpl
@@ -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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 14:19:29 +0000