mirror of
https://github.com/friendica/friendica
synced 2024-11-10 05:02:58 +00:00
Merge branch 'master' of github.com:fabrixxm/friendica
This commit is contained in:
Fabio Comuni
commit
be2fd56aae
30 changed files with 652 additions and 316 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 3 KiB After Width: | Height: | Size: 463 B |
BIN
images/icons/10/unlock.png
Normal file
BIN
images/icons/10/unlock.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 398 B |
Binary file not shown.
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 593 B |
BIN
images/icons/16/unlock.png
Normal file
BIN
images/icons/16/unlock.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 547 B |
Binary file not shown.
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 736 B |
BIN
images/icons/22/unlock.png
Normal file
BIN
images/icons/22/unlock.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 682 B |
Binary file not shown.
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 1.3 KiB |
BIN
images/icons/48/unlock.png
Normal file
BIN
images/icons/48/unlock.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
|
|
@ -2,7 +2,7 @@
|
|||
IMAGES=add.png edit.png gear.png info.png menu.png \
|
||||
notify_off.png star.png delete.png feed.png group.png \
|
||||
lock.png notice.png notify_on.png user.png link.png \
|
||||
play.png plugin.png
|
||||
play.png plugin.png unlock.png
|
||||
|
||||
DESTS=10/ 16/ 22/ 48/ \
|
||||
$(addprefix 10/, $(IMAGES)) \
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 8 KiB After Width: | Height: | Size: 8 KiB |
BIN
images/icons/lock.png.tmp
Normal file
BIN
images/icons/lock.png.tmp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8 KiB |
BIN
images/icons/unlock.png
Normal file
BIN
images/icons/unlock.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.2 KiB |
|
|
@ -145,8 +145,9 @@ function get_pconfig($uid,$family, $key, $instore = false) {
|
|||
);
|
||||
|
||||
if(count($ret)) {
|
||||
$a->config[$uid][$family][$key] = $ret[0]['v'];
|
||||
return $ret[0]['v'];
|
||||
$val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
|
||||
$a->config[$uid][$family][$key] = $val;
|
||||
return $val;
|
||||
}
|
||||
else {
|
||||
$a->config[$uid][$family][$key] = '!<unset>!';
|
||||
|
|
@ -177,20 +178,23 @@ function set_pconfig($uid,$family,$key,$value) {
|
|||
|
||||
global $a;
|
||||
|
||||
// manage array value
|
||||
$dbvalue = (is_array($value)?serialize($value):$value);
|
||||
|
||||
if(get_pconfig($uid,$family,$key,true) === false) {
|
||||
$a->config[$uid][$family][$key] = $value;
|
||||
$ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ",
|
||||
intval($uid),
|
||||
dbesc($family),
|
||||
dbesc($key),
|
||||
dbesc($value)
|
||||
dbesc($dbvalue)
|
||||
);
|
||||
if($ret)
|
||||
return $value;
|
||||
return $ret;
|
||||
}
|
||||
$ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
|
||||
dbesc($value),
|
||||
dbesc($dbvalue),
|
||||
intval($uid),
|
||||
dbesc($family),
|
||||
dbesc($key)
|
||||
|
|
|
|||
|
|
@ -856,13 +856,21 @@ function status_editor($a,$x, $notes_cid = 0) {
|
|||
'$action' => 'item',
|
||||
'$share' => (($x['button']) ? $x['button'] : t('Share')),
|
||||
'$upload' => t('Upload photo'),
|
||||
'$shortupload' => t('upload photo'),
|
||||
'$attach' => t('Attach file'),
|
||||
'$shortattach' => t('attach file'),
|
||||
'$weblink' => t('Insert web link'),
|
||||
'$shortweblink' => t('web link'),
|
||||
'$video' => t('Insert video link'),
|
||||
'$shortvideo' => t('video link'),
|
||||
'$audio' => t('Insert audio link'),
|
||||
'$shortaudio' => t('audio link'),
|
||||
'$setloc' => t('Set your location'),
|
||||
'$shortsetloc' => t('set location'),
|
||||
'$noloc' => t('Clear browser location'),
|
||||
'$title' => t('Set title'),
|
||||
'$shortnoloc' => t('clear location'),
|
||||
'$title' => "",
|
||||
'$placeholdertitle' => t('Set title'),
|
||||
'$wait' => t('Please wait'),
|
||||
'$permset' => t('Permission settings'),
|
||||
'$ptyp' => (($notes_cid) ? 'note' : 'wall'),
|
||||
|
|
|
|||
|
|
@ -1367,30 +1367,36 @@ function photos_content(&$a) {
|
|||
intval($a->pager['itemspage'])
|
||||
);
|
||||
|
||||
$o .= '<h3>' . t('Recent Photos') . '</h3>';
|
||||
|
||||
if($can_post) {
|
||||
$o .= '<div id="photo-top-links"><a id="photo-top-upload-link" href="'. $a->get_baseurl() . '/photos/'
|
||||
. $a->data['user']['nickname'] . '/upload' . '">' . t('Upload New Photos') . '</a></div>';
|
||||
}
|
||||
|
||||
$tpl = get_markup_template('photo_top.tpl');
|
||||
$photos = array();
|
||||
if(count($r)) {
|
||||
foreach($r as $rr) {
|
||||
$o .= replace_macros($tpl,array(
|
||||
'$id' => $rr['id'],
|
||||
'$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
|
||||
'$phototitle' => t('View Photo'),
|
||||
'$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.jpg',
|
||||
'$albumlink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
|
||||
'$albumname' => template_escape($rr['album']),
|
||||
'$albumalt' => t('View Album'),
|
||||
'$imgalt' => template_escape($rr['filename'])
|
||||
));
|
||||
|
||||
$photos[] = array(
|
||||
'id' => $rr['id'],
|
||||
'link' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
|
||||
'title' => t('View Photo'),
|
||||
'src' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.jpg',
|
||||
'alt' => template_escape($rr['filename']),
|
||||
'album' => array(
|
||||
'link' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
|
||||
'name' => template_escape($rr['album']),
|
||||
'alt' => t('View Album'),
|
||||
),
|
||||
|
||||
);
|
||||
}
|
||||
$o .= '<div id="photo-top-end"></div>';
|
||||
}
|
||||
|
||||
$tpl = get_markup_template('photos_recent.tpl');
|
||||
$o .= replace_macros($tpl,array(
|
||||
'$title' => t('Recent Photos'),
|
||||
'$can_post' => $can_post,
|
||||
'$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['user']['nickname'].'/upload'),
|
||||
'$photos' => $photos,
|
||||
));
|
||||
|
||||
|
||||
$o .= paginate($a);
|
||||
return $o;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,23 +1,21 @@
|
|||
|
||||
<div class="contact-entry-wrapper" id="contact-entry-wrapper-$id" >
|
||||
<div class="contact-entry-photo-wrapper" >
|
||||
<div class="contact-entry-photo mframe" id="contact-entry-photo-$id"
|
||||
<div class="contact-wrapper" id="contact-entry-wrapper-$id" >
|
||||
<div class="contact-photo-wrapper" >
|
||||
<div class="contact-photo mframe" id="contact-entry-photo-$id"
|
||||
onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('contact-photo-menu-button-$id')" onmouseout="t$id=setTimeout('closeMenu(\'contact-photo-menu-button-$id\'); closeMenu(\'contact-photo-menu-$id\');',200)" >
|
||||
|
||||
<a href="$url" title="$img_hover" /><img src="$thumb" $sparkle alt="$name" /></a>
|
||||
|
||||
<span onclick="openClose('contact-photo-menu-$id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$id">menu</span>
|
||||
<div class="contact-photo-menu" id="contact-photo-menu-$id">
|
||||
<ul>
|
||||
$contact_photo_menu
|
||||
</ul>
|
||||
</div>
|
||||
<a href="#" rel="#contact-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-$id">menu</a>
|
||||
<ul class="contact-photo-menu menu-popup" id="contact-photo-menu-$id">
|
||||
$contact_photo_menu
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="contact-entry-photo-end" ></div>
|
||||
<div class="contact-entry-name" id="contact-entry-name-$id" >$name</div>
|
||||
<div class="contact-name" id="contact-entry-name-$id" >$name</div>
|
||||
|
||||
|
||||
<div class="contact-entry-end" ></div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,11 @@
|
|||
|
||||
<div class="directory-item lframe" id="directory-item-$id" >
|
||||
<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" >
|
||||
<div class="directory-photo" id="directory-photo-$id" ><a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" ><img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" /></a>
|
||||
<div class="contact-photo-wrapper" id="directory-photo-wrapper-$id" >
|
||||
<div class="contact-photo" id="directory-photo-$id" >
|
||||
<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" ><img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" /></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="contact-name" id="directory-name-$id">$name</div>
|
||||
<div class="contact-details">$details</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="directory-photo-end"></div>
|
||||
<div class="directory-name-wrapper">
|
||||
<div class="directory-name" id="directory-name-$id">$name</div>
|
||||
</div>
|
||||
<div class="directory-name-end"></div>
|
||||
<div class="directory-details">$details</div>
|
||||
<div class="directory-item-end"></div>
|
||||
</div>
|
||||
|
|
@ -81,7 +81,7 @@ function initEditor(cb){
|
|||
ed.onInit.add(function(ed) {
|
||||
ed.pasteAsPlainText = true;
|
||||
$("#profile-jot-text-loading").hide();
|
||||
$("#profile-jot-submit-wrapper").show();
|
||||
$(".jothidden").show();
|
||||
if (typeof cb!="undefined") cb();
|
||||
});
|
||||
|
||||
|
|
@ -98,19 +98,21 @@ function initEditor(cb){
|
|||
}
|
||||
}
|
||||
|
||||
function enableOnUser(){
|
||||
if (editor) return;
|
||||
$(this).val("");
|
||||
initEditor();
|
||||
}
|
||||
|
||||
</script>
|
||||
<script type="text/javascript" src="js/ajaxupload.js" ></script>
|
||||
<script>
|
||||
var ispublic = '$ispublic';
|
||||
$(document).ready(function() {
|
||||
|
||||
/* enable tinymce on focus */
|
||||
$("#profile-jot-text").focus(function(){
|
||||
if (editor) return;
|
||||
$(this).val("");
|
||||
initEditor();
|
||||
});
|
||||
|
||||
/* enable tinymce on focus and click */
|
||||
$("#profile-jot-text").focus(enableOnUser);
|
||||
$("#profile-jot-text").click(enableOnUser);
|
||||
|
||||
var uploader = new window.AjaxUpload(
|
||||
'wall-image-upload',
|
||||
|
|
|
|||
103
view/jot.tpl
103
view/jot.tpl
|
|
@ -1,77 +1,48 @@
|
|||
|
||||
<div id="profile-jot-wrapper" >
|
||||
<div id="profile-jot-banner-wrapper">
|
||||
<div id="profile-jot-desc" > </div>
|
||||
<div id="character-counter" class="grey"></div>
|
||||
</div>
|
||||
<div id="profile-jot-banner-end"></div>
|
||||
|
||||
<form id="profile-jot-form" action="$action" method="post" >
|
||||
<form action="$action" method="post">
|
||||
<div id="jot">
|
||||
<div id="profile-jot-desc" class="jothidden" > </div>
|
||||
<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
|
||||
<div id="character-counter" class="grey jothidden"></div>
|
||||
|
||||
<input type="hidden" name="type" value="$ptyp" />
|
||||
<input type="hidden" name="profile_uid" value="$profile_uid" />
|
||||
<input type="hidden" name="return" value="$return_path" />
|
||||
<input type="hidden" name="location" id="jot-location" value="$defloc" />
|
||||
<input type="hidden" name="coord" id="jot-coord" value="" />
|
||||
<input type="hidden" name="title" id="jot-title" value="" />
|
||||
<input type="hidden" name="post_id" value="$post_id" />
|
||||
|
||||
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
|
||||
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
|
||||
|
||||
|
||||
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
|
||||
{{ if $content }}<script>initEditor();</script>{{ endif }}
|
||||
|
||||
|
||||
<ul id="jot-tools" class="jothidden" style="display:none">
|
||||
<li><a href="#" onclick="return false;" id="wall-image-upload" title="$upload">$shortupload</a></a></li>
|
||||
<li><a href="#" onclick="return false;" id="wall-file-upload" title="$attach">$shortattach</a></li>
|
||||
<li><a id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink">$shortweblink</a></li>
|
||||
<li><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo">$shortvideo</a></li>
|
||||
<li><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio">$shortaudio</a></li>
|
||||
<li><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc">$shortsetloc</a></li>
|
||||
<li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc">$shortnoloc</a></li>
|
||||
$jotplugins
|
||||
|
||||
<div id="profile-jot-submit-wrapper" style="display:none">
|
||||
<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
|
||||
<div id="profile-upload-wrapper" style="display: $visitor;" >
|
||||
<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
|
||||
</div>
|
||||
<div id="profile-attach-wrapper" style="display: $visitor;" >
|
||||
<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
|
||||
</div>
|
||||
|
||||
<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
|
||||
<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
|
||||
</div>
|
||||
<div id="profile-video-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-audio-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-location-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-nolocation-wrapper" style="display: none;" >
|
||||
<a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-title-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-title" class="icon article" title="$title" onclick="jotTitle();return false;"></a>
|
||||
</div>
|
||||
|
||||
<div id="profile-jot-plugin-wrapper">
|
||||
$jotplugins
|
||||
<li class="perms"><a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon s22 $lockstate $bang" title="$permset" ></a></li>
|
||||
<li class="submit"><input type="submit" id="profile-jot-submit" name="submit" value="$share" /></li>
|
||||
<li id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait" /></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div id="profile-rotator-wrapper" style="display: $visitor;" >
|
||||
<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
|
||||
</div>
|
||||
<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
|
||||
<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang
|
||||
</div>
|
||||
<div id="profile-jot-perms-end"></div>
|
||||
|
||||
<div style="display: none;">
|
||||
<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
|
||||
$acl
|
||||
<hr style="clear:both"/>
|
||||
<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
|
||||
<div id="profile-jot-email-end"></div>
|
||||
$jotnets
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="profile-jot-end"></div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div style="display: none;">
|
||||
<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
|
||||
$acl
|
||||
<hr style="clear:both"/>
|
||||
<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
|
||||
<div id="profile-jot-email-end"></div>
|
||||
$jotnets
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
|
||||
<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$id">
|
||||
<a href="$photolink" class="photo-top-photo-link" id="photo-top-photo-link-$id" title="$phototitle"><img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-top-photo" id="photo-top-photo-$id" /></a>
|
||||
<div class="photo-top-album-name"><a href="$albumlink" class="photo-top-album-link" title="$albumalt" >$albumname</a></div>
|
||||
<a href="$photo.link" class="photo-top-photo-link" id="photo-top-photo-link-$photo.id" title="$photo.title">
|
||||
<img src="$photo.src" alt="$photo.alt" title="$photo.title" class="photo-top-photo" id="photo-top-photo-$photo.id" />
|
||||
</a>
|
||||
<div class="photo-top-album-name"><a href="$photo.album.link" class="photo-top-album-link" title="$photo.album.alt" >$photo.album.name</a></div>
|
||||
</div>
|
||||
<div class="photo-top-image-wrapper-end"></div>
|
||||
|
||||
|
|
|
|||
10
view/photos_recent.tpl
Normal file
10
view/photos_recent.tpl
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
<h3>$title</h3>
|
||||
{{ if $can_post }}
|
||||
<a id="photo-top-upload-link" href="$upload.1">$upload.0</a>
|
||||
{{ endif }}
|
||||
|
||||
<div class="photos">
|
||||
{{ for $photos as $photo }}
|
||||
{{ inc photo_top.tpl }}{{ endinc }}
|
||||
{{ endfor }}
|
||||
</div>
|
||||
|
|
@ -23,8 +23,8 @@ $tabs
|
|||
{{ endif }}
|
||||
{{ endif }}
|
||||
{{ if $app.my }}
|
||||
<a href="$baseurl/settings/oauth/edit/$app.client_id" class="icon edit" title="$edit"> </a>
|
||||
<a href="$baseurl/settings/oauth/delete/$app.client_id" class="icon drop" title="$delete"> </a>
|
||||
<a href="$baseurl/settings/oauth/edit/$app.client_id" class="icon s22 edit" title="$edit"> </a>
|
||||
<a href="$baseurl/settings/oauth/delete/$app.client_id" class="icon s22 delete" title="$delete"> </a>
|
||||
{{ endif }}
|
||||
</div>
|
||||
{{ endfor }}
|
||||
|
|
|
|||
|
|
@ -20,37 +20,33 @@
|
|||
|
||||
{{ if $content }}<script>initEditor();</script>{{ endif }}
|
||||
|
||||
<div id="profile-jot-submit-wrapper" style="display:none">
|
||||
<div id="profile-jot-submit-wrapper" style="display:none" class="jothidden">
|
||||
<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
|
||||
<div id="profile-upload-wrapper" style="display: $visitor;" >
|
||||
<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload">image upload</a></div>
|
||||
<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
|
||||
</div>
|
||||
<div id="profile-attach-wrapper" style="display: $visitor;" >
|
||||
<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach">attach file</a></div>
|
||||
<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
|
||||
</div>
|
||||
|
||||
<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
|
||||
<a id="profile-link" class="link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;">enter link</a>
|
||||
<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
|
||||
</div>
|
||||
<div id="profile-video-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-video" class="video" title="$video" onclick="jotVideoURL();return false;">video url</a>
|
||||
<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-audio-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-audio" class="audio" title="$audio" onclick="jotAudioURL();return false;">audio url</a>
|
||||
<a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-location-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;">set location</a>
|
||||
<a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-nolocation-wrapper" style="display: none;" >
|
||||
<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;">no location</a>
|
||||
<a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-title-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-title" class="article" title="$title" onclick="jotTitle();return false;">title</a>
|
||||
<a id="profile-title" class="icon article" title="$title" onclick="jotTitle();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
|
||||
<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="$lockstate" title="$permset" >permissions</a>$bang
|
||||
</div>
|
||||
<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
|
||||
<div id="profile-jot-perms-end"></div>
|
||||
|
||||
<div id="profile-jot-plugin-wrapper">
|
||||
$jotplugins
|
||||
|
|
@ -59,6 +55,10 @@
|
|||
<div id="profile-rotator-wrapper" style="display: $visitor;" >
|
||||
<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
|
||||
</div>
|
||||
<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
|
||||
<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang
|
||||
</div>
|
||||
<div id="profile-jot-perms-end"></div>
|
||||
|
||||
<div style="display: none;">
|
||||
<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
|
||||
77
view/theme/loozah/jot.tpl
Normal file
77
view/theme/loozah/jot.tpl
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
|
||||
<div id="profile-jot-wrapper" >
|
||||
<div id="profile-jot-banner-wrapper">
|
||||
<div id="profile-jot-desc" > </div>
|
||||
<div id="character-counter" class="grey"></div>
|
||||
</div>
|
||||
<div id="profile-jot-banner-end"></div>
|
||||
|
||||
<form id="profile-jot-form" action="$action" method="post" >
|
||||
<input type="hidden" name="type" value="$ptyp" />
|
||||
<input type="hidden" name="profile_uid" value="$profile_uid" />
|
||||
<input type="hidden" name="return" value="$return_path" />
|
||||
<input type="hidden" name="location" id="jot-location" value="$defloc" />
|
||||
<input type="hidden" name="coord" id="jot-coord" value="" />
|
||||
<input type="hidden" name="title" id="jot-title" value="" />
|
||||
<input type="hidden" name="post_id" value="$post_id" />
|
||||
|
||||
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
|
||||
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
|
||||
|
||||
{{ if $content }}<script>initEditor();</script>{{ endif }}
|
||||
|
||||
<div id="profile-jot-submit-wrapper" style="display:none" class="jothidden">
|
||||
<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
|
||||
<div id="profile-upload-wrapper" style="display: $visitor;" >
|
||||
<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
|
||||
</div>
|
||||
<div id="profile-attach-wrapper" style="display: $visitor;" >
|
||||
<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
|
||||
</div>
|
||||
|
||||
<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
|
||||
<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
|
||||
</div>
|
||||
<div id="profile-video-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-audio-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-location-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-nolocation-wrapper" style="display: none;" >
|
||||
<a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-title-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-title" class="icon article" title="$title" onclick="jotTitle();return false;"></a>
|
||||
</div>
|
||||
|
||||
<div id="profile-jot-plugin-wrapper">
|
||||
$jotplugins
|
||||
</div>
|
||||
|
||||
<div id="profile-rotator-wrapper" style="display: $visitor;" >
|
||||
<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
|
||||
</div>
|
||||
<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
|
||||
<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang
|
||||
</div>
|
||||
<div id="profile-jot-perms-end"></div>
|
||||
|
||||
<div style="display: none;">
|
||||
<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
|
||||
$acl
|
||||
<hr style="clear:both"/>
|
||||
<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
|
||||
<div id="profile-jot-email-end"></div>
|
||||
$jotnets
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="profile-jot-end"></div>
|
||||
</form>
|
||||
</div>
|
||||
|
|
@ -78,3 +78,17 @@
|
|||
@CommentBoxFullBorderColor: @Grey5;
|
||||
|
||||
@TagColor: @Grey1;
|
||||
|
||||
@JotToolsBackgroundColor: @Metalic4;
|
||||
@JotToolsBorderColor: @Metalic2;
|
||||
@JotToolsOverBackgroundColor: @Metalic3;
|
||||
@JotToolsOverBorderColor: @Metalic1;
|
||||
@JotToolsText: @Grey2;
|
||||
@JotSubmitBackgroundColor: @Grey2;
|
||||
@JotSubmitText: @Grey4;
|
||||
@JotSubmitOverBackgroundColor: @Metalic1;
|
||||
@JotSubmitOverText: @Grey4;
|
||||
@JotPermissionUnlockBackgroundColor: @Grey2;
|
||||
@JotPermissionLockBackgroundColor: @Grey4;
|
||||
@JotLoadingBackgroundColor: @Grey1;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ body {
|
|||
margin: 50px 0px 0px 0px;
|
||||
display:table;
|
||||
}
|
||||
h4 { font-size: 1.1em }
|
||||
|
||||
.shadow(@x: 0px, @y: 5px){
|
||||
-webkit-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7);
|
||||
|
|
@ -33,6 +34,7 @@ body {
|
|||
transition: all 0.2s ease-in-out;
|
||||
}
|
||||
|
||||
|
||||
a, a:link { color: @Link; text-decoration: none; }
|
||||
a:visited { color: @LinkVisited; text-decoration: none; }
|
||||
a:hover {color: @LinkHover; text-decoration: underline; }
|
||||
|
|
@ -40,6 +42,7 @@ a:hover {color: @LinkHover; text-decoration: underline; }
|
|||
.left { float: left; }
|
||||
.right { float: right; }
|
||||
.hidden { display: none; }
|
||||
.clear { clear: both; }
|
||||
|
||||
code {
|
||||
font-family: Courier, monospace;
|
||||
|
|
@ -290,6 +293,7 @@ aside {
|
|||
.contact-block-link {
|
||||
float: left;
|
||||
margin: 0px 2px 2px 0px;
|
||||
img { widht: 48px; height: 58px; }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -338,6 +342,7 @@ section {
|
|||
position: relative;
|
||||
padding: 10px;
|
||||
margin-bottom: 20px;
|
||||
width: 780px;
|
||||
}
|
||||
.wall-item-decor { position: absolute; left: 790px; top: -10px; width: 16px;}
|
||||
.unstarred { display: none; }
|
||||
|
|
@ -357,23 +362,6 @@ section {
|
|||
text-align: left;
|
||||
width: 60px;
|
||||
|
||||
.wall-item-photo-wrapper { position: relative; }
|
||||
.wall-item-photo {
|
||||
width: 48px; height: 48px;
|
||||
overflow: hidden;
|
||||
text-indent: -9999px;
|
||||
display: block;
|
||||
background: url(../../../images/icons/48/user.png) no-repeat center center;
|
||||
}
|
||||
|
||||
.wall-item-photo-menu-button {
|
||||
display: none;
|
||||
position: absolute;
|
||||
left: -4px;
|
||||
top: 28px;
|
||||
}
|
||||
.wall-item-photo-menu { display: none; }
|
||||
|
||||
}
|
||||
.wall-item-location {
|
||||
word-wrap: break-word;
|
||||
|
|
@ -416,12 +404,12 @@ section {
|
|||
|
||||
.wall-item-container.comment {
|
||||
/*margin-top: 50px;*/
|
||||
.wall-item-photo { width: 32px; height: 32px; margin-left: 16px;
|
||||
background: url(../../../images/icons/22/user.png) no-repeat center center;
|
||||
.contact-photo { width: 32px; height: 32px; margin-left: 16px;
|
||||
/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
|
||||
}
|
||||
.wall-item-photo-menu-button {
|
||||
top: 13px !important;
|
||||
left: 10px !important;
|
||||
.contact-photo-menu-button {
|
||||
top: 15px !important;
|
||||
left: 15px !important;
|
||||
}
|
||||
.wall-item-links { padding-left: 12px; }
|
||||
}
|
||||
|
|
@ -457,77 +445,164 @@ section {
|
|||
}
|
||||
}
|
||||
|
||||
/* contacts menu */
|
||||
.contact-photo-wrapper { position: relative; }
|
||||
.contact-photo {
|
||||
width: 48px; height: 48px;
|
||||
img { width: 48px; height: 48px; }
|
||||
overflow: hidden;
|
||||
display: block;
|
||||
}
|
||||
.contact-photo-menu-button {
|
||||
display: none;
|
||||
position: absolute;
|
||||
left: -2px;
|
||||
top: 31px;
|
||||
}
|
||||
|
||||
.contact-wrapper {
|
||||
float: left;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
.contact-photo {
|
||||
width: 80px; height: 80px;
|
||||
img { width: 80px; height: 80px; }
|
||||
}
|
||||
.contact-photo-menu-button {
|
||||
left: 0px;
|
||||
top: 63px;
|
||||
}
|
||||
}
|
||||
.directory-item {
|
||||
float: left;
|
||||
width: 200px;
|
||||
height: 200px;
|
||||
.contact-photo {
|
||||
width: 175px; height: 175px;
|
||||
img { width: 175px; height: 175px; }
|
||||
}
|
||||
}
|
||||
.contact-name { text-align: center; font-weight: bold; }
|
||||
.contact-details { color: @Grey3;}
|
||||
|
||||
/* editor */
|
||||
.jothidden { display: none; }
|
||||
#jot {
|
||||
|
||||
#profile-jot-wrapper {
|
||||
width: 100%;
|
||||
margin: 0px 2em 20px 0px;
|
||||
|
||||
|
||||
}
|
||||
.profile-jot-text {
|
||||
height: 1em; width: 100%; font-size: 10px;
|
||||
color: @CommentBoxEmptyColor;
|
||||
border: 1px solid @CommentBoxEmptyBorderColor;
|
||||
padding:0.3em;
|
||||
}
|
||||
#profile-jot-plugin-wrapper,
|
||||
#profile-jot-submit-wrapper {
|
||||
margin-top: 10px;
|
||||
.profile-jot-text {
|
||||
height: 1em; width: 99%; font-size: 10px;
|
||||
color: @CommentBoxEmptyColor;
|
||||
border: 1px solid @CommentBoxEmptyBorderColor;
|
||||
padding:0.3em;
|
||||
}
|
||||
|
||||
#jot-tools {
|
||||
margin: 0px; padding: 0px;
|
||||
height: 40px; overflow: none;
|
||||
width: 800px;
|
||||
background-color: @JotToolsBackgroundColor;
|
||||
border-bottom: 2px solid @JotToolsBorderColor;
|
||||
li {
|
||||
list-style: none;
|
||||
float: left;
|
||||
width: 80px;
|
||||
height: 40px;
|
||||
border-bottom: 2px solid @JotToolsBorderColor;
|
||||
a {
|
||||
display: block;
|
||||
color: @JotToolsText;
|
||||
width: 100%;
|
||||
height:40px;
|
||||
text-align: center;
|
||||
line-height: 40px;
|
||||
overflow: hidden;
|
||||
}
|
||||
}
|
||||
li:hover {
|
||||
background-color: @JotToolsOverBackgroundColor;
|
||||
border-bottom: 2px solid @JotToolsOverBorderColor;
|
||||
}
|
||||
li.perms {
|
||||
float: right;
|
||||
width: 40px;
|
||||
a.unlock {
|
||||
width: 30px;
|
||||
border-left: 10px solid @JotPermissionUnlockBackgroundColor;
|
||||
background-color: @JotPermissionUnlockBackgroundColor;
|
||||
}
|
||||
a.lock {
|
||||
width: 30px;
|
||||
border-left: 10px solid @JotPermissionLockBackgroundColor;
|
||||
background-color: @JotPermissionLockBackgroundColor;
|
||||
}
|
||||
|
||||
}
|
||||
li.submit {
|
||||
float: right;
|
||||
background-color: @JotSubmitBackgroundColor;
|
||||
border-bottom: 2px solid @JotSubmitBackgroundColor;
|
||||
border-right: 1px solid @Grey4;
|
||||
border-left: 1px solid @Grey4;
|
||||
input {
|
||||
border: 0px; margin: 0px; padding: 0px;
|
||||
background-color: @JotSubmitBackgroundColor;
|
||||
color: @JotSubmitText;
|
||||
width: 80px; height: 40px;
|
||||
line-height: 40px;
|
||||
}
|
||||
input:hover {
|
||||
background-color: @JotSubmitOverBackgroundColor;
|
||||
color: @JotSubmitOverText;
|
||||
}
|
||||
}
|
||||
li.loading {
|
||||
float: right;
|
||||
background-color: @JotLoadingBackgroundColor;
|
||||
width: 20px;
|
||||
vertical-align: center;
|
||||
text-align: center;
|
||||
img { margin-top: 10px; }
|
||||
border-top: 2px solid @JotToolsBorderColor;
|
||||
height: 38px;
|
||||
}
|
||||
}
|
||||
|
||||
#jot-title {
|
||||
border: 0px;
|
||||
margin: 0px;
|
||||
height: 20px;
|
||||
width: 700px;
|
||||
font-weight: bold;
|
||||
border: 1px solid @BodyBackground;
|
||||
|
||||
&:-webkit-input-placeholder {
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
&:-moz-placeholder {
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
&:hover { border: 1px solid @CommentBoxEmptyBorderColor }
|
||||
&:focus { border: 1px solid @CommentBoxEmptyBorderColor }
|
||||
}
|
||||
|
||||
#character-counter {
|
||||
width: 80px;
|
||||
float: right;
|
||||
text-align: right;
|
||||
height: 20px;
|
||||
line-height: 20px;
|
||||
padding-right: 20px;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
#profile-jot-submit {
|
||||
float: left;
|
||||
}
|
||||
#profile-upload-wrapper{
|
||||
float: left;
|
||||
margin-left: 10px;
|
||||
}
|
||||
#profile-attach-wrapper,
|
||||
#profile-rotator,
|
||||
#profile-link-wrapper,
|
||||
#profile-youtube-wrapper,
|
||||
#profile-video-wrapper,
|
||||
#profile-audio-wrapper,
|
||||
#profile-location-wrapper,
|
||||
#profile-nolocation-wrapper,
|
||||
#profile-title-wrapper {
|
||||
float: left;
|
||||
margin-left: 20px;
|
||||
}
|
||||
|
||||
#profile-jot-perms {
|
||||
float: left;
|
||||
margin-left: 35px;
|
||||
margin-right: 35px;
|
||||
}
|
||||
|
||||
#profile-jot-perms-end {
|
||||
/*clear: left;*/
|
||||
height: 20px;
|
||||
}
|
||||
|
||||
#profile-jot-plugin-end{
|
||||
clear: both;
|
||||
}
|
||||
.profile-jot-net {
|
||||
float: left;
|
||||
margin-right: 10px;
|
||||
margin-top: 5px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
#profile-jot-networks-end {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#profile-jot-end, #about-jot-end {
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
#about-jot-submit-wrapper {
|
||||
margin-top: 15px;
|
||||
}
|
||||
/** buttons **/
|
||||
/*input[type="submit"] {
|
||||
border: 0px;
|
||||
|
|
@ -717,6 +792,42 @@ ul.tabs {
|
|||
&.radio .field_help { margin-left: 0px; }
|
||||
}
|
||||
|
||||
#profile-edit-links li {
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
/* oauth */
|
||||
.oauthapp {
|
||||
height: auto; overflow: auto;
|
||||
border-bottom: 2px solid #cccccc;
|
||||
padding-bottom: 1em;
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
.oauthapp img {
|
||||
float: left;
|
||||
width: 48px; height: 48px;
|
||||
margin: 10px;
|
||||
}
|
||||
.oauthapp img.noicon {
|
||||
background-image: url("../../../images/icons/48/plugin.png");
|
||||
background-position: center center;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
.oauthapp a {
|
||||
float: left;
|
||||
}
|
||||
|
||||
/* contacts */
|
||||
.contact-entry-wrapper {
|
||||
width: 50px; float: left;
|
||||
}
|
||||
|
||||
/* photo */
|
||||
.lframe {
|
||||
float: left;
|
||||
margin: 0px 10px 10px 0px;
|
||||
}
|
||||
|
||||
|
||||
/* page footer */
|
||||
footer { height: 100px; display: table-row; }
|
||||
|
|
|
|||
|
|
@ -168,6 +168,9 @@ body {
|
|||
margin: 50px 0px 0px 0px;
|
||||
display: table;
|
||||
}
|
||||
h4 {
|
||||
font-size: 1.1em;
|
||||
}
|
||||
a, a:link {
|
||||
color: #005c94;
|
||||
text-decoration: none;
|
||||
|
|
@ -189,6 +192,9 @@ a:hover {
|
|||
.hidden {
|
||||
display: none;
|
||||
}
|
||||
.clear {
|
||||
clear: both;
|
||||
}
|
||||
code {
|
||||
font-family: Courier, monospace;
|
||||
white-space: pre;
|
||||
|
|
@ -529,6 +535,10 @@ aside #profiles-menu {
|
|||
float: left;
|
||||
margin: 0px 2px 2px 0px;
|
||||
}
|
||||
#contact-block .contact-block-link img {
|
||||
widht: 48px;
|
||||
height: 58px;
|
||||
}
|
||||
/* widget */
|
||||
.widget {
|
||||
margin-bottom: 2em;
|
||||
|
|
@ -609,6 +619,7 @@ section {
|
|||
position: relative;
|
||||
padding: 10px;
|
||||
margin-bottom: 20px;
|
||||
width: 780px;
|
||||
}
|
||||
.wall-item-decor {
|
||||
position: absolute;
|
||||
|
|
@ -648,26 +659,6 @@ section {
|
|||
text-align: left;
|
||||
width: 60px;
|
||||
}
|
||||
.wall-item-container .wall-item-info .wall-item-photo-wrapper {
|
||||
position: relative;
|
||||
}
|
||||
.wall-item-container .wall-item-info .wall-item-photo {
|
||||
width: 48px;
|
||||
height: 48px;
|
||||
overflow: hidden;
|
||||
text-indent: -9999px;
|
||||
display: block;
|
||||
background: url(../../../images/icons/48/user.png) no-repeat center center;
|
||||
}
|
||||
.wall-item-container .wall-item-info .wall-item-photo-menu-button {
|
||||
display: none;
|
||||
position: absolute;
|
||||
left: -4px;
|
||||
top: 28px;
|
||||
}
|
||||
.wall-item-container .wall-item-info .wall-item-photo-menu {
|
||||
display: none;
|
||||
}
|
||||
.wall-item-container .wall-item-location {
|
||||
word-wrap: break-word;
|
||||
width: 50px;
|
||||
|
|
@ -733,15 +724,16 @@ section {
|
|||
/*margin-top: 50px;*/
|
||||
|
||||
}
|
||||
.wall-item-container.comment .wall-item-photo {
|
||||
.wall-item-container.comment .contact-photo {
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
margin-left: 16px;
|
||||
background: url(../../../images/icons/22/user.png) no-repeat center center;
|
||||
/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
|
||||
|
||||
}
|
||||
.wall-item-container.comment .wall-item-photo-menu-button {
|
||||
top: 13px !important;
|
||||
left: 10px !important;
|
||||
.wall-item-container.comment .contact-photo-menu-button {
|
||||
top: 15px !important;
|
||||
left: 15px !important;
|
||||
}
|
||||
.wall-item-container.comment .wall-item-links {
|
||||
padding-left: 12px;
|
||||
|
|
@ -779,67 +771,182 @@ section {
|
|||
background: url("../../../images/tag.png") no-repeat center right;
|
||||
color: #ffffff;
|
||||
}
|
||||
#profile-jot-wrapper {
|
||||
/* contacts menu */
|
||||
.contact-photo-wrapper {
|
||||
position: relative;
|
||||
}
|
||||
.contact-photo {
|
||||
width: 48px;
|
||||
height: 48px;
|
||||
overflow: hidden;
|
||||
display: block;
|
||||
}
|
||||
.contact-photo img {
|
||||
width: 48px;
|
||||
height: 48px;
|
||||
}
|
||||
.contact-photo-menu-button {
|
||||
display: none;
|
||||
position: absolute;
|
||||
left: -2px;
|
||||
top: 31px;
|
||||
}
|
||||
.contact-wrapper {
|
||||
float: left;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.contact-wrapper .contact-photo {
|
||||
width: 80px;
|
||||
height: 80px;
|
||||
}
|
||||
.contact-wrapper .contact-photo img {
|
||||
width: 80px;
|
||||
height: 80px;
|
||||
}
|
||||
.contact-wrapper .contact-photo-menu-button {
|
||||
left: 0px;
|
||||
top: 63px;
|
||||
}
|
||||
.directory-item {
|
||||
float: left;
|
||||
width: 200px;
|
||||
height: 200px;
|
||||
}
|
||||
.directory-item .contact-photo {
|
||||
width: 175px;
|
||||
height: 175px;
|
||||
}
|
||||
.directory-item .contact-photo img {
|
||||
width: 175px;
|
||||
height: 175px;
|
||||
}
|
||||
.contact-name {
|
||||
text-align: center;
|
||||
font-weight: bold;
|
||||
}
|
||||
.contact-details {
|
||||
color: #999999;
|
||||
}
|
||||
/* editor */
|
||||
.jothidden {
|
||||
display: none;
|
||||
}
|
||||
#jot {
|
||||
width: 100%;
|
||||
margin: 0px 2em 20px 0px;
|
||||
}
|
||||
.profile-jot-text {
|
||||
#jot .profile-jot-text {
|
||||
height: 1em;
|
||||
width: 100%;
|
||||
width: 99%;
|
||||
font-size: 10px;
|
||||
color: #999999;
|
||||
border: 1px solid #999999;
|
||||
padding: 0.3em;
|
||||
}
|
||||
#profile-jot-plugin-wrapper, #profile-jot-submit-wrapper {
|
||||
#jot #jot-tools {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
height: 40px;
|
||||
overflow: none;
|
||||
width: 800px;
|
||||
background-color: #0e232e;
|
||||
border-bottom: 2px solid #9eabb0;
|
||||
}
|
||||
#jot #jot-tools li {
|
||||
list-style: none;
|
||||
float: left;
|
||||
width: 80px;
|
||||
height: 40px;
|
||||
border-bottom: 2px solid #9eabb0;
|
||||
}
|
||||
#jot #jot-tools li a {
|
||||
display: block;
|
||||
color: #cccccc;
|
||||
width: 100%;
|
||||
height: 40px;
|
||||
text-align: center;
|
||||
line-height: 40px;
|
||||
overflow: hidden;
|
||||
}
|
||||
#jot #jot-tools li:hover {
|
||||
background-color: #364e59;
|
||||
border-bottom: 2px solid #bdcdd4;
|
||||
}
|
||||
#jot #jot-tools li.perms {
|
||||
float: right;
|
||||
width: 40px;
|
||||
}
|
||||
#jot #jot-tools li.perms a.unlock {
|
||||
width: 30px;
|
||||
border-left: 10px solid #cccccc;
|
||||
background-color: #cccccc;
|
||||
}
|
||||
#jot #jot-tools li.perms a.lock {
|
||||
width: 30px;
|
||||
border-left: 10px solid #666666;
|
||||
background-color: #666666;
|
||||
}
|
||||
#jot #jot-tools li.submit {
|
||||
float: right;
|
||||
background-color: #cccccc;
|
||||
border-bottom: 2px solid #cccccc;
|
||||
border-right: 1px solid #666666;
|
||||
border-left: 1px solid #666666;
|
||||
}
|
||||
#jot #jot-tools li.submit input {
|
||||
border: 0px;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
background-color: #cccccc;
|
||||
color: #666666;
|
||||
width: 80px;
|
||||
height: 40px;
|
||||
line-height: 40px;
|
||||
}
|
||||
#jot #jot-tools li.submit input:hover {
|
||||
background-color: #bdcdd4;
|
||||
color: #666666;
|
||||
}
|
||||
#jot #jot-tools li.loading {
|
||||
float: right;
|
||||
background-color: #ffffff;
|
||||
width: 20px;
|
||||
vertical-align: center;
|
||||
text-align: center;
|
||||
border-top: 2px solid #9eabb0;
|
||||
height: 38px;
|
||||
}
|
||||
#jot #jot-tools li.loading img {
|
||||
margin-top: 10px;
|
||||
}
|
||||
#profile-jot-submit {
|
||||
float: left;
|
||||
}
|
||||
#profile-upload-wrapper {
|
||||
float: left;
|
||||
margin-left: 10px;
|
||||
}
|
||||
#profile-attach-wrapper,
|
||||
#profile-rotator,
|
||||
#profile-link-wrapper,
|
||||
#profile-youtube-wrapper,
|
||||
#profile-video-wrapper,
|
||||
#profile-audio-wrapper,
|
||||
#profile-location-wrapper,
|
||||
#profile-nolocation-wrapper,
|
||||
#profile-title-wrapper {
|
||||
float: left;
|
||||
margin-left: 20px;
|
||||
}
|
||||
#profile-jot-perms {
|
||||
float: left;
|
||||
margin-left: 35px;
|
||||
margin-right: 35px;
|
||||
}
|
||||
#profile-jot-perms-end {
|
||||
/*clear: left;*/
|
||||
|
||||
#jot #jot-title {
|
||||
border: 0px;
|
||||
margin: 0px;
|
||||
height: 20px;
|
||||
width: 700px;
|
||||
font-weight: bold;
|
||||
border: 1px solid #ffffff;
|
||||
}
|
||||
#profile-jot-plugin-end {
|
||||
clear: both;
|
||||
#jot #jot-title:-webkit-input-placeholder {
|
||||
font-weight: normal;
|
||||
}
|
||||
.profile-jot-net {
|
||||
float: left;
|
||||
margin-right: 10px;
|
||||
margin-top: 5px;
|
||||
margin-bottom: 5px;
|
||||
#jot #jot-title:-moz-placeholder {
|
||||
font-weight: normal;
|
||||
}
|
||||
#profile-jot-networks-end {
|
||||
clear: both;
|
||||
#jot #jot-title:hover {
|
||||
border: 1px solid #999999;
|
||||
}
|
||||
#profile-jot-end, #about-jot-end {
|
||||
margin-bottom: 15px;
|
||||
#jot #jot-title:focus {
|
||||
border: 1px solid #999999;
|
||||
}
|
||||
#about-jot-submit-wrapper {
|
||||
margin-top: 15px;
|
||||
#jot #character-counter {
|
||||
width: 80px;
|
||||
float: right;
|
||||
text-align: right;
|
||||
height: 20px;
|
||||
line-height: 20px;
|
||||
padding-right: 20px;
|
||||
}
|
||||
/** buttons **/
|
||||
/*input[type="submit"] {
|
||||
|
|
@ -1025,6 +1132,41 @@ ul.tabs li .active {
|
|||
.field.radio .field_help {
|
||||
margin-left: 0px;
|
||||
}
|
||||
#profile-edit-links li {
|
||||
list-style: none;
|
||||
}
|
||||
/* oauth */
|
||||
.oauthapp {
|
||||
height: auto;
|
||||
overflow: auto;
|
||||
border-bottom: 2px solid #cccccc;
|
||||
padding-bottom: 1em;
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
.oauthapp img {
|
||||
float: left;
|
||||
width: 48px;
|
||||
height: 48px;
|
||||
margin: 10px;
|
||||
}
|
||||
.oauthapp img.noicon {
|
||||
background-image: url("../../../images/icons/48/plugin.png");
|
||||
background-position: center center;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
.oauthapp a {
|
||||
float: left;
|
||||
}
|
||||
/* contacts */
|
||||
.contact-entry-wrapper {
|
||||
width: 50px;
|
||||
float: left;
|
||||
}
|
||||
/* photo */
|
||||
.lframe {
|
||||
float: left;
|
||||
margin: 0px 10px 10px 0px;
|
||||
}
|
||||
/* page footer */
|
||||
footer {
|
||||
height: 100px;
|
||||
|
|
|
|||
|
|
@ -1,15 +1,9 @@
|
|||
|
||||
<div class="view-contact-wrapper" id="view-contact-wrapper-$id" >
|
||||
<div class="view-contact-photo-wrapper" >
|
||||
<div class="mframe view-contact-photo" id="view-contact-photo-$id" >
|
||||
<div class="contact-wrapper" id="view-contact-wrapper-$id" >
|
||||
<div class="contact-photo-wrapper" >
|
||||
<div class="mframe contact-photo" id="view-contact-photo-$id" >
|
||||
<a href="$url" title="$alt_text" /><img src="$thumb" alt="$name" /></a>
|
||||
</div>
|
||||
<div class="view-contact-photo-end" ></div>
|
||||
</div>
|
||||
<div class="view-contact-name-wrapper" >
|
||||
<div class="view-contact-name" id="view-contact-name-$id" >$name</div>
|
||||
</div>
|
||||
<div class="view-contact-name-end" ></div>
|
||||
<div class="contact-name" id="view-contact-name-$id" >$name</div>
|
||||
</div>
|
||||
<div class="view-contact-wrapper-end"></div>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
<div class="wall-item-container $indent">
|
||||
<div class="wall-item-item">
|
||||
<div class="wall-item-info">
|
||||
<div class="wall-item-photo-wrapper"
|
||||
<div class="contact-photo-wrapper"
|
||||
onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
|
||||
onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
|
||||
<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
|
||||
<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
|
||||
<a href="$profile_url" target="redir" title="$linktitle" class="contact-photo-link" id="wall-item-photo-link-$id">
|
||||
<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
|
||||
</a>
|
||||
<a href="#" rel="#wall-item-photo-menu-$id" class="fakelink wall-item-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
|
||||
<ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$id">
|
||||
<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
|
||||
<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
|
||||
$item_photo_menu
|
||||
</ul>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,19 +8,19 @@
|
|||
<div class="wall-item-container $indent">
|
||||
<div class="wall-item-item">
|
||||
<div class="wall-item-info">
|
||||
<div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$id" >
|
||||
<a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
|
||||
<img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" alt="$owner_name" />
|
||||
<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$id" >
|
||||
<a href="$owner_url" target="redir" title="$olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$id">
|
||||
<img src="$owner_photo" class="contact-photo $osparkle" id="wall-item-ownerphoto-$id" alt="$owner_name" />
|
||||
</a>
|
||||
</div>
|
||||
<div class="wall-item-photo-wrapper mframe wwfrom"
|
||||
<div class="contact-photo-wrapper mframe wwfrom"
|
||||
onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
|
||||
onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
|
||||
<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
|
||||
<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
|
||||
<a href="$profile_url" target="redir" title="$linktitle" class="contact-photo-link" id="wall-item-photo-link-$id">
|
||||
<img src="$thumb" class="contact-photo $sparkle" id="wall-item-photo-$id" alt="$name" />
|
||||
</a>
|
||||
<a href="#" rel="#wall-item-photo-menu-$id" class="fakelink wall-item-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
|
||||
<ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$id">
|
||||
<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
|
||||
<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
|
||||
$item_photo_menu
|
||||
</ul>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue