aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xboot.php2
-rwxr-xr-xinclude/html2bbcode.php2
-rwxr-xr-xinclude/items.php24
-rwxr-xr-xview/theme/diabook/jot.tpl15
-rw-r--r--view/theme/diabook/style.css29
-rw-r--r--view/theme/diabook/wallwall_item.tpl3
-rw-r--r--view/theme/dispy/style.css30
-rwxr-xr-xview/theme/duepuntozero/jot.tpl5
-rw-r--r--view/theme/ghost/unsupported0
-rwxr-xr-xview/theme/testbubble/jot.tpl6
10 files changed, 81 insertions, 35 deletions
diff --git a/boot.php b/boot.php
index 81e84d372..362b49e9f 100755
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1270' );
+define ( 'FRIENDICA_VERSION', '2.3.1271' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1131 );
diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 51d629940..32a90d7d6 100755
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -212,7 +212,7 @@ function html2bbcode($message)
node2bbcode($doc, 'audio', array('src'=>'/(.+)/'), '[audio]$1', '[/audio]');
node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]');
- node2bbcode($doc, 'code', array(), '[code]$1', '[/code]');
+ node2bbcode($doc, 'code', array(), '[code]', '[/code]');
$message = $doc->saveHTML();
diff --git a/include/items.php b/include/items.php
index a1254e165..3c55fbb4f 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1747,6 +1747,18 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
$datarray['parent-uri'] = $item_id;
$datarray['uid'] = $importer['uid'];
$datarray['contact-id'] = $contact['id'];
+
+ if(x($datarray,'owner-link') && strlen($datarray['owner-link']) && (! link_compare($datarray['owner-link'],$contact['url']))) {
+ // The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
+ // but otherwise there's a possible data mixup on the sender's system.
+ // the tgroup delivery code called from item_store will correct it if it's a forum,
+ // but we're going to unconditionally correct it here so that the post will always be owned by our contact.
+ logger('local_delivery: Correcting item owner.', LOGGER_DEBUG);
+ $datarray['owner-name'] = $contact['name'];
+ $datarray['owner-link'] = $contact['url'];
+ $datarray['owner-avatar'] = $contact['thumb'];
+ }
+
$r = item_store($datarray);
continue;
@@ -2439,6 +2451,18 @@ function local_delivery($importer,$data) {
$datarray['parent-uri'] = $item_id;
$datarray['uid'] = $importer['importer_uid'];
$datarray['contact-id'] = $importer['id'];
+
+ if(x($datarray,'owner-link') && strlen($datarray['owner-link']) && (! link_compare($datarray['owner-link'],$importer['url']))) {
+ // The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
+ // but otherwise there's a possible data mixup on the sender's system.
+ // the tgroup delivery code called from item_store will correct it if it's a forum,
+ // but we're going to unconditionally correct it here so that the post will always be owned by our contact.
+ logger('local_delivery: Correcting item owner.', LOGGER_DEBUG);
+ $datarray['owner-name'] = $importer['senderName'];
+ $datarray['owner-link'] = $importer['url'];
+ $datarray['owner-avatar'] = $importer['thumb'];
+ }
+
$r = item_store($datarray);
continue;
}
diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl
index 4f784c3f8..59066a19c 100755
--- a/view/theme/diabook/jot.tpl
+++ b/view/theme/diabook/jot.tpl
@@ -45,23 +45,25 @@
</div>
<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
-
- <button onclick="preview_post();" id="jot-preview-link" class="button creation1">$preview</button>
-
+
+ <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
+
<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 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>
+ <div id="profile-jot-perms-end"></div>
+
<div id="jot-preview-content" style="display:none;"></div>
<div style="display: none;">
@@ -75,9 +77,8 @@
</div>
-</div>
-<div id="profile-jot-end"></div>
+
</form>
</div>
{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index f005ff4bd..06ddf6de1 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -384,9 +384,7 @@ body {
font-size: 13px;
background-color: #ffffff;
color: #2d2d2d;
- margin-left: : auto;
- margin-right: auto;
- margin-top: 50px;
+ margin: 50px auto auto;
display: table;
}
h4 {
@@ -1005,24 +1003,24 @@ section {
display: table-cell;
vertical-align: top;
width: 800px;
- padding: 0px 0px 0px 10px;
+ padding: 0px 0px 0px 12px;
}
.tabs {
background-position: 0 -20px;
background-repeat: repeat-x;
-
height: 27px;
padding: 0;
}
.tab.button {
- margin-right: 15px;
- margin-left: 15px;
- background: none repeat scroll 0 0 #F8F8F8;
+ margin-right: 5px;
+ margin-left: 5px;
+ /*background: none repeat scroll 0 0 #F8F8F8;*/
border: 1px solid #CCCCCC;
border-radius: 3px 3px 3px 3px;
- font-weight: bold;
+ font-weight: normal;
padding: 3px;
+ color: #333333;
}
/* wall item */
.tread-wrapper {
@@ -1045,6 +1043,8 @@ section {
display: table;
width: 780px;
}
+
+
.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
display: table-row;
}
@@ -1221,8 +1221,12 @@ section {
border-right: 1px solid #A7C7F7;
padding-right: 12px;
}
+
+#jot-preview-content{
+ margin-top: 30px;}
+
#jot-preview-content .tread-wrapper {
- background-color: #fce94f;
+ background-color: #fff797;
}
.wall-item-tags {
@@ -1667,11 +1671,10 @@ ul.tabs {
}
ul.tabs li {
float: left;
- margin-left: 7px;
+ margin-left: 5px;
}
ul.tabs li .active {
- background-color: #33ACFF;
- background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
+ background-color: #333333;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index 08ea36781..effb7273f 100644
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -103,5 +103,4 @@
<div class="wall-item-comment-wrapper" >
$item.comment
-</div>
-tb \ No newline at end of file
+</div> \ No newline at end of file
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 23f0539d0..476ba59e9 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -153,7 +153,7 @@ a:hover {
color: #729fcf;
}
input[type=submit] {
- margin-top: 20px;
+ margin-top: 10px;
height: 22px;
background-color: #555753;
color: #eeeeec;
@@ -1751,6 +1751,14 @@ div[id$="wrapper"] br {
/**
* contacts selector
*/
+.group-delete-wrapper {
+ margin: -28px 150px 0 0;
+ float: right;
+}
+#group-edit-submit-wrapper {
+ margin: 0 0 10px 0;
+ display: inline;
+}
#group-edit-desc {
margin: 10px 0px;
}
@@ -2081,19 +2089,29 @@ div[id$="wrapper"] br {
* Form fields
*/
.field {
- margin-bottom: 10px;
- padding-bottom: 10px;
+ /*margin-bottom: 10px;*/
+ /*padding-bottom: 10px;*/
overflow: auto;
width: 100%;
}
.field label {
float: left;
width: 200px;
+ display: block;
+ font-size: 1.077em;
+ margin-bottom: 0.2em;
+ margin: 0 10px 0.2em 0;
+ border: 1px #999 solid;
+ padding: 5px;
+ vertical-align: middle;
+}
+.field input {
+ width: 250px;
+ height: 25px;
+ border: 1px #666 solid;
}
-
-.field input,
.field textarea {
- width: 400px;
+ width: 80%;
}
.field textarea {
height: 100px;
diff --git a/view/theme/duepuntozero/jot.tpl b/view/theme/duepuntozero/jot.tpl
index e356d1d8f..5fe1f954e 100755
--- a/view/theme/duepuntozero/jot.tpl
+++ b/view/theme/duepuntozero/jot.tpl
@@ -14,10 +14,11 @@
<input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="preview" id="jot-preview" value="0" />
- <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+ <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
+ <div id="jot-text-wrap">
<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>
-
+ </div>
<div id="profile-jot-submit-wrapper" class="jothidden">
<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
diff --git a/view/theme/ghost/unsupported b/view/theme/ghost/unsupported
deleted file mode 100644
index e69de29bb..000000000
--- a/view/theme/ghost/unsupported
+++ /dev/null
diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl
index 5bb5b4673..45d206d57 100755
--- a/view/theme/testbubble/jot.tpl
+++ b/view/theme/testbubble/jot.tpl
@@ -16,11 +16,11 @@
<input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="preview" id="jot-preview" value="0" />
- <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
-
+ <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
+ <div id="jot-text-wrap">
<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>
-
+ </div>
<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="$upload"></a></div>
</div>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 01:56:55 +0000