aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/js/mod_connections.js3
-rw-r--r--view/js/mod_message.js5
-rw-r--r--view/js/mod_network.js1
-rw-r--r--view/js/mod_poke.js3
-rw-r--r--view/js/mod_sources.js3
-rw-r--r--view/theme/redbasic/css/style.css112
-rw-r--r--view/theme/redbasic/js/redbasic.js30
-rw-r--r--view/theme/redbasic/php/config.php15
-rw-r--r--view/theme/redbasic/php/style.php32
-rw-r--r--view/theme/redbasic/tpl/theme_settings.tpl5
-rwxr-xr-xview/tpl/comment_item.tpl21
-rwxr-xr-xview/tpl/jot-header.tpl125
-rwxr-xr-xview/tpl/jot.tpl2
-rwxr-xr-xview/tpl/prv_message.tpl5
-rwxr-xr-xview/tpl/removeme.tpl2
-rwxr-xr-xview/tpl/xchan_vcard.tpl2
16 files changed, 158 insertions, 208 deletions
diff --git a/view/js/mod_connections.js b/view/js/mod_connections.js
index ed1577792..404010636 100644
--- a/view/js/mod_connections.js
+++ b/view/js/mod_connections.js
@@ -3,7 +3,8 @@ $(document).ready(function() {
a = $("#contacts-search").autocomplete({
serviceUrl: baseurl + '/acl',
minChars: 2,
- width: 350,
+ width: 250,
+ id: 'contact-search-ac',
});
a.setOptions({ autoSubmit: true, params: { type: 'a' }});
diff --git a/view/js/mod_message.js b/view/js/mod_message.js
index e3318ce6b..82f60f46f 100644
--- a/view/js/mod_message.js
+++ b/view/js/mod_message.js
@@ -3,10 +3,11 @@ $(document).ready(function() {
a = $("#recip").autocomplete({
serviceUrl: baseurl + '/acl',
minChars: 2,
- width: 350,
+ width: 250,
+ id: 'recip-ac',
onSelect: function(value,data) {
$("#recip-complete").val(data);
- }
+ },
});
});
diff --git a/view/js/mod_network.js b/view/js/mod_network.js
index ca910ae52..f63a57653 100644
--- a/view/js/mod_network.js
+++ b/view/js/mod_network.js
@@ -4,6 +4,7 @@ $(document).ready(function() {
serviceUrl: baseurl + '/search_ac',
minChars: 2,
width: 250,
+ id: 'search-text-ac',
});
});
diff --git a/view/js/mod_poke.js b/view/js/mod_poke.js
index fa00ac2d5..edd53bb6a 100644
--- a/view/js/mod_poke.js
+++ b/view/js/mod_poke.js
@@ -3,7 +3,8 @@ $(document).ready(function() {
a = $("#poke-recip").autocomplete({
serviceUrl: baseurl + '/acl',
minChars: 2,
- width: 350,
+ width: 250,
+ id: 'poke-recip-ac';
onSelect: function(value,data) {
$("#poke-recip-complete").val(data);
}
diff --git a/view/js/mod_sources.js b/view/js/mod_sources.js
index 140f13843..fda952cae 100644
--- a/view/js/mod_sources.js
+++ b/view/js/mod_sources.js
@@ -3,7 +3,8 @@ $(document).ready(function() {
a = $("#id_name").autocomplete({
serviceUrl: baseurl + '/acl',
minChars: 2,
- width: 350,
+ width: 250,
+ id: 'id-name-ac',
onSelect: function(value,data) {
$("#id_xchan").val(data);
}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index ee3534a11..c280e555a 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -9,7 +9,7 @@
/* generals */
body {
font-family: arial,freesans,sans-serif;
- font-size: 12px;
+ font-size: $body_font_size;
background-color: $bgcolour;
background-image: url('$background_image');
background-attachment: fixed;
@@ -50,14 +50,19 @@ a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; }
cursor: pointer;
}
+
+input[type=text] {
+ font-family: arial,freesans,sans-serif;
+}
+
input {
border: 1px solid #666666;
-moz-border-radius: $radiuspx;
border-radius: $radiuspx;
padding: 3px;
+ font-size: $body_font_size;
}
-
code {
font-family: Courier, monospace;
display: block;
@@ -129,10 +134,7 @@ nav {
}
-/*
-section {width: $section_width;
-}
-*/
+
nav:hover {
background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
@@ -780,6 +782,12 @@ footer {
height: 120px;
padding: 10px;
}
+
+#contacts-search {
+ font-size: 1em;
+ width: 300px;
+}
+
#contacts-search-end {
margin-bottom: 10px;
}
@@ -876,7 +884,7 @@ footer {
margin: 0px; padding: 0px;
width: 16px;
height: 16px;
- top: 74px; left:10px;
+ top: $pmenu_top; left:10px;
overflow: hidden;
text-indent: 40px;
display: none;
@@ -896,7 +904,7 @@ footer {
.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
-.comment .wall-item-photo-menu-button { top: 44px;}
+.comment .wall-item-photo-menu-button { top: $pmenu_reply;}
.comment .wall-item-photo-menu { top: 60px; }
.wallwall .wwto {
@@ -931,7 +939,7 @@ footer {
}
.wall-item-lock {
- font-size: 1.4em;
+ font-size: 1.2em;
left: 105px;
position: absolute;
top: 1px;
@@ -998,15 +1006,18 @@ footer {
.wall-item-photo {
border: none;
+ width: $top_photo !important;
+ height: $top_photo !important;
+
}
.comment .wall-item-photo {
- width: 50px !important;
- height: 50px !important;
+ width: $reply_photo !important;
+ height: $reply_photo !important;
}
.wall-item-content {
margin-left: 10px;
overflow: auto;
- font-size: $font_sizepx;
+ font-size: $font_size;
}
.wall-item-content img {
@@ -1023,8 +1034,8 @@ footer {
}
.thread-wrapper.toplevel_item {
- width: 92%;
- max-width: 1024px;
+ width: 92%;
+ max-width: $converse_width;
}
.wall-item-body {
@@ -1720,6 +1731,7 @@ tr.mceLast {
#prvmail-attach-wrapper,
#prvmail-link-wrapper,
#prvmail-expire-wrapper,
+#prvmail-encrypt-wrapper,
#prvmail-rotator-wrapper {
float: left;
margin-top: 10px;
@@ -1890,6 +1902,19 @@ a.mail-list-link {
#side-follow-url, #side-peoplefind-url {
margin-top: 5px;
}
+
+#side-peoplefind-url {
+ font-size: 1em;
+}
+
+#side-peoplefind-url::-webkit-input-placeholder {
+ font-family: FontAwesome;
+}
+
+#side-peoplefind-url::-moz-placeholder {
+ font-family: FontAwesome;
+}
+
#side-follow-submit, #side-peoplefind-submit {
margin-top: 15px;
}
@@ -2036,6 +2061,26 @@ a.mail-list-link {
transition: background-color 300ms ease 0s;
}
+#nav-search-text::-webkit-input-placeholder {
+ font-family: FontAwesome;
+}
+
+#nav-search-text::-moz-placeholder {
+ font-family: FontAwesome;
+}
+
+#search-text {
+ font-size: 1em;
+}
+
+#search-text::-webkit-input-placeholder {
+ font-family: FontAwesome;
+}
+
+#search-text::-moz-placeholder {
+ font-family: FontAwesome;
+}
+
#nav-user-linkmenu img {
border-radius: $radiuspx;
margin-top: -4px;
@@ -2859,36 +2904,45 @@ div.jGrowl div.info {
width:100px;
}
-#recip {
-
+#nav-search-text-ac .autocomplete {
+ position: fixed;
+ top: 24px;
+ border: 1px solid $nav_bg_1;
+ border-top: none;
}
-.autocomplete-w1 {
- position:fixed;
- top:24px;
+#search-text-ac .autocomplete,
+#recip-ac .autocomplete,
+#poke-recip-ac .autocomplete,
+#id-name-ac .autocomplete,
+#contact-search-ac .autocomplete {
+ margin-top: 2px;
+ margin-left: $radiuspx;
+ border: 1px solid #666;
+ border-top: none;
+
}
-.autocomplete {
+.autocomplete {
color: $font_colour;
- border: 1px solid $nav_bg_1;
- border-top: none;
background: #FFF;
cursor: pointer;
text-align: left;
max-height: 350px;
overflow: auto;
- border-bottom-left-radius:$radiuspx;
- border-bottom-right-radius:$radiuspx;
+ border-bottom-left-radius: $radiuspx;
+ border-bottom-right-radius: $radiuspx;
}
.autocomplete .selected {
- background:$bgcolour;
+ background: $search_background;
}
.autocomplete div {
- padding:2px 5px;
- white-space:nowrap;
- overflow:hidden;
+ padding: 2px 5px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
#datebrowse-sidebar select {
@@ -2899,7 +2953,7 @@ div.jGrowl div.info {
.jslider .jslider-scale ins {
color: #333;
- font-size: 12px;
+ font-size: $body_font_size;
width: 100px;
text-align: center;
}
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index a97e906bf..e40a94fcc 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -1,35 +1,5 @@
-function insertFormatting(comment,BBcode,id) {
-
- var tmpStr = $("#comment-edit-text-" + id).val();
- if(tmpStr == comment) {
- tmpStr = "";
- $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
- $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
- openMenu("comment-edit-submit-wrapper-" + id);
- $("#comment-edit-text-" + id).val(tmpStr);
- }
-
- textarea = document.getElementById("comment-edit-text-" +id);
- if (document.selection) {
- textarea.focus();
- selected = document.selection.createRange();
- if (BBcode == "url"){
- selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
- } else
- selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
- } else if (textarea.selectionStart || textarea.selectionStart == "0") {
- var start = textarea.selectionStart;
- var end = textarea.selectionEnd;
- if (BBcode == "url"){
- textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
- } else
- textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
- }
- return true;
-}
-
function cmtBbOpen(comment, id) {
if($(comment).hasClass('comment-edit-text-full')) {
$(".comment-edit-bb-" + id).show();
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index eb583d9bf..20355197f 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -15,11 +15,14 @@ function theme_content(&$a) {
$arr['toolicon_colour'] = get_pconfig(local_user(),'redbasic','toolicon_colour');
$arr['toolicon_activecolour'] = get_pconfig(local_user(),'redbasic','toolicon_activecolour');
$arr['font_size'] = get_pconfig(local_user(),'redbasic', 'font_size' );
+ $arr['body_font_size'] = get_pconfig(local_user(),'redbasic', 'body_font_size' );
$arr['font_colour'] = get_pconfig(local_user(),'redbasic', 'font_colour' );
$arr['radius'] = get_pconfig(local_user(),'redbasic', 'radius' );
$arr['shadow'] = get_pconfig(local_user(),'redbasic', 'photo_shadow' );
- $arr['section_width']=get_pconfig(local_user(),"redbasic","section_width");
+ $arr['converse_width']=get_pconfig(local_user(),"redbasic","converse_width");
$arr['nav_min_opacity']=get_pconfig(local_user(),"redbasic","nav_min_opacity");
+ $arr['top_photo']=get_pconfig(local_user(),"redbasic","top_photo");
+ $arr['reply_photo']=get_pconfig(local_user(),"redbasic","reply_photo");
$arr['sloppy_photos']=get_pconfig(local_user(),"redbasic","sloppy_photos");
return redbasic_form($a, $arr);
}
@@ -38,11 +41,14 @@ function theme_post(&$a) {
set_pconfig(local_user(), 'redbasic', 'toolicon_colour', $_POST['redbasic_toolicon_colour']);
set_pconfig(local_user(), 'redbasic', 'toolicon_activecolour', $_POST['redbasic_toolicon_activecolour']);
set_pconfig(local_user(), 'redbasic', 'font_size', $_POST['redbasic_font_size']);
+ set_pconfig(local_user(), 'redbasic', 'body_font_size', $_POST['redbasic_body_font_size']);
set_pconfig(local_user(), 'redbasic', 'font_colour', $_POST['redbasic_font_colour']);
set_pconfig(local_user(), 'redbasic', 'radius', $_POST['redbasic_radius']);
set_pconfig(local_user(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']);
- set_pconfig(local_user(), 'redbasic', 'section_width', $_POST['redbasic_section_width']);
+ set_pconfig(local_user(), 'redbasic', 'converse_width', $_POST['redbasic_converse_width']);
set_pconfig(local_user(), 'redbasic', 'nav_min_opacity', $_POST['redbasic_nav_min_opacity']);
+ set_pconfig(local_user(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']);
+ set_pconfig(local_user(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']);
set_pconfig(local_user(), 'redbasic', 'sloppy_photos', $_POST['redbasic_sloppy_photos']);
}
}
@@ -89,12 +95,15 @@ if(feature_enabled(local_user(),'expert'))
'$item_opacity' => array('redbasic_item_opacity', t('Set the opacity of items'), $arr['item_opacity']),
'$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic colour for item icons'),$arr['toolicon_colour']),
'$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover colour for item icons'),$arr['toolicon_activecolour']),
+ '$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size']),
'$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $arr['font_size']),
'$font_colour' => array('redbasic_font_colour', t('Set font-colour for posts and comments'), $arr['font_colour']),
'$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius']),
'$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']),
- '$section_width' => array('redbasic_section_width',t('Set width of main section'),$arr['section_width']),
+ '$converse_width' => array('redbasic_converse_width',t('Set maximum width of conversation regions'),$arr['converse_width']),
'$nav_min_opacity' => array('redbasic_nav_min_opacity',t('Set minimum opacity of nav bar - to hide it'),$arr['nav_min_opacity']),
+ '$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
+ '$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
'$sloppy_photos' => array('redbasic_sloppy_photos',t('Sloppy photo albums'),$arr['sloppy_photos'],t('Are you a clean desk or a messy desk person?')),
));
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 716a2dd9e..2fcda2cc8 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -20,13 +20,16 @@
$toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour');
$item_colour = get_pconfig($uid, "redbasic", "item_colour");
$item_opacity = get_pconfig($uid, "redbasic", "item_opacity");
+ $body_font_size = get_pconfig($uid, "redbasic", "body_font_size");
$font_size = get_pconfig($uid, "redbasic", "font_size");
$font_colour = get_pconfig($uid, "redbasic", "font_colour");
$radius = get_pconfig($uid, "redbasic", "radius");
$shadow = get_pconfig($uid,"redbasic","photo_shadow");
- $section_width=get_pconfig($uid,"redbasic","section_width");
+ $converse_width=get_pconfig($uid,"redbasic","converse_width");
$nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity');
$sloppy_photos=get_pconfig($uid,'redbasic','sloppy_photos');
+ $top_photo=get_pconfig($uid,'redbasic','top_photo');
+ $reply_photo=get_pconfig($uid,'redbasic','reply_photo');
// Now load the scheme. If a value is changed above, we'll keep the settings
// If not, we'll keep those defined by the schema
@@ -75,17 +78,27 @@
if (! $item_opacity)
$item_opacity = "1";
if (! $font_size)
- $font_size = "12";
+ $font_size = "1.0em";
+ if (! $body_font_size)
+ $body_font_size = "11px";
if (! $font_colour)
$font_colour = "#4D4D4D";
if (! $radius)
- $radius = "5";
+ $radius = "0";
if (! $shadow)
$shadow = "0";
if(! $active_colour)
$active_colour = '#FFFFFF';
- if (! $section_width)
- $section_width="72%";
+ if (! $converse_width)
+ $converse_width="1024px";
+ if(! $top_photo)
+ $top_photo = '64px';
+ $pmenu_top = intval($top_photo) - 6 . 'px';
+
+ if(! $reply_photo)
+ $reply_photo = '32px';
+ $pmenu_reply = intval($reply_photo) - 6 . 'px';
+
if($nav_min_opacity === false || $nav_min_opacity === '') {
$nav_float_min_opacity = 1.0;
$nav_percent_min_opacity = 100;
@@ -138,12 +151,17 @@ $options = array (
'$toolicon_activecolour' => $toolicon_activecolour,
'$font_size' => $font_size,
'$font_colour' => $font_colour,
+'$body_font_size' => $body_font_size,
'$radius' => $radius,
'$shadow' => $shadow,
'$active_colour' => $active_colour,
-'$section_width' => $section_width,
+'$converse_width' => $converse_width,
'$nav_float_min_opacity' => $nav_float_min_opacity,
-'$nav_percent_min_opacity' => $nav_percent_min_opacity
+'$nav_percent_min_opacity' => $nav_percent_min_opacity,
+'$top_photo' => $top_photo,
+'$reply_photo' => $reply_photo,
+'$pmenu_top' => $pmenu_top,
+'$pmenu_reply' => $pmenu_reply
);
echo str_replace(array_keys($options), array_values($options), $x);
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 237637770..e0f546896 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -12,12 +12,15 @@
{{include file="field_input.tpl" field=$item_opacity}}
{{include file="field_input.tpl" field=$toolicon_colour}}
{{include file="field_input.tpl" field=$toolicon_activecolour}}
+{{include file="field_input.tpl" field=$body_font_size}}
{{include file="field_input.tpl" field=$font_size}}
{{include file="field_input.tpl" field=$font_colour}}
{{include file="field_input.tpl" field=$radius}}
{{include file="field_input.tpl" field=$shadow}}
-{{include file="field_input.tpl" field=$section_width}}
+{{include file="field_input.tpl" field=$converse_width}}
{{include file="field_input.tpl" field=$nav_min_opacity}}
+{{include file="field_input.tpl" field=$top_photo}}
+{{include file="field_input.tpl" field=$reply_photo}}
{{include file="field_checkbox.tpl" field=$sloppy_photos}}
<div class="settings-submit-wrapper">
<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index 7b6113105..b8e2b4730 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -18,28 +18,33 @@
<ul class="comment-edit-bb-{{$id}}">
<li><i class="icon-bold shadow comment-icon"
style="cursor: pointer;" title="{{$edbold}}"
- onclick="insertFormatting('{{$comment}}','b', {{$id}});"></i></li>
+ onclick="insertbbcomment('{{$comment}}','b', {{$id}});"></i></li>
<li><i class="icon-italic shadow comment-icon"
style="cursor: pointer;" title="{{$editalic}}"
- onclick="insertFormatting('{{$comment}}','i', {{$id}});"></i></li>
+ onclick="insertbbcomment('{{$comment}}','i', {{$id}});"></i></li>
<li><i class="icon-underline shadow comment-icon"
style="cursor: pointer;" title="{{$eduline}}"
- onclick="insertFormatting('{{$comment}}','u', {{$id}});"></i></li>
+ onclick="insertbbcomment('{{$comment}}','u', {{$id}});"></i></li>
<li><i class="icon-quote-left shadow comment-icon"
style="cursor: pointer;" title="{{$edquote}}"
- onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></i></li>
+ onclick="insertbbcomment('{{$comment}}','quote', {{$id}});"></i></li>
<li><i class="icon-terminal shadow comment-icon"
style="cursor: pointer;" title="{{$edcode}}"
- onclick="insertFormatting('{{$comment}}','code', {{$id}});"></i></li>
+ onclick="insertbbcomment('{{$comment}}','code', {{$id}});"></i></li>
<li><i class="icon-camera shadow comment-icon"
style="cursor: pointer;" title="{{$edimg}}"
- onclick="insertFormatting('{{$comment}}','img', {{$id}});"></i></li>
+ onclick="insertbbcomment('{{$comment}}','img', {{$id}});"></i></li>
<li><i class="icon-link shadow comment-icon"
style="cursor: pointer;" title="{{$edurl}}"
- onclick="insertFormatting('{{$comment}}','url', {{$id}});"></i></li>
+ onclick="insertbbcomment('{{$comment}}','url', {{$id}});"></i></li>
<li><i class="icon-facetime-video shadow comment-icon"
style="cursor: pointer;" title="{{$edvideo}}"
- onclick="insertFormatting('{{$comment}}','video', {{$id}});"></i></li>
+ onclick="insertbbcomment('{{$comment}}','video', {{$id}});"></i></li>
+ {{if $feature_encrypt}}
+ <li><i class="icon-key shadow comment-icon"
+ style="cursor: pointer;" title="{{$encrypt}}"
+ onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;"></i></li>
+ {{/if}}
</ul>
<div class="comment-edit-bb-end"></div>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen(this, {{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose(this,{{$id}});" >{{$comment}}</textarea>
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index c3e020619..1ceca04c6 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -120,6 +120,7 @@ function enableOnUser(){
onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
onComplete: function(file,response) {
addeditortext(response);
+ $('#jot-media').val($('#jot-media').val() + response);
$('#profile-rotator').spin(false);
}
}
@@ -131,6 +132,7 @@ function enableOnUser(){
onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
onComplete: function(file,response) {
addeditortext(response);
+ $('#jot-media').val($('#jot-media').val() + response);
$('#profile-rotator').spin(false);
}
}
@@ -292,129 +294,6 @@ function enableOnUser(){
}
- function addhtmltext(data) {
- data = h2b(data);
- addeditortext(data);
- }
-
-
- function addeditortext(data) {
- if(typeof tinyMCE !== "undefined") {
- tinyMCE.execCommand('mceInsertRawHTML',false,data);
- }
- else {
- var currentText = $("#profile-jot-text").val();
- $("#profile-jot-text").val(currentText + data);
- }
- }
-
- function h2b(s) {
- var y = s;
- function rep(re, str) {
- y = y.replace(re,str);
- };
-
- rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");
- rep(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");
- rep(/<span style=\"color:(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");
- rep(/<font>(.*?)<\/font>/gi,"$1");
- rep(/<img.*?width=\"(.*?)\".*?height=\"(.*?)\".*?src=\"(.*?)\".*?\/>/gi,"[img=$1x$2]$3[/img]");
- rep(/<img.*?height=\"(.*?)\".*?width=\"(.*?)\".*?src=\"(.*?)\".*?\/>/gi,"[img=$2x$1]$3[/img]");
- rep(/<img.*?src=\"(.*?)\".*?height=\"(.*?)\".*?width=\"(.*?)\".*?\/>/gi,"[img=$3x$2]$1[/img]");
- rep(/<img.*?src=\"(.*?)\".*?width=\"(.*?)\".*?height=\"(.*?)\".*?\/>/gi,"[img=$2x$3]$1[/img]");
- rep(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");
-
-
- rep(/<ul class=\"listbullet\" style=\"list-style-type\: circle\;\">(.*?)<\/ul>/gi,"[list]$1[/list]");
- rep(/<ul class=\"listnone\" style=\"list-style-type\: none\;\">(.*?)<\/ul>/gi,"[list=]$1[/list]");
- rep(/<ul class=\"listdecimal\" style=\"list-style-type\: decimal\;\">(.*?)<\/ul>/gi,"[list=1]$1[/list]");
- rep(/<ul class=\"listlowerroman\" style=\"list-style-type\: lower-roman\;\">(.*?)<\/ul>/gi,"[list=i]$1[/list]");
- rep(/<ul class=\"listupperroman\" style=\"list-style-type\: upper-roman\;\">(.*?)<\/ul>/gi,"[list=I]$1[/list]");
- rep(/<ul class=\"listloweralpha\" style=\"list-style-type\: lower-alpha\;\">(.*?)<\/ul>/gi,"[list=a]$1[/list]");
- rep(/<ul class=\"listupperalpha\" style=\"list-style-type\: upper-alpha\;\">(.*?)<\/ul>/gi,"[list=A]$1[/list]");
- rep(/<li>(.*?)<\/li>/gi,"[li]$1[/li]");
-
- rep(/<code>(.*?)<\/code>/gi,"[code]$1[/code]");
- rep(/<\/(strong|b)>/gi,"[/b]");
- rep(/<(strong|b)>/gi,"[b]");
- rep(/<\/(em|i)>/gi,"[/i]");
- rep(/<(em|i)>/gi,"[i]");
- rep(/<\/u>/gi,"[/u]");
-
-
- rep(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");
- rep(/<u>/gi,"[u]");
- rep(/<blockquote[^>]*>/gi,"[quote]");
- rep(/<\/blockquote>/gi,"[/quote]");
- rep(/<hr \/>/gi,"[hr]");
- rep(/<br (.*?)\/>/gi,"\n");
- rep(/<br\/>/gi,"\n");
- rep(/<br>/gi,"\n");
- rep(/<p>/gi,"");
- rep(/<\/p>/gi,"\n");
- rep(/&nbsp;/gi," ");
- rep(/&quot;/gi,"\"");
- rep(/&lt;/gi,"<");
- rep(/&gt;/gi,">");
- rep(/&amp;/gi,"&");
-
- return y;
- };
-
-
- function b2h(s) {
- var y = s;
- function rep(re, str) {
- y = y.replace(re,str);
- };
-
- rep(/\&/gi,"&amp;");
- rep(/\</gi,"&lt;");
- rep(/\>/gi,"&gt;");
- rep(/\"/gi,"&quot;");
-
- rep(/\n/gi,"<br />");
- rep(/\[b\]/gi,"<strong>");
- rep(/\[\/b\]/gi,"</strong>");
- rep(/\[i\]/gi,"<em>");
- rep(/\[\/i\]/gi,"</em>");
- rep(/\[u\]/gi,"<u>");
- rep(/\[\/u\]/gi,"</u>");
- rep(/\[hr\]/gi,"<hr />");
- rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>");
- rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");
- rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,"<img width=\"$1\" height=\"$2\" src=\"$3\" />");
- rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />");
-
- // FIXME - add zid
- rep(/\[zrl=([^\]]+)\](.*?)\[\/zrl\]/gi,"<a href=\"$1\">$2</a>");
- rep(/\[zrl\](.*?)\[\/zrl\]/gi,"<a href=\"$1\">$1</a>");
- rep(/\[zmg=(.*?)x(.*?)\](.*?)\[\/zmg\]/gi,"<img width=\"$1\" height=\"$2\" src=\"$3\" />");
- rep(/\[zmg\](.*?)\[\/zmg\]/gi,"<img src=\"$1\" />");
-
- rep(/\[list\](.*?)\[\/list\]/gi, '<ul class="listbullet" style="list-style-type: circle;">$1</ul>');
- rep(/\[list=\](.*?)\[\/list\]/gi, '<ul class="listnone" style="list-style-type: none;">$1</ul>');
- rep(/\[list=1\](.*?)\[\/list\]/gi, '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>');
- rep(/\[list=i\](.*?)\[\/list\]/gi,'<ul class="listlowerroman" style="list-style-type: lower-roman;">$1</ul>');
- rep(/\[list=I\](.*?)\[\/list\]/gi, '<ul class="listupperroman" style="list-style-type: upper-roman;">$1</ul>');
- rep(/\[list=a\](.*?)\[\/list\]/gi, '<ul class="listloweralpha" style="list-style-type: lower-alpha;">$1</ul>');
- rep(/\[list=A\](.*?)\[\/list\]/gi, '<ul class="listupperalpha" style="list-style-type: upper-alpha;">$1</ul>');
- rep(/\[li\](.*?)\[\/li\]/gi, '<li>$1</li>');
- rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"<span style=\"color: $1;\">$2</span>");
- rep(/\[size=(.*?)\](.*?)\[\/size\]/gi,"<span style=\"font-size: $1;\">$2</span>");
- rep(/\[code\](.*?)\[\/code\]/gi,"<code>$1</code>");
- rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<blockquote>$1</blockquote>");
-
- rep(/\[video\](.*?)\[\/video\]/gi,"<a href=\"$1\">$1</a>");
- rep(/\[audio\](.*?)\[\/audio\]/gi,"<a href=\"$1\">$1</a>");
-
- rep(/\[\&amp\;([#a-z0-9]+)\;\]/gi,'&$1;');
-
- rep(/\<(.*?)(src|href)=\"[^hfm](.*?)\>/gi,'<$1$2="">');
-
- return y;
- };
-
{{$geotag}}
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 924f7d9bc..ef91f45be 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -6,6 +6,8 @@
<input type="hidden" name="return" value="{{$return_path}}" />
<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
<input type="hidden" name="expire" id="jot-expire" value="{{$defexpire}}" />
+ <input type="hidden" name="media_str" id="jot-media" value="" />
+ <input type="hidden" name="source" id="jot-source" value="{{$source}}" />
<input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="{{$post_id}}" />
<input type="hidden" name="webpage" value="{{$webpage}}" />
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index 621f56be7..b7654dc2d 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -15,6 +15,7 @@
{{/if}}
<input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" />
+<input type="hidden" name="media_str" id="jot-media" value="" />
<div id="prvmail-subject-label">{{$subject}}</div>
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
@@ -40,7 +41,9 @@
<div id="prvmail-expire-wrapper" style="display: {{$feature_expire}};" >
<i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="prvmailGetExpiry();return false;"></i>
</div>
-
+ <div id="prvmail-encrypt-wrapper" style="display: {{$feature_encrypt}};" >
+ <i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;"></i>
+ </div>
<div id="prvmail-rotator-wrapper" >
<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl
index 496f91ff5..c42eaf0e1 100755
--- a/view/tpl/removeme.tpl
+++ b/view/tpl/removeme.tpl
@@ -13,6 +13,8 @@
</div>
<div id="remove-account-pass-end"></div>
+{{include file="field_checkbox.tpl" field=$global}}
+
<input type="submit" name="submit" value="{{$submit}}" />
</form>
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
index ac2eaf7ae..929965727 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"><img class="vcard-photo photo" src="{{$photo}}" alt="name" /></div>
+<div id="profile-photo-wrapper"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></div>
</div>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-29 05:55:18 +0000