diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-01 23:56:13 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-01 23:56:13 -0400 |
commit | 5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c (patch) | |
tree | 5ce33b1595a2dd7d94e43ca9d2efc7be8facc94b /view/jot.tpl | |
parent | 9472ba8d2031183cc9d573f27e02511c1c5a3050 (diff) | |
parent | 5d35f0d54a52801dd9a17d4e44c294e4c9168de3 (diff) | |
download | volse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.tar.gz volse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.tar.bz2 volse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
add title to D* posts
allow users to set categories on their posts
Modified peopleyouknow to handle sites without Facebook better
diabook-themes: add link to global dir in "find friends" at right_aside
modified: mod/newmember.php
New user quick start.
check for style.php existence before inclusion
Moved Diaspora notes away from top, per user request
* master:
Diffstat (limited to 'view/jot.tpl')
-rwxr-xr-x | view/jot.tpl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/view/jot.tpl b/view/jot.tpl index 5fe1f954e..91de628ac 100755 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -15,6 +15,7 @@ <input type="hidden" name="post_id" value="$post_id" /> <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> + <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" 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> |