diff options
| author | friendica <info@friendica.com> | 2013-02-27 17:09:04 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-02-27 17:09:04 -0800 |
| commit | 5612716cff11039c64e1dba46bde5795f6b65c5c (patch) | |
| tree | 9c08a7f76729bbc4b366f72561dffaab1593d961 | |
| parent | 596ed80adf220920e619dab85bbc9a9aaaff5404 (diff) | |
| download | volse-hubzilla-5612716cff11039c64e1dba46bde5795f6b65c5c.tar.gz volse-hubzilla-5612716cff11039c64e1dba46bde5795f6b65c5c.tar.bz2 volse-hubzilla-5612716cff11039c64e1dba46bde5795f6b65c5c.zip | |
taking the next step on pages
| -rw-r--r-- | include/conversation.php | 3 | ||||
| -rw-r--r-- | view/tpl/jot.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/smarty3/jot.tpl | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/include/conversation.php b/include/conversation.php index 90a6aaa7f..f8507c595 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -949,6 +949,9 @@ function status_editor($a,$x,$popup=false) { '$return_path' => $a->query_string, '$action' => $a->get_baseurl(true) . '/item', '$share' => (x($x,'button') ? $x['button'] : t('Share')), + '$webpage' => (x($x,'webpage') ? '1' : ''), + '$placeholdpagetitle' => t('Page link title'), + '$pagetitle' => (x($x,'pagetitle') ? $x['pagetitle'] : ''), '$upload' => t('Upload photo'), '$shortupload' => t('upload photo'), '$attach' => t('Attach file'), diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 29c420900..6de2ef97e 100644 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -13,11 +13,15 @@ <input type="hidden" name="location" id="jot-location" value="$defloc" /> <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" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div> {{ if $catsenabled }} <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div> {{ endif }} + {{ if $webpage }} + <div id="jot-pagetitle-wrap"><input name="pagetitle" id="jot-pagetitle" type="text" placeholder="$placeholdpagetitle" value="$pagetitle" class="jothidden" style="display:none" /></div> + {{ endif }} <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> diff --git a/view/tpl/smarty3/jot.tpl b/view/tpl/smarty3/jot.tpl index 87e00413c..9ce34ee2f 100644 --- a/view/tpl/smarty3/jot.tpl +++ b/view/tpl/smarty3/jot.tpl @@ -18,11 +18,15 @@ <input type="hidden" name="location" id="jot-location" value="{{$defloc}}" /> <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}}" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div> {{if $catsenabled}} <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div> {{/if}} + {{if $webpage}} + <div id="jot-pagetitle-wrap"><input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}" class="jothidden" style="display:none" /></div> + {{/if}} <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}}{{/if}}</textarea> |