diff options
| author | friendica <redmatrix@redmatrix.me> | 2015-04-15 16:43:44 -0700 |
|---|---|---|
| committer | friendica <redmatrix@redmatrix.me> | 2015-04-15 16:43:44 -0700 |
| commit | 7febf1bf21d36f45efba9d458597086e84d4a6b7 (patch) | |
| tree | a417444e7e1803f5610293ab8980da0c118efd7b | |
| parent | d7cc07f5d71316d75ea786d5c442b47c5d234d6d (diff) | |
| parent | 2ba95e55a5323f55b5cf8789e86411a23013d2a6 (diff) | |
| download | volse-hubzilla-7febf1bf21d36f45efba9d458597086e84d4a6b7.tar.gz volse-hubzilla-7febf1bf21d36f45efba9d458597086e84d4a6b7.tar.bz2 volse-hubzilla-7febf1bf21d36f45efba9d458597086e84d4a6b7.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rw-r--r-- | mod/viewsrc.php | 3 | ||||
| -rw-r--r-- | view/it/strings.php | 1 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 10 |
4 files changed, 9 insertions, 7 deletions
diff --git a/include/conversation.php b/include/conversation.php index 67f3afde0..05898cfce 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -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'), diff --git a/mod/viewsrc.php b/mod/viewsrc.php index 983a0e725..3125ae4c0 100644 --- a/mod/viewsrc.php +++ b/mod/viewsrc.php @@ -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(); } diff --git a/view/it/strings.php b/view/it/strings.php index dce82adab..daa7ccf2d 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -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"; diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index ed1d1e35f..927b3a5b9 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -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> |