mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 06:35:15 +00:00
Merge https://github.com/redmatrix/redmatrix into pending_merge
This commit is contained in:
commit
7febf1bf21
4 changed files with 9 additions and 7 deletions
|
@ -1171,7 +1171,7 @@ function status_editor($a, $x, $popup = false) {
|
|||
'$action' => $a->get_baseurl(true) . '/item',
|
||||
'$share' => (x($x,'button') ? $x['button'] : t('Share')),
|
||||
'$webpage' => $webpage,
|
||||
'$placeholdpagetitle' => ((x($x,'ptlabel')) ? $x['ptlabel'] : t('Page link title')),
|
||||
'$placeholdpagetitle' => ((x($x,'ptlabel')) ? $x['ptlabel'] : t('Page link name')),
|
||||
'$pagetitle' => (x($x,'pagetitle') ? $x['pagetitle'] : ''),
|
||||
'$id_select' => $id_select,
|
||||
'$id_seltext' => t('Post as'),
|
||||
|
|
|
@ -21,7 +21,7 @@ function viewsrc_content(&$a) {
|
|||
}
|
||||
|
||||
if(local_channel() && $item_id) {
|
||||
$r = q("select item_flags, body from item where item_restrict = 0 and uid in (%d , %d) and id = %d limit 1",
|
||||
$r = q("select item_flags, body, id from item where item_restrict = 0 and uid in (%d , %d) and id = %d limit 1",
|
||||
intval(local_channel()),
|
||||
intval($sys['channel_id']),
|
||||
intval($item_id)
|
||||
|
@ -35,6 +35,7 @@ function viewsrc_content(&$a) {
|
|||
}
|
||||
|
||||
if(is_ajax()) {
|
||||
print '<div><i class="icon-pencil"> ' . t('Source of Item') . ' ' . $r[0]['id'] . '</i></div>';
|
||||
echo $o;
|
||||
killme();
|
||||
}
|
||||
|
|
|
@ -2127,3 +2127,4 @@ $a->strings["Website SSL certificate is not valid. Please correct."] = "Il certi
|
|||
$a->strings["[red] Website SSL error for %s"] = "[red] Errore SSL %s ";
|
||||
$a->strings["Cron/Scheduled tasks not running."] = "Processi/cron non avviati.";
|
||||
$a->strings["[red] Cron tasks not running on %s"] = "[red] Processi non avviati su %s";
|
||||
$a->strings["Source of Item"] = "Sorgente dell'Elemento";
|
||||
|
|
|
@ -19,6 +19,11 @@
|
|||
<span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}}
|
||||
</div>
|
||||
{{/if}}
|
||||
{{if $webpage}}
|
||||
<div id="jot-pagetitle-wrap" class="jothidden" style="display:none">
|
||||
<input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}">
|
||||
</div>
|
||||
{{/if}}
|
||||
<div id="jot-title-wrap" class="jothidden" style="display:none">
|
||||
<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" tabindex=1 value="{{$title}}">
|
||||
</div>
|
||||
|
@ -27,11 +32,6 @@
|
|||
<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="cat-tagsinput">
|
||||
</div>
|
||||
{{/if}}
|
||||
{{if $webpage}}
|
||||
<div id="jot-pagetitle-wrap" class="jothidden" style="display:none">
|
||||
<input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}">
|
||||
</div>
|
||||
{{/if}}
|
||||
<div id="jot-text-wrap">
|
||||
<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex=2 placeholder="{{$share}}">{{$content}}</textarea>
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue